Changeset 350
- Timestamp:
- 06/13/08 10:26:38 (4 months ago)
- Files:
-
- trunk/demo/config/database.yml (modified) (2 diffs)
- trunk/demo/test/unit/comment_test.rb (modified) (1 diff)
- trunk/plugin/acts_as_ferret/lib/instance_methods.rb (modified) (1 diff)
- trunk/plugin/acts_as_ferret/recipes/aaf_recipes.rb (modified) (1 diff)
- trunk/plugin/acts_as_ferret/tasks/ferret.rake (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/demo/config/database.yml
r270 r350 13 13 username: ferret 14 14 password: ferret 15 socket: /var/run/mysqld/mysqld.sock16 15 17 16 test: … … 20 19 username: ferret 21 20 password: ferret 22 socket: /var/run/mysqld/mysqld.sock23 21 24 22 # since this is a demo, we won't need this one trunk/demo/test/unit/comment_test.rb
r324 r350 11 11 def test_truth 12 12 assert_kind_of Comment, comments(:first) 13 end 14 15 def test_issue_220_index_false_as_false 16 c = Comment.new :content => false 17 assert_equal false, c.content 18 assert_equal 'false', c.content_for_field_name(:content) 19 assert_equal 'false', c.to_doc[:content] 20 c.save 21 assert_equal c, Comment.find_with_ferret('content:false').first 13 22 end 14 23 trunk/plugin/acts_as_ferret/lib/instance_methods.rb
r327 r350 151 151 152 152 def content_for_field_name(field, via = field, dynamic_boost = nil) 153 field_data = self.send(via) || self.instance_variable_get("@#{via}") 153 field_data = (respond_to?(via) ? send(via) : instance_variable_get("@#{via}")).to_s 154 # field_data = self.send(via) || self.instance_variable_get("@#{via}") 154 155 if (dynamic_boost && boost_value = self.send(dynamic_boost)) 155 156 field_data = Ferret::Field.new(field_data) trunk/plugin/acts_as_ferret/recipes/aaf_recipes.rb
r349 r350 66 66 67 67 desc "Rebuild the Ferret index. See aaf_recipes.rb for instructions." 68 task :rebuild => :environment, :roles => :app do68 task :rebuild, :roles => :app do 69 69 rake = fetch(:rake, 'rake') 70 70 rails_env = fetch(:rails_env, 'production') trunk/plugin/acts_as_ferret/tasks/ferret.rake
r348 r350 7 7 desc "Rebuild a Ferret index. Specify what model to rebuild with the MODEL environment variable." 8 8 task :rebuild => :environment do 9 #require File.join(RAILS_ROOT, 'config', 'environment')10 11 9 indexes = ENV['INDEXES'].split 12 10 indexes.each do |index_name|
