freelancing-god-thinking-sphinx 1.1.23 → 1.1.24

data/README.textile

@@ -141,3 +141,6 @@ Since I first released this library, there's been quite a few people who have su
 * Paul Campbell
 * Matthew Beale
 * Tom Simnett
+* Erik Ostrom
+* Ole Riesenberg
+* Josh Kalderimis

data/lib/thinking_sphinx.rb

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

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -37,7 +37,8 @@ module ThinkingSphinx
     end
     
     def convert_nulls(clause, default = '')
-      default = "'#{default}'" if default.is_a?(String)
+      default = "'#{default}'"  if default.is_a?(String)
+      default = 'NULL'          if default.nil?
       
       "COALESCE(#{clause}, #{default})"
     end
@@ -132,4 +133,4 @@ module ThinkingSphinx
       execute function, true
     end
   end
-end
+end

data/lib/thinking_sphinx/attribute.rb

@@ -89,14 +89,21 @@ module ThinkingSphinx
     def to_select_sql
       return nil unless include_as_association?
       
-      separator = all_ints? || @crc ? ',' : ' '
+      separator = all_ints? || all_datetimes? || @crc ? ',' : ' '
       
       clause = @columns.collect { |column|
         part = column_with_prefix(column)
-        type == :string ? adapter.convert_nulls(part) : part
+        case type
+        when :string
+          adapter.convert_nulls(part)
+        when :datetime
+          adapter.cast_to_datetime(part)
+        else
+          part
+        end
       }.join(', ')
       
-      clause = adapter.cast_to_datetime(clause)             if type == :datetime
+      # clause = adapter.cast_to_datetime(clause)             if type == :datetime
       clause = adapter.crc(clause)                          if @crc
       clause = adapter.concatenate(clause, separator)       if concat_ws?
       clause = adapter.group_concatenate(clause, separator) if is_many?
@@ -142,6 +149,8 @@ module ThinkingSphinx
     def type
       @type ||= begin
         base_type = case
+        when is_many_datetimes?
+          :datetime
         when is_many?, is_many_ints?
           :multi
         when @associations.values.flatten.length > 1
@@ -171,14 +180,11 @@ module ThinkingSphinx
     end
     
     def all_ints?
-      @columns.all? { |col|
-        klasses = @associations[col].empty? ? [@model] :
-          @associations[col].collect { |assoc| assoc.reflection.klass }
-        klasses.all? { |klass|
-          column = klass.columns.detect { |column| column.name == col.__name.to_s }
-          !column.nil? && column.type == :integer
-        }
-      }
+      all_of_type?(:integer)
+    end
+    
+    def all_datetimes?
+      all_of_type?(:datetime, :date, :timestamp)
     end
     
     private
@@ -274,14 +280,19 @@ WHERE #{@source.index.delta_object.clause(model, true)})
     def is_many_ints?
       concat_ws? && all_ints?
     end
-        
+    
+    def is_many_datetimes?
+      is_many? && all_datetimes?
+    end
+       
     def type_from_database
       klass = @associations.values.flatten.first ? 
         @associations.values.flatten.first.reflection.klass : @model
       
-      klass.columns.detect { |col|
+      column = klass.columns.detect { |col|
         @columns.collect { |c| c.__name.to_s }.include? col.name
-      }.type
+      }
+      column.nil? ? nil : column.type
     end
     
     def translated_type_from_database
@@ -303,5 +314,16 @@ block:
         MESSAGE
       end
     end
+    
+    def all_of_type?(*column_types)
+      @columns.all? { |col|
+        klasses = @associations[col].empty? ? [@model] :
+          @associations[col].collect { |assoc| assoc.reflection.klass }
+        klasses.all? { |klass|
+          column = klass.columns.detect { |column| column.name == col.__name.to_s }
+          !column.nil? && column_types.include?(column.type)
+        }
+      }
+    end
   end
 end

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -1,11 +1,26 @@
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :thinking_sphinx do
     namespace :install do
-      desc "Install Sphinx by source"
+      desc <<-DESC
+        Install Sphinx by source
+        
+        If Postgres is available, Sphinx will use it.
+        
+        If the variable :thinking_sphinx_configure_args is set, it will
+        be passed to the Sphinx configure script. You can use this to
+        install Sphinx in a non-standard location:
+        
+          set :thinking_sphinx_configure_args, "--prefix=$HOME/software"
+DESC
+
       task :sphinx do
         with_postgres = false
-        run "which pg_config" do |channel, stream, data|
-          with_postgres = !(data.nil? || data == "")
+        begin
+          run "which pg_config" do |channel, stream, data|
+            with_postgres = !(data.nil? || data == "")
+          end
+        rescue Capistrano::CommandError => e
+          puts "Continuing despite error: #{e.message}"
         end
       
         args = []
@@ -14,14 +29,15 @@ Capistrano::Configuration.instance(:must_exist).load do
             args << "--with-pgsql=#{data}"
           end
         end
-      
+        args << fetch(:thinking_sphinx_configure_args, '')
+        
         commands = <<-CMD
         wget -q http://www.sphinxsearch.com/downloads/sphinx-0.9.8.1.tar.gz >> sphinx.log
         tar xzvf sphinx-0.9.8.1.tar.gz
         cd sphinx-0.9.8.1
         ./configure #{args.join(" ")}
         make
-        sudo make install
+        #{try_sudo} make install
         rm -rf sphinx-0.9.8.1 sphinx-0.9.8.1.tar.gz
         CMD
         run commands.split(/\n\s+/).join(" && ")
@@ -29,7 +45,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     
       desc "Install Thinking Sphinx as a gem from GitHub"
       task :ts do
-        sudo "gem install freelancing-god-thinking-sphinx --source http://gems.github.com"
+        run "#{try_sudo} gem install freelancing-god-thinking-sphinx --source http://gems.github.com"
       end
     end
   
@@ -70,7 +86,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   
     desc "Add the shared folder for sphinx files for the production environment"
     task :shared_sphinx_folder, :roles => :web do
-      sudo "mkdir -p #{shared_path}/db/sphinx/production"
+      run "mkdir -p #{shared_path}/db/sphinx/production"
     end
 
     def rake(*tasks)

data/lib/thinking_sphinx/source/sql.rb

@@ -112,7 +112,9 @@ GROUP BY #{ sql_group_clause }
       end
 
       def crc_column
-        if @model.column_names.include?(@model.inheritance_column)
+        if @model.table_exists? &&
+          @model.column_names.include?(@model.inheritance_column)
+          
           adapter.cast_to_unsigned(adapter.convert_nulls(
             adapter.crc(adapter.quote_with_table(@model.inheritance_column), true),
             @model.to_crc32

data/spec/unit/thinking_sphinx/attribute_spec.rb

@@ -88,6 +88,19 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
+  describe '#to_select_sql' do
+    it "should convert a mixture of dates and datetimes to timestamps" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:created_at),
+          ThinkingSphinx::Index::FauxColumn.new(:created_on) ],
+        :as => :times
+      )
+      attribute.model = Friendship
+      
+      attribute.to_select_sql.should == "CONCAT_WS(',', UNIX_TIMESTAMP(`friendships`.`created_at`), UNIX_TIMESTAMP(`friendships`.`created_on`)) AS `times`"
+    end
+  end
+  
   describe "is_many? method" do
     before :each do
       @assoc_a = Object.stub_instance(:is_many? => true)
@@ -191,7 +204,7 @@ describe ThinkingSphinx::Attribute do
       attribute.model = Person
       attribute.columns.each { |col| attribute.associations[col] = [] }
       
-      attribute.send(:all_ints?).should be_true
+      attribute.should be_all_ints
     end
     
     it "should return false if only some columns are integers" do
@@ -202,7 +215,7 @@ describe ThinkingSphinx::Attribute do
       attribute.model = Person
       attribute.columns.each { |col| attribute.associations[col] = [] }
       
-      attribute.send(:all_ints?).should be_false
+      attribute.should_not be_all_ints
     end
     
     it "should return false if no columns are integers" do
@@ -213,7 +226,42 @@ describe ThinkingSphinx::Attribute do
       attribute.model = Person
       attribute.columns.each { |col| attribute.associations[col] = [] }
       
-      attribute.send(:all_ints?).should be_false
+      attribute.should_not be_all_ints
+    end
+  end
+  
+  describe "all_datetimes? method" do
+    it "should return true if all columns are datetimes" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:created_at),
+          ThinkingSphinx::Index::FauxColumn.new(:updated_at) ]
+      )
+      attribute.model = Friendship
+      attribute.columns.each { |col| attribute.associations[col] = [] }
+      
+      attribute.should be_all_datetimes
+    end
+    
+    it "should return false if only some columns are datetimes" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:id),
+          ThinkingSphinx::Index::FauxColumn.new(:created_at) ]
+      )
+      attribute.model = Friendship
+      attribute.columns.each { |col| attribute.associations[col] = [] }
+      
+      attribute.should_not be_all_datetimes
+    end
+    
+    it "should return true if all columns can be " do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:created_at),
+          ThinkingSphinx::Index::FauxColumn.new(:created_on) ]
+      )
+      attribute.model = Friendship
+      attribute.columns.each { |col| attribute.associations[col] = [] }
+      
+      attribute.should be_all_datetimes
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.23
+  version: 1.1.24
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -07:00
+date: 2009-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: []