controlled_versioning 0.8.0 → 0.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjk3OGY1NzhhMTZjMzU0NzBkYjE1MjhhZWRiYTdlNmZhZTNiMzFiYg==
+    YjYzZmVjOTZmMTM2ZDk2ZmFkNmMwMTMwZDJjOTI1MGI5NjkzNWI1ZA==
   data.tar.gz: !binary |-
-    MTg1MzA2ZDA3MzIzOGNkMGY0NDc3ZmM1MmEwYjljOGVjOGIzZjU2Nw==
+    ZGM5N2Y0ZGM3Yjg5YjJjYjQ0MWYxNDQxN2M4YzNhZTdkNzRkZjJhNg==
 SHA512:
   metadata.gz: !binary |-
-    MmUzOTBhMmI3NThmOWM3NGFiYWNkMzUwNjJiYjMzN2E1OTJlZmI1ODIyYjRk
-    NTVkMmQzMWNiMzA5MmVhOTZlZDA1Yjg0NjU4M2U5YmNjNDQ5ZDIxOTc1Zjcy
-    NDJhMDBhMTgwZTg2OTRhMWIyODJjMzQxZmVkMzAyMzYzODYyYzM=
+    ZTMwNjg4OGY0NmIwMzNhZGFlYzgwM2NhOTllZTEyY2NjODhiZDAzMGUyNmQ3
+    OGUzNzI0ZTA4OGRmYTAyODg1NjExMjZmNjEyZDQ1YWRiYWEwNTQ1MTQ5OWRm
+    ZTQ4MTc1ZmJhMDc1NTQ1MTQyYzA2MGMzN2IwOWM3NWMxZDFiMjM=
   data.tar.gz: !binary |-
-    OWVkYTdhMGU5MGI0YzRjN2JmZDRjM2NmMWRhMzU1MjJmNzVjNGQ1OTM1Yzk4
-    OWNlYzFhYjIwODE0NWUyZjgyYTM0YTkxZWU2ZDcxNmQ3NDZlYjJjMGY5ZWFj
-    OGRhMWIzM2UxYzVkNjc0NTY3MzlkMGVjZTljY2Y2NDUyOGQzMzQ=
+    Y2Y0ZWMyZmM5YTdiYmNjMTA0MGZiNGVjZmJiOGFmNzEyODEwODlhZmViNTMz
+    MzYyZDA4YjMwZjU0YTM5NDAyNDk2ZDI0MWU2ZmM0ODgwMTNlMjEwMDc2MDgw
+    YzlmOTZmN2NmOTdjNzRjMDIxZmMzYmY0OTFiNmZjYzZiZWJjYmQ=

data/app/models/controlled_versioning/version.rb

@@ -20,8 +20,12 @@ module ControlledVersioning
       update_attributes(pending: false, declined: true) if pending?
     end
 
-    def changes
-      ChangeTracker.new(self).get_changes
+    def versionable_changes
+      ChangeTracker.new(self)
+    end
+
+    def is_a_child?
+      false
     end
   end
 end

data/app/models/controlled_versioning/version_child.rb

@@ -6,8 +6,16 @@ module ControlledVersioning
     has_many :version_attributes, as: :version
     has_many :version_children, as: :version
 
-    def changes
-      ChangeTracker.new(self).get_changes
+    def versionable_changes
+      ChangeTracker.new(self)
+    end
+
+    def parent
+      version
+    end
+
+    def is_a_child?
+      true
     end
   end
 end

data/lib/controlled_versioning.rb

@@ -4,6 +4,8 @@ require "controlled_versioning/engine"
 require "controlled_versioning/version"
 
 require "controlled_versioning/change_tracker"
+require "controlled_versioning/change_tracker/attribute"
+require "controlled_versioning/change_tracker/child"
 
 require "controlled_versioning/initial_version"
 require "controlled_versioning/initial_version/factory"
@@ -109,18 +111,10 @@ module ControlledVersioning
       end
 
       def submit_revision(suggested_attributes)
-        assign_attributes(suggested_attributes)
-        if invalid?
-          errors
-        elsif !Revision::Auditor.new(self).changes_original?
-          errors[:base] << I18n.t("errors.messages.no_revisions_made")
-          errors
-        else
-          version = versions.build
-          Revision::Factory.new(versionable: self, version: version).build
-          version.save
-          version
-        end
+        Revision::Factory.new(
+          versionable: self,
+          suggested_attributes: suggested_attributes
+        ).build_parent
       end
 
     end

data/lib/controlled_versioning/change_tracker.rb

@@ -5,28 +5,15 @@ class ChangeTracker < Version
     @version = version
   end
 
-  def get_changes
-    changed_attributes.merge(marked_for_removal).merge(changed_children)
+  def all
+    attributes + children
   end
 
-  private
-  def changed_attributes
-    version_attributes.each_with_object({}) do |v, h|
-      h[v.name] = { new_value: v.new_value, old_value: v.old_value }
-    end
+  def attributes
+    version_attributes.collect{ |attr| ChangeTracker::Attribute.new(attr) }
   end
 
-  def marked_for_removal
-    version.marked_for_removal? ? { marked_for_removal: true } : {}
-  end
-
-  def changed_children
-    version_children.each_with_object({}) do |v, h|
-      if h[v.association_name].present?
-        h[v.association_name] += [{ id: v.versionable_id}.merge(v.changes)]
-      else
-        h[v.association_name] = [{ id: v.versionable_id}.merge(v.changes)]
-      end
-    end
+  def children
+    version_children.collect{ |child| ChangeTracker::Child.new(child) }
   end
 end

data/lib/controlled_versioning/change_tracker/attribute.rb

@@ -0,0 +1,20 @@
+class ChangeTracker::Attribute
+
+  attr_reader :attr
+  def initialize(attr)
+    @attr = attr
+  end
+
+  def name
+    attr.name
+  end
+
+  def old_value
+    attr.old_value
+  end
+
+  def new_value
+    attr.new_value
+  end
+
+end

data/lib/controlled_versioning/change_tracker/child.rb

@@ -0,0 +1,20 @@
+class ChangeTracker::Child < ChangeTracker
+
+  attr_reader :version
+  def initialize(version)
+    @version = version
+  end
+
+  def name
+    version.association_name
+  end
+
+  def marked_for_removal?
+    version.marked_for_removal?
+  end
+
+  def new?
+    version.versionable_id.nil?
+  end
+
+end

data/lib/controlled_versioning/revision/factory.rb

@@ -1,28 +1,43 @@
 class Revision::Factory < Revision
 
-  attr_reader :versionable, :version
+  attr_reader :versionable, :suggested_attributes
+  attr_accessor :version
   def initialize(args)
     @versionable = args[:versionable]
     @version = args[:version]
+    @suggested_attributes = args[:suggested_attributes]
   end
 
-  def build
+  def build_parent
+    versionable.assign_attributes(suggested_attributes)
+    if versionable.invalid?
+      versionable.errors
+    elsif !Revision::Auditor.new(versionable).changes_original?
+      versionable.errors[:base] << I18n.t("errors.messages.no_revisions_made")
+      versionable.errors
+    else
+      self.version = versionable.versions.build
+      add_notes
+      build_associations
+      version.save
+      version
+    end
+  end
+
+  def build_associations
     mark_for_removal
-    add_notes
     build_attributes
     build_children
   end
 
   private
-  def mark_for_removal
-    version.marked_for_removal = true if versionable.marked_for_destruction?
+  def add_notes
+    version.notes = versionable_notes
+    version.user = versionable_user
   end
 
-  def add_notes
-    unless versionable_is_a_nested_association?
-      version.notes = versionable_notes
-      version.user = versionable_user
-    end
+  def mark_for_removal
+    version.marked_for_removal = true if versionable.marked_for_destruction?
   end
 
   def build_attributes
@@ -52,17 +67,16 @@ class Revision::Factory < Revision
   def build_child(child, association)
     if Revision::Auditor.new(child).changes_original?
       version_child = build_version_child(child, association)
-      Revision::Factory.new(versionable: child, version: version_child).build
+      Revision::Factory.new(
+        versionable: child,
+        version: version_child
+      ).build_associations
     end
   end
 
   def build_version_child(child, association)
     version_child = version_children.build(association_name: association)
-    if child.new_record?
-      version_child.versionable_type = child.class.name
-    else
-      version_child.versionable = child
-    end
+    version_child.versionable = child unless child.new_record?
     version_child
   end
 

data/lib/controlled_versioning/revision/publisher.rb

@@ -21,8 +21,8 @@ class Revision::Publisher < Revision
   end
 
   def create_versionable
-    version.versionable = version.versionable_type.constantize.
-                          create(new_attributes)
+    version.versionable = version.parent.versionable.public_send(
+                          version.association_name).create(new_attributes)
   end
 
   def update_versionable

data/lib/controlled_versioning/version_number.rb

@@ -1,3 +1,3 @@
 module ControlledVersioning
-  VERSION_NUMBER = "0.8.0"
+  VERSION_NUMBER = "0.9.0"
 end

data/spec/controlled_versioning_spec.rb

@@ -65,8 +65,8 @@ describe "ControlledVersioning" do
     end
 
     it 'returns the initial version' do
-      @resource.versions.create
-      @resource.versions.create
+      @resource.submit_revision(r_string: "new string")
+      @resource.submit_revision(r_float: 63.5)
       expect(@resource.initial_version).to eq(
         @resource.versions.find_by(initial: true))
     end
@@ -230,23 +230,6 @@ describe "ControlledVersioning" do
         expect(@first_child_resource.r_string).to eq "new string"
         expect(@second_child_resource.r_string).to eq "second new string"
       end
-
-      it 'returns a hash of changed attributes for the full family' do
-        expect(@version.changes).to eq "child_resources" => [
-          { id: @second_child_resource.id,
-            "r_string" => {
-              new_value: "second new string",
-              old_value: "my string"
-            }
-          },
-          { id: @first_child_resource.id,
-            "r_string" => {
-              new_value: "new string",
-              old_value: "my string"
-            }
-          }
-        ]
-      end
     end
 
     context 'handles revision for deeply nested children' do
@@ -277,15 +260,6 @@ describe "ControlledVersioning" do
         @first_grand_child_resource.reload
         expect(@first_grand_child_resource.r_string).to eq "new string"
       end
-
-      it 'returns a hash of changed attributes for the full family' do
-        expect(@version.changes).to eq "child_resources" => [{ id:
-          @first_child_resource.id, "grand_child_resources" => [{ id:
-            @first_grand_child_resource.id, "r_string" => { new_value:
-              "new string", old_value: "my string" }
-            }]
-          }]
-      end
     end
 
     context 'handles new children' do
@@ -312,14 +286,6 @@ describe "ControlledVersioning" do
         @resource.reload
         expect(@resource.child_resources.find_by(r_float: 14.0)).to_not be_nil
       end
-
-      it 'returns a hash of attributes for new children' do
-        expect(@version.changes).to eq "child_resources" => [{ id:
-          nil, "r_float" => { new_value: "14.0", old_value: nil },
-          "parent_resource_id" => { new_value: @resource.id.to_s,
-            old_value: nil}
-        }]
-      end
     end
 
     context 'handles child destruction' do
@@ -350,12 +316,6 @@ describe "ControlledVersioning" do
         @resource.reload
         expect(@resource.child_resources.length).to eq 2
       end
-
-      it 'returns a hash noting marked children' do
-        expect(@version.changes).to eq "child_resources" => [{ id:
-          @first_child_resource.id, marked_for_removal: true
-        }]
-      end
     end
   end
 

data/spec/models/controlled_versioning/version_spec.rb

@@ -2,12 +2,90 @@ require 'spec_helper'
 
 describe ControlledVersioning::Version do
 
-  it 'returns a hash of changed attributes' do
-    resource = create(:versionable_resource)
-    version = resource.submit_revision(r_string: "new string", r_float: 90.1)
-    expect(version.changes).to eq "r_string" => { new_value: "new string",
-      old_value: "my string" }, "r_float" => { new_value: "90.1",
-      old_value: "3.14" }
+  context 'returns a hash of' do
+    before :each do
+      @resource = ParentResource.create_with_version({ r_string: "my string",
+        r_float: 3.14, child_resources_attributes: [
+          { r_string: "my string", r_float: 3.14,
+            grand_child_resources_attributes: [
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 }
+            ] },
+          { r_string: "my string", r_float: 3.14,
+            grand_child_resources_attributes: [
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 }
+            ] },
+          { r_string: "my string", r_float: 3.14,
+            grand_child_resources_attributes: [
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 },
+              { r_string: "my string", r_float: 3.14 }
+            ] }
+        ] })
+    end
+
+    it 'changed attributes' do
+      version = @resource.submit_revision(r_string: "new string")
+      changed_attribute = version.versionable_changes.attributes.first
+      expect(changed_attribute.name).to eq "r_string"
+      expect(changed_attribute.old_value).to eq "my string"
+      expect(changed_attribute.new_value).to eq "new string"
+    end
+
+    it 'changed children' do
+      first_child_resource = @resource.child_resources[0]
+      version = @resource.submit_revision(child_resources_attributes: [
+        {id: first_child_resource.id, r_string: "new string"}
+      ])
+      changed_child = version.versionable_changes.children.first
+      changed_attribute = changed_child.attributes.first
+      expect(changed_child.name).to eq "child_resources"
+      expect(changed_attribute.name).to eq "r_string"
+      expect(changed_attribute.old_value).to eq "my string"
+      expect(changed_attribute.new_value).to eq "new string"
+    end
+
+    it 'changed deeply nested children' do
+      first_child_resource = @resource.child_resources[0]
+      first_grand_child_resource = first_child_resource.
+                                    grand_child_resources.first
+      version = @resource.submit_revision(child_resources_attributes: [
+        {id: first_child_resource.id, grand_child_resources_attributes: [
+          {id: first_grand_child_resource.id, r_string: "new string"}
+        ]}
+      ])
+      changed_child = version.versionable_changes.children.first
+      changed_grand_child = changed_child.children.first
+      changed_attribute = changed_grand_child.attributes.first
+      expect(changed_grand_child.name).to eq "grand_child_resources"
+      expect(changed_attribute.name).to eq "r_string"
+      expect(changed_attribute.old_value).to eq "my string"
+      expect(changed_attribute.new_value).to eq "new string"
+    end
+
+    it 'new children' do
+      version = @resource.submit_revision(child_resources_attributes: [
+        {r_float: 3.14}
+      ])
+      changed_child = version.versionable_changes.children.first
+      changed_attribute = changed_child.attributes.first
+      expect(changed_child.new?).to be_true
+      expect(changed_attribute.name).to eq "r_float"
+      expect(changed_attribute.old_value).to be_nil
+      expect(changed_attribute.new_value).to eq "3.14"
+    end
+
+    it 'marked children' do
+      first_child_resource = @resource.child_resources[0]
+      version = @resource.submit_revision(child_resources_attributes: [
+        {id: first_child_resource.id, _destroy: true}
+      ])
+      changed_child = version.versionable_changes.children.first
+      expect(changed_child.marked_for_removal?).to be_true
+    end
   end
 
   context 'has a scope that' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: controlled_versioning
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - timothythehuman
@@ -133,6 +133,8 @@ files:
 - db/migrate/20140206204920_create_controlled_versioning_version_children.rb
 - lib/controlled_versioning.rb
 - lib/controlled_versioning/change_tracker.rb
+- lib/controlled_versioning/change_tracker/attribute.rb
+- lib/controlled_versioning/change_tracker/child.rb
 - lib/controlled_versioning/engine.rb
 - lib/controlled_versioning/initial_version.rb
 - lib/controlled_versioning/initial_version/factory.rb
@@ -229,62 +231,62 @@ specification_version: 4
 summary: Adds model versioning to a Rails app, with the ability to approve and declined
   revisions.
 test_files:
-- spec/spec_helper.rb
-- spec/factories/parent_resources.rb
-- spec/factories/partially_inclusive_versionable_resources.rb
-- spec/factories/unversionable_resources.rb
-- spec/factories/grand_child_resources.rb
-- spec/factories/users.rb
-- spec/factories/versionable_resources.rb
-- spec/factories/child_resources.rb
-- spec/factories/partially_exclusive_versionable_resources.rb
 - spec/models/controlled_versioning/version_spec.rb
-- spec/controlled_versioning_spec.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/Rakefile
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
+- spec/dummy/public/500.html
 - spec/dummy/public/422.html
-- spec/dummy/public/favicon.ico
 - spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/child_resource.rb
+- spec/dummy/public/favicon.ico
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/app/models/partially_inclusive_versionable_resource.rb
+- spec/dummy/app/models/parent_resource.rb
+- spec/dummy/app/models/grand_child_resource.rb
 - spec/dummy/app/models/nonversionable_resource.rb
 - spec/dummy/app/models/versionable_resource.rb
-- spec/dummy/app/models/grand_child_resource.rb
+- spec/dummy/app/models/child_resource.rb
 - spec/dummy/app/models/partially_exclusive_versionable_resource.rb
-- spec/dummy/app/models/parent_resource.rb
 - spec/dummy/app/models/user.rb
-- spec/dummy/app/models/partially_inclusive_versionable_resource.rb
+- spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/config.ru
+- spec/dummy/config/database.yml
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
 - spec/dummy/README.rdoc
-- spec/dummy/db/schema.rb
+- spec/dummy/Rakefile
+- spec/dummy/db/migrate/20140117222842_create_grand_child_resources.rb
+- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
+- spec/dummy/db/migrate/20140117222840_create_parent_resources.rb
+- spec/dummy/db/migrate/20140117222828_create_nonversionable_resources.rb
 - spec/dummy/db/migrate/20140117222815_create_partially_exclusive_versionable_resources.rb
 - spec/dummy/db/migrate/20140117222808_create_versionable_resources.rb
-- spec/dummy/db/migrate/20140117222840_create_parent_resources.rb
 - spec/dummy/db/migrate/20140117222800_create_users.rb
-- spec/dummy/db/migrate/20140117222842_create_grand_child_resources.rb
 - spec/dummy/db/migrate/20140117222841_create_child_resources.rb
-- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
-- spec/dummy/db/migrate/20140117222828_create_nonversionable_resources.rb
+- spec/dummy/db/schema.rb
+- spec/factories/partially_inclusive_versionable_resources.rb
+- spec/factories/unversionable_resources.rb
+- spec/factories/versionable_resources.rb
+- spec/factories/parent_resources.rb
+- spec/factories/grand_child_resources.rb
+- spec/factories/partially_exclusive_versionable_resources.rb
+- spec/factories/users.rb
+- spec/factories/child_resources.rb
+- spec/controlled_versioning_spec.rb
+- spec/spec_helper.rb