activerecord-duplicate 0.5.0 → 0.5.1

data/activerecord-duplicate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'activerecord-duplicate'
-  gem.version       = '0.5.0'
+  gem.version       = '0.5.1'
   gem.authors       = 'Mario Uher'
   gem.email         = 'uher.mario@gmail.com'
   gem.description   = gem.summary = 'Duplicating ActiveRecords is easy again.'

data/gemfiles/Rails_master.gemfile

@@ -1,10 +1,11 @@
 source :rubygems
 
-gem 'activerecord', git: 'git://github.com/rails/rails.git'
+gem 'activerecord', github: 'rails/rails'
+gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
 
 group :development do
   gem 'minitest'
   gem 'purdytest'
-  gem 'rails', git: 'git://github.com/rails/rails.git'
+  gem 'rails', github: 'rails/rails'
   gem 'sqlite3'
 end

data/lib/activerecord-duplicate.rb

@@ -1,4 +1,4 @@
-require 'activerecord-duplicate/active_record/duplicate'
+require 'activerecord-duplicate/duplicate'
 require 'activerecord-duplicate/railtie' if defined?(Rails)
 
 module ActiveRecord::Duplicate

data/lib/activerecord-duplicate/duplicate.rb

@@ -0,0 +1,95 @@
+module ActiveRecord::Duplicate
+  extend ActiveSupport::Concern
+
+  included do
+    define_callbacks :duplication, terminator: "result == false", scope: [:kind, :name]
+
+    class_attribute :_duplicatable_attributes
+    attr_accessor :duplication_parent, :duplication_context
+  end
+
+  def duplicate
+    self.duplication_context = :original
+      self.run_callbacks(:duplication) do
+      dup.tap do |duplicate|
+        duplicate.duplication_context = :duplicate
+        duplicate.run_callbacks(:duplication) do
+          attributes.each do |key, value|
+            value = case true
+            
+            # Duplicate attribute if whitelisted
+            when self.class.attr_duplicatable.include?(key.to_sym)
+              value
+            
+            # If not whitelisted, set to default value
+            when (column = self.class.columns.detect { |c| c.name == key }).present?
+              column.default
+            
+            else
+              nil
+            end
+            
+            duplicate.send(:"#{key}=", value)
+          end
+          
+          self.class.reflect_on_all_associations.each do |association|
+            name = association.name
+            macro = association.macro
+            association = self.association(association.name)
+            
+            case macro
+            when :belongs_to
+              # Duplicate all belongs_to associations.
+              if duplication_parent.is_a?(association.klass)
+                duplicate.send(:"#{name}=", duplication_parent)
+                duplicate.send(:"#{name}_id=", nil)
+              else
+                duplicate.send(:"#{name}=", send(name))
+              end
+            
+            when :has_many
+              # Duplicate all has_many associations.
+              duplicate.send(:"#{name}=", send(name).map do |object|
+                object.duplication_parent = duplicate
+                object = object.duplicate
+                next unless object.present?
+                
+                object
+              end.compact)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  module ClassMethods
+    def attr_duplicatable(*attributes)
+      self._duplicatable_attributes = attributes.map(&:to_sym) if attributes.present?
+      self._duplicatable_attributes || []
+    end
+
+    # Duplicated from activemodel/lib/active_model/validations/callbacks.rb
+    def before_duplication(*args, &block)
+      options = args.last
+      
+      if options.is_a?(Hash) && options[:on]
+        options[:if] = Array.wrap(options[:if])
+        options[:if].unshift("self.duplication_context == :#{options[:on]}")
+      end
+      
+      set_callback(:duplication, :before, *args, &block)
+    end
+
+    def after_duplication(*args, &block)
+      options = args.extract_options!
+      
+      options[:prepend] = true
+      options[:if] = Array.wrap(options[:if])
+      options[:if] << "!halted"
+      options[:if].unshift("self.duplication_context == :#{options[:on]}") if options[:on]
+      
+      set_callback(:duplication, :after, *(args << options), &block)
+    end
+  end
+end

data/spec/callbacks_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../spec_helper', __FILE__)
 
-describe ActiveRecord::Duplicate::Callbacks do
+describe ActiveRecord::Duplicate do
   let(:klass) { Class.new(ActiveRecord::Base) { self.table_name = 'records' } }
 
 
@@ -16,7 +16,7 @@ describe ActiveRecord::Duplicate::Callbacks do
     mock.expect(:after_duplication, nil, [:original])
     mock.expect(:before_duplication, nil, [:duplicate])
     mock.expect(:after_duplication, nil, [:duplicate])
-        
+    
     klass.create.duplicate
     mock.verify
   end

data/spec/integration_spec.rb

@@ -32,23 +32,16 @@ describe 'Integration' do
     class Post < ActiveRecord::Base
       # Don't duplicate copyrighted posts
       before_duplication { !self.is_copyrighted? }
-      after_duplication(:increase_counter, on: :duplicate)
+      after_duplication(on: :duplicate) { self.title = title.match(/\d+$/) ? title.succ : "#{title} 2" }
       
       belongs_to :blog
       has_many :comments
       has_many :ratings, as: :parent
       
-      attr_duplicatable :content
+      attr_duplicatable :title, :content
       class_attribute :counter
       
       validates :title, presence: true, uniqueness: true
-      
-    private
-      def increase_counter
-        self.class.counter ||= 0
-        self.class.counter += 1
-        self.title = "Lorem #{self.class.counter}" 
-      end
     end
     
     class Comment < ActiveRecord::Base
@@ -64,7 +57,7 @@ describe 'Integration' do
   end
 
 
-  let(:blog) { Blog.create }
+  let(:blog) { Blog.create! }
 
 
   describe 'duplicating blog' do
@@ -78,15 +71,15 @@ describe 'Integration' do
 
 
     it 'duplicates posts too' do
-      3.times do |i|
-        post = blog.posts.create(title: "Post #{i}")
-        rating = post.ratings.create(value: 5)
+      %w[Sample Blog Post].each do |title|
+        post = blog.posts.create!(title: title)
+        rating = post.ratings.create!(value: 5)
       end
       
       subject.posts.all?(&:new_record?).must_equal(true)
       subject.posts.size.must_equal(3)
       
-      subject.save
+      subject.save!
       
       Blog.count.must_equal(2)
       Post.count.must_equal(6)
@@ -95,28 +88,30 @@ describe 'Integration' do
 
 
     it 'sets blog association' do
-      3.times do |i|
-        post = blog.posts.create(title: "Post #{i}")
-        rating = post.ratings.create(value: 5)
+      %w[Sample Blog Post].each do |title|
+        post = blog.posts.create!(title: title)
+        rating = post.ratings.create!(value: 5)
       end
       
       subject.posts.each do |post|
         post.blog.must_equal(subject)
         post.blog_id.must_be_nil
       end
+      
+      subject.save!
     end
 
 
     it 'ignores copyrighted posts' do
-      3.times do |i|
-        post = blog.posts.create(title: "Post #{i}", is_copyrighted: i == 0)
-        rating = post.ratings.create(value: 5)
+      %w[Sample Blog Post].each do |title|
+        post = blog.posts.create!(title: title, is_copyrighted: title == 'Sample')
+        rating = post.ratings.create!(value: 5)
       end
       
       subject.posts.all?(&:new_record?).must_equal(true)
       subject.posts.size.must_equal(2)
       
-      subject.save
+      subject.save!
       
       Blog.count.must_equal(2)
       Post.count.must_equal(5)
@@ -124,27 +119,29 @@ describe 'Integration' do
     end
 
 
-    it 'ignores posts copyright flag' do
-      post = blog.posts.create(title: 'Post', content: 'Lorem', published_at: Time.now)
-      rating = post.ratings.create(value: 5)
+    it 'ignores posts published_at timestamp' do
+      post = blog.posts.create!(title: 'Post', content: 'Lorem', published_at: Time.now)
+      rating = post.ratings.create!(value: 5)
       
       post = subject.posts.first
       post.wont_be_nil
       post.content.must_equal('Lorem')
       post.published_at.must_be_nil
+      
+      subject.save!
     end
 
 
     it 'wont duplicate comments' do
-      post = blog.posts.create(title: 'Post')
-      rating = post.ratings.create(value: 5)
-      3.times { post.comments.create }
+      post = blog.posts.create!(title: 'Post')
+      rating = post.ratings.create!(value: 5)
+      3.times { post.comments.create! }
       
       post = subject.posts.first
       post.wont_be_nil
       post.comments.size.must_equal(0)
       
-      subject.save
+      subject.save!
       
       Blog.count.must_equal(2)
       Post.count.must_equal(2)
@@ -156,9 +153,10 @@ describe 'Integration' do
 
   describe 'duplicating post' do
     it 'sets blog association' do
-      post = blog.posts.create
+      post = blog.posts.create!(title: 'Post')
       
       post = post.duplicate
+      post.save!
       
       post.blog.must_equal(blog)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-duplicate
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70285775741840 !ruby/object:Gem::Requirement
+  requirement: &70282697881420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70285775741840
+  version_requirements: *70282697881420
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70285775741440 !ruby/object:Gem::Requirement
+  requirement: &70282697880800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285775741440
+  version_requirements: *70282697880800
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &70285775740980 !ruby/object:Gem::Requirement
+  requirement: &70282697880060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285775740980
+  version_requirements: *70282697880060
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70285775740480 !ruby/object:Gem::Requirement
+  requirement: &70282697879480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70285775740480
+  version_requirements: *70282697879480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70285775740060 !ruby/object:Gem::Requirement
+  requirement: &70282697879060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285775740060
+  version_requirements: *70282697879060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70285775739600 !ruby/object:Gem::Requirement
+  requirement: &70282697878580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285775739600
+  version_requirements: *70282697878580
 description: Duplicating ActiveRecords is easy again.
 email: uher.mario@gmail.com
 executables: []
@@ -92,8 +92,7 @@ files:
 - gemfiles/Rails_3_2.gemfile
 - gemfiles/Rails_master.gemfile
 - lib/activerecord-duplicate.rb
-- lib/activerecord-duplicate/active_record/duplicate.rb
-- lib/activerecord-duplicate/active_record/duplicate/callbacks.rb
+- lib/activerecord-duplicate/duplicate.rb
 - lib/activerecord-duplicate/railtie.rb
 - spec/acts_as_duplicator_spec.rb
 - spec/callbacks_spec.rb

data/lib/activerecord-duplicate/active_record/duplicate.rb

@@ -1,71 +0,0 @@
-require 'activerecord-duplicate/active_record/duplicate/callbacks'
-
-module ActiveRecord
-  module Duplicate
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :_duplicatable_attributes
-      
-      attr_accessor :duplication_parent
-      
-      include ActiveRecord::Duplicate::Callbacks
-    end
-
-    def duplicate      
-      dup.tap do |duplicate|
-        attributes.each do |key, value|
-          value = case true
-          
-          # Duplicate attribute if whitelisted
-          when self.class.attr_duplicatable.include?(key.to_sym)
-            value
-          
-          # If not whitelisted, set to default value
-          when (column = self.class.columns.detect { |c| c.name == key }).present?
-            column.default
-          
-          else
-            nil
-          end
-          
-          duplicate.send(:"#{key}=", value)
-        end
-        
-        self.class.reflect_on_all_associations.each do |association|
-          name = association.name
-          macro = association.macro
-          association = self.association(association.name)
-          
-          case macro
-          when :belongs_to
-            # Duplicate all belongs_to associations.
-            if duplication_parent.is_a?(association.klass)
-              duplicate.send(:"#{name}=", duplication_parent)
-              duplicate.send(:"#{name}_id=", nil)
-            else
-              duplicate.send(:"#{name}=", send(name))
-            end
-          
-          when :has_many
-            # Duplicate all has_many associations.
-            duplicate.send(:"#{name}=", send(name).map do |object|
-              object.duplication_parent = duplicate
-              object = object.duplicate
-              next unless object.present?
-              
-              object
-            end.compact)
-          end
-        end
-      end
-    end
-
-    module ClassMethods
-      def attr_duplicatable(*attributes)
-        self._duplicatable_attributes = attributes.map(&:to_sym) if attributes.present?
-        self._duplicatable_attributes || []
-      end
-    end
-  end
-end

data/lib/activerecord-duplicate/active_record/duplicate/callbacks.rb

@@ -1,49 +0,0 @@
-module ActiveRecord
-  module Duplicate
-    module Callbacks
-      extend ActiveSupport::Concern
-
-      included do
-        define_callbacks :duplication, terminator: "result == false", scope: [:kind, :name]
-        attr_accessor :duplication_context
-      end
-
-      def dup
-        super.tap do |duplicate|
-          duplicate.duplication_context = :duplicate
-          duplicate.run_callbacks(:duplication)
-        end
-      end
-
-      def duplicate
-        self.duplication_context = :original
-        self.run_callbacks(:duplication) { super }
-      end
-
-      module ClassMethods
-        # Duplicated from activemodel/lib/active_model/validations/callbacks.rb
-        def before_duplication(*args, &block)
-          options = args.last
-          
-          if options.is_a?(Hash) && options[:on]
-            options[:if] = Array.wrap(options[:if])
-            options[:if].unshift("self.duplication_context == :#{options[:on]}")
-          end
-          
-          set_callback(:duplication, :before, *args, &block)
-        end
-
-        def after_duplication(*args, &block)
-          options = args.extract_options!
-          
-          options[:prepend] = true
-          options[:if] = Array.wrap(options[:if])
-          options[:if] << "!halted"
-          options[:if].unshift("self.duplication_context == :#{options[:on]}") if options[:on]
-          
-          set_callback(:duplication, :after, *(args << options), &block)
-        end
-      end
-    end
-  end
-end