portable_model 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGMxOWY3ZjVjMmRlY2NiOWY3ZTBkOTA2Nzg0M2JlZTIzMjgxYjIxZQ==
-  data.tar.gz: !binary |-
-    YTk4MTcxMzEwYzNlZGM0ZWZkMjdkZmRkNDA2MmExMzMzZWNkN2IxNQ==
+SHA1:
+  metadata.gz: d6897d9fb7774a53644006262851eef7a35821c8
+  data.tar.gz: 3c0f72fa86f1d8076bd3b4d9ec0e882a710443df
 SHA512:
-  metadata.gz: !binary |-
-    NTYwYjFkMjYxYThjNTMyYjE1OTUyZmVmN2EwOGNjYmI1ZTBlZDc2ZGM5NjRm
-    MzQyODk0MjhhNGYyNDljOWEwYmVjNDUyYTMwMjY3MTQ2NGYyZDc4YmI3Nzcz
-    NTg5N2VhOGM4NzRjMjc1ZTc1ODQyZmRlZWViNWI0OTQxNGU0MGU=
-  data.tar.gz: !binary |-
-    Mjc5MzI3M2I1YjY3ZGQwZTkwYmE2NDk2MTk1MTkzNjI4NTgyZTc1OWFlMzFm
-    OWUzZjVkZDJmM2M3NzVkZWU5MTA0ZTUwZTIzNzg0NzE3ODk0YzZmNGE1ODQx
-    YzNhMTQ5ZWM4MmY0YjUxZDJjNWIzNDI4ZmM2NTQ1NWI5M2Q3YWU=
+  metadata.gz: 0702055e33fbb5b65364eeb2c427036ee826ed6a67d102e0a5d4269cd268b60e649cfdb1f976c551533d2cdb8d1856d836e38e46dc1fe2ca8fa65dc5d765feee
+  data.tar.gz: 186005d91cca52fe8ef36e585381df1d9ea1fa94836d3dca5129bdf58607e0f27c4c9b0be464622e5a15ef08e8242d76756e16dfcc0c4ea303323eb64e39c55a

data/lib/portable_model.rb

@@ -40,7 +40,13 @@ module PortableModel
         # Include the exported attributes of portable associations.
         self.class.portable_associations.inject(record_hash) do |hash, assoc_name|
           assoc = self.__send__(assoc_name)
-          hash[assoc_name] = assoc.export_portable_association if assoc
+          if assoc
+             if assoc.respond_to?(:export_portable_association)
+               hash[assoc_name] = assoc.export_portable_association
+             elsif !assoc.new_record?
+               hash[assoc_name] = assoc.export_to_hash
+             end
+          end
           hash
         end
 
@@ -67,15 +73,15 @@ module PortableModel
 
   # Import values into the record's association.
   #
-  def import_into_association(assoc_name, assoc_value)
+  def import_into_association(assoc_name, assoc_value, options = {})
     assoc = self.__send__(assoc_name)
     if assoc
-      assoc.import_portable_association(assoc_value)
+      assoc.import_portable_association(assoc_value, options)
     else
       assoc_reflection = self.class.reflect_on_association(assoc_name.to_sym)
       raise 'nil can only be handled for direct has_one associations' unless assoc_reflection.macro == :has_one && !assoc_reflection.is_a?(ActiveRecord::Reflection::ThroughReflection)
       assoc = ActiveRecord::Associations::HasOneAssociation.new(self, assoc_reflection)
-      assoc.import_portable_association(assoc_value)
+      assoc.import_portable_association(assoc_value, options)
       association_instance_set(assoc_reflection.name, assoc.target.nil? ? nil : assoc)
     end
   end
@@ -84,7 +90,7 @@ module PortableModel
 
     # Import a record from a hash.
     #
-    def import_from_hash(record_hash)
+    def import_from_hash(record_hash, options = {})
       raise ArgumentError.new('specified argument is not a hash') unless record_hash.is_a?(Hash)
 
       # Override any necessary attributes before importing.
@@ -96,7 +102,7 @@ module PortableModel
           record_type_name != sti_name)
         # The model implements STI and the record type points to a different
         # class; call the method in that class instead.
-        compute_type(record_type_name).import_from_hash(record_hash)
+        compute_type(record_type_name).import_from_hash(record_hash, options)
       else
         start_importing do |imported_records|
           # If the hash had already been imported during the current session,
@@ -112,13 +118,20 @@ module PortableModel
                 hash
               end
 
-              # Create a new record.
-              record = create!(record_hash.merge(:importing_record => true))
+              if options.fetch(:skip_validations, false)
+                # Create a new record and save, skipping validations.
+                record = new(record_hash.merge(:importing_record => true))
+                record.save(false)
+              else
+                record = create!(record_hash.merge(:importing_record => true))
+              end
 
               # Import each of the record's associations into the record.
+              assoc_attrs = assoc_attrs.sort_by { |assoc_name, assoc_value| order_associations.index(assoc_name) ? order_associations.index(assoc_name) : order_associations.size } unless order_associations.empty?
               assoc_attrs.each do |assoc_name, assoc_value|
-                record.import_into_association(assoc_name, assoc_value)
+                record.import_into_association(assoc_name, assoc_value, options)
               end
+
             end
 
             imported_records[record_hash.object_id] = record
@@ -131,9 +144,9 @@ module PortableModel
 
     # Export a record from a YAML file.
     #
-    def import_from_yml(filename, additional_attrs = {})
+    def import_from_yml(filename, additional_attrs = {}, options = {})
       record_hash = YAML::load_file(filename)
-      import_from_hash(record_hash.merge(additional_attrs))
+      import_from_hash(record_hash.merge(additional_attrs), options)
     end
 
     # Starts an export session and yields a hash of currently exported records
@@ -198,6 +211,10 @@ module PortableModel
       @overridden_import_attrs ||= {}
     end
 
+    def order_associations
+      @order_associations ||= []
+    end
+
   protected
 
     # Includes the specified associations' foreign keys (which are normally
@@ -236,6 +253,10 @@ module PortableModel
       end
     end
 
+    def order_associations_on_import(assocs)
+      order_associations.concat assocs
+    end
+
   private
 
     def start_porting(storage_identifier)

data/lib/portable_model/active_record.rb

@@ -60,7 +60,7 @@ module ActiveRecord::Associations
 
     # Import the association from a hash.
     #
-    def import_portable_association(record_hash)
+    def import_portable_association(record_hash, options = {})
       NotPortableError.raise_on_not_portable(self)
       raise ArgumentError.new('specified argument is not a hash') unless record_hash.is_a?(Hash)
       raise 'cannot replace existing association record' unless target.nil?
@@ -68,7 +68,7 @@ module ActiveRecord::Associations
       proxy_reflection.klass.start_importing do
         proxy_owner.transaction do
           record_hash.merge!(primary_key_hash)
-          assoc_record = proxy_reflection.klass.import_from_hash(record_hash)
+          assoc_record = proxy_reflection.klass.import_from_hash(record_hash, options)
           replace(assoc_record)
         end
       end
@@ -87,7 +87,7 @@ module ActiveRecord::Associations
 
     # Import the association from an array of hashes.
     #
-    def import_portable_association(record_hashes)
+    def import_portable_association(record_hashes, options = {})
       NotPortableError.raise_on_not_portable(self)
       raise ArgumentError.new('specified argument is not an array of hashes') unless record_hashes.is_a?(Array) && record_hashes.all? { |record_hash| record_hash.is_a?(Hash) }
 
@@ -96,7 +96,7 @@ module ActiveRecord::Associations
           delete_all
           assoc_records = record_hashes.map do |record_hash|
             record_hash.merge!(primary_key_hash)
-            proxy_reflection.klass.import_from_hash(record_hash)
+            proxy_reflection.klass.import_from_hash(record_hash, options)
           end
           replace(assoc_records)
         end

data/lib/portable_model/version.rb

@@ -1,3 +1,3 @@
 module PortableModel
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: portable_model
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Clyde Law
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.8
 description: Enables exporting and importing an ActiveRecord model's records.
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -48,17 +48,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: portable_model
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enables exporting and importing an ActiveRecord model's records.