thinking-sphinx 1.3.14 → 1.3.15

data/VERSION

@@ -1 +1 @@
-1.3.14
+1.3.15

data/lib/thinking_sphinx/active_record/has_many_association.rb

@@ -6,6 +6,7 @@ module ThinkingSphinx
         stack = [@reflection.options[:through]].compact
         
         attribute   = nil
+        @reflection.klass.define_indexes
         (@reflection.klass.sphinx_indexes || []).each do |index|
           attribute = index.attributes.detect { |attrib|
             attrib.columns.length == 1 &&

data/lib/thinking_sphinx/configuration.rb

@@ -120,9 +120,15 @@ module ThinkingSphinx
     end
     
     def self.environment
-      Thread.current[:thinking_sphinx_environment] ||= (
-        defined?(Merb) ? Merb.environment : ENV['RAILS_ENV']
-      ) || "development"
+      Thread.current[:thinking_sphinx_environment] ||= begin
+        if defined?(Merb)
+          Merb.environment
+        elsif defined?(RAILS_ENV)
+          RAILS_ENV
+        else
+          ENV['RAILS_ENV'] || 'development'
+        end
+      end
     end
     
     def environment

data/lib/thinking_sphinx/search.rb

@@ -80,6 +80,12 @@ module ThinkingSphinx
       @array
     end
     
+    def freeze
+      populate
+      @array.freeze
+      self
+    end
+    
     # Indication of whether the request has been made to Sphinx for the search
     # query.
     # 

data/spec/thinking_sphinx/active_record/has_many_association_spec.rb

@@ -21,7 +21,13 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
       end
       
       @person.friendships.search "test"
-    end    
+    end
+    
+    it "should define indexes for the reflection class" do
+      Friendship.should_receive(:define_indexes)
+      
+      @person.friendships.search 'test'
+    end
   end
   
   describe "search method for has_many :through" do

data/spec/thinking_sphinx/configuration_spec.rb

@@ -17,7 +17,15 @@ describe ThinkingSphinx::Configuration do
       Merb.stub!(:environment => "merb_production")
       ThinkingSphinx::Configuration.environment.should == "merb_production"
 
-      Object.send(:remove_const, :Merb)
+      Object.send :remove_const, :Merb
+    end
+    
+    it "should use RAILS_ENV if set" do
+      RAILS_ENV = 'global_rails'
+      
+      ThinkingSphinx::Configuration.environment.should == 'global_rails'
+      
+      Object.send :remove_const, :RAILS_ENV
     end
 
     it "should use the Rails environment value if set" do

data/spec/thinking_sphinx/search_spec.rb

@@ -1172,6 +1172,26 @@ describe ThinkingSphinx::Search do
       }.should_not be_nil
     end
   end
+  
+  describe '#freeze' do
+    before :each do
+      @search = ThinkingSphinx::Search.new
+    end
+    
+    it "should populate the result set" do
+      @search.freeze
+      @search.should be_populated
+    end
+    
+    it "should freeze the underlying array" do
+      @search.freeze
+      @search.to_a.should be_frozen
+    end
+    
+    it "should return the Search object" do
+      @search.freeze.should be_a(ThinkingSphinx::Search)
+    end
+  end
 end
 
 describe ThinkingSphinx::Search, "playing nice with Search model" do

data/tasks/distribution.rb

@@ -28,7 +28,7 @@ Jeweler::Tasks.new do |gem|
   ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
-  gem.add_dependency 'riddle',       '>= 1.0.8'
+  gem.add_dependency 'riddle',       '>= 1.0.9'
   gem.add_dependency 'after_commit', '>= 1.0.5'
   
   gem.post_install_message = <<-MESSAGE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.14
+  version: 1.3.15
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 +11:00
+date: 2010-01-29 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.8
+        version: 1.0.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: after_commit