conscript 0.2.1 → 0.2.3

data/CHANGELOG.md

@@ -1,8 +1,17 @@
+## v0.2.3
+
+* Fixed a failing scenario where associated objects modified the parent object before the parent was destroyed
+* Fixed a failing scenario where inverse relationship was not detected under certain conditions
+
+## v0.2.2
+
+* Fixed regression bug where attributes were sometimes not being copied over to the draft parent.
+
 ## v0.2.1
 
 * Fixed bug where associated `has_many` records with CarrierWave uploads were not duplicated correctly - uploaded files are now copied
 * Fixed bug where destroying a draft would remove an uploaded file from its draft parent if they shared the same file.
-* Fixed bug where drafts were destroyed before publish_Draft was successful
+* Fixed bug where drafts were destroyed before `publish_draft` was successful
 * Added an ActiveRecord error where `save` fails if drafts exist for an instance
 
 ## v0.2.0

data/lib/conscript/orm/activerecord.rb

@@ -21,7 +21,7 @@ module Conscript
       self.conscript_options[:ignore_attributes].map!(&:to_s)
       self.conscript_options.update options.slice(:allow_update_with_drafts, :destroy_drafts_on_publish)
 
-      belongs_to :draft_parent, class_name: self
+      belongs_to :draft_parent, class_name: self, inverse_of: :drafts
       has_many :drafts, conditions: {is_draft: true}, class_name: self, foreign_key: :draft_parent_id, dependent: :destroy, inverse_of: :draft_parent
 
       define_callbacks :publish_draft, :save_as_draft
@@ -64,25 +64,29 @@ module Conscript
           run_callbacks :publish_draft do
             raise Conscript::Exception::NotADraft unless is_draft?
             return self.update_attribute(:is_draft, false) if !draft_parent_id
+            parent = self.draft_parent
             ::ActiveRecord::Base.transaction do
-              draft_parent.assign_attributes attributes_to_publish, without_protection: true
+              parent.assign_attributes attributes_to_publish, without_protection: true
 
               self.class.conscript_options[:associations].each do |association|
                 case reflections[association].macro
                   when :has_many
-                    draft_parent.send(association.to_s + "=", self.send(association).collect {|child| child.dup do |original, dup|
-                      # Workaround for CarrierWave uploaders on associated records. Copy the uploaded files.
-                      if dup.class.respond_to? :uploaders
-                        dup.class.uploaders.keys.each {|uploader| dup.send(uploader.to_s + "=", original.send(uploader)) }
+                    parent.send(association.to_s + "=", self.send(association).collect do |child|
+                      child.dup do |original, dup|
+                        # Workaround for CarrierWave uploaders on associated records. Copy the uploaded files.
+                        if dup.class.respond_to? :uploaders
+                          dup.class.uploaders.keys.each {|uploader| dup.send(uploader.to_s + "=", original.send(uploader)) }
+                        end
                       end
-                    end })
+                    end)
                 end
               end
 
+              self.reload
               self.destroy
-              draft_parent.save!
+              parent.save!
             end
-            draft_parent
+            parent
           end
         end
 

data/lib/conscript/version.rb

@@ -1,3 +1,3 @@
 module Conscript
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conscript
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000Z
+date: 2013-07-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70350313257540 !ruby/object:Gem::Requirement
+  requirement: &70300252198620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70350313257540
+  version_requirements: *70300252198620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70350313257120 !ruby/object:Gem::Requirement
+  requirement: &70300252198040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350313257120
+  version_requirements: *70300252198040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70350313256600 !ruby/object:Gem::Requirement
+  requirement: &70300252195300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350313256600
+  version_requirements: *70300252195300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70350313256180 !ruby/object:Gem::Requirement
+  requirement: &70300252194860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350313256180
+  version_requirements: *70300252194860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70350313255560 !ruby/object:Gem::Requirement
+  requirement: &70300252194360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *70350313255560
+  version_requirements: *70300252194360
 - !ruby/object:Gem::Dependency
   name: deep_cloneable
-  requirement: &70350313254920 !ruby/object:Gem::Requirement
+  requirement: &70300252193860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70350313254920
+  version_requirements: *70300252193860
 description: Provides ActiveRecord models with draft instances, including associations
 email:
 - steve@stevelorek.com