returning 0.0.3 → 0.0.4

data/.travis.yml

@@ -6,7 +6,6 @@ rvm:
   - rbx
   - rbx-2.0
   - ree
-  - jruby
   - ruby-head
 gemfile:
   - Gemfile

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.0.4 - 2011-08-24
+* Save returning in an instance variable of the model, instead of connection. Previous approach failed when you tried to load an association inside a callback.
+
 0.0.3 - 2011-08-22
 -----
 * Pass parameters down on save. This makes update_attribute work.

data/lib/returning.rb

@@ -2,14 +2,27 @@ require 'active_record'
 require 'active_record/connection_adapters/postgresql_adapter'
 
 require "returning/version"
-require 'returning/active_record/returning'
-require 'returning/active_record/adapter'
-
-
-module Returning
-  # Your code goes here...
+if ActiveRecord::VERSION::STRING =~ /^3\.0/
+  require 'returning/rails30/returning'
+elsif ActiveRecord::VERSION::STRING =~ /^3\.1/
+  require 'returning/rails31/returning'
+else
+  raise "ActiveRecord version #{ActiveRecord::VERSION::STRING} is not supported!"
 end
 
+require 'returning/active_record/returning'
+require 'returning/arel/tree_manager'
+require 'returning/arel/nodes/select_core'
+require 'returning/arel/nodes/returning'
+require 'returning/arel/delete_update_manager'
+require 'returning/arel/nodes/delete_update_statement'
+require 'returning/arel/visitors/postgresql'
 
 ActiveRecord::Base.send(:include, Returning::ActiveRecord::Returning)
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, Returning::ActiveRecord::Adapter)
+Arel::SelectManager.send(:include, Returning::Arel::TreeManager)
+Arel::UpdateManager.send(:include, Returning::Arel::DeleteUpdateManager)
+Arel::DeleteManager.send(:include, Returning::Arel::DeleteUpdateManager)
+Arel::Nodes::SelectCore.send(:include, Returning::Arel::Nodes::SelectCore)
+Arel::Nodes::UpdateStatement.send(:include, Returning::Arel::Nodes::DeleteUpdateStatement)
+Arel::Nodes::DeleteStatement.send(:include, Returning::Arel::Nodes::DeleteUpdateStatement)
+Arel::Visitors::PostgreSQL.send(:include, Returning::Arel::Visitors::PostgreSQL)

data/lib/returning/active_record/returning.rb

@@ -3,22 +3,13 @@ require 'active_support/concern'
 module Returning
   module ActiveRecord
     module Returning
-      extend ActiveSupport::Concern
-
-      included do
-        if method(:find_by_sql).arity == 1
-          class_eval do
-            def self.find_by_sql(sql, binds = [])
-              connection.select_all(sanitize_sql(sql), "#{name} Load").collect! { |record| instantiate(record) }
-            end
-          end
-        end
-      end
-
       def save(options = {})
         if r = options[:returning]
-          connection.returning(r, self.class) do
+          begin
+            old_returning, @_returning = @_returning, r
             super
+          ensure
+            @_returning = old_returning
           end
         else
           super
@@ -26,10 +17,18 @@ module Returning
       end
 
       def create_or_update
-        if connection.returning? && !new_record?
-          fields = update
-          # if no attributes were changed return self
-          fields == 0 ? self : fields[0]
+        if @_returning
+          raise ReadOnlyRecord if readonly?
+          if new_record?
+            create
+            self
+          elsif r = update
+            r = self.class.send(:instantiate, r[0])
+            r.readonly!
+            r
+          else
+            false
+          end
         else
           super
         end
@@ -37,8 +36,16 @@ module Returning
 
       def destroy(options = {})
         if r = options[:returning]
-          connection.returning(r, self.class) do
-            super()
+          begin
+            old_returning, @_returning = @_returning, r
+            if r = super()
+              r = self.class.send(:instantiate, r[0])
+              r.readonly!
+            end
+
+            r
+          ensure
+            @_returning = old_returning
           end
         else
           super()

data/lib/returning/arel/delete_update_manager.rb

@@ -0,0 +1,10 @@
+module Returning
+  module Arel
+    module DeleteUpdateManager
+      def returning returnings
+        @ast.returnings = Nodes::Returning.new(returnings) if returnings
+        self
+      end
+    end
+  end
+end

data/lib/returning/arel/nodes/delete_update_statement.rb

@@ -0,0 +1,14 @@
+module Returning
+  module Arel
+    module Nodes
+      module DeleteUpdateStatement
+        attr_accessor :returnings
+
+        def initialize_copy other
+          super
+          @returnings = @returnings.clone if @returnings
+        end
+      end
+    end
+  end
+end

data/lib/returning/arel/nodes/returning.rb

@@ -0,0 +1,18 @@
+module Returning
+  module Arel
+    module Nodes
+      class Returning < ::Arel::Nodes::Node
+        attr_accessor :returnings
+
+        def initialize(returnings)
+          @returnings = returnings
+        end
+
+        def initialize_copy other
+          super
+          @returnings = @returnings.clone if @returnings
+        end
+      end
+    end
+  end
+end

data/lib/returning/arel/nodes/select_core.rb

@@ -0,0 +1,14 @@
+module Returning
+  module Arel
+    module Nodes
+      module SelectCore
+        attr_accessor :returnings
+
+        def initialize_copy other
+          super
+          @returnings = @returnings.clone if @returnings
+        end
+      end
+    end
+  end
+end

data/lib/returning/arel/tree_manager.rb

@@ -0,0 +1,10 @@
+module Returning
+  module Arel
+    module TreeManager
+      def returning *returnings
+        @ctx.returnings = returnings if !returnings.compact.empty?
+        self
+      end
+    end
+  end
+end

data/lib/returning/arel/visitors/postgresql.rb

@@ -0,0 +1,32 @@
+module Returning
+  module Arel
+    module Visitors
+      module PostgreSQL
+        private
+        def visit_Returning_Arel_Nodes_Returning o
+          if o.returnings.empty?
+            ""
+          else
+            " RETURNING #{o.returnings.join(', ')}"
+          end
+        end
+
+        def visit_Arel_Nodes_UpdateStatement o
+          if o.returnings
+            "#{super}#{visit o.returnings}"
+          else
+            super
+          end
+        end
+
+        def visit_Arel_Nodes_DeleteStatement o
+          if o.returnings
+            "#{super}#{visit o.returnings}"
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/returning/rails30/active_record/persistence.rb

@@ -0,0 +1,29 @@
+module Returning
+  module Rails30
+    module ActiveRecord
+      module Persistence
+        extend ActiveSupport::Concern
+        included do
+          def update(attribute_names = @attributes.keys, options = {})
+            attributes_with_values = arel_attributes_values(false, false, attribute_names)
+            return @_returning ? [@attributes] : 0 if attributes_with_values.empty?
+            self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).arel.returning(@_returning).update(attributes_with_values)
+          end
+
+          def destroy
+            destroy_associations
+
+            if persisted?
+              result = self.class.unscoped.where(self.class.arel_table[self.class.primary_key].eq(id)).arel.returning(@_returning).delete
+            end
+
+            @destroyed = true
+            freeze
+
+            result ? result : self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/returning/rails30/arel/crud.rb

@@ -0,0 +1,42 @@
+module Returning
+  module Rails30
+    module Arel
+      module Crud
+        def update values
+          um = ::Arel::UpdateManager.new @engine
+
+          if ::Arel::Nodes::SqlLiteral === values
+            relation = @ctx.froms
+          else
+            relation = values.first.first.relation
+          end
+          um.table relation
+          um.set values
+          um.take @ast.limit.expr if @ast.limit
+          um.order(*@ast.orders)
+          um.wheres = @ctx.wheres
+          um.returning @ctx.returnings if @ctx.returnings
+
+          if @ctx.returnings
+            @engine.connection.select_all um.to_sql, 'AREL'
+          else
+            @engine.connection.update um.to_sql, 'AREL'
+          end
+        end
+
+        def delete
+          dm = ::Arel::DeleteManager.new @engine
+          dm.wheres = @ctx.wheres
+          dm.from @ctx.froms
+          dm.returning @ctx.returnings if @ctx.returnings
+
+          if @ctx.returnings
+            @engine.connection.select_all dm.to_sql, 'AREL'
+          else
+            @engine.connection.delete dm.to_sql, 'AREL'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/returning/rails30/returning.rb

@@ -0,0 +1,6 @@
+require 'returning/rails30/active_record/persistence'
+require 'returning/rails30/arel/crud'
+
+
+Arel::SelectManager.send(:include, Returning::Rails30::Arel::Crud)
+ActiveRecord::Persistence.send(:include, Returning::Rails30::ActiveRecord::Persistence)

data/lib/returning/rails31/active_record/persistence.rb

@@ -0,0 +1,51 @@
+module Returning
+  module Rails31
+    module ActiveRecord
+      module Persistence
+        extend ActiveSupport::Concern
+        included do
+          def update(attribute_names = @attributes.keys)
+            attributes_with_values = arel_attributes_values(false, false, attribute_names)
+            return @_returning ? [@attributes] : 0 if attributes_with_values.empty?
+            klass = self.class
+            stmt = klass.unscoped.where(klass.arel_table[klass.primary_key].eq(id)).arel.returning(@_returning).compile_update(attributes_with_values)
+            if @_returning
+              klass.connection.select_all stmt
+            else
+              klass.connection.update stmt
+            end
+          end
+
+          def destroy
+            destroy_associations
+
+            if persisted?
+              ::ActiveRecord::IdentityMap.remove(self) if ::ActiveRecord::IdentityMap.enabled?
+              pk         = self.class.primary_key
+              column     = self.class.columns_hash[pk]
+              substitute = connection.substitute_at(column, 0)
+
+              relation = self.class.unscoped.where(
+                self.class.arel_table[pk].eq(substitute))
+
+              relation.bind_values = [[column, id]]
+              stmt = relation.arel.returning(@_returning).compile_delete
+
+              klass = self.class
+              result = if @_returning
+                klass.connection.select_all stmt, 'SQL', relation.bind_values
+              else
+                klass.connection.delete stmt, 'SQL', relation.bind_values
+              end
+            end
+
+            @destroyed = true
+            freeze
+
+            result ? result : self
+          end
+        end
+      end
+    end
+  end
+end

data/lib/returning/rails31/arel/crud.rb

@@ -0,0 +1,32 @@
+module Returning
+  module Rails31
+    module Arel
+      module Crud
+        def compile_update values
+          um = ::Arel::UpdateManager.new @engine
+
+          if ::Arel::Nodes::SqlLiteral === values
+            relation = @ctx.from
+          else
+            relation = values.first.first.relation
+          end
+          um.table relation
+          um.set values
+          um.take @ast.limit.expr if @ast.limit
+          um.order(*@ast.orders)
+          um.wheres = @ctx.wheres
+          um.returning @ctx.returnings if @ctx.returnings
+          um
+        end
+
+        def compile_delete
+          dm = ::Arel::DeleteManager.new @engine
+          dm.wheres = @ctx.wheres
+          dm.from @ctx.froms
+          dm.returning @ctx.returnings if @ctx.returnings
+          dm
+        end
+      end
+    end
+  end
+end

data/lib/returning/rails31/returning.rb

@@ -0,0 +1,6 @@
+require 'returning/rails31/active_record/persistence'
+require 'returning/rails31/arel/crud'
+
+
+Arel::SelectManager.send(:include, Returning::Rails31::Arel::Crud)
+ActiveRecord::Persistence.send(:include, Returning::Rails31::ActiveRecord::Persistence)

data/lib/returning/version.rb

@@ -1,3 +1,3 @@
 module Returning
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/returning_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'logger'
 
 describe Returning do
   before do
@@ -37,13 +38,23 @@ describe Returning do
         post.save(:returning => "name", :validate => false).should be_true
       end
     end
+
+    context 'works fine with associations' do
+      it "does not pollute destroy with RETURNING of an association" do
+        post = Post.first
+        post.update_attributes :tags_attributes => [{:tag => 'a'}, {:tag => 'b'}]
+        post.tags_attributes = Post.find(post.id).tags.map { |t| {:id => t.id, :_destroy => '1'} }
+        post.name = 'New name'
+        post.save(:returning => 'name')
+      end
+    end
   end
 
   describe '#destroy' do
     it 'returns the column passed to returning' do
       post = Post.first
       post.name = 'hello world'
-      post.destroy(:returning => 'name').name.should == 'hello world'
+      post.destroy(:returning => 'name').name.should == 'hello'
     end
 
     context 'with query cache' do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'bundler/setup'
 
 Bundler.require
 
-Dir['spec/support/**/*.rb'].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do
 end

data/spec/support/ar.rb

@@ -23,16 +23,28 @@ class Migration < ActiveRecord::Migration
     create_table :posts, :force => true do |t|
       t.string :name, :author
     end
+    create_table :tags, :force => true do |t|
+      t.string :tag
+      t.references :post
+    end
   end
 
   def self.down
     drop_table :posts
+    drop_table :tags
   end
 end
 
 Migration.up
 
 class Post < ActiveRecord::Base
+  has_many :tags
+
+  accepts_nested_attributes_for :tags, :allow_destroy => true
+end
+
+class Tag < ActiveRecord::Base
+  belongs_to :post
 end
 
 class PostQueryCache < ActiveRecord::Base

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: returning
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Eugene Pimenov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-08-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -67,6 +67,18 @@ files:
 - lib/returning.rb
 - lib/returning/active_record/adapter.rb
 - lib/returning/active_record/returning.rb
+- lib/returning/arel/delete_update_manager.rb
+- lib/returning/arel/nodes/delete_update_statement.rb
+- lib/returning/arel/nodes/returning.rb
+- lib/returning/arel/nodes/select_core.rb
+- lib/returning/arel/tree_manager.rb
+- lib/returning/arel/visitors/postgresql.rb
+- lib/returning/rails30/active_record/persistence.rb
+- lib/returning/rails30/arel/crud.rb
+- lib/returning/rails30/returning.rb
+- lib/returning/rails31/active_record/persistence.rb
+- lib/returning/rails31/arel/crud.rb
+- lib/returning/rails31/returning.rb
 - lib/returning/version.rb
 - returning.gemspec
 - spec/returning_spec.rb