freelancing-god-thinking-sphinx 1.2.7 → 1.2.8

data/README.textile

@@ -30,6 +30,10 @@ Alternatively, install the ginger gem directly from the freelancing-god github r
 
   sudo gem sources -a http://gems.github.com
   sudo gem install freelancing-god-ginger
+  
+Then install the cucumber, yard, jeweler and rspec gems. Make sure you have a git install version 1.6.0.0 or higher, otherwise the jeweler gem won't install.
+
+  sudo gem install cucumber yard jeweler rspec
 
 Then set up your database:
 
@@ -148,3 +152,6 @@ Since I first released this library, there's been quite a few people who have su
 * Jeffrey Chupp
 * Rob Anderton
 * Zach Inglis
+* Ward Bekker
+* Brian Terlson
+* Christian Aust

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 7
+:patch: 8

data/lib/thinking_sphinx/active_record.rb

@@ -281,7 +281,7 @@ module ThinkingSphinx
     # @return [Integer] Unique record id for the purposes of Sphinx.
     # 
     def primary_key_for_sphinx
-      attributes[self.class.primary_key_for_sphinx.to_s]
+      read_attribute(self.class.primary_key_for_sphinx)
     end
     
     def sphinx_document_id

data/lib/thinking_sphinx/attribute.rb

@@ -75,7 +75,9 @@ module ThinkingSphinx
       @crc            = options[:crc]
       
       @type         ||= :multi    unless @query_source.nil?
-      @type           = :integer  if @type == :string && @crc
+      if @type == :string && @crc
+        @type = is_many? ? :multi : :integer
+      end
       
       source.attributes << self
     end

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -91,8 +91,9 @@ DESC
 
     def rake(*tasks)
       rails_env = fetch(:rails_env, "production")
+      rake = fetch(:rake, "rake")
       tasks.each do |t|
-        run "cd #{current_path} && rake #{t} RAILS_ENV=#{rails_env}"
+        run "cd #{current_path}; #{rake} RAILS_ENV=#{rails_env} #{t}"
       end
     end
   end

data/lib/thinking_sphinx/facet.rb

@@ -95,7 +95,9 @@ module ThinkingSphinx
         return nil unless object = object.send(method)
       }
       if object.is_a?(Array)
-        object.collect { |item| item.send(column.__name) }
+        object.collect { |item| item.send(column.__name) }.detect { |item|
+          item.to_crc32 == attribute_value
+        }
       else
         object.send(column.__name)
       end

data/lib/thinking_sphinx/index/builder.rb

@@ -198,7 +198,6 @@ module ThinkingSphinx
       #   set_property :delta => true
       #   set_property :field_weights => {"name" => 100}
       #   set_property :order => "name ASC"
-      #   set_property :include => :picture
       #   set_property :select => 'name'
       # 
       # Also, the following two properties are particularly relevant for

data/lib/thinking_sphinx/property.rb

@@ -14,6 +14,8 @@ module ThinkingSphinx
       @faceted  = options[:facet]
       @admin    = options[:admin]
       
+      @alias    = @alias.to_sym unless @alias.blank?
+      
       @columns.each { |col|
         @associations[col] = association_stack(col.__stack.clone).each { |assoc|
           assoc.join_to(source.base)

data/spec/lib/thinking_sphinx/active_record/delta_spec.rb

@@ -18,7 +18,7 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
     
     @beta.should have_received(:toggle_delta)
   end
-
+  
   describe "suspended_delta method" do
     before :each do
       ThinkingSphinx.stub_method(:deltas_enabled? => true)

data/spec/lib/thinking_sphinx/index/builder_spec.rb

@@ -53,6 +53,35 @@ describe ThinkingSphinx::Index::Builder do
     end
   end
   
+  describe 'aliased field' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name, :as => 'name'
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    it "should store the alias as a symbol for consistency" do
+      @source.fields.last.unique_name.should == :name
+    end
+  end
+  
+  describe 'aliased attribute' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name
+        has :id, :as => 'real_id'
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    it "should store the alias as a symbol for consistency" do
+      @source.attributes.last.unique_name.should == :real_id
+    end
+  end
+  
   describe "sortable field" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
@@ -223,6 +252,77 @@ describe ThinkingSphinx::Index::Builder do
     end
   end
   
+  describe 'faceted manual MVA' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name
+        has 'SQL STATEMENT', :type => :multi, :as => :sql, :facet => true
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    after :each do
+      Person.sphinx_facets.delete_at(-1)
+    end
+    
+    it "should have two attributes alongside the four internal ones" do
+      @source.attributes.length.should == 6
+    end
+    
+    it "should set the facet attribute name to have the _facet suffix" do
+      @source.attributes.last.unique_name.should == :sql_facet
+    end
+    
+    it "should keep the original attribute's name set as requested" do
+      @source.attributes[-2].unique_name.should == :sql
+    end
+    
+    it "should set the attribute type to multi" do
+      @source.attributes.last.type.should == :multi
+    end
+    
+    it "should set the attribute column to be the same as the field" do
+      @source.attributes.last.columns.length.should == 1
+      @source.attributes.last.columns.first.__name.should == 'SQL STATEMENT'
+    end
+  end
+  
+  describe 'faceted MVA field' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes tags(:name), :as => :tags, :facet => true
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    after :each do
+      Person.sphinx_facets.delete_at(-1)
+    end
+    
+    it "should have one field" do
+      @source.fields.length.should == 1
+    end
+    
+    it "should have one attribute alongside the four internal ones" do
+      @source.attributes.length.should == 5
+    end
+    
+    it "should set the attribute name to have the _facet suffix" do
+      @source.attributes.last.unique_name.should == :tags_facet
+    end
+    
+    it "should set the attribute type to multi" do
+      @source.attributes.last.type.should == :multi
+    end
+    
+    it "should set the attribute column to be the same as the field" do
+      @source.attributes.last.columns.length.should == 1
+      @source.attributes.last.columns.first.__name.should == :name
+    end
+  end
+  
   describe "no fields" do
     it "should raise an exception" do
       lambda {

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -158,10 +158,10 @@ describe ThinkingSphinx::Search do
       @alpha_a, @alpha_b  = Alpha.new,  Alpha.new
       @beta_a, @beta_b    = Beta.new,   Beta.new
       
-      @alpha_a.stub! :id => 1, :attributes => {'id' => 1}
-      @alpha_b.stub! :id => 2, :attributes => {'id' => 2}
-      @beta_a.stub!  :id => 1, :attributes => {'id' => 1}
-      @beta_b.stub!  :id => 2, :attributes => {'id' => 2}
+      @alpha_a.stub! :id => 1, :read_attribute => 1
+      @alpha_b.stub! :id => 2, :read_attribute => 2
+      @beta_a.stub!  :id => 1, :read_attribute => 1
+      @beta_b.stub!  :id => 2, :read_attribute => 2
       
       @client.stub! :query => {
         :matches => minimal_result_hashes(@alpha_a, @beta_b, @alpha_b, @beta_a)
@@ -805,7 +805,7 @@ describe ThinkingSphinx::Search do
   describe '.each_with_groupby_and_count' do
     before :each do
       @alpha = Alpha.new
-      @alpha.stub!(:id => 1, :attributes => {'id' => 1})
+      @alpha.stub!(:id => 1, :read_attribute => 1)
       
       @client.stub! :query => {
         :matches => [{
@@ -833,7 +833,7 @@ describe ThinkingSphinx::Search do
   describe '.each_with_weighting' do
     before :each do
       @alpha = Alpha.new
-      @alpha.stub!(:id => 1, :attributes => {'id' => 1})
+      @alpha.stub!(:id => 1, :read_attribute => 1)
       
       @client.stub! :query => {
         :matches => [{
@@ -858,7 +858,7 @@ describe ThinkingSphinx::Search do
   describe '.each_with_*' do
     before :each do
       @alpha = Alpha.new
-      @alpha.stub!(:id => 1, :attributes => {'id' => 1})
+      @alpha.stub!(:id => 1, :read_attribute => 1)
       
       @client.stub! :query => {
         :matches => [{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency