honkster-acts_as_solr 0.3.4 → 0.3.6

data/Rakefile

@@ -57,8 +57,8 @@ end
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
-    s.name = "acts_as_solr"
-    #s.name = "honkster-acts_as_solr"
+#    s.name = "acts_as_solr"
+    s.name = "honkster-acts_as_solr"
     s.summary = "This plugin adds full text search capabilities and many other nifty features from Apache�s Solr to any Rails model. I'm currently rearranging the test suite to include a real unit test suite, and adding a few features I need myself."
     s.email = "meyer@paperplanes.de"
     s.homepage = "http://github.com/mattmatt/acts_as_solr"

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:patch: 4
+:build: 
 :major: 0
 :minor: 3
+:patch: 6

data/lib/acts_as_solr/acts_methods.rb

@@ -286,18 +286,12 @@ module ActsAsSolr #:nodoc:
       configuration[:solr_fields][field_name] = options
       
       define_method("#{field_name}_for_solr".to_sym) do
-        begin
-          value = self[field_name] || self.instance_variable_get("@#{field_name.to_s}".to_sym) || self.send(field_name.to_sym)
-          case options[:type] 
-            # format dates properly; return nil for nil dates 
-            when :date
-              value ? (value.respond_to?(:utc) ? value.utc : value).strftime("%Y-%m-%dT%H:%M:%SZ") : nil 
-            else value
-          end
-        rescue
-          puts $!
-          logger.debug "There was a problem getting the value for the field '#{field_name}': #{$!}"
-          value = ''
+        value = self[field_name] || self.instance_variable_get("@#{field_name.to_s}".to_sym) || self.send(field_name.to_sym)
+        case options[:type]
+          # format dates properly; return nil for nil dates
+          when :date
+            value ? (value.respond_to?(:utc) ? value.utc : value).strftime("%Y-%m-%dT%H:%M:%SZ") : nil
+          else value
         end
       end
     end

data/lib/acts_as_solr/parser_methods.rb

@@ -72,8 +72,7 @@ module ActsAsSolr #:nodoc:
         query_options[:field_list] = [field_list, 'score']
         query = "(#{query.gsub(/ *: */,"_t:")}) #{models}"
         order = options[:order].split(/\s*,\s*/).collect{|e| e.gsub(/\s+/,'_t ').gsub(/\bscore_t\b/, 'score')  }.join(',') if options[:order] 
-        query_options[:query] = replace_types([query])[0] # TODO adjust replace_types to work with String or Array
-        query_options[:query] = quote_values_with_spaces(query_options[:query])
+        query_options[:query] = replace_types([query])[0] # TODO adjust replace_types to work with String or Array  
 
         if options[:order]
           # TODO: set the sort parameter instead of the old ;order. style.
@@ -167,10 +166,6 @@ module ActsAsSolr #:nodoc:
       end
       strings
     end
-
-    def quote_values_with_spaces(string)
-      string.gsub(/:([^\s\)]*)\s([^\s\)]*)\)/, ':"\1 \2")')
-    end
     
     # Adds the score to each one of the instances found
     def add_scores(results, solr_data)

data/lib/solr/connection.rb

@@ -153,10 +153,12 @@ class Solr::Connection
   # send the http post request to solr; for convenience there are shortcuts
   # to some requests: add(), query(), commit(), delete() or send()
   def post(request)
-    response = @connection.post(@url.path + "/" + request.handler,
-                                request.to_s,
-                                { "Content-Type" => request.content_type })
-  
+    
+    url = @url.path + "/" + request.handler
+    RAILS_DEFAULT_LOGGER.info "acts_as_solr url: #{url}"
+    RAILS_DEFAULT_LOGGER.info "acts_as_solr post params: #{request.to_s}"
+    response = @connection.post( url, request.to_s, { "Content-Type" => request.content_type })
+
     case response
     when Net::HTTPSuccess then response.body
     else

data/test/unit/parser_instance.rb

@@ -15,5 +15,5 @@ class ActsAsSolr::ParserInstance
     []
   end
   
-  public :parse_results, :reorder, :parse_query, :add_scores, :replace_types, :quote_values_with_spaces
+  public :parse_results, :reorder, :parse_query, :add_scores, :replace_types
 end

data/test/unit/parser_methods_shoulda.rb

@@ -245,18 +245,6 @@ class ParserMethodsTest < Test::Unit::TestCase
         end
       end
     end
-
-    context "When quoting strings" do
-
-      should "quote values that have spaces" do
-        assert_equal '(some_facet:"One Fish") AND (other_t:"Two Fish")', @parser.quote_values_with_spaces("(some_facet:One Fish) AND (other_t:Two Fish)")
-      end
-
-      should "not quote values that do not have spaces" do
-        assert_equal '(age_i:21) OR (some_facet:foo)', @parser.quote_values_with_spaces("(age_i:21) OR (some_facet:foo)")
-      end
-
-    end
   
     context "When adding scores" do
       setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-acts_as_solr
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors: 
 - Mathias Meyer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-11-06 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -179,8 +179,10 @@ files:
 - test/unit/parser_methods_shoulda.rb
 - test/unit/solr_instance.rb
 - test/unit/test_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/mattmatt/acts_as_solr
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -201,41 +203,41 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: "This plugin adds full text search capabilities and many other nifty features from Apache\xEF\xBF\xBDs Solr to any Rails model. I'm currently rearranging the test suite to include a real unit test suite, and adding a few features I need myself."
 test_files: 
-- test/db/connections/mysql/connection.rb
-- test/db/connections/sqlite/connection.rb
-- test/db/migrate/001_create_books.rb
-- test/db/migrate/002_create_movies.rb
-- test/db/migrate/003_create_categories.rb
-- test/db/migrate/004_create_electronics.rb
-- test/db/migrate/005_create_authors.rb
-- test/db/migrate/006_create_postings.rb
-- test/db/migrate/007_create_posts.rb
-- test/db/migrate/008_create_gadgets.rb
+- test/unit/class_methods_shoulda.rb
+- test/unit/parser_instance.rb
+- test/unit/acts_methods_shoulda.rb
+- test/unit/lazy_document_shoulda.rb
+- test/unit/solr_instance.rb
+- test/unit/test_helper.rb
+- test/unit/common_methods_shoulda.rb
+- test/unit/instance_methods_shoulda.rb
+- test/unit/parser_methods_shoulda.rb
+- test/test_helper.rb
 - test/functional/acts_as_solr_test.rb
 - test/functional/association_indexing_test.rb
-- test/functional/faceted_search_test.rb
 - test/functional/multi_solr_search_test.rb
+- test/functional/faceted_search_test.rb
+- test/models/posting.rb
+- test/models/movie.rb
 - test/models/author.rb
-- test/models/book.rb
-- test/models/category.rb
 - test/models/electronic.rb
-- test/models/gadget.rb
-- test/models/movie.rb
 - test/models/novel.rb
+- test/models/gadget.rb
 - test/models/post.rb
-- test/models/posting.rb
-- test/test_helper.rb
-- test/unit/acts_methods_shoulda.rb
-- test/unit/class_methods_shoulda.rb
-- test/unit/common_methods_shoulda.rb
-- test/unit/instance_methods_shoulda.rb
-- test/unit/lazy_document_shoulda.rb
-- test/unit/parser_instance.rb
-- test/unit/parser_methods_shoulda.rb
-- test/unit/solr_instance.rb
-- test/unit/test_helper.rb
+- test/models/book.rb
+- test/models/category.rb
+- test/db/connections/mysql/connection.rb
+- test/db/connections/sqlite/connection.rb
+- test/db/migrate/006_create_postings.rb
+- test/db/migrate/007_create_posts.rb
+- test/db/migrate/008_create_gadgets.rb
+- test/db/migrate/004_create_electronics.rb
+- test/db/migrate/005_create_authors.rb
+- test/db/migrate/002_create_movies.rb
+- test/db/migrate/003_create_categories.rb
+- test/db/migrate/001_create_books.rb