controlled_versioning 0.11.0 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTg2ZTUxYzM1ZWU1NDM1YTllODA2NDE1NzFmYjBjNTI2YjMwMjg5NA==
+    NTA4NTM0NzYxMDI5YmIyZjhmM2M1NzY0MWY4OTU4MTZjMjE5MjM4ZA==
   data.tar.gz: !binary |-
-    ZTFkMWMzMTZmNzNlZGQxNzc2OGM3YWI3YWUwZTgyOWU1ZGJjNjA0Mw==
+    OGQ3MzdhNTMyZDMzNTI1M2MxMTM1MGY2MDYzMGQxNzc3ZDA2M2RlOA==
 SHA512:
   metadata.gz: !binary |-
-    OWRlNWJiMjUzMzk4YTkwODZiNTExZGZkZGMxMjliMjhhYmRkMzg0ZTE2MTI0
-    NWU4MWExMzMyYzY1NTgzZGE5ZGE3OThjZTNlN2RiMmY1NWVhZDJiZjc3YTlj
-    ZDFmMTkwZDg3NDZjMDgxMjIwNWQ3ZTdmODUyODc3YmYyODE4NTA=
+    N2FiNzc2MGMwNzU0MDZkMmZhNzhiYmVjYmU1NThlNGVlMmZjNGY3ZTE3MmYz
+    Y2Y5OTc5YzlkZDg2MTM0MTAwYTUwMDk2YWU3MTdmMGQ4NzkxMjEzZGRhNjVl
+    YjgxZjU1YzlhY2I2NGQ3NmJjMWMzMDI0MTA0ZWMwMGFkOThhOWI=
   data.tar.gz: !binary |-
-    YmQ2NjQwYjY5YjIwMmQ4NGMwZTFiZWM4ZDYyNDhlY2E2NTM0MjIyYzg2ZGE0
-    NmJhMmQxNjEzODJiNmYxYTc2OTZiMmI0ODRhODc5ZTU3OWIzN2FhNTdiZjU3
-    MjMwOWM1ODVmMDQyZWJjZjAxNTRiMjIxMjA4ZTQ5YTkxZjkyNDE=
+    NmMxOTE1ODZlZjllYjdjZWM5ZDIyYmUzZWNmNTEzNzM0NjgyYTY2YTBlZDkz
+    MzM1Y2VmMjllZTdiOGQ4ZTM4Mjg1ZmY3ZmJiY2FkYzg2YWU0NTlhZTg1MWYz
+    MjIxNDg2ZGExNWVhYTYxYjRhODZhZGU2MDk4MWM3YWJjMzZjMzg=

data/app/models/controlled_versioning/version.rb

@@ -32,6 +32,10 @@ module ControlledVersioning
       end
     end
 
+    def changed_attributes_count
+      ChangeCounter.new(self).count
+    end
+
     def revisions
       ChangeTracker.new(self)
     end
@@ -50,7 +54,17 @@ module ControlledVersioning
     def trigger_callbacks(type)
       if versionable.class.respond_to?(type)
         callbacks = versionable.class.send(type)
-        callbacks.each { |callback| versionable.send(callback) }
+        callbacks.each do |callback|
+          send_callback(callback)
+        end
+      end
+    end
+
+    def send_callback(callback)
+      if versionable.method(callback).parameters.length > 0
+        versionable.send(callback, self)
+      else
+        versionable.send(callback)
       end
     end
   end

data/lib/controlled_versioning.rb

@@ -3,6 +3,8 @@ require "controlled_versioning/engine"
 # Core
 require "controlled_versioning/version"
 
+require "controlled_versioning/change_counter"
+
 require "controlled_versioning/change_tracker"
 require "controlled_versioning/change_tracker/attribute"
 require "controlled_versioning/change_tracker/child"

data/lib/controlled_versioning/change_counter.rb

@@ -0,0 +1,18 @@
+class ChangeCounter
+  
+  attr_accessor :version
+  def initialize(version)
+    @version = version
+  end
+
+  def count
+    version.version_attributes.length + changed_child_attributes
+  end
+
+  private
+  def changed_child_attributes
+    version.version_children.collect{ |child| ChangeCounter.new(child).count }.
+      inject(:+) || 0
+  end
+
+end

data/lib/controlled_versioning/version_number.rb

@@ -1,3 +1,3 @@
 module ControlledVersioning
-  VERSION_NUMBER = "0.11.0"
+  VERSION_NUMBER = "0.12.0"
 end

data/spec/models/controlled_versioning/version_spec.rb

@@ -27,6 +27,19 @@ describe ControlledVersioning::Version do
         ] })
     end
 
+    it 'changed attributes count' do
+      first_child_resource = @resource.child_resources[0]
+      first_grand_child_resource = first_child_resource.
+                                    grand_child_resources.first
+      version = @resource.submit_revision(r_string: "new string",
+        child_resources_attributes: [
+          {id: first_child_resource.id, grand_child_resources_attributes: [
+            {id: first_grand_child_resource.id, r_string: "new string"}
+          ]}
+      ])
+      expect(version.changed_attributes_count).to eq 2
+    end
+
     it 'changed attributes' do
       version = @resource.submit_revision(r_string: "new string")
       changed_attribute = version.revisions.attributes.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controlled_versioning
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - timothythehuman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,6 +133,7 @@ files:
 - db/migrate/20140206204910_create_controlled_versioning_version_attributes.rb
 - db/migrate/20140206204920_create_controlled_versioning_version_children.rb
 - lib/controlled_versioning.rb
+- lib/controlled_versioning/change_counter.rb
 - lib/controlled_versioning/change_tracker.rb
 - lib/controlled_versioning/change_tracker/attribute.rb
 - lib/controlled_versioning/change_tracker/child.rb
@@ -235,65 +236,65 @@ 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/handler_resources.rb
-- spec/factories/grand_child_resources.rb
+- spec/factories/partially_exclusive_versionable_resources.rb
 - spec/factories/users.rb
+- spec/factories/partially_inclusive_versionable_resources.rb
 - spec/factories/versionable_resources.rb
+- spec/factories/handler_resources.rb
+- spec/factories/parent_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/factories/grand_child_resources.rb
+- spec/factories/unversionable_resources.rb
+- spec/spec_helper.rb
 - spec/dummy/config/environment.rb
-- spec/dummy/config/boot.rb
 - spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/environments/production.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/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/README.rdoc
+- spec/dummy/db/schema.rb
+- spec/dummy/db/migrate/20140117222842_create_grand_child_resources.rb
+- spec/dummy/db/migrate/20140117222808_create_versionable_resources.rb
+- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
+- spec/dummy/db/migrate/20140118222842_create_handler_resources.rb
+- spec/dummy/db/migrate/20140117222815_create_partially_exclusive_versionable_resources.rb
+- spec/dummy/db/migrate/20140117222840_create_parent_resources.rb
+- spec/dummy/db/migrate/20140117222841_create_child_resources.rb
+- spec/dummy/db/migrate/20140117222828_create_nonversionable_resources.rb
+- spec/dummy/db/migrate/20140117222800_create_users.rb
 - spec/dummy/public/422.html
+- spec/dummy/public/500.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/handler_resource.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/models/parent_resource.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/models/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/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/views/layouts/application.html.erb
+- spec/dummy/app/models/handler_resource.rb
+- spec/dummy/app/models/nonversionable_resource.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/Rakefile
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
 - spec/dummy/config.ru
-- spec/dummy/README.rdoc
-- spec/dummy/db/schema.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/20140118222842_create_handler_resources.rb
-- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
-- spec/dummy/db/migrate/20140117222828_create_nonversionable_resources.rb
+- spec/models/controlled_versioning/version_spec.rb
+- spec/controlled_versioning_spec.rb