returning 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+0.0.2 - 2011-08-22
+-----
+* Add support for ActiveRecord::ConnectionAdapters::QueryCache

data/lib/returning/active_record/adapter.rb

@@ -13,27 +13,36 @@ module Returning
         !!@_returning
       end
 
-      def update(sql, name = nil, binds = [])
-        if @_returning
-          records = @_returning[1].find_by_sql("#{to_sql(sql)} RETURNING #{@_returning[0]}", binds)
-          records.each { |r| r.readonly! }
-          records
-        else
-          super
-        end
+      def exec_with_returning(sql, binds)
+        records = @_returning[1].find_by_sql("#{to_sql(sql)} RETURNING #{@_returning[0]}", binds)
+        records.each { |r| r.readonly! }
+        records
       end
 
-      def delete(arel, name = nil, binds = [])
-        if @_returning
-          records = @_returning[1].find_by_sql("#{to_sql(arel)} RETURNING #{@_returning[0]}", binds)
-          records.each { |r| r.readonly! }
-          records
+      [:update, :delete].each do |method|
+        if ::ActiveRecord::VERSION::STRING =~ /^3\.0/
+          class_eval <<-RUBY, __FILE__, __LINE__+1
+            def #{method}(sql, name = nil)
+              if @_returning
+                exec_with_returning(sql, [])
+              else
+                super
+              end
+            end
+          RUBY
         else
-          super
+          class_eval <<-RUBY, __FILE__, __LINE__+1
+            def #{method}(sql, name = nil, binds = [])
+              if @_returning
+                exec_with_returning(sql, binds)
+              else
+                super
+              end
+            end
+          RUBY
         end
       end
 
-
       def returning(columns, klass)
         old_returning, @_returning = @_returning, [columns, klass]
         yield

data/lib/returning/version.rb

@@ -1,3 +1,3 @@
 module Returning
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/returning.rb

@@ -1,9 +1,10 @@
+require 'active_record'
+require 'active_record/connection_adapters/postgresql_adapter'
+
 require "returning/version"
 require 'returning/active_record/returning'
 require 'returning/active_record/adapter'
 
-require 'active_record'
-require 'active_record/connection_adapters/postgresql_adapter'
 
 module Returning
   # Your code goes here...

data/spec/returning_spec.rb

@@ -22,6 +22,12 @@ describe Returning do
         post.save(:returning => 'name').should eql(post)
       end
     end
+
+    context 'with query cache' do
+      it 'works' do
+        PostQueryCache.first.update_attributes :name => 'cached'
+      end
+    end
   end
 
   describe '#destroy' do
@@ -30,5 +36,11 @@ describe Returning do
       post.name = 'hello world'
       post.destroy(:returning => 'name').name.should == 'hello world'
     end
+
+    context 'with query cache' do
+      it 'works' do
+        expect { PostQueryCache.first.destroy }.not_to raise_error
+      end
+    end
   end
 end

data/spec/support/ar.rb

@@ -34,3 +34,8 @@ Migration.up
 
 class Post < ActiveRecord::Base
 end
+
+class PostQueryCache < ActiveRecord::Base
+  set_table_name :posts
+  include ActiveRecord::ConnectionAdapters::QueryCache
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: returning
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eugene Pimenov
@@ -58,6 +58,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Gemfile3.1
 - README.md