transitions 0.2.0 → 0.2.1

data/test/event/test_event_arguments.rb

@@ -1,4 +1,4 @@
-require "helper"
+require 'helper'
 
 class ArgumentsTestSubject
   include Transitions
@@ -9,7 +9,7 @@ class ArgumentsTestSubject
     state :opened
 
     event :open do
-      transitions :from => :initial, :to => :opened, :on_transition => :update_date
+      transitions from: :initial, to: :opened, on_transition: :update_date
     end
   end
 
@@ -19,7 +19,7 @@ class ArgumentsTestSubject
 end
 
 class StateMachineMachineTest < Test::Unit::TestCase
-  test "pass arguments to transition method" do
+  test 'pass arguments to transition method' do
     subject = ArgumentsTestSubject.new
     assert_equal :initial, subject.current_state
     subject.open!(Date.yesterday)
@@ -27,4 +27,3 @@ class StateMachineMachineTest < Test::Unit::TestCase
     assert_equal Date.yesterday, subject.date
   end
 end
-

data/test/event/test_event_being_fired.rb

@@ -1,7 +1,7 @@
-require "helper"
+require 'helper'
 
 class TestEventBeingFired < Test::Unit::TestCase
-  test "should raise an Transitions::InvalidTransition error if the transitions are empty" do
+  test 'should raise an Transitions::InvalidTransition error if the transitions are empty' do
     event = Transitions::Event.new(nil, :event_that_is_fired)
     class AnotherDummy; end
     obj = AnotherDummy.new
@@ -13,9 +13,9 @@ class TestEventBeingFired < Test::Unit::TestCase
     assert_match /Can't fire event `event_that_is_fired` in current state `running` for `TestEventBeingFired::AnotherDummy`/, exception.message
   end
 
-  test "should return the state of the first matching transition it finds" do
+  test 'should return the state of the first matching transition it finds' do
     event = Transitions::Event.new(nil, :event) do
-      transitions :to => :closed, :from => [:open, :received]
+      transitions to: :closed, from: [:open, :received]
     end
 
     obj = stub

data/test/event/test_event_checks.rb

@@ -1,25 +1,25 @@
-require "helper"
+require 'helper'
 
 class ChecksTestSubject
   include Transitions
 
-  state_machine :initial => :initial do
+  state_machine initial: :initial do
     state :initial
     state :opened
     state :closed
 
     event :open do
-      transitions :from => :initial, :to => :opened
+      transitions from: :initial, to: :opened
     end
 
     event :close do
-      transitions :from => :opened, :to => :closed
+      transitions from: :opened, to: :closed
     end
   end
 end
 
 class StateMachineChecksTest < Test::Unit::TestCase
-  test "checks if a given transition is possible" do
+  test 'checks if a given transition is possible' do
     subject = ChecksTestSubject.new
     assert_equal :initial, subject.current_state
     assert_equal true, subject.can_open?
@@ -31,4 +31,3 @@ class StateMachineChecksTest < Test::Unit::TestCase
     assert_equal true, subject.can_close?
   end
 end
-

data/test/helper.rb

@@ -8,7 +8,7 @@ require 'mocha'
 require 'random_data'
 
 def db_defaults!
-  ActiveRecord::Base.establish_connection(:adapter  => 'sqlite3', :database => ':memory:')
+  ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
   ActiveRecord::Migration.verbose = false
 end
 

data/test/machine/machine_template.rb

@@ -1,20 +1,20 @@
 class MachineTestSubject
   include Transitions
 
-  state_machine :initial => :open do
+  state_machine initial: :open do
     state :open
     state :closed
 
     event :shutdown do
-      transitions :from => :open, :to => :closed
+      transitions from: :open, to: :closed
     end
 
     event :timeout do
-      transitions :from => :open, :to => :closed
+      transitions from: :open, to: :closed
     end
 
     event :restart do
-      transitions :from => :closed, to: :open, guard: :restart_allowed?
+      transitions from: :closed, to: :open, guard: :restart_allowed?
     end
   end
 

data/test/machine/test_available_states_listing.rb

@@ -1,4 +1,4 @@
-require "helper"
+require 'helper'
 
 class Bender
   include Transitions

data/test/machine/test_fire_event_machine.rb

@@ -1,5 +1,5 @@
-require "helper"
-require_relative "./machine_template"
+require 'helper'
+require_relative './machine_template'
 
 class TestFireEventMachine < Test::Unit::TestCase
   def setup
@@ -9,19 +9,19 @@ class TestFireEventMachine < Test::Unit::TestCase
     assert_not_nil @event
   end
 
-  test "fire_event returns true if state transition was successful" do
+  test 'fire_event returns true if state transition was successful' do
     @machine.stubs(:transition_to_new_state).returns(:closed)
 
     assert_equal true, @machine.fire_event(@event, @record, false)
   end
 
-  test "fire_event returns false if state transition was unsuccessful" do
+  test 'fire_event returns false if state transition was unsuccessful' do
     @machine.stubs(:transition_to_new_state).returns(false)
 
     assert_equal false, @machine.fire_event(@event, @record, false)
   end
 
-  test "fire_event returns false if state transition raises" do
+  test 'fire_event returns false if state transition raises' do
     @machine.stubs(:transition_to_new_state).raises(StandardError)
 
     assert_equal false, @machine.fire_event(@event, @record, false)

data/test/machine/test_machine.rb

@@ -1,22 +1,22 @@
-require "helper"
+require 'helper'
 
 class MachineTestSubject
   include Transitions
 
-  state_machine :initial => :closed do
+  state_machine initial: :closed do
     state :open
     state :closed
 
     event :shutdown do
-      transitions :from => :open, :to => :closed
+      transitions from: :open, to: :closed
     end
 
     event :timeout do
-      transitions :from => :open, :to => :closed
+      transitions from: :open, to: :closed
     end
 
     event :restart do
-      transitions :from => :closed, to: :open, guard: :restart_allowed?
+      transitions from: :closed, to: :open, guard: :restart_allowed?
     end
   end
 
@@ -26,28 +26,28 @@ class MachineTestSubject
 end
 
 class TransitionsMachineTest < Test::Unit::TestCase
-  test "sets #initial_state from :initial option" do
+  test 'sets #initial_state from :initial option' do
     assert_equal :closed, MachineTestSubject.get_state_machine.initial_state
   end
 
-  test "`get_state_machine` returns Transitions::Machine" do
+  test '`get_state_machine` returns Transitions::Machine' do
     assert_kind_of Transitions::Machine, MachineTestSubject.get_state_machine
   end
 
-  test "finds events for given state" do
+  test 'finds events for given state' do
     events = MachineTestSubject.get_state_machine.events_for(:open)
     assert events.include?(:shutdown)
     assert events.include?(:timeout)
   end
 
-  test "knows all available transitions for current state" do
+  test 'knows all available transitions for current state' do
     machine = MachineTestSubject.new
     assert_equal [:restart], machine.available_transitions
     machine.restart
     assert_equal [:shutdown, :timeout], machine.available_transitions
   end
 
-  test "knows that it can use a transition when it is available" do
+  test 'knows that it can use a transition when it is available' do
     machine = MachineTestSubject.new
     machine.restart
     assert machine.can_transition?(:shutdown)

data/test/state/test_state.rb

@@ -1,4 +1,4 @@
-require "helper"
+require 'helper'
 
 class TestState < Test::Unit::TestCase
   def setup
@@ -8,7 +8,7 @@ class TestState < Test::Unit::TestCase
       end
     end.get_state_machine
     state_name = :astate
-    @options = { :machine => machine, :custom_key => :my_key }
+    @options = { machine: machine, custom_key: :my_key }
     @state   = Transitions::State.new(state_name, @options)
   end
 
@@ -16,34 +16,34 @@ class TestState < Test::Unit::TestCase
     Random.alphanumeric(16)
   end
 
-  test "sets the name" do
+  test 'sets the name' do
     assert_equal :astate, @state.name
   end
 
-  test "sets the display_name from name" do
-    assert_equal "Astate", @state.display_name
+  test 'sets the display_name from name' do
+    assert_equal 'Astate', @state.display_name
   end
 
-  test "sets the display_name from options" do
-    assert_equal "A State", Transitions::State.new(new_state_name, @options.merge(:display => "A State")).display_name
+  test 'sets the display_name from options' do
+    assert_equal 'A State', Transitions::State.new(new_state_name, @options.merge(display: 'A State')).display_name
   end
 
-  test "sets the options and expose them as options" do
+  test 'sets the options and expose them as options' do
     @options.delete(:machine)
     state = Transitions::State.new new_state_name, @options
     assert_equal @options, state.options
   end
 
-  test "equals a symbol of the same name" do
+  test 'equals a symbol of the same name' do
     assert_equal @state, :astate
   end
 
-  test "equals a State of the same name" do
+  test 'equals a State of the same name' do
     assert_equal @state, @state
   end
 
-  test "should send a message to the record for an action if the action is present as a symbol" do
-    state = Transitions::State.new new_state_name, @options.merge(:entering => :foo)
+  test 'should send a message to the record for an action if the action is present as a symbol' do
+    state = Transitions::State.new new_state_name, @options.merge(entering: :foo)
 
     record = stub
     record.expects(:foo)
@@ -51,8 +51,8 @@ class TestState < Test::Unit::TestCase
     state.call_action(:entering, record)
   end
 
-  test "should send a message to the record for an action if the action is present as a string" do
-    state = Transitions::State.new new_state_name, @options.merge(:entering => "foo")
+  test 'should send a message to the record for an action if the action is present as a string' do
+    state = Transitions::State.new new_state_name, @options.merge(entering: 'foo')
 
     record = stub
     record.expects(:foo)
@@ -60,8 +60,8 @@ class TestState < Test::Unit::TestCase
     state.call_action(:entering, record)
   end
 
-  test "should call a proc, passing in the record for an action if the action is present" do
-    state = Transitions::State.new new_state_name, @options.merge(:entering => Proc.new {|r| r.foobar})
+  test 'should call a proc, passing in the record for an action if the action is present' do
+    state = Transitions::State.new new_state_name, @options.merge(entering: proc(&:foobar))
 
     record = stub
     record.expects(:foobar)

data/test/state/test_state_predicate_method.rb

@@ -1,4 +1,4 @@
-require "helper"
+require 'helper'
 
 class Bus
   include Transitions
@@ -13,7 +13,7 @@ class TestStatePredicateMethod < Test::Unit::TestCase
     @bus = Bus.new
   end
 
-  test "should generate predicate methods for states" do
+  test 'should generate predicate methods for states' do
     assert_true @bus.respond_to?(:parking?)
     assert_true @bus.send(:parking?)
   end

data/test/state_transition/test_state_transition.rb

@@ -1,8 +1,8 @@
-require "helper"
+require 'helper'
 
 class TestStateTransition < Test::Unit::TestCase
-  test "should set from, to, and opts attr readers" do
-    opts = {:from => "foo", :to => "bar", :guard => "g"}
+  test 'should set from, to, and opts attr readers' do
+    opts = { from: 'foo', to: 'bar', guard: 'g' }
     st = Transitions::StateTransition.new(opts)
 
     assert_equal opts[:from], st.from
@@ -10,8 +10,8 @@ class TestStateTransition < Test::Unit::TestCase
     assert_equal opts,        st.options
   end
 
-  test "should pass equality check if from and to are the same" do
-    opts = {:from => "foo", :to => "bar", :guard => "g"}
+  test 'should pass equality check if from and to are the same' do
+    opts = { from: 'foo', to: 'bar', guard: 'g' }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
@@ -21,24 +21,24 @@ class TestStateTransition < Test::Unit::TestCase
     assert_equal st, obj
   end
 
-  test "should fail equality check if from are not the same" do
-    opts = {:from => "foo", :to => "bar", :guard => "g"}
+  test 'should fail equality check if from are not the same' do
+    opts = { from: 'foo', to: 'bar', guard: 'g' }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
-    obj.stubs(:from).returns("blah")
+    obj.stubs(:from).returns('blah')
     obj.stubs(:to).returns(opts[:to])
 
     assert_not_equal st, obj
   end
 
-  test "should fail equality check if to are not the same" do
-    opts = {:from => "foo", :to => "bar", :guard => "g"}
+  test 'should fail equality check if to are not the same' do
+    opts = { from: 'foo', to: 'bar', guard: 'g' }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
     obj.stubs(:from).returns(opts[:from])
-    obj.stubs(:to).returns("blah")
+    obj.stubs(:to).returns('blah')
 
     assert_not_equal st, obj
   end

data/test/state_transition/test_state_transition_event_failed_callback.rb

@@ -9,11 +9,11 @@ class Car
     state :switched_off
 
     event :start_driving do
-      transitions :from => :parked, :to => :driving
+      transitions from: :parked, to: :driving
     end
 
     event :switch_off_engine do
-      transitions :from => :parked, :to => :switched_off
+      transitions from: :parked, to: :switched_off
     end
   end
 end
@@ -23,7 +23,7 @@ class TestStateTransitionEventFailedCallback < Test::Unit::TestCase
     @car = Car.new
   end
 
- test "should execute the event_failed_callback and don't raise error if callback is defined" do
+  test "should execute the event_failed_callback and don't raise error if callback is defined" do
     @car.start_driving
     @car.expects(:event_failed).with(:switch_off_engine)
     @car.switch_off_engine

data/test/state_transition/test_state_transition_event_fired_callback.rb

@@ -8,7 +8,7 @@ class Car
     state :driving
 
     event :start_driving do
-      transitions :from => :parked, :to => :driving
+      transitions from: :parked, to: :driving
     end
   end
 end
@@ -18,14 +18,14 @@ class TestStateTransitionEventFiredCallback < Test::Unit::TestCase
     @car = Car.new
   end
 
-  test "should execute the event_fired callback after successfull event execution if it callback is defined" do
+  test 'should execute the event_fired callback after successfull event execution if it callback is defined' do
     @car.stubs(:event_fired)
     @car.expects(:event_fired).with(:parked, :driving, :start_driving).once
 
     @car.start_driving!
   end
 
-  test "should not execute the event_fired callback after successfull event execution if it callback is not defined" do
+  test 'should not execute the event_fired callback after successfull event execution if it callback is not defined' do
     pend 'Test fails right now although functionality is working as expected'
     # This test fails right now even though it works as expected in the console.
     # The reason for this is, that mocha's `expects` does a little bit more than just set up an expectation,

data/test/state_transition/test_state_transition_guard_check.rb

@@ -1,17 +1,17 @@
-require "helper"
+require 'helper'
 
 class TestStateTransitionGuardCheck < Test::Unit::TestCase
-  args = [:foo, "bar"]
+  args = [:foo, 'bar']
 
-  test "should return true of there is no guard" do
-    opts = {:from => "foo", :to => "bar"}
+  test 'should return true of there is no guard' do
+    opts = { from: 'foo', to: 'bar' }
     st = Transitions::StateTransition.new(opts)
 
     assert st.executable?(nil, *args)
   end
 
-  test "should call the method on the object if guard is a symbol" do
-    opts = {:from => "foo", :to => "bar", :guard => :test_guard}
+  test 'should call the method on the object if guard is a symbol' do
+    opts = { from: 'foo', to: 'bar', guard: :test_guard }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
@@ -20,8 +20,8 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     st.executable?(obj, *args)
   end
 
-  test "should call the method on the object if guard is a string" do
-    opts = {:from => "foo", :to => "bar", :guard => "test_guard"}
+  test 'should call the method on the object if guard is a string' do
+    opts = { from: 'foo', to: 'bar', guard: 'test_guard' }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
@@ -30,8 +30,8 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     st.executable?(obj, *args)
   end
 
-  test "should call the proc passing the object if the guard is a proc" do
-    opts = {:from => "foo", :to => "bar", :guard => Proc.new {|o, *args| o.test_guard(*args)}}
+  test 'should call the proc passing the object if the guard is a proc' do
+    opts = { from: 'foo', to: 'bar', guard: proc { |o, *args| o.test_guard(*args) } }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
@@ -40,11 +40,11 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     st.executable?(obj, *args)
   end
 
-  test "should call the callable passing the object if the guard responds to #call" do
+  test 'should call the callable passing the object if the guard responds to #call' do
     callable = Object.new
     callable.define_singleton_method(:call) { |obj, *args| obj.test_guard(*args) }
 
-    opts = {:from => "foo", :to => "bar", :guard => callable }
+    opts = { from: 'foo', to: 'bar', guard: callable }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
@@ -53,8 +53,8 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
     st.executable?(obj, *args)
   end
 
-  test "should call the method on the object if guard is a symbol" do
-    opts = {:from => "foo", :to => "bar", :guard => [:test_guard, :test_another_guard] }
+  test 'should call the method on the object if guard is a symbol' do
+    opts = { from: 'foo', to: 'bar', guard: [:test_guard, :test_another_guard] }
     st = Transitions::StateTransition.new(opts)
 
     obj = stub
@@ -63,5 +63,4 @@ class TestStateTransitionGuardCheck < Test::Unit::TestCase
 
     assert st.executable?(obj, *args)
   end
-
 end

data/test/state_transition/test_state_transition_on_transition_callback.rb

@@ -14,16 +14,16 @@ class Truck
     state :driving
 
     event :turn_key do
-      transitions :from => :parked, :to => :running, :on_transition => :start_engine
+      transitions from: :parked, to: :running, on_transition: :start_engine
     end
 
     event :start_driving do
-      transitions :from => :parked, :to => :driving, :on_transition => [:start_engine, :loosen_handbrake, :push_gas_pedal]
+      transitions from: :parked, to: :driving, on_transition: [:start_engine, :loosen_handbrake, :push_gas_pedal]
     end
   end
 
-  %w!start_engine loosen_handbrake push_gas_pedal!.each do |m|
-    define_method(m){ @test_recorder << m }
+  %w(start_engine loosen_handbrake push_gas_pedal).each do |m|
+    define_method(m) { @test_recorder << m }
   end
 end
 

data/test/state_transition/test_state_transition_success_callback.rb

@@ -14,17 +14,17 @@ class DrivingSchoolCar
     state :driving
     state :switched_off
 
-    event :start_driving, :success => lambda { |car| DrivingInstructor.applause! } do
-      transitions :from => :parked, :to => :driving, :on_transition => [:start_engine, :loosen_handbrake, :push_gas_pedal]
+    event :start_driving, success: lambda { |_car| DrivingInstructor.applause! } do
+      transitions from: :parked, to: :driving, on_transition: [:start_engine, :loosen_handbrake, :push_gas_pedal]
     end
 
     event :switch_off_engine do
-      transitions :from => :parked, :to => :switched_off
+      transitions from: :parked, to: :switched_off
     end
   end
 
-  %w!start_engine loosen_handbrake push_gas_pedal!.each do |m|
-    define_method(m){}
+  %w(start_engine loosen_handbrake push_gas_pedal).each do |m|
+    define_method(m) {}
   end
 end
 
@@ -33,17 +33,17 @@ class TestStateTransitionSuccessCallback < Test::Unit::TestCase
     @car = DrivingSchoolCar.new
   end
 
-  test "should execute the success callback after successfull event execution" do
+  test 'should execute the success callback after successfull event execution' do
     DrivingInstructor.expects(:applause!)
 
     @car.start_driving!
   end
 
-  test "should not execute the success callback after event execution failed" do
+  test 'should not execute the success callback after event execution failed' do
     DrivingInstructor.expects(:applause!).never
 
     @car.stubs(:event_failed)
-    @car.expects(:loosen_handbrake).raises("Drive with handbrake fail!")
+    @car.expects(:loosen_handbrake).raises('Drive with handbrake fail!')
     @car.start_driving!
   end
 end

data/transitions.gemspec

@@ -1,29 +1,29 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path("../lib/transitions/version", __FILE__)
+require File.expand_path('../lib/transitions/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "transitions"
+  s.name        = 'transitions'
   s.version     = Transitions::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jakub Kuzma", "Timo Roessner"]
-  s.email       = "timo.roessner@googlemail.com"
-  s.homepage    = "http://github.com/troessner/transitions"
-  s.summary     = "State machine extracted from ActiveModel"
-  s.description = "Lightweight state machine extracted from ActiveModel"
+  s.authors     = ['Jakub Kuzma', 'Timo Roessner']
+  s.email       = 'timo.roessner@googlemail.com'
+  s.homepage    = 'http://github.com/troessner/transitions'
+  s.summary     = 'State machine extracted from ActiveModel'
+  s.description = 'Lightweight state machine extracted from ActiveModel'
 
-  s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "transitions"
+  s.required_rubygems_version = '>= 1.3.6'
+  s.rubyforge_project         = 'transitions'
 
-  s.add_development_dependency "bundler", "~> 1"
-  s.add_development_dependency "test-unit", "~> 2.5"
-  s.add_development_dependency "mocha", '~> 0.11.0' # With mocha 0.12 we get: undefined method `run' for #<StateMachineMachineTest:0x94918b8> (NoMethodError)
-  s.add_development_dependency "rake"
-  s.add_development_dependency "random_data"
+  s.add_development_dependency 'bundler', '~> 1'
+  s.add_development_dependency 'test-unit', '~> 2.5'
+  s.add_development_dependency 'mocha', '~> 0.11.0' # With mocha 0.12 we get: undefined method `run' for #<StateMachineMachineTest:0x94918b8> (NoMethodError)
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'random_data'
   s.add_development_dependency 'appraisal'
-  s.add_development_dependency "activerecord", [">= 3.0", "<= 4.0"]
+  s.add_development_dependency 'activerecord', ['>= 3.0', '<= 4.0']
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.executables  = `git ls-files`.split("\n").map { |f| f =~ /^bin\/(.*)/ ? Regexp.last_match[1] : nil }.compact
   s.require_path = 'lib'
   s.license      = 'MIT'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transitions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jakub Kuzma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: transitions
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: State machine extracted from ActiveModel