state_machines-activemodel 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5e81550481dde36492aae79d59f69ee5f599927
-  data.tar.gz: 05248350d267f60ad3cb5ed43c89d00c2cd143d0
+  metadata.gz: 0f82de01738a5f173a174e6ccafb88d4b068ddf0
+  data.tar.gz: 2a53957a4121e365e978f093bfafca9f50b9dafd
 SHA512:
-  metadata.gz: 16f73d32b72ebd5ca59bd45676281c87511f915a16968ecb6648ff3409745c49caa1fe25b46c212a742aca1cc3696ea8b0c7954029d27e7eca0af5b154e76fe8
-  data.tar.gz: 087afbda3cff8e922bd1e88d3858e73244ef779ada26903b5ed4f12d2f006fcafc48f4119b76c7c1e6413923c8f8cd6f5dbe33e239a19d8fde3c3c4fbc171741
+  metadata.gz: f8ba8dc5b7b59fc95208faaa2735476e89e669509037f8dfb1a3a7c799fafd53ca9964822694228d3ed1afccd8af035e7ab53cea989854fbd099ba078afcda5e
+  data.tar.gz: fbbb9bb8aa367b9b9a37a55f8b8b2fdafcec6cf914f417fc3135c63ae8f80e2c482df959886cd9ef6a5fc3be559805ca5764d872c11551809edd83586a00b7a3

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 *.a
 mkmf.log
 .idea/
+*.lock

data/.travis.yml

@@ -1,16 +1,20 @@
 language: ruby
-before_install:
- - gem install bundler
- - bundle install
-script: bundle exec rake
+sudo: false
+cache: bundler
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.1
+  - 2.2
   - jruby-19mode
+  - jruby
   - rbx-2
+
 gemfile:
-  - gemfiles/active_model_3.2.gemfile
-  - gemfiles/active_model_4.0.gemfile
   - gemfiles/active_model_4.1.gemfile
-  - gemfiles/active_model_edge.gemfile
+  - gemfiles/active_model_4.2.gemfile
+
+matrix:
+  allow_failures:
+    - rvm: jruby
+    - rvm: jruby-19mode
+    - rvm: rbx-2

data/Appraisals

@@ -1,19 +1,8 @@
 # ActiveModel integrations
-appraise "active_model_3.2" do
-    gem "activemodel", "~> 3.2.0"
+appraise 'active_model_4.1' do
+    gem 'activemodel', github: 'rails/rails', branch: '4-2-stable'
 end
 
-appraise "active_model_4.0" do
-    gem "activemodel", "~> 4.0.0"
+appraise 'active_model_4.2' do
+    gem 'activemodel', github: 'rails/rails', branch: '4-2-stable'
 end
-
-
-appraise 'active_model_4.1' do 
-    gem 'activemodel', '~> 4.1.0'
-end
-
-appraise 'active_model_edge' do 
-    gem 'activemodel', github: 'rails/rails'
-end
-
-

data/Gemfile

@@ -3,3 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in state_machine2_activemodel.gemspec
 gemspec
 
+platforms :mri_20, :mri_21 do
+  gem 'pry-byebug'
+end

data/LICENSE.txt

@@ -1,5 +1,5 @@
 Copyright (c) 2006-2012 Aaron Pfeifer
-Copyright (c) 2014 Abdelkader Boudih
+Copyright (c) 2014-2015 Abdelkader Boudih
 
 MIT License
 

data/README.md

@@ -1,12 +1,11 @@
-[![Build Status](https://travis-ci.org/seuros/state_machines-activemodel.svg?branch=master)](https://travis-ci.org/seuros/state_machines-activemodel)
-[![Code Climate](https://codeclimate.com/github/seuros/state_machines-activemodel.png)](https://codeclimate.com/github/seuros/state_machines-activemodel)
+[![Build Status](https://travis-ci.org/state-machines/state_machines-activemodel.svg?branch=master)](https://travis-ci.org/state-machines/state_machines-activemodel)
+[![Code Climate](https://codeclimate.com/github/state-machines/state_machines-activemodel.png)](https://codeclimate.com/github/state-machines/state_machines-activemodel)
 
 # StateMachines ActiveModel Integration
 
 The ActiveModel integration is useful for both standalone usage and for providing
 the base implementation for ORMs which implement the ActiveModel API.  This
-integration adds support for validation errors, dirty attribute tracking, and
-observers.
+integration adds support for validation errors and dirty attribute tracking.
 
 ## Installation
 
@@ -29,7 +28,6 @@ Or install it yourself as:
 class Vehicle
   include ActiveModel::Dirty
   include ActiveModel::Validations
-  include ActiveModel::Observing
 
   attr_accessor :state
   define_attribute_methods [:state]
@@ -80,9 +78,14 @@ end
 
 ```
 
+Dependencies
+
+Active Model 4.1+
+
+
 ## Contributing
 
-1. Fork it ( https://github.com/seuros/state_machines-activemodel/fork )
+1. Fork it ( https://github.com/state-machines/state_machines-activemodel/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1,10 +1,9 @@
-require 'rubygems'
-require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/*_test.rb']
 end
 
 desc 'Default: run all tests.'
-task :default => :spec
+task default: :test

data/gemfiles/active_model_4.1.gemfile

@@ -2,6 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "activemodel", "~> 4.1.0"
+gem "activemodel", :github => "rails/rails", :branch => "4-2-stable"
+
+platforms :mri_20, :mri_21 do
+  gem "pry-byebug"
+end
 
 gemspec :path => "../"

data/gemfiles/active_model_4.2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activemodel", :github => "rails/rails", :branch => "4-2-stable"
+
+platforms :mri_20, :mri_21 do
+  gem "pry-byebug"
+end
+
+gemspec :path => "../"

data/lib/state_machines/integrations/active_model.rb

@@ -1,70 +1,72 @@
 require 'active_model'
-require 'active_support/all'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/module/attribute_accessors.rb'
 require 'state_machines'
-require 'state_machines/integrations/version'
+require 'state_machines/integrations/base'
+require 'state_machines/integrations/active_model/version'
 
 module StateMachines
   module Integrations #:nodoc:
     # Adds support for integrating state machines with ActiveModel classes.
-    # 
+    #
     # == Examples
-    # 
+    #
     # If using ActiveModel directly within your class, then any one of the
     # following features need to be included in order for the integration to be
     # detected:
     # * ActiveModel::Observing
     # * ActiveModel::Validations
-    # 
+    #
     # Below is an example of a simple state machine defined within an
     # ActiveModel class:
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::Observing
     #     include ActiveModel::Validations
-    #     
+    #
     #     attr_accessor :state
     #     define_attribute_methods [:state]
-    #     
+    #
     #     state_machine :initial => :parked do
     #       event :ignite do
     #         transition :parked => :idling
     #       end
     #     end
     #   end
-    # 
+    #
     # The examples in the sections below will use the above class as a
     # reference.
-    # 
+    #
     # == Actions
-    # 
+    #
     # By default, no action will be invoked when a state is transitioned.  This
     # means that if you want to save changes when transitioning, you must
     # define the action yourself like so:
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::Validations
     #     attr_accessor :state
-    #     
+    #
     #     state_machine :action => :save do
     #       ...
     #     end
-    #     
+    #
     #     def save
     #       # Save changes
     #     end
     #   end
-    # 
+    #
     # == Validations
-    # 
+    #
     # As mentioned in StateMachine::Machine#state, you can define behaviors,
     # like validations, that only execute for certain states. One *important*
     # caveat here is that, due to a constraint in ActiveModel's validation
     # framework, custom validators will not work as expected when defined to run
     # in multiple states.  For example:
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::Validations
-    #     
+    #
     #     state_machine do
     #       ...
     #       state :first_gear, :second_gear do
@@ -72,14 +74,14 @@ module StateMachines
     #       end
     #     end
     #   end
-    # 
+    #
     # In this case, the <tt>:speed_is_legal</tt> validation will only get run
     # for the <tt>:second_gear</tt> state.  To avoid this, you can define your
     # custom validation like so:
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::Validations
-    #     
+    #
     #     state_machine do
     #       ...
     #       state :first_gear, :second_gear do
@@ -87,103 +89,103 @@ module StateMachines
     #       end
     #     end
     #   end
-    # 
+    #
     # == Validation errors
-    # 
+    #
     # In order to hook in validation support for your model, the
     # ActiveModel::Validations feature must be included.  If this is included
     # and an event fails to successfully fire because there are no matching
     # transitions for the object, a validation error is added to the object's
     # state attribute to help in determining why it failed.
-    # 
+    #
     # For example,
-    # 
+    #
     #   vehicle = Vehicle.new
     #   vehicle.ignite                # => false
     #   vehicle.errors.full_messages  # => ["State cannot transition via \"ignite\""]
-    # 
+    #
     # In addition, if you're using the <tt>ignite!</tt> version of the event,
     # then the failure reason (such as the current validation errors) will be
     # included in the exception that gets raised when the event fails.  For
     # example, assuming there's a validation on a field called +name+ on the class:
-    # 
+    #
     #   vehicle = Vehicle.new
     #   vehicle.ignite!       # => StateMachine::InvalidTransition: Cannot transition state via :ignite from :parked (Reason(s): Name cannot be blank)
-    # 
+    #
     # === Security implications
-    # 
+    #
     # Beware that public event attributes mean that events can be fired
     # whenever mass-assignment is being used.  If you want to prevent malicious
     # users from tampering with events through URLs / forms, the attribute
     # should be protected like so:
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::MassAssignmentSecurity
     #     attr_accessor :state
-    #     
+    #
     #     attr_protected :state_event
     #     # attr_accessible ... # Alternative technique
-    #     
+    #
     #     state_machine do
     #       ...
     #     end
     #   end
-    # 
+    #
     # If you want to only have *some* events be able to fire via mass-assignment,
     # you can build two state machines (one public and one protected) like so:
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::MassAssignmentSecurity
     #     attr_accessor :state
-    #     
+    #
     #     attr_protected :state_event # Prevent access to events in the first machine
-    #     
+    #
     #     state_machine do
     #       # Define private events here
     #     end
-    #     
+    #
     #     # Public machine targets the same state as the private machine
     #     state_machine :public_state, :attribute => :state do
     #       # Define public events here
     #     end
     #   end
-    # 
+    #
     # == Callbacks
-    # 
+    #
     # All before/after transition callbacks defined for ActiveModel models
     # behave in the same way that other ActiveSupport callbacks behave.  The
     # object involved in the transition is passed in as an argument.
-    # 
+    #
     # For example,
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::Validations
     #     attr_accessor :state
-    #     
+    #
     #     state_machine :initial => :parked do
     #       before_transition any => :idling do |vehicle|
     #         vehicle.put_on_seatbelt
     #       end
-    #       
+    #
     #       before_transition do |vehicle, transition|
     #         # log message
     #       end
-    #       
+    #
     #       event :ignite do
     #         transition :parked => :idling
     #       end
     #     end
-    #     
+    #
     #     def put_on_seatbelt
     #       ...
     #     end
     #   end
-    # 
+    #
     # Note, also, that the transition can be accessed by simply defining
     # additional arguments in the callback block.
-    # 
+    #
     # == Observers
-    # 
+    #
     # In order to hook in observer support for your application, the
     # ActiveModel::Observing feature must be included.  Because of the way
     # ActiveModel observers are designed, there is less flexibility around the
@@ -200,49 +202,49 @@ module StateMachines
     # * before/after/after_failure_to-_transition_state_to_idling
     # * before/after/after_failure_to-_transition_state
     # * before/after/after_failure_to-_transition
-    # 
+    #
     # The following class shows an example of some of these hooks:
-    # 
+    #
     #   class VehicleObserver < ActiveModel::Observer
     #     # Callback for :ignite event *before* the transition is performed
     #     def before_ignite(vehicle, transition)
     #       # log message
     #     end
-    #     
+    #
     #     # Callback for :ignite event *after* the transition has been performed
     #     def after_ignite(vehicle, transition)
     #       # put on seatbelt
     #     end
-    #     
+    #
     #     # Generic transition callback *before* the transition is performed
     #     def after_transition(vehicle, transition)
     #       Audit.log(vehicle, transition)
     #     end
-    #     
+    #
     #     def after_failure_to_transition(vehicle, transition)
     #       Audit.error(vehicle, transition)
     #     end
     #   end
-    # 
+    #
     # More flexible transition callbacks can be defined directly within the
     # model as described in StateMachine::Machine#before_transition
     # and StateMachine::Machine#after_transition.
-    # 
+    #
     # To define a single observer for multiple state machines:
-    # 
+    #
     #   class StateMachineObserver < ActiveModel::Observer
     #     observe Vehicle, Switch, Project
-    #     
+    #
     #     def after_transition(object, transition)
     #       Audit.log(object, transition)
     #     end
     #   end
-    # 
+    #
     # == Internationalization
-    # 
+    #
     # Any error message that is generated from performing invalid transitions
     # can be localized.  The following default translations are used:
-    # 
+    #
     #   en:
     #     activemodel:
     #       errors:
@@ -252,16 +254,16 @@ module StateMachines
     #           invalid_event: "cannot transition when %{state}"
     #           # %{value} = attribute value, %{event} = Human event name, %{state} = Human current state name
     #           invalid_transition: "cannot transition via %{event}"
-    # 
+    #
     # You can override these for a specific model like so:
-    # 
+    #
     #   en:
     #     activemodel:
     #       errors:
     #         models:
     #           user:
     #             invalid: "is not valid"
-    # 
+    #
     # In addition to the above, you can also provide translations for the
     # various states / events in each state machine.  Using the Vehicle example,
     # state translations will be looked for using the following keys, where
@@ -270,16 +272,16 @@ module StateMachines
     # * <tt>activemodel.state_machines.#{model_name}.states.#{state_name}</tt>
     # * <tt>activemodel.state_machines.#{machine_name}.states.#{state_name}</tt>
     # * <tt>activemodel.state_machines.states.#{state_name}</tt>
-    # 
+    #
     # Event translations will be looked for using the following keys, where
     # +model_name+ = "vehicle", +machine_name+ = "state" and +event_name+ = "ignite":
     # * <tt>activemodel.state_machines.#{model_name}.#{machine_name}.events.#{event_name}</tt>
     # * <tt>activemodel.state_machines.#{model_name}.events.#{event_name}</tt>
     # * <tt>activemodel.state_machines.#{machine_name}.events.#{event_name}</tt>
     # * <tt>activemodel.state_machines.events.#{event_name}</tt>
-    # 
+    #
     # An example translation configuration might look like so:
-    # 
+    #
     #   es:
     #     activemodel:
     #       state_machines:
@@ -287,83 +289,81 @@ module StateMachines
     #           parked: 'estacionado'
     #         events:
     #           park: 'estacionarse'
-    # 
+    #
     # == Dirty Attribute Tracking
-    # 
+    #
     # When using the ActiveModel::Dirty extension, your model will keep track of
     # any changes that are made to attributes.  Depending on your ORM, an object
     # will only be saved when there are attributes that have changed on the
     # object.  When integrating with state_machine, typically the +state+ field
     # will be marked as dirty after a transition occurs.  In some situations,
     # however, this isn't the case.
-    # 
+    #
     # If you define loopback transitions in your state machine, the value for
     # the machine's attribute (e.g. state) will not change.  Unless you explicitly
     # indicate so, this means that your object won't persist anything on a
     # loopback.  For example:
-    # 
+    #
     #   class Vehicle
     #     include ActiveModel::Validations
     #     include ActiveModel::Dirty
     #     attr_accessor :state
-    #     
+    #
     #     state_machine :initial => :parked do
     #       event :park do
     #         transition :parked => :parked, ...
     #       end
     #     end
     #   end
-    # 
+    #
     # If, instead, you'd like your object to always persist regardless of
     # whether the value actually changed, you can do so by using the
     # <tt>#{attribute}_will_change!</tt> helpers or defining a +before_transition+
     # callback that actually changes an attribute on the model.  For example:
-    # 
+    #
     #   class Vehicle
     #     ...
     #     state_machine :initial => :parked do
     #       before_transition all => same do |vehicle|
     #         vehicle.state_will_change!
-    #         
+    #
     #         # Alternative solution, updating timestamp
-    #         # vehicle.updated_at = Time.curent
+    #         # vehicle.updated_at = Time.current
     #       end
     #     end
     #   end
-    # 
+    #
     # == Creating new integrations
-    # 
+    #
     # If you want to integrate state_machine with an ORM that implements parts
     # or all of the ActiveModel API, only the machine defaults need to be
     # specified.  Otherwise, the implementation is similar to any other
     # integration.
-    # 
+    #
     # For example,
-    # 
+    #
     #   module StateMachine::Integrations::MyORM
-    #     include StateMachine::Integrations::ActiveModel
-    #     
-    #     @defaults = {:action => :persist}
-    #     
+    #     include ActiveModel
+    #
+    #     mattr_accessor(:defaults) { :action => :persist }
+    #
     #     def self.matches?(klass)
     #       defined?(::MyORM::Base) && klass <= ::MyORM::Base
     #     end
-    #     
+    #
     #     protected
-    #       def runs_validations_on_action?
-    #         action == :persist
-    #       end
+    #
+    #     def runs_validations_on_action?
+    #      action == :persist
+    #     end
     #   end
-    # 
+    #
     # If you wish to implement other features, such as attribute initialization
     # with protected attributes, named scopes, or database transactions, you
     # must add these independent of the ActiveModel integration.  See the
     # ActiveRecord implementation for examples of these customizations.
     module ActiveModel
-
-      include StateMachines::Integrations::Base
-      extend ClassMethods
-
+      include Base
 
       @defaults = {}
 
@@ -373,11 +373,11 @@ module StateMachines
         %w(ActiveModel ActiveModel::Validations)
       end
 
-      # Adds a validation error to the given object 
+      # Adds a validation error to the given object
       def invalidate(object, attribute, message, values = [])
         if supports_validations?
           attribute = self.attribute(attribute)
-          options = values.inject({}) do |h, (key, value)|
+          options = values.reduce({}) do |h, (key, value)|
             h[key] = value
             h
           end
@@ -400,7 +400,7 @@ module StateMachines
 
       # Runs state events around the object's validation process
       def around_validation(object)
-        object.class.state_machines.transitions(object, action, :after => false).perform { yield }
+        object.class.state_machines.transitions(object, action, after: false).perform { yield }
       end
 
       protected
@@ -420,7 +420,7 @@ module StateMachines
 
       # Gets the terminator to use for callbacks
       def callback_terminator
-        @terminator ||= lambda { |result| result == false }
+        @terminator ||= ->(result) { result == false }
       end
 
       # Determines the base scope to use when looking up translations
@@ -430,8 +430,8 @@ module StateMachines
 
       # The default options to use when generating messages for validation
       # errors
-      def default_error_message_options(object, attribute, message)
-        {:message => @messages[message]}
+      def default_error_message_options(_object, _attribute, message)
+        { message: @messages[message] }
       end
 
       # Translates the given key / value combo.  Translation keys are looked
@@ -451,7 +451,7 @@ module StateMachines
         translations = ancestors.map { |ancestor| :"#{ancestor.model_name.to_s.underscore}.#{name}.#{group}.#{value}" }
         translations.concat(ancestors.map { |ancestor| :"#{ancestor.model_name.to_s.underscore}.#{group}.#{value}" })
         translations.concat([:"#{name}.#{group}.#{value}", :"#{group}.#{value}", value.humanize.downcase])
-        I18n.translate(translations.shift, :default => translations, :scope => [i18n_scope(klass), :state_machines])
+        I18n.translate(translations.shift, default: translations, scope: [i18n_scope(klass), :state_machines])
       end
 
       # Build a list of ancestors for the given class to use when
@@ -475,12 +475,11 @@ module StateMachines
         "#{File.dirname(__FILE__)}/active_model/locale.rb"
       end
 
-
       # Skips defining reader/writer methods since this is done automatically
       def define_state_accessor
         name = self.name
 
-        owner_class.validates_each(attribute) do |object, attr, value|
+        owner_class.validates_each(attribute) do |object|
           machine = object.class.state_machine(name)
           machine.invalidate(object, :state, :invalid) unless machine.states.match(object)
         end if supports_validations?
@@ -495,7 +494,7 @@ module StateMachines
       # Hooks into validations by defining around callbacks for the
       # :validation event
       def define_validation_hook
-        owner_class.set_callback(:validation, :around, self, :prepend => true)
+        owner_class.set_callback(:validation, :around, self, prepend: true)
       end
 
       # Creates a new callback in the callback chain, always inserting it
@@ -507,20 +506,18 @@ module StateMachines
       end
 
       # Configures new states with the built-in humanize scheme
-      def add_states(new_states)
+      def add_states(*)
         super.each do |new_state|
-          new_state.human_name = lambda { |state, klass| translate(klass, :state, state.name) }
+          new_state.human_name = ->(state, klass) { translate(klass, :state, state.name) }
         end
       end
 
       # Configures new event with the built-in humanize scheme
-      def add_events(new_events)
+      def add_events(*)
         super.each do |new_event|
-          new_event.human_name = lambda { |event, klass| translate(klass, :event, event.name) }
+          new_event.human_name = ->(event, klass) { translate(klass, :event, event.name) }
         end
       end
-
-
     end
   end
 end