thinking-sphinx 1.4.2 → 1.4.3

data/README.textile

@@ -180,3 +180,5 @@ Since I first released this library, there's been quite a few people who have su
 * Marcin Stecki
 * Robert Glaser
 * Paul Schyska
+* Kirill Maximov
+* Hans Hasselberg

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/lib/thinking_sphinx/active_record.rb

@@ -1,6 +1,7 @@
 require 'thinking_sphinx/active_record/attribute_updates'
 require 'thinking_sphinx/active_record/delta'
 require 'thinking_sphinx/active_record/has_many_association'
+require 'thinking_sphinx/active_record/has_many_association_with_scopes'
 require 'thinking_sphinx/active_record/scopes'
 
 module ThinkingSphinx
@@ -45,8 +46,7 @@ module ThinkingSphinx
           end
           
           def sphinx_database_adapter
-            @sphinx_database_adapter ||=
-              ThinkingSphinx::AbstractAdapter.detect(self)
+            ThinkingSphinx::AbstractAdapter.detect(self)
           end
           
           def sphinx_name

data/lib/thinking_sphinx/active_record/has_many_association.rb

@@ -9,17 +9,7 @@ module ThinkingSphinx
         args << options
         @reflection.klass.search(*args)
       end
-      
-      def method_missing(method, *args, &block)
-        if responds_to_scope(method)
-          @reflection.klass.
-            search(:with => default_filter).
-            send(method, *args, &block)
-        else
-          super
-        end
-      end
-      
+
       private
       
       def attribute_for_foreign_key
@@ -41,11 +31,6 @@ module ThinkingSphinx
       def default_filter
         {attribute_for_foreign_key.unique_name => @owner.id}
       end
-      
-      def responds_to_scope(scope)
-        @reflection.klass.respond_to?(:sphinx_scopes)   &&
-        @reflection.klass.sphinx_scopes.include?(scope)
-      end
     end
   end
 end

data/lib/thinking_sphinx/active_record/has_many_association_with_scopes.rb

@@ -0,0 +1,21 @@
+module ThinkingSphinx
+  module ActiveRecord
+    module HasManyAssociationWithScopes
+      def method_missing(method, *args, &block)
+        if responds_to_scope(method)
+          @reflection.klass.
+            search(:with => default_filter).
+            send(method, *args, &block)
+        else
+          super
+        end
+      end
+      
+      private
+      def responds_to_scope(scope)
+        @reflection.klass.respond_to?(:sphinx_scopes)   &&
+        @reflection.klass.sphinx_scopes.include?(scope)
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/active_record/scopes.rb

@@ -17,6 +17,7 @@ module ThinkingSphinx
         # The scope is automatically applied when the search method is called. It
         # will only be applied if it is an existing sphinx_scope.
         def default_sphinx_scope(sphinx_scope_name)
+          add_sphinx_scopes_support_to_has_many_associations
           @default_sphinx_scope = sphinx_scope_name
         end
 
@@ -43,6 +44,8 @@ module ThinkingSphinx
         #   @articles =  Article.latest_first.search 'pancakes'
         #
         def sphinx_scope(method, &block)
+          add_sphinx_scopes_support_to_has_many_associations
+
           @sphinx_scopes ||= []
           @sphinx_scopes << method
           
@@ -76,6 +79,14 @@ module ThinkingSphinx
           
           sphinx_scopes.clear
         end
+
+        def add_sphinx_scopes_support_to_has_many_associations
+          scope_mixin = ::ThinkingSphinx::ActiveRecord::HasManyAssociationWithScopes
+
+          ::ActiveRecord::Associations::HasManyAssociation.send(:include, scope_mixin)
+          ::ActiveRecord::Associations::HasManyThroughAssociation.send(:include, scope_mixin)
+        end
+
       end
     end
   end

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -117,6 +117,7 @@ module ThinkingSphinx
           DECLARE tmp bigint;
           DECLARE i int;
           DECLARE j int;
+          DECLARE byte_length int;
           DECLARE word_array bytea;
           BEGIN
             IF COALESCE(word, '') = '' THEN
@@ -125,6 +126,7 @@ module ThinkingSphinx
           
             i = 0;
             tmp = 4294967295;
+            byte_length = bit_length(word) / 8;
             word_array = decode(replace(word, E'\\\\', E'\\\\\\\\'), 'escape');
             LOOP
               tmp = (tmp # get_byte(word_array, i))::bigint;
@@ -137,7 +139,7 @@ module ThinkingSphinx
                   EXIT;
                 END IF;
               END LOOP;
-              IF i >= char_length(word) THEN
+              IF i >= byte_length THEN
                 EXIT;
               END IF;
             END LOOP;

data/lib/thinking_sphinx/search.rb

@@ -29,32 +29,32 @@ module ThinkingSphinx
     
     # Deprecated. Use ThinkingSphinx.search
     def self.search(*args)
-      log 'ThinkingSphinx::Search.search is deprecated. Please use ThinkingSphinx.search instead.'
-      ThinkingSphinx.search *args
+      warn 'ThinkingSphinx::Search.search is deprecated. Please use ThinkingSphinx.search instead.'
+      ThinkingSphinx.search(*args)
     end
     
     # Deprecated. Use ThinkingSphinx.search_for_ids
     def self.search_for_ids(*args)
-      log 'ThinkingSphinx::Search.search_for_ids is deprecated. Please use ThinkingSphinx.search_for_ids instead.'
-      ThinkingSphinx.search_for_ids *args
+      warn 'ThinkingSphinx::Search.search_for_ids is deprecated. Please use ThinkingSphinx.search_for_ids instead.'
+      ThinkingSphinx.search_for_ids(*args)
     end
     
     # Deprecated. Use ThinkingSphinx.search_for_ids
     def self.search_for_id(*args)
-      log 'ThinkingSphinx::Search.search_for_id is deprecated. Please use ThinkingSphinx.search_for_id instead.'
-      ThinkingSphinx.search_for_id *args
+      warn 'ThinkingSphinx::Search.search_for_id is deprecated. Please use ThinkingSphinx.search_for_id instead.'
+      ThinkingSphinx.search_for_id(*args)
     end
     
     # Deprecated. Use ThinkingSphinx.count
     def self.count(*args)
-      log 'ThinkingSphinx::Search.count is deprecated. Please use ThinkingSphinx.count instead.'
-      ThinkingSphinx.count *args
+      warn 'ThinkingSphinx::Search.count is deprecated. Please use ThinkingSphinx.count instead.'
+      ThinkingSphinx.count(*args)
     end
     
     # Deprecated. Use ThinkingSphinx.facets
     def self.facets(*args)
-      log 'ThinkingSphinx::Search.facets is deprecated. Please use ThinkingSphinx.facets instead.'
-      ThinkingSphinx.facets *args
+      warn 'ThinkingSphinx::Search.facets is deprecated. Please use ThinkingSphinx.facets instead.'
+      ThinkingSphinx.facets(*args)
     end
     
     def self.bundle_searches(enum = nil)
@@ -334,7 +334,7 @@ module ThinkingSphinx
       merge_search self, args, options
       args << options
       
-      ThinkingSphinx::FacetSearch.new *args
+      ThinkingSphinx::FacetSearch.new(*args)
     end
     
     def client
@@ -354,16 +354,7 @@ module ThinkingSphinx
       @populated = true
       @results   = results
       
-      if options[:ids_only]
-        replace @results[:matches].collect { |match|
-          match[:attributes]["sphinx_internal_id"]
-        }
-      else
-        replace instances_from_matches
-        add_excerpter
-        add_sphinx_attributes
-        add_matching_fields if client.rank_mode == :fieldmask
-      end
+      compose_results
     end
     
     private
@@ -395,18 +386,44 @@ module ThinkingSphinx
           raise ThinkingSphinx::ConnectionError,
             'Connection to Sphinx Daemon (searchd) failed.'
         end
-      
-        if options[:ids_only]
-          replace @results[:matches].collect { |match|
-            match[:attributes]["sphinx_internal_id"]
-          }
+        
+        compose_results
+      end
+    end
+
+    def compose_results
+      if options[:ids_only]
+        compose_ids_results
+      elsif options[:only]
+        compose_only_results
+      else
+        replace instances_from_matches
+        add_excerpter
+        add_sphinx_attributes
+        add_matching_fields if client.rank_mode == :fieldmask
+      end
+    end
+    
+    def compose_ids_results
+      replace @results[:matches].collect { |match|
+        match[:attributes]['sphinx_internal_id']
+      }
+    end
+    
+    def compose_only_results
+      replace @results[:matches].collect { |match|
+        case only = options[:only]
+        when String, Symbol
+          match[:attributes][only.to_s]
+        when Array
+          only.inject({}) do |hash, attribute|
+            hash[attribute.to_sym] = match[:attributes][attribute.to_s]
+            hash
+          end
         else
-          replace instances_from_matches
-          add_excerpter
-          add_sphinx_attributes
-          add_matching_fields if client.rank_mode == :fieldmask
+          raise "Unexpected object for :only argument. String or Array is expected, #{only.class} was received."
         end
-      end
+      }
     end
     
     def add_excerpter
@@ -903,7 +920,7 @@ module ThinkingSphinx
     end
     
     def scoped_count
-      return self.total_entries if @options[:ids_only]
+      return self.total_entries if(@options[:ids_only] || @options[:only])
       
       @options[:ids_only] = true
       results_count = self.total_entries

data/spec/thinking_sphinx/search_spec.rb

@@ -867,6 +867,36 @@ describe ThinkingSphinx::Search do
       end
     end
     
+    describe ':only option' do
+      it "returns the requested attribute as an array" do
+        ThinkingSphinx::Search.new(:only => :class_crc).first.
+          should == Alpha.to_crc32
+      end
+      
+      it "returns multiple attributes as hashes with values" do
+        ThinkingSphinx::Search.new(
+          :only => [:class_crc, :sphinx_internal_id]
+        ).first.should == {
+          :class_crc          => Alpha.to_crc32,
+          :sphinx_internal_id => @alpha_a.id
+        }
+      end
+      
+      it "handles strings for a single attribute name" do
+        ThinkingSphinx::Search.new(:only => 'class_crc').first.
+          should == Alpha.to_crc32
+      end
+      
+      it "handles strings for multiple attribute names" do
+        ThinkingSphinx::Search.new(
+          :only => ['class_crc', 'sphinx_internal_id']
+        ).first.should == {
+          :class_crc          => Alpha.to_crc32,
+          :sphinx_internal_id => @alpha_a.id
+        }
+      end
+    end
+    
     context 'result objects' do
       describe '#excerpts' do
         before :each do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +11:00
+date: 2011-01-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -303,6 +303,7 @@ files:
 - lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
 - lib/thinking_sphinx/active_record/has_many_association.rb
+- lib/thinking_sphinx/active_record/has_many_association_with_scopes.rb
 - lib/thinking_sphinx/active_record/scopes.rb
 - lib/thinking_sphinx/adapters/abstract_adapter.rb
 - lib/thinking_sphinx/adapters/mysql_adapter.rb