freelancing-god-thinking-sphinx 1.1.19 → 1.1.20

data/README.textile

@@ -131,3 +131,4 @@ Since I first released this library, there's been quite a few people who have su
 * Jerome Riga
 * Tien Dung
 * Johannes Kaefer
+* Paul Campbell

data/lib/thinking_sphinx.rb

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

data/lib/thinking_sphinx/configuration.rb

@@ -225,7 +225,7 @@ module ThinkingSphinx
       conf = YAML::load(ERB.new(IO.read(path)).result)[environment]
       
       conf.each do |key,value|
-        self.send("#{key}=", value) if self.methods.include?("#{key}=")
+        self.send("#{key}=", value) if self.respond_to?("#{key}=")
         
         set_sphinx_setting self.source_options, key, value, SourceOptions
         set_sphinx_setting self.index_options,  key, value, IndexOptions
@@ -246,8 +246,8 @@ module ThinkingSphinx
       if object.is_a?(Hash)
         object[key.to_sym] = value if allowed.include?(key.to_s)
       else
-        object.send("#{key}=", value) if object.methods.include?("#{key}")
-        send("#{key}=", value) if self.methods.include?("#{key}")
+        object.send("#{key}=", value) if object.respond_to?("#{key}")
+        send("#{key}=", value) if self.respond_to?("#{key}")
       end
     end
   end

data/lib/thinking_sphinx/search.rb

@@ -222,6 +222,10 @@ module ThinkingSphinx
       # * <tt>:group_by</tt> determines the field which is used for grouping
       # * <tt>:group_clause</tt> determines the sorting order 
       #
+      # As a convenience, you can also use
+      # * <tt>:group</tt>
+      # which sets :group_by and defaults to :group_function of :attr
+      # 
       # === group_function
       #  
       # Valid values for :group_function are
@@ -508,6 +512,12 @@ module ThinkingSphinx
           end
         end
         
+        # Group by defaults using :group
+        if options[:group]
+          options[:group_by] = options[:group].to_s
+          options[:group_function] ||= :attr
+        end
+        
         [
           :max_matches, :match_mode, :sort_mode, :sort_by, :id_range,
           :group_by, :group_function, :group_clause, :group_distinct, :cut_off,

data/lib/thinking_sphinx/tasks.rb

@@ -2,7 +2,11 @@ require 'fileutils'
 
 namespace :thinking_sphinx do
   task :app_env do
-    Rake::Task[:environment].invoke if defined?(RAILS_ROOT)
+    if defined?(RAILS_ROOT)
+      Rake::Task[:environment].invoke
+      Rails.configuration.cache_classes = false
+    end
+    
     Rake::Task[:merb_env].invoke    if defined?(Merb)
   end
   

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -86,6 +86,20 @@ describe ThinkingSphinx::Search do
       end
     end
     
+    describe "grouping" do
+      before :each do
+        @client = Riddle::Client.new
+        @client.stub_method(:query => {:matches => []})
+        Riddle::Client.stub_method(:new => @client)
+      end
+
+      it "should convert group into group_by and group_function" do
+        ThinkingSphinx::Search.search "foo", :group => :edition
+        @client.group_function.should == :attr
+        @client.group_by.should == "edition"
+      end
+    end
+    
     describe ":comment option" do
       before :each do
         @client = Riddle::Client.new

metadata

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