state_machines-activemodel 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11ff8fca94c8ac107ae350fc15b495e60382aa2
-  data.tar.gz: 3b4f9a5a1faef97c4e0c17056f4b9f1dbcfc5f4a
+  metadata.gz: b5e81550481dde36492aae79d59f69ee5f599927
+  data.tar.gz: 05248350d267f60ad3cb5ed43c89d00c2cd143d0
 SHA512:
-  metadata.gz: f66365a5bb8cd800eb6e5aca5f8cd460d918a203da9ea0b1bf258a1bb01b78a2d4642c16af47e5d16519ade297f22984f443b5c2faa967fe487878efaecbac74
-  data.tar.gz: e834da143cca6992e98b286f9f82203983b58dade11b58f6bd18bcc6e5a46d5bbee1f8987aff7a961f26be781866f165a52a4ca65be9792349bfeb4e34ecd947
+  metadata.gz: 16f73d32b72ebd5ca59bd45676281c87511f915a16968ecb6648ff3409745c49caa1fe25b46c212a742aca1cc3696ea8b0c7954029d27e7eca0af5b154e76fe8
+  data.tar.gz: 087afbda3cff8e922bd1e88d3858e73244ef779ada26903b5ed4f12d2f006fcafc48f4119b76c7c1e6413923c8f8cd6f5dbe33e239a19d8fde3c3c4fbc171741

data/.gitignore

@@ -12,11 +12,10 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
-test/tmp
-test/version_tmp
 tmp
 *.bundle
 *.so
 *.o
 *.a
 mkmf.log
+.idea/

data/.travis.yml

@@ -6,14 +6,11 @@ script: bundle exec rake
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
   - jruby-19mode
   - rbx-2
 gemfile:
   - gemfiles/active_model_3.2.gemfile
-  - gemfiles/active_model_4.0_obs.gemfile
   - gemfiles/active_model_4.0.gemfile
-  - gemfiles/active_model_4.1_obs.gemfile
   - gemfiles/active_model_4.1.gemfile
-  - gemfiles/active_model_edge_obs.gemfile
   - gemfiles/active_model_edge.gemfile

data/Appraisals

@@ -3,30 +3,15 @@ appraise "active_model_3.2" do
     gem "activemodel", "~> 3.2.0"
 end
 
-appraise "active_model_4.0_obs" do
-    gem "activemodel", "~> 4.0.0"
-    gem 'rails-observers'
-end
-
-
 appraise "active_model_4.0" do
     gem "activemodel", "~> 4.0.0"
 end
 
-appraise 'active_model_4.1_obs' do
-    gem 'activemodel', '~> 4.1.0'
-    gem 'rails-observers'
-end
 
 appraise 'active_model_4.1' do 
     gem 'activemodel', '~> 4.1.0'
 end
 
-appraise 'active_model_edge_obs' do
-    gem 'activemodel', github: 'rails/rails'
-    gem 'rails-observers'
-end
-
 appraise 'active_model_edge' do 
     gem 'activemodel', github: 'rails/rails'
 end

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in state_machine2_activemodel.gemspec
-gemspec
+gemspec
+

data/README.md

@@ -1,3 +1,6 @@
+[![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)
+
 # StateMachines ActiveModel Integration
 
 The ActiveModel integration is useful for both standalone usage and for providing
@@ -9,7 +12,7 @@ observers.
 
 Add this line to your application's Gemfile:
 
-    gem 'state_machine2_activemodel'
+    gem 'state_machines-activemodel'
 
 And then execute:
 
@@ -17,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install state_machine2_activemodel
+    $ gem install state_machines-activemodel
 
 ## Usage
 

data/gemfiles/active_model_3.2.gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: ../
   specs:
-    state_machines-activemodel (0.0.1)
+    state_machines-activemodel (0.0.2)
       activemodel (>= 3.2)
       state_machines
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activesupport (3.2.17)
+    activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     appraisal (1.0.0)
@@ -21,7 +21,7 @@ GEM
     builder (3.0.4)
     diff-lcs (1.2.5)
     i18n (0.6.9)
-    multi_json (1.9.3)
+    multi_json (1.10.0)
     rake (10.3.1)
     rspec (3.0.0.beta2)
       rspec-core (= 3.0.0.beta2)
@@ -35,7 +35,7 @@ GEM
     rspec-mocks (3.0.0.beta2)
       rspec-support (= 3.0.0.beta2)
     rspec-support (3.0.0.beta2)
-    state_machines (0.0.1)
+    state_machines (0.0.2)
     thor (0.19.1)
 
 PLATFORMS

data/gemfiles/active_model_4.0.gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: ../
   specs:
-    state_machines-activemodel (0.0.1)
+    state_machines-activemodel (0.0.2)
       activemodel (>= 3.2)
       state_machines
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
-    activesupport (4.0.4)
+    activesupport (4.0.5)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -25,7 +25,7 @@ GEM
     diff-lcs (1.2.5)
     i18n (0.6.9)
     minitest (4.7.5)
-    multi_json (1.9.3)
+    multi_json (1.10.0)
     rake (10.3.1)
     rspec (3.0.0.beta2)
       rspec-core (= 3.0.0.beta2)
@@ -39,7 +39,7 @@ GEM
     rspec-mocks (3.0.0.beta2)
       rspec-support (= 3.0.0.beta2)
     rspec-support (3.0.0.beta2)
-    state_machines (0.0.1)
+    state_machines (0.0.2)
     thor (0.19.1)
     thread_safe (0.3.3)
     tzinfo (0.3.39)

data/gemfiles/active_model_4.1.gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: ../
   specs:
-    state_machines-activemodel (0.0.1)
+    state_machines-activemodel (0.0.2)
       activemodel (>= 3.2)
       state_machines
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
       builder (~> 3.1)
-    activesupport (4.1.0)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -39,7 +39,7 @@ GEM
     rspec-mocks (3.0.0.beta2)
       rspec-support (= 3.0.0.beta2)
     rspec-support (3.0.0.beta2)
-    state_machines (0.0.1)
+    state_machines (0.0.2)
     thor (0.19.1)
     thread_safe (0.3.3)
     tzinfo (1.1.0)

data/gemfiles/active_model_edge.gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 89893a000188f977163dddc04ff37846169a35dc
+  revision: 595326647405282e9edc6754019945896b1f2fc5
   specs:
     activemodel (4.2.0.alpha)
       activesupport (= 4.2.0.alpha)
@@ -15,7 +15,7 @@ GIT
 PATH
   remote: ../
   specs:
-    state_machines-activemodel (0.0.1)
+    state_machines-activemodel (0.0.2)
       activemodel (>= 3.2)
       state_machines
 
@@ -44,7 +44,7 @@ GEM
     rspec-mocks (3.0.0.beta2)
       rspec-support (= 3.0.0.beta2)
     rspec-support (3.0.0.beta2)
-    state_machines (0.0.1)
+    state_machines (0.0.2)
     thor (0.19.1)
     thread_safe (0.3.3)
     tzinfo (1.1.0)

data/lib/state_machines/integrations/active_model.rb

@@ -367,10 +367,10 @@ module StateMachines
 
       @defaults = {}
 
-      # Classes that include ActiveModel::Observing or ActiveModel::Validations
+      # Classes that include ActiveModel::Validations
       # will automatically use the ActiveModel integration.
       def self.matching_ancestors
-        %w(ActiveModel ActiveModel::Observing ActiveModel::Validations)
+        %w(ActiveModel ActiveModel::Validations)
       end
 
       # Adds a validation error to the given object 
@@ -404,11 +404,6 @@ module StateMachines
       end
 
       protected
-      # Whether observers are supported in the integration.  Only true if
-      # ActiveModel::Observer is available.
-      def supports_observers?
-        defined?(::ActiveModel::Observing) && owner_class <= ::ActiveModel::Observing
-      end
 
       # Whether validations are supported in the integration.  Only true if
       # the ActiveModel feature is enabled on the owner class.
@@ -462,7 +457,6 @@ module StateMachines
       # Build a list of ancestors for the given class to use when
       # determining which localization key to use for a particular string.
       def ancestors_for(klass)
-        load_observer_extensions
         klass.lookup_ancestors
       end
 
@@ -470,10 +464,6 @@ module StateMachines
       def after_initialize
         super()
         load_locale
-        if supports_observers?
-          load_observer_extensions
-          add_default_callbacks
-        end
       end
 
       # Loads any locale files needed for translating validation errors
@@ -485,20 +475,6 @@ module StateMachines
         "#{File.dirname(__FILE__)}/active_model/locale.rb"
       end
 
-      # Loads extensions to ActiveModel's Observers
-      def load_observer_extensions
-        require 'state_machines/integrations/active_model/observer'
-        require 'state_machines/integrations/active_model/observer_update'
-      end
-
-      # Adds a set of default callbacks that utilize the Observer extensions
-      def add_default_callbacks
-        if supports_observers?
-          callbacks[:before] << Callback.new(:before) { |object, transition| notify(:before, object, transition) }
-          callbacks[:after] << Callback.new(:after) { |object, transition| notify(:after, object, transition) }
-          callbacks[:failure] << Callback.new(:failure) { |object, transition| notify(:after_failure_to, object, transition) }
-        end
-      end
 
       # Skips defining reader/writer methods since this is done automatically
       def define_state_accessor
@@ -527,14 +503,7 @@ module StateMachines
       # initialization.
       def add_callback(type, options, &block)
         options[:terminator] = callback_terminator
-
-        if supports_observers?
-          @callbacks[type == :around ? :before : type].insert(-2, callback = Callback.new(type, options, &block))
-          add_states(callback.known_states)
-          callback
-        else
-          super
-        end
+        super
       end
 
       # Configures new states with the built-in humanize scheme
@@ -551,43 +520,7 @@ module StateMachines
         end
       end
 
-      # Notifies observers on the given object that a callback occurred
-      # involving the given transition.  This will attempt to call the
-      # following methods on observers:
-      # * <tt>#{type}_#{qualified_event}_from_#{from}_to_#{to}</tt>
-      # * <tt>#{type}_#{qualified_event}_from_#{from}</tt>
-      # * <tt>#{type}_#{qualified_event}_to_#{to}</tt>
-      # * <tt>#{type}_#{qualified_event}</tt>
-      # * <tt>#{type}_transition_#{machine_name}_from_#{from}_to_#{to}</tt>
-      # * <tt>#{type}_transition_#{machine_name}_from_#{from}</tt>
-      # * <tt>#{type}_transition_#{machine_name}_to_#{to}</tt>
-      # * <tt>#{type}_transition_#{machine_name}</tt>
-      # * <tt>#{type}_transition</tt>
-      #
-      # This will always return true regardless of the results of the
-      # callbacks.
-      def notify(type, object, transition)
-        name = self.name
-        event = transition.qualified_event
-        from = transition.from_name || 'nil'
-        to = transition.to_name || 'nil'
-
-        # Machine-specific updates
-        ["#{type}_#{event}", "#{type}_transition_#{name}"].each do |event_segment|
-          ["_from_#{from}", nil].each do |from_segment|
-            ["_to_#{to}", nil].each do |to_segment|
-              object.class.changed if object.class.respond_to?(:changed)
-              object.class.notify_observers('update_with_transition', ObserverUpdate.new([event_segment, from_segment, to_segment].join, object, transition))
-            end
-          end
-        end
-
-        # Generic updates
-        object.class.changed if object.class.respond_to?(:changed)
-        object.class.notify_observers('update_with_transition', ObserverUpdate.new("#{type}_transition", object, transition))
 
-        true
-      end
     end
   end
 end

data/lib/state_machines/integrations/version.rb

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveModel
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
     end
   end
 end

data/spec/active_model_spec.rb

@@ -636,4 +636,166 @@ describe StateMachines::Integrations::ActiveModel do
       assert record.valid?
     end
   end
+
+
+
+  context 'WithInternationalization' do
+    before(:each) do
+      I18n.backend = I18n::Backend::Simple.new
+
+      # Initialize the backend
+      I18n.backend.translate(:en, 'activemodel.errors.messages.invalid_transition', :event => 'ignite', :value => 'idling')
+
+      @model = new_model { include ActiveModel::Validations }
+    end
+
+    it 'should_use_defaults' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:errors => {:messages => {:invalid_transition => 'cannot %{event}'}}}
+      })
+
+      machine = StateMachines::Machine.new(@model, :action => :save)
+      machine.state :parked, :idling
+      machine.event :ignite
+
+      record = @model.new(:state => 'idling')
+
+      machine.invalidate(record, :state, :invalid_transition, [[:event, 'ignite']])
+      assert_equal ['State cannot ignite'], record.errors.full_messages
+    end
+
+    it 'should_allow_customized_error_key' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:errors => {:messages => {:bad_transition => 'cannot %{event}'}}}
+      })
+
+      machine = StateMachines::Machine.new(@model, :action => :save, :messages => {:invalid_transition => :bad_transition})
+      machine.state :parked, :idling
+
+      record = @model.new
+      record.state = 'idling'
+
+      machine.invalidate(record, :state, :invalid_transition, [[:event, 'ignite']])
+      assert_equal ['State cannot ignite'], record.errors.full_messages
+    end
+
+    it 'should_allow_customized_error_string' do
+      machine = StateMachines::Machine.new(@model, :action => :save, :messages => {:invalid_transition => 'cannot %{event}'})
+      machine.state :parked, :idling
+
+      record = @model.new(:state => 'idling')
+
+      machine.invalidate(record, :state, :invalid_transition, [[:event, 'ignite']])
+      assert_equal ['State cannot ignite'], record.errors.full_messages
+    end
+
+    it 'should_allow_customized_state_key_scoped_to_class_and_machine' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:'bar/foo' => {:state => {:states => {:parked => 'shutdown'}}}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.state :parked
+
+      assert_equal 'shutdown', machine.state(:parked).human_name
+    end
+
+    it 'should_allow_customized_state_key_scoped_to_class' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:'bar/foo' => {:states => {:parked => 'shutdown'}}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.state :parked
+
+      assert_equal 'shutdown', machine.state(:parked).human_name
+    end
+
+    it 'should_allow_customized_state_key_scoped_to_machine' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:state => {:states => {:parked => 'shutdown'}}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.state :parked
+
+      assert_equal 'shutdown', machine.state(:parked).human_name
+    end
+
+    it 'should_allow_customized_state_key_unscoped' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:states => {:parked => 'shutdown'}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.state :parked
+
+      assert_equal 'shutdown', machine.state(:parked).human_name
+    end
+
+    it 'should_support_nil_state_key' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:states => {:nil => 'empty'}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+
+      assert_equal 'empty', machine.state(nil).human_name
+    end
+
+    it 'should_allow_customized_event_key_scoped_to_class_and_machine' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:'bar/foo' => {:state => {:events => {:park => 'stop'}}}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.event :park
+
+      assert_equal 'stop', machine.event(:park).human_name
+    end
+
+    it 'should_allow_customized_event_key_scoped_to_class' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:'bar/foo' => {:events => {:park => 'stop'}}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.event :park
+
+      assert_equal 'stop', machine.event(:park).human_name
+    end
+
+    it 'should_allow_customized_event_key_scoped_to_machine' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:state => {:events => {:park => 'stop'}}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.event :park
+
+      assert_equal 'stop', machine.event(:park).human_name
+    end
+
+    it 'should_allow_customized_event_key_unscoped' do
+      I18n.backend.store_translations(:en, {
+          :activemodel => {:state_machines => {:events => {:park => 'stop'}}}
+      })
+
+      machine = StateMachines::Machine.new(@model)
+      machine.event :park
+
+      assert_equal 'stop', machine.event(:park).human_name
+    end
+
+    it 'should_only_add_locale_once_in_load_path' do
+      assert_equal 1, I18n.load_path.select { |path| path =~ %r{active_model/locale\.rb$} }.length
+
+      # Create another ActiveModel model that will triger the i18n feature
+      new_model
+
+      assert_equal 1, I18n.load_path.select { |path| path =~ %r{active_model/locale\.rb$} }.length
+    end
+
+  end
+
 end