activerecord-duplicate 0.4.2 → 0.5.0

data/README.md

@@ -1,4 +1,4 @@
-## active_record-duplicate [![Build Status](https://secure.travis-ci.org/haihappen/active_record-duplicate.png)](http://travis-ci.org/haihappen/active_record-duplicate)
+## activerecord-duplicate [![Build Status](https://secure.travis-ci.org/haihappen/activerecord-duplicate.png)](http://travis-ci.org/haihappen/activerecord-duplicate)
 
 Duplicating ActiveRecords is easy again. All you have to do:
 
@@ -32,7 +32,7 @@ class Tag < ActiveRecord::Base
 end
 
 class Comment < ActiveRecord::Base
-  self.duplicatable = false
+  before_duplication { false }
 end
 
 # Duplicates non-copyrighted posts and tags as well, but ignores comments.
@@ -46,7 +46,7 @@ Tested against Ruby versions `1.9.2`, `1.9.3`, `ruby-head` and Rails versions `3
 In your `Gemfile`:
 
 ```ruby
-gem 'active_record-duplicate'
+gem 'activerecord-duplicate'
 ```
 
 ## Contributing

data/activerecord-duplicate.gemspec

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

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

@@ -6,16 +6,13 @@ module ActiveRecord
 
     included do
       class_attribute :_duplicatable_attributes
-      class_attribute :_duplicatable
       
       attr_accessor :duplication_parent
       
       include ActiveRecord::Duplicate::Callbacks
     end
 
-    def duplicate
-      return unless self.class.duplicatable
-      
+    def duplicate      
       dup.tap do |duplicate|
         attributes.each do |key, value|
           value = case true
@@ -35,29 +32,31 @@ module ActiveRecord
           duplicate.send(:"#{key}=", value)
         end
         
-        # Duplicate all belongs_to associations.
-         self.class.reflect_on_all_associations(:belongs_to).each do |association|
-           association = self.association(association.name)
-           
-           if duplication_parent.is_a?(association.klass)
-             duplicate.send(:"#{association.reflection.name}=", duplication_parent)
-             duplicate.send(:"#{association.reflection.name}_id=", nil)
-           else
-             duplicate.send(:"#{association.reflection.name}=", send(association.reflection.name))
-           end
-         end
-        
-        # Duplicate all has_many associations.
-        self.class.reflect_on_all_associations(:has_many).each do |association|
+        self.class.reflect_on_all_associations.each do |association|
+          name = association.name
+          macro = association.macro
           association = self.association(association.name)
           
-          duplicate.send(:"#{association.reflection.name}=", send(association.reflection.name).map do |object|
-            object.duplication_parent = duplicate
-            object = object.duplicate
-            next unless object.present?
-            
-            object
-          end.compact)
+          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
@@ -67,15 +66,6 @@ module ActiveRecord
         self._duplicatable_attributes = attributes.map(&:to_sym) if attributes.present?
         self._duplicatable_attributes || []
       end
-
-      def duplicatable=(duplicatable)
-        self._duplicatable = duplicatable unless duplicatable.nil?
-        self.duplicatable
-      end
-
-      def duplicatable
-        self._duplicatable.nil? ? true : !!self._duplicatable
-      end
     end
   end
 end

data/spec/acts_as_duplicator_spec.rb

@@ -18,11 +18,13 @@ describe ActiveRecord::Duplicate do
   end
 
 
-  describe :duplicatable do
+  describe 'before_duplication { false }' do
     it 'marks associations as non-duplicatable' do
-      klass.duplicatable = false
+      klass.instance_eval do
+        before_duplication { false }
+      end
       
-      klass.duplicatable.must_equal(false)
+      klass.new.duplicate.must_equal(false)
     end
   end
 

data/spec/integration_spec.rb

@@ -52,7 +52,7 @@ describe 'Integration' do
     end
     
     class Comment < ActiveRecord::Base
-      self.duplicatable = false
+      before_duplication { false }
       
       belongs_to :post
       has_many :ratings, as: :parent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-duplicate
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70294310520280 !ruby/object:Gem::Requirement
+  requirement: &70285775741840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70294310520280
+  version_requirements: *70285775741840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70294310519880 !ruby/object:Gem::Requirement
+  requirement: &70285775741440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294310519880
+  version_requirements: *70285775741440
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &70294310519420 !ruby/object:Gem::Requirement
+  requirement: &70285775740980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294310519420
+  version_requirements: *70285775740980
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70294310518920 !ruby/object:Gem::Requirement
+  requirement: &70285775740480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70294310518920
+  version_requirements: *70285775740480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70294310567580 !ruby/object:Gem::Requirement
+  requirement: &70285775740060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294310567580
+  version_requirements: *70285775740060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70294310567120 !ruby/object:Gem::Requirement
+  requirement: &70285775739600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294310567120
+  version_requirements: *70285775739600
 description: Duplicating ActiveRecords is easy again.
 email: uher.mario@gmail.com
 executables: []