controlled_versioning 0.10.0 → 0.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzdiMmM3ZTU3MWI2YTQ4MjgxYWE5Y2E4ODRiYmRmM2U5NGNkZDg4OA==
+    YTg2ZTUxYzM1ZWU1NDM1YTllODA2NDE1NzFmYjBjNTI2YjMwMjg5NA==
   data.tar.gz: !binary |-
-    ZTI3OTQ4MThkZWNmNTg5ZmNhOWE1NjAyZjdiNzg0MzliZmEwYmUxMA==
+    ZTFkMWMzMTZmNzNlZGQxNzc2OGM3YWI3YWUwZTgyOWU1ZGJjNjA0Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZDRiYTI2NWU3OWY4YTgxNzljZTQ1NWM4YThjNDRmMGVkZTdhMGRkOGJjZjU5
-    NGM3Mzg3ZWIyN2RlNTBjMDY5MTMzNDFlZGZhYjEwMDZhNDUyMThlYmVmZGQ1
-    ZDg1YzE0NDg0NGJkYzNkMzZjZWExNjllZjBmMjc4MjNjYzAxYzA=
+    OWRlNWJiMjUzMzk4YTkwODZiNTExZGZkZGMxMjliMjhhYmRkMzg0ZTE2MTI0
+    NWU4MWExMzMyYzY1NTgzZGE5ZGE3OThjZTNlN2RiMmY1NWVhZDJiZjc3YTlj
+    ZDFmMTkwZDg3NDZjMDgxMjIwNWQ3ZTdmODUyODc3YmYyODE4NTA=
   data.tar.gz: !binary |-
-    MTA5YmE1NzRjMjQ3N2IxYTMzODVhZjNiNjFlYmI1OTgwMGQ0ZDM0Y2EwOGMy
-    Y2JkZjRhNGY0YmIyYmY2YWU3NWU2NGE2NDFhMGZkYzE2MTRiNzg4ZDFiN2I5
-    NGU0ZmY0NzM4NzRjNmVkNTEyMjU3NzJjODgwNThlZTExZWE2Njk=
+    YmQ2NjQwYjY5YjIwMmQ4NGMwZTFiZWM4ZDYyNDhlY2E2NTM0MjIyYzg2ZGE0
+    NmJhMmQxNjEzODJiNmYxYTc2OTZiMmI0ODRhODc5ZTU3OWIzN2FhNTdiZjU3
+    MjMwOWM1ODVmMDQyZWJjZjAxNTRiMjIxMjA4ZTQ5YTkxZjkyNDE=

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 YOURNAME
+Copyright 2014 Timothy Baron
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/models/controlled_versioning/version.rb

@@ -9,22 +9,26 @@ module ControlledVersioning
     scope :accepted, -> { where(accepted: true) }
     scope :declined, -> { where(declined: true) }
 
+    after_create :run_user_generated_create_callbacks
+
     def accept
       if pending?
+        versionable.reload
         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?
+        trigger_callbacks(:general_accepting_callbacks)
+        trigger_callbacks(:initial_accepting_callbacks) if initial?
+        trigger_callbacks(:revision_accepting_callbacks) unless initial?
       end
     end
 
     def decline
       if pending?
+        versionable.reload
         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?
+        trigger_callbacks(:general_declining_callbacks)
+        trigger_callbacks(:initial_declining_callbacks) if initial?
+        trigger_callbacks(:revision_declining_callbacks) unless initial?
       end
     end
 
@@ -35,5 +39,19 @@ module ControlledVersioning
     def is_a_child?
       false
     end
+
+    private
+    def run_user_generated_create_callbacks
+      trigger_callbacks(:general_creating_callbacks)
+      trigger_callbacks(:initial_creating_callbacks) if initial?
+      trigger_callbacks(:revision_creating_callbacks) unless initial?
+    end
+
+    def trigger_callbacks(type)
+      if versionable.class.respond_to?(type)
+        callbacks = versionable.class.send(type)
+        callbacks.each { |callback| versionable.send(callback) }
+      end
+    end
   end
 end

data/lib/controlled_versioning.rb

@@ -31,6 +31,27 @@ module ControlledVersioning
 
         send :include, InstanceMethods
 
+        def define_callbacks(*types)
+          types.each { |type| define_callback(type) }
+        end
+
+        def define_callback(type)
+          define_singleton_method("after_#{type}_a_version") do |*args|
+            options = args.extract_options!
+            options.merge!(only: :general) if options[:only].blank?
+            register_callback_methods(type, args, options)
+          end
+        end
+
+        def register_callback_methods(type, args, options)
+          restriction = options[:only].to_s
+          define_singleton_method("#{restriction}_#{type}_callbacks") do
+            args
+          end
+        end
+
+        define_callbacks :creating, :accepting, :declining
+
         def set_versionable_attribute_names(nonversionables)
           nonversionables = [] unless nonversionables.present?
           ArrayConverter.to_s!(nonversionables)

data/lib/controlled_versioning/version_number.rb

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

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

@@ -1,30 +1,61 @@
 class HandlerResource < ActiveRecord::Base
-  acts_as_versionable
-  
-  def when_accepting_anything
+  acts_as_versionable nonversionable_attributes: [:create_count, :accept_count,
+    :decline_count, :created_revisions_count, :accepted_revisions_count,
+    :declined_revisions_count, :has_been_created, :accepted, :declined]
+
+  after_creating_a_version :increment_create_count
+  after_creating_a_version :created, only: :initial
+  after_creating_a_version :increment_created_revision_count,
+    only: :revision
+
+  after_accepting_a_version :increment_accept_count
+  after_accepting_a_version :accept, only: :initial
+  after_accepting_a_version :increment_accepted_revision_count,
+    only: :revision
+
+  after_declining_a_version :increment_decline_count
+  after_declining_a_version :decline, only: :initial
+  after_declining_a_version :increment_declined_revision_count,
+    only: :revision
+
+  def increment_create_count
+    increment(:create_count)
+    save
+  end
+
+  def created
+    update_attribute(:has_been_created, true)
+  end
+
+  def increment_created_revision_count
+    increment(:created_revisions_count)
+    save
+  end
+
+  def increment_accept_count
     increment(:accept_count)
     save
   end
 
-  def when_accepting_an_initial_version
+  def accept
     update_attribute(:accepted, true)
   end
 
-  def when_accepting_a_revision
+  def increment_accepted_revision_count
     increment(:accepted_revisions_count)
     save
   end
   
-  def when_declining_anything
+  def increment_decline_count
     increment(:decline_count)
     save
   end
 
-  def when_declining_an_initial_version
+  def decline
     update_attribute(:declined, true)
   end
 
-  def when_declining_a_revision
+  def increment_declined_revision_count
     increment(:declined_revisions_count)
     save
   end

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

@@ -11,11 +11,15 @@ class CreateHandlerResources < ActiveRecord::Migration
       t.text :r_text
       t.time :r_time
 
+      t.integer :create_count, null: false, default: 0
       t.integer :accept_count, null: false, default: 0
       t.integer :decline_count, null: false, default: 0
+
+      t.integer :created_revisions_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 :has_been_created, null: false, default: false
       t.boolean :accepted, null: false, default: false
       t.boolean :declined, null: false, default: false
 

data/spec/dummy/db/schema.rb

@@ -98,10 +98,13 @@ ActiveRecord::Schema.define(version: 20140206204920) do
     t.string   "r_string"
     t.text     "r_text"
     t.time     "r_time"
+    t.integer  "create_count",             default: 0,     null: false
     t.integer  "accept_count",             default: 0,     null: false
     t.integer  "decline_count",            default: 0,     null: false
+    t.integer  "created_revisions_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  "has_been_created",         default: false, null: false
     t.boolean  "accepted",                 default: false, null: false
     t.boolean  "declined",                 default: false, null: false
     t.datetime "created_at"

data/spec/models/controlled_versioning/version_spec.rb

@@ -95,6 +95,24 @@ describe ControlledVersioning::Version do
       @revision_two = @resource.submit_revision(r_string: "second revisions")
     end
 
+    context 'creations of' do
+      before :each do
+        @resource.reload
+      end
+
+      it 'any kind' do
+        expect(@resource.create_count).to eq 3
+      end
+
+      it 'initial versions' do
+        expect(@resource.has_been_created).to be_true
+      end
+
+      it 'revisions' do
+        expect(@resource.created_revisions_count).to eq 2
+      end
+    end
+
     context 'acceptances of' do
       before :each do
         @resource.initial_version.accept

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controlled_versioning
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - timothythehuman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,71 +229,71 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 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/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/handler_resources.rb
+- spec/factories/grand_child_resources.rb
 - spec/factories/users.rb
-- spec/spec_helper.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/Rakefile
-- 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/20140117222841_create_child_resources.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/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/database.yml
 - 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/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/locales/en.yml
+- 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/database.yml
+- spec/dummy/config/locales/en.yml
+- spec/dummy/Rakefile
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- 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/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/helpers/application_helper.rb
+- spec/dummy/app/models/handler_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/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/helpers/application_helper.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- 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