diff --git a/vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN b/vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN index 06d5d76..2404a55 100644 --- a/vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN +++ b/vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN @@ -14,7 +14,7 @@ To run the acts_as_solr's plugin tests run the following steps: - create a new Rails project, if needed (the plugin can only be tested from within a Rails project); move/checkout acts_as_solr into its vendor/plugins/, as usual -- copy vendor/plugins/acts_as_solr/config/solr.yml to config/ (the Rails config folder) +- copy vendor/plugins/acts_as_solr_reloaded/config/solr.yml to config/ (the Rails config folder) - rake solr:start RAILS_ENV=test diff --git a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb index c84df21..b7caccf 100644 --- a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb +++ b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb @@ -181,8 +181,8 @@ module ActsAsSolr #:nodoc: end def multi_model_suffix(options) - models = "AND (#{solr_configuration[:type_field]}:#{self.name}" - models << " OR " + options[:models].collect {|m| "#{solr_configuration[:type_field]}:" + m.to_s}.join(" OR ") if options[:models].is_a?(Array) + models = "AND (#{solr_configuration[:type_field]}:\"#{self.name}\"" + models << " OR " + options[:models].collect {|m| "#{solr_configuration[:type_field]}:\"" + m.to_s + "\""}.join(" OR ") if options[:models].is_a?(Array) models << ")" end diff --git a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb index 3ebabc1..2b25a24 100644 --- a/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb +++ b/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb @@ -107,8 +107,8 @@ module ActsAsSolr #:nodoc: end def solr_type_condition - (subclasses || []).inject("(#{solr_configuration[:type_field]}:#{self.name}") do |condition, subclass| - condition << (subclass.name.empty? ? "" : " OR #{solr_configuration[:type_field]}:#{subclass.name}") + (subclasses || []).inject("(#{solr_configuration[:type_field]}:\"#{self.name}\"") do |condition, subclass| + condition << (subclass.name.empty? ? "" : " OR #{solr_configuration[:type_field]}:\"#{subclass.name}\"") end << ')' end diff --git a/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake b/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake index 9926f3c..16617a0 100644 --- a/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake +++ b/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake @@ -2,7 +2,7 @@ namespace :solr do desc 'Download and install Solr+Jetty 3.3.0.' task :download do - if (File.exists?(Rails.root + '/vendor/plugins/acts_as_solr/solr/start.jar')) + if (File.exists?(Rails.root + '/vendor/plugins/acts_as_solr_reloaded/solr/start.jar')) puts 'Solr already downloaded.' else cd '/tmp' -- libgit2 0.21.2