ngmoco-cache-money 0.2.13 → 0.2.14

data/UNSUPPORTED_FEATURES

@@ -6,7 +6,7 @@
 * update_all, delete, update_counter, increment_counter, decrement_counter, counter_caches in general - counter caches are replaced by this gem, bear that in mind.
 * attr_readonly - no technical obstacle, just not yet supported
 * attributes before typecast behave unpredictably - hard to support
-* ActiveRecord::Rollback is unsupported - the exception gets swallowed so there isn't an opportunity to rollback the cache transaction - not hard to support
+* Named bind variables :conditions => ["name = :name", { :name => "37signals!" }] - not hard to support
 * printf style binds: :conditions => ["name = '%s'", "37signals!"] - not too hard to support
 * objects as attributes that are serialized. story.title = {:foo => :bar}; customer.balance = Money.new(...) - these could be coerced using Column#type_cast?
 

data/lib/cache_money.rb

@@ -57,11 +57,13 @@ module Cash
       end
     end
 
-    def transaction_with_cache_transaction(&block)
+    def transaction_with_cache_transaction(*args)
       if cache_config
-        repository.transaction { transaction_without_cache_transaction(&block) }
+        transaction_without_cache_transaction(*args) do
+          repository.transaction { yield }
+        end
       else
-        transaction_without_cache_transaction(&block)
+        transaction_without_cache_transaction(*args)
       end
     end
 

data/lib/cash/query/abstract.rb

@@ -187,9 +187,9 @@ module Cash
 
       def find_from_keys(*missing_keys)
         missing_ids = Array(missing_keys).flatten.collect { |key| key.split('/')[2].to_i }
-        options = @options1.dup
-        options.delete(:conditions)
-        options.delete(:limit)
+        options = {}
+        order_sql = @options1[:order] || @options2[:order]
+        options[:order] = order_sql if order_sql
         find_from_ids_without_cache(missing_ids, options)
       end
     end

data/spec/cash/write_through_spec.rb

@@ -219,5 +219,27 @@ module Cash
         end
       end
     end
+    
+    describe 'Transactions' do
+      def create_story_and_update
+        @story = Story.create!(:title => original_title = "original title")
+        
+        Story.transaction do
+          @story.title = "new title"
+          @story.save
+          yield if block_given?
+        end
+      end
+      
+      it 'should commit on success' do
+        create_story_and_update
+        @story.reload.title.should == "new title"
+      end
+      
+      it 'should roll back transactions when ActiveRecord::Rollback is raised' do
+        create_story_and_update { raise ActiveRecord::Rollback }
+        @story.reload.title.should == "original title"
+      end
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Nick Kallen
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -07:00
+date: 2010-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency