DrMark-thinking-sphinx 1.1.14 → 1.1.15

data/lib/thinking_sphinx.rb

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

data/lib/thinking_sphinx/active_record.rb

@@ -83,6 +83,17 @@ module ThinkingSphinx
             include ThinkingSphinx::ActiveRecord::AttributeUpdates
             
             index
+            
+            # We want to make sure that if the database doesn't exist, then Thinking
+            # Sphinx doesn't mind when running non-TS tasks (like db:create, db:drop
+            # and db:migrate). It's a bit hacky, but I can't think of a better way.
+          rescue StandardError => err
+            case err.class.name
+            when "Mysql::Error", "Java::JavaSql::SQLException", "ActiveRecord::StatementInvalid"
+              return
+            else
+              raise err
+            end
           end
           alias_method :sphinx_index, :define_index
           

data/lib/thinking_sphinx/index.rb

@@ -30,19 +30,6 @@ module ThinkingSphinx
       @sources      = []
       @options      = {}
       @delta_object = nil
-      
-      # add_internal_attributes_and_facets
-      
-      # We want to make sure that if the database doesn't exist, then Thinking
-      # Sphinx doesn't mind when running non-TS tasks (like db:create, db:drop
-      # and db:migrate). It's a bit hacky, but I can't think of a better way.
-    rescue StandardError => err
-      case err.class.name
-      when "Mysql::Error", "Java::JavaSql::SQLException", "ActiveRecord::StatementInvalid"
-        return
-      else
-        raise err
-      end
     end
     
     def fields

data/lib/thinking_sphinx/index/builder.rb

@@ -14,7 +14,7 @@ module ThinkingSphinx
     # 
     class Builder
       instance_methods.grep(/^[^_]/).each { |method|
-        next if method == "instance_eval"
+        next if method.to_s == "instance_eval"
         define_method(method) {
           caller.grep(/irb.completion/).empty? ? method_missing(method) : super
         }

data/spec/unit/thinking_sphinx/active_record_spec.rb

@@ -92,6 +92,22 @@ describe "ThinkingSphinx::ActiveRecord" do
     it "should return the new index" do
       TestModule::TestModel.define_index.should == @index
     end
+    
+    it "should die quietly if there is a database error" do
+      ThinkingSphinx::Index::Builder.stub_method_to_raise(:generate => Mysql::Error)
+      
+      lambda {
+        TestModule::TestModel.define_index
+      }.should_not raise_error
+    end
+    
+    it "should die noisily if there is a non-database error" do
+      ThinkingSphinx::Index::Builder.stub_method_to_raise(:generate => StandardError)
+      
+      lambda {
+        TestModule::TestModel.define_index
+      }.should raise_error
+    end
   end
 
   describe "index methods" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DrMark-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: []