freelancing-god-thinking-sphinx 1.2.2 → 1.2.3

data/lib/thinking_sphinx.rb

@@ -38,7 +38,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 2
-    Tiny  = 2
+    Tiny  = 3
     
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/thinking_sphinx/configuration.rb

@@ -227,6 +227,18 @@ module ThinkingSphinx
       client
     end
     
+    def models_by_crc
+      @models_by_crc ||= begin
+        ThinkingSphinx.indexed_models.inject({}) do |hash, model|
+          hash[model.constantize.to_crc32] = model
+          Object.subclasses_of(model.constantize).each { |subclass|
+            hash[subclass.to_crc32] = subclass.name
+          }
+          hash
+        end
+      end
+    end
+    
     private
     
     # Parse the config/sphinx.yml file - if it exists - then use the attribute

data/lib/thinking_sphinx/search.rb

@@ -493,10 +493,10 @@ module ThinkingSphinx
       return {} unless options[:geo] || (options[:lat] && options[:lng])
       
       {
-        :latitude       => options[:geo] ? options[:geo].first : options[:lat],
-        :longitude      => options[:geo] ? options[:geo].last  : options[:lng],
-        :latitude_attr  => latitude_attr,
-        :longitude_attr => longitude_attr
+        :latitude   => options[:geo] ? options[:geo].first : options[:lat],
+        :longitude  => options[:geo] ? options[:geo].last  : options[:lng],
+        :latitude_attribute  => latitude_attr,
+        :longitude_attribute => longitude_attr
       }
     end
     
@@ -602,16 +602,7 @@ module ThinkingSphinx
     end
     
     def class_from_crc(crc)
-      @models_by_crc ||= begin
-        ThinkingSphinx.indexed_models.inject({}) do |hash, model|
-          hash[model.constantize.to_crc32] = model
-          Object.subclasses_of(model.constantize).each { |subclass|
-            hash[subclass.to_crc32] = subclass.name
-          }
-          hash
-        end
-      end
-      @models_by_crc[crc].constantize
+      config.models_by_crc[crc].constantize
     end
     
     def each_with_attribute(attribute, &block)

data/spec/lib/thinking_sphinx/configuration_spec.rb

@@ -244,4 +244,19 @@ describe ThinkingSphinx::Configuration do
       @config.client.max_matches.should == 100
     end
   end
+  
+  describe '#models_by_crc' do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+    end
+    
+    it "should return a hash" do
+      @config.models_by_crc.should be_a(Hash)
+    end
+    
+    it "should pair class names to their crc codes" do
+      @config.models_by_crc[Person.to_crc32].should == 'Person'
+      @config.models_by_crc[Alpha.to_crc32].should  == 'Alpha'
+    end
+  end
 end

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -563,8 +563,8 @@ describe ThinkingSphinx::Search do
           :classes => [Alpha]
         ).first
         
-        @client.anchor[:latitude_attr].should == :lat
-        @client.anchor[:longitude_attr].should == :lng
+        @client.anchor[:latitude_attribute].should == :lat
+        @client.anchor[:longitude_attribute].should == :lng
       end
       
       it "should detect lat and lon attributes on the given model" do
@@ -573,8 +573,8 @@ describe ThinkingSphinx::Search do
           :classes => [Beta]
         ).first
         
-        @client.anchor[:latitude_attr].should == :lat
-        @client.anchor[:longitude_attr].should == :lon
+        @client.anchor[:latitude_attribute].should == :lat
+        @client.anchor[:longitude_attribute].should == :lon
       end
       
       it "should detect latitude and longitude attributes on the given model" do
@@ -583,8 +583,8 @@ describe ThinkingSphinx::Search do
           :classes => [Person]
         ).first
         
-        @client.anchor[:latitude_attr].should == :latitude
-        @client.anchor[:longitude_attr].should == :longitude
+        @client.anchor[:latitude_attribute].should == :latitude
+        @client.anchor[:longitude_attribute].should == :longitude
       end
       
       it "should accept manually defined latitude and longitude attributes" do
@@ -595,8 +595,8 @@ describe ThinkingSphinx::Search do
           :longitude_attr => :leftright
         ).first
         
-        @client.anchor[:latitude_attr].should == :updown
-        @client.anchor[:longitude_attr].should == :leftright
+        @client.anchor[:latitude_attribute].should == :updown
+        @client.anchor[:longitude_attribute].should == :leftright
       end
       
       it "should accept manually defined latitude and longitude attributes in the given model" do
@@ -605,8 +605,8 @@ describe ThinkingSphinx::Search do
           :classes => [Friendship]
         ).first
         
-        @client.anchor[:latitude_attr].should == :person_id
-        @client.anchor[:longitude_attr].should == :person_id
+        @client.anchor[:latitude_attribute].should == :person_id
+        @client.anchor[:longitude_attribute].should == :person_id
       end
       
       it "should accept geo array for geo-position values" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Pat Allan