replicate 1.4 → 1.5

data/README.md

@@ -101,7 +101,7 @@ ActiveRecord
 ------------
 
 Basic support for dumping and loading ActiveRecord objects is included. The
-tests pass under ActiveRecord versions 2.2.3, 2.3.14, 3.0.10, and 3.1.0 under
+tests pass under ActiveRecord versions 2.2.3, 2.3.5, 2.3.14, 3.0.10, and 3.1.0 under
 MRI 1.8.7 as well as under MRI 1.9.2.
 
 To use customization macros in your models, require the replicate library after

data/Rakefile

@@ -26,7 +26,7 @@ end
 
 # supported activerecord gem versions
 AR_VERSIONS = []
-AR_VERSIONS << '2.2.3' if RUBY_VERSION < '1.9'
+AR_VERSIONS.concat %w[2.2.3 2.3.5] if RUBY_VERSION < '1.9'
 AR_VERSIONS.concat %w[2.3.14 3.0.10 3.1.0]
 
 desc "Run unit tests under all supported AR versions"

data/bin/replicate

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #/ Usage: replicate --dump dumpscript.rb > objects.dump
-#/        replicate [-r <lib>] --dump "<ruby>" > objects.dump
+#/        replicate [-r <lib>] --dump "<ruby>" [-- <argv>...] > objects.dump
 #/        replicate [-r <lib>] --load < objects.dump
 #/ Dump and load objects between environments.
 #
@@ -9,6 +9,9 @@
 #/ must call dump(object) on one or more objects. When a Ruby expression is
 #/ given, all resulting objects are dumped automatically.
 #/
+#/ Dump scripts have access to any additional <argv> provided via the normal
+#/ system ARGV array. This can be used to pass arguments to dump scripts.
+#/
 #/ The --load form reads dump data from stdin and creates objects under the
 #/ current environment.
 #/
@@ -62,20 +65,19 @@ end
 # dump mode means we're reading records from the database here and writing to
 # stdout. the database should not be modified at all by this operation.
 if mode == :dump
-  usage.call if ARGV.empty? || ARGV[0].empty?
+  script = ARGV.shift
+  usage.call if script.empty?
   Replicate::Dumper.new do |dumper|
     dumper.marshal_to out
     dumper.log_to $stderr, verbose, quiet
-    ARGV.each do |code|
-      if File.exist?(code)
-        dumper.load_script code
-      elsif code == '-'
-        code = $stdin.read
-        objects = dumper.instance_eval(code, '<stdin>', 0)
-      else
-        objects = dumper.instance_eval(code, '<argv>', 0)
-        dumper.dump objects
-      end
+    if script == '-'
+      code = $stdin.read
+      objects = dumper.instance_eval(code, '<stdin>', 0)
+    elsif File.exist?(script)
+      dumper.load_script script
+    else
+      objects = dumper.instance_eval(script, '<argv>', 0)
+      dumper.dump objects
     end
   end
 

data/lib/replicate.rb

@@ -16,7 +16,7 @@ module Replicate
     elsif ENV['RAILS_ENV']
       ENV['RAILS_ENV'] == 'production'
     elsif ENV['RACK_ENV']
-      ENV['RAILS_ENV'] == 'production'
+      ENV['RACK_ENV'] == 'production'
     end
   end
 

data/lib/replicate/active_record.rb

@@ -38,16 +38,27 @@ module Replicate
         self.class.replicate_omit_attributes.each do |omit|
           attributes.delete(omit.to_s)
         end
-        self.class.reflect_on_all_associations(:belongs_to).select {|association|
-          association.options[:polymorphic] != true
-        }.each do |reflection|
-          klass = reflection.klass
+        self.class.reflect_on_all_associations(:belongs_to).each do |reflection|
           options = reflection.options
-          primary_key = (options[:primary_key] || klass.primary_key).to_s
-          foreign_key = (options[:foreign_key] || "#{reflection.name}_id").to_s
+          if options[:polymorphic]
+            if ::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR > 0
+              reference_class = attributes[reflection.foreign_type]
+            else
+              reference_class = attributes[options[:foreign_type]]
+            end
+            next if reference_class.nil?
+
+            klass = Kernel.const_get(reference_class)
+            primary_key = klass.primary_key
+            foreign_key = "#{reflection.name}_id"
+          else
+            klass = reflection.klass
+            primary_key = (options[:primary_key] || klass.primary_key).to_s
+            foreign_key = (options[:foreign_key] || "#{reflection.name}_id").to_s
+          end
           if primary_key == klass.primary_key
             if id = attributes[foreign_key]
-              attributes[foreign_key] = [:id, reflection.klass.to_s, id]
+              attributes[foreign_key] = [:id, klass.to_s, id]
             else
               # nil value in association reference
             end
@@ -154,6 +165,7 @@ module Replicate
 
       # Set flag for replicating original id.
       def replicate_id=(boolean)
+        self.replicate_natural_key = [:id] if boolean
         @replicate_id = boolean
       end
 
@@ -168,7 +180,7 @@ module Replicate
 
       # Set which, if any, attributes should not be dumped. Also works for
       # associations.
-      # 
+      #
       # attribute_names - Array of attribute name symbols
       def replicate_omit_attributes=(attribute_names)
         @replicate_omit_attributes = attribute_names

data/test/active_record_test.rb

@@ -51,6 +51,7 @@ ActiveRecord::Schema.define do
 
   create_table "notes", :force => true do |t|
     t.integer "notable_id"
+    t.string  "notable_type"
   end
 end
 
@@ -252,7 +253,7 @@ class ActiveRecordTest < Test::Unit::TestCase
     assert_equal 'Note', type
     assert_equal note.id, id
     assert_equal note.notable_type, attrs['notable_type']
-    assert_equal attrs["notable_id"], rtomayko.id
+    assert_equal attrs["notable_id"], [:id, 'User', rtomayko.id]
     assert_equal note, obj
   end
 
@@ -292,6 +293,54 @@ class ActiveRecordTest < Test::Unit::TestCase
     assert_equal rtomayko.emails.last, obj
   end
 
+  def test_dumping_polymorphic_associations
+    objects = []
+    @dumper.listen { |type, id, attrs, obj| objects << [type, id, attrs, obj] }
+
+    User.replicate_associations :notes
+    rtomayko = User.find_by_login('rtomayko')
+    note = Note.create!(:notable => rtomayko)
+    @dumper.dump rtomayko
+
+    assert_equal 3, objects.size
+
+    type, id, attrs, obj = objects.shift
+    assert_equal 'User', type
+    assert_equal rtomayko.id, id
+    assert_equal 'rtomayko', attrs['login']
+    assert_equal rtomayko.created_at, attrs['created_at']
+    assert_equal rtomayko, obj
+
+    type, id, attrs, obj = objects.shift
+    assert_equal 'Profile', type
+    assert_equal rtomayko.profile.id, id
+    assert_equal 'Ryan Tomayko', attrs['name']
+    assert_equal rtomayko.profile, obj
+
+    type, id, attrs, obj = objects.shift
+    assert_equal 'Note', type
+    assert_equal note.notable_type, attrs['notable_type']
+    assert_equal [:id, 'User', rtomayko.id], attrs['notable_id']
+    assert_equal rtomayko.notes.first, obj
+
+  end
+
+  def test_dumping_empty_polymorphic_associations
+    objects = []
+    @dumper.listen { |type, id, attrs, obj| objects << [type, id, attrs, obj] }
+
+    note = Note.create!()
+    @dumper.dump note
+
+    assert_equal 1, objects.size
+
+    type, id, attrs, obj = objects.shift
+    assert_equal 'Note', type
+    assert_equal nil, attrs['notable_type']
+    assert_equal nil, attrs['notable_id']
+  end
+
+
   def test_loading_everything
     objects = []
     @dumper.listen { |type, id, attrs, obj| objects << [type, id, attrs, obj] }

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: replicate
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 1
-  - 4
-  version: "1.4"
+  - 5
+  version: "1.5"
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -20,9 +21,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 3
         - 1
@@ -33,9 +36,11 @@ dependencies:
   name: sqlite3
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -77,23 +82,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: Dump and load relational objects between Ruby environments.