controlled_versioning 0.9.2 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjRhOWQ1Y2VjZTQ5YzI2NmJlZmUyNWQxMGFkMjU2NDYyMzUzZmVlYQ==
+    NzdiMmM3ZTU3MWI2YTQ4MjgxYWE5Y2E4ODRiYmRmM2U5NGNkZDg4OA==
   data.tar.gz: !binary |-
-    MWFkNjNmMjA1M2VhOWQwMzFmNThmN2UxNDBmYWJlZGU2YTQ4YmNkMA==
+    ZTI3OTQ4MThkZWNmNTg5ZmNhOWE1NjAyZjdiNzg0MzliZmEwYmUxMA==
 SHA512:
   metadata.gz: !binary |-
-    YmEyODNiMWNhY2JjYzZhZjNkZTU5ZjU5OTk4ZTdhM2NiZTI1YjZjNTJjYzNi
-    MDdkNTQ4ZGVlY2VlMjE0NzhhMjMxOGY5YjU2ZjliMTZhNWM5Y2ZiNjcwMTUy
-    MGUyODUyNGEyOGZhM2NiN2U4N2I4MjUyMTQzMmYyYTFjMGM5ZDc=
+    ZDRiYTI2NWU3OWY4YTgxNzljZTQ1NWM4YThjNDRmMGVkZTdhMGRkOGJjZjU5
+    NGM3Mzg3ZWIyN2RlNTBjMDY5MTMzNDFlZGZhYjEwMDZhNDUyMThlYmVmZGQ1
+    ZDg1YzE0NDg0NGJkYzNkMzZjZWExNjllZjBmMjc4MjNjYzAxYzA=
   data.tar.gz: !binary |-
-    ODUxMmQwYTFjNzdmYzliMWYzZjk5ZDBjNDNlMTBjMzljMTIwYjcwZTcwZmQ2
-    MGY5ZWY3NjRmMTIzYzUwNmYxMjFjYWU1YWUxYTJmZTVmYzNlYWYxMTUwNWYx
-    MjgwNzdmMGM1OGI1ZDNlZjhlMzVhZmMyMWFhZmQ2NDRjN2ZhZmE=
+    MTA5YmE1NzRjMjQ3N2IxYTMzODVhZjNiNjFlYmI1OTgwMGQ0ZDM0Y2EwOGMy
+    Y2JkZjRhNGY0YmIyYmY2YWU3NWU2NGE2NDFhMGZkYzE2MTRiNzg4ZDFiN2I5
+    NGU0ZmY0NzM4NzRjNmVkNTEyMjU3NzJjODgwNThlZTExZWE2Njk=

data/app/models/controlled_versioning/version.rb

@@ -13,11 +13,19 @@ module ControlledVersioning
       if pending?
         Revision::Publisher.new(self).accept_revision unless initial?
         update_attributes(pending: false, accepted: true)
+        versionable.try(:when_accepting_anything)
+        versionable.try(:when_accepting_an_initial_version) if initial?
+        versionable.try(:when_accepting_a_revision) unless initial?
       end
     end
 
     def decline
-      update_attributes(pending: false, declined: true) if pending?
+      if pending?
+        update_attributes(pending: false, declined: true)
+        versionable.try(:when_declining_anything)
+        versionable.try(:when_declining_an_initial_version) if initial?
+        versionable.try(:when_declining_a_revision) unless initial?
+      end
     end
 
     def revisions

data/config/locales/controlled_versioning.en.yml

@@ -0,0 +1,4 @@
+en:
+ errors:
+    messages:
+      no_revisions_made: "We didn't find any changes. Please make sure you've revised at least one attribute."

data/lib/controlled_versioning/revision/factory.rb

@@ -10,14 +10,9 @@ class Revision::Factory < Revision
 
   def build
     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
-      build_parent
-    end
+    versionable.valid?
+    validate_presence_of_changes
+    versionable.errors.present? ? versionable : build_parent
   end
 
   def build_associations
@@ -27,6 +22,12 @@ class Revision::Factory < Revision
   end
 
   private
+  def validate_presence_of_changes
+    unless Revision::Auditor.new(versionable).changes_original?
+      versionable.errors[:base] << I18n.t("errors.messages.no_revisions_made")
+    end
+  end
+
   def build_parent
     self.version = versionable.versions.build
     version.notes = versionable_notes

data/lib/controlled_versioning/version_number.rb

@@ -1,3 +1,3 @@
 module ControlledVersioning
-  VERSION_NUMBER = "0.9.2"
+  VERSION_NUMBER = "0.10.0"
 end

data/spec/dummy/app/models/handler_resource.rb

@@ -0,0 +1,31 @@
+class HandlerResource < ActiveRecord::Base
+  acts_as_versionable
+  
+  def when_accepting_anything
+    increment(:accept_count)
+    save
+  end
+
+  def when_accepting_an_initial_version
+    update_attribute(:accepted, true)
+  end
+
+  def when_accepting_a_revision
+    increment(:accepted_revisions_count)
+    save
+  end
+  
+  def when_declining_anything
+    increment(:decline_count)
+    save
+  end
+
+  def when_declining_an_initial_version
+    update_attribute(:declined, true)
+  end
+
+  def when_declining_a_revision
+    increment(:declined_revisions_count)
+    save
+  end
+end

data/spec/dummy/db/migrate/20140118222842_create_handler_resources.rb

@@ -0,0 +1,25 @@
+class CreateHandlerResources < ActiveRecord::Migration
+  def change
+    create_table :handler_resources do |t|
+      t.boolean :r_boolean
+      t.date :r_date
+      t.datetime :r_datetime
+      t.decimal :r_decimal
+      t.float :r_float
+      t.integer :r_integer
+      t.string :r_string
+      t.text :r_text
+      t.time :r_time
+
+      t.integer :accept_count, null: false, default: 0
+      t.integer :decline_count, null: false, default: 0
+      t.integer :accepted_revisions_count, null: false, default: 0
+      t.integer :declined_revisions_count, null: false, default: 0
+
+      t.boolean :accepted, null: false, default: false
+      t.boolean :declined, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -88,6 +88,26 @@ ActiveRecord::Schema.define(version: 20140206204920) do
     t.datetime "updated_at"
   end
 
+  create_table "handler_resources", force: true do |t|
+    t.boolean  "r_boolean"
+    t.date     "r_date"
+    t.datetime "r_datetime"
+    t.decimal  "r_decimal"
+    t.float    "r_float"
+    t.integer  "r_integer"
+    t.string   "r_string"
+    t.text     "r_text"
+    t.time     "r_time"
+    t.integer  "accept_count",             default: 0,     null: false
+    t.integer  "decline_count",            default: 0,     null: false
+    t.integer  "accepted_revisions_count", default: 0,     null: false
+    t.integer  "declined_revisions_count", default: 0,     null: false
+    t.boolean  "accepted",                 default: false, null: false
+    t.boolean  "declined",                 default: false, null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "nonversionable_resources", force: true do |t|
     t.boolean  "r_boolean"
     t.date     "r_date"

data/spec/factories/handler_resources.rb

@@ -0,0 +1,16 @@
+FactoryGirl.define do
+  factory :handler_resource do
+    r_boolean true
+    r_date Date.today
+    r_datetime DateTime.now
+    r_decimal 3.14
+    r_float 3.14
+    r_integer 3
+    r_string "my string"
+    r_text "my text"
+    r_time Time.now
+
+    initialize_with { HandlerResource.create_with_version(attributes) }
+
+  end
+end

data/spec/models/controlled_versioning/version_spec.rb

@@ -73,9 +73,9 @@ describe ControlledVersioning::Version do
       changed_child = version.revisions.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.name).to eq "r_float" || "parent_id"
       expect(changed_attribute.old_value).to be_nil
-      expect(changed_attribute.new_value).to eq "3.14"
+      expect(changed_attribute.new_value).to eq "3.14" || @resource.id
     end
 
     it 'marked children' do
@@ -88,6 +88,56 @@ describe ControlledVersioning::Version do
     end
   end
 
+  context 'allows for custom handling of' do
+    before :each do
+      @resource = create(:handler_resource)
+      @revision_one = @resource.submit_revision(r_string: "first revision")
+      @revision_two = @resource.submit_revision(r_string: "second revisions")
+    end
+
+    context 'acceptances of' do
+      before :each do
+        @resource.initial_version.accept
+        @revision_one.accept
+        @revision_two.accept
+        @resource.reload
+      end
+
+      it 'any kind' do
+        expect(@resource.accept_count).to eq 3
+      end
+
+      it 'initial versions' do
+        expect(@resource.accepted).to be_true
+      end
+
+      it 'revisions' do
+        expect(@resource.accepted_revisions_count).to eq 2
+      end
+    end
+
+    context 'declines of' do
+      before :each do
+        @resource.initial_version.decline
+        @revision_one.decline
+        @revision_two.decline
+        @resource.reload
+      end
+
+      it 'any kind' do
+        expect(@resource.decline_count).to eq 3
+      end
+
+      it 'initial versions' do
+        expect(@resource.declined).to be_true
+      end
+
+      it 'revisions' do
+        expect(@resource.declined_revisions_count).to eq 2
+      end
+    end
+  end  
+
   context 'has a scope that' do
     before :each do
       @resource = create(:versionable_resource)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: controlled_versioning
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - timothythehuman
@@ -128,6 +128,7 @@ files:
 - app/models/controlled_versioning/version_attribute.rb
 - app/models/controlled_versioning/version_child.rb
 - app/views/layouts/controlled_versioning/application.html.erb
+- config/locales/controlled_versioning.en.yml
 - db/migrate/20140206204853_create_controlled_versioning_versions.rb
 - db/migrate/20140206204910_create_controlled_versioning_version_attributes.rb
 - db/migrate/20140206204920_create_controlled_versioning_version_children.rb
@@ -156,6 +157,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/child_resource.rb
 - spec/dummy/app/models/grand_child_resource.rb
+- spec/dummy/app/models/handler_resource.rb
 - spec/dummy/app/models/nonversionable_resource.rb
 - spec/dummy/app/models/parent_resource.rb
 - spec/dummy/app/models/partially_exclusive_versionable_resource.rb
@@ -191,6 +193,7 @@ files:
 - spec/dummy/db/migrate/20140117222840_create_parent_resources.rb
 - spec/dummy/db/migrate/20140117222841_create_child_resources.rb
 - spec/dummy/db/migrate/20140117222842_create_grand_child_resources.rb
+- spec/dummy/db/migrate/20140118222842_create_handler_resources.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -198,6 +201,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/factories/child_resources.rb
 - spec/factories/grand_child_resources.rb
+- spec/factories/handler_resources.rb
 - spec/factories/parent_resources.rb
 - spec/factories/partially_exclusive_versionable_resources.rb
 - spec/factories/partially_inclusive_versionable_resources.rb
@@ -231,62 +235,65 @@ specification_version: 4
 summary: Adds model versioning to a Rails app, with the ability to approve and declined
   revisions.
 test_files:
+- spec/factories/parent_resources.rb
+- spec/factories/versionable_resources.rb
+- spec/factories/grand_child_resources.rb
+- spec/factories/handler_resources.rb
+- spec/factories/partially_inclusive_versionable_resources.rb
+- spec/factories/child_resources.rb
+- spec/factories/partially_exclusive_versionable_resources.rb
+- spec/factories/unversionable_resources.rb
+- spec/factories/users.rb
+- spec/spec_helper.rb
+- spec/models/controlled_versioning/version_spec.rb
+- spec/controlled_versioning_spec.rb
 - spec/dummy/Rakefile
-- spec/dummy/README.rdoc
-- spec/dummy/db/migrate/20140117222815_create_partially_exclusive_versionable_resources.rb
-- spec/dummy/db/migrate/20140117222800_create_users.rb
-- spec/dummy/db/migrate/20140117222840_create_parent_resources.rb
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/bin/rake
+- spec/dummy/bin/rails
+- spec/dummy/bin/bundle
+- spec/dummy/db/schema.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/20140117222815_create_partially_exclusive_versionable_resources.rb
 - spec/dummy/db/migrate/20140117222828_create_nonversionable_resources.rb
-- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
 - spec/dummy/db/migrate/20140117222841_create_child_resources.rb
-- spec/dummy/db/migrate/20140117222842_create_grand_child_resources.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rake
-- 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/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/models/parent_resource.rb
-- spec/dummy/app/models/partially_exclusive_versionable_resource.rb
-- spec/dummy/app/models/child_resource.rb
-- spec/dummy/app/models/nonversionable_resource.rb
-- spec/dummy/app/models/grand_child_resource.rb
-- spec/dummy/app/models/versionable_resource.rb
-- spec/dummy/app/models/partially_inclusive_versionable_resource.rb
+- spec/dummy/db/migrate/20140117222814_create_partially_inclusive_versionable_resources.rb
+- spec/dummy/db/migrate/20140118222842_create_handler_resources.rb
 - spec/dummy/config.ru
 - spec/dummy/config/boot.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/filter_parameter_logging.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/filter_parameter_logging.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/application.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/application.rb
 - spec/dummy/config/environment.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/database.yml
-- spec/spec_helper.rb
-- spec/factories/child_resources.rb
-- spec/factories/grand_child_resources.rb
-- spec/factories/partially_inclusive_versionable_resources.rb
-- spec/factories/unversionable_resources.rb
-- spec/factories/users.rb
-- spec/factories/partially_exclusive_versionable_resources.rb
-- spec/factories/parent_resources.rb
-- spec/factories/versionable_resources.rb
-- spec/controlled_versioning_spec.rb
-- spec/models/controlled_versioning/version_spec.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/models/versionable_resource.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/parent_resource.rb
+- spec/dummy/app/models/partially_exclusive_versionable_resource.rb
+- spec/dummy/app/models/child_resource.rb
+- spec/dummy/app/models/nonversionable_resource.rb
+- spec/dummy/app/models/handler_resource.rb
+- spec/dummy/app/models/grand_child_resource.rb
+- spec/dummy/app/models/partially_inclusive_versionable_resource.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/README.rdoc