statesman 3.4.1 → 3.5.0

data/spec/statesman/config_spec.rb

@@ -1,14 +1,17 @@
 require "spec_helper"
 
 describe Statesman::Config do
-  let(:instance) { Statesman::Config.new }
+  let(:instance) { described_class.new }
+
   after { Statesman.configure { storage_adapter(Statesman::Adapters::Memory) } }
 
   describe "#storage_adapter" do
-    let(:adapter) { Class.new }
-    before  { instance.storage_adapter(adapter) }
     subject { instance.adapter_class }
 
+    let(:adapter) { Class.new }
+
+    before { instance.storage_adapter(adapter) }
+
     it { is_expected.to be(adapter) }
 
     it "is DSL configurable" do

data/spec/statesman/guard_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Statesman::Guard do
   let(:callback) { -> {} }
-  let(:guard) { Statesman::Guard.new(from: nil, to: nil, callback: callback) }
+  let(:guard) { described_class.new(from: nil, to: nil, callback: callback) }
 
   specify { expect(guard).to be_a(Statesman::Callback) }
 
@@ -11,11 +11,13 @@ describe Statesman::Guard do
 
     context "success" do
       let(:callback) { -> { true } }
+
       specify { expect { call }.to_not raise_error }
     end
 
     context "error" do
       let(:callback) { -> { false } }
+
       specify { expect { call }.to raise_error(Statesman::GuardFailedError) }
     end
   end

data/spec/statesman/machine_spec.rb

@@ -6,11 +6,14 @@ describe Statesman::Machine do
 
   describe ".state" do
     before { machine.state(:x) }
+
     before { machine.state(:y) }
+
     specify { expect(machine.states).to eq(%w[x y]) }
 
     context "initial" do
       before { machine.state(:x, initial: true) }
+
       specify { expect(machine.initial_state).to eq("x") }
 
       context "when an initial state is already defined" do
@@ -23,6 +26,12 @@ describe Statesman::Machine do
   end
 
   describe ".retry_conflicts" do
+    subject(:transition_state) do
+      described_class.retry_conflicts(retry_attempts) do
+        instance.transition_to(:y)
+      end
+    end
+
     before do
       machine.class_eval do
         state :x, initial: true
@@ -32,15 +41,10 @@ describe Statesman::Machine do
         transition from: :y, to: :z
       end
     end
+
     let(:instance) { machine.new(my_model) }
     let(:retry_attempts) { 2 }
 
-    subject(:transition_state) do
-      Statesman::Machine.retry_conflicts(retry_attempts) do
-        instance.transition_to(:y)
-      end
-    end
-
     context "when no exception occurs" do
       it "runs the transition once" do
         expect(instance).to receive(:transition_to).once
@@ -248,26 +252,31 @@ describe Statesman::Machine do
     context "with invalid states" do
       context "when both are invalid" do
         let(:options) { { from: :foo, to: :bar } }
+
         it_behaves_like "fails", Statesman::InvalidStateError
       end
 
       context "from a terminal state to anything" do
         let(:options) { { from: :y, to: [] } }
+
         it_behaves_like "fails", Statesman::InvalidTransitionError
       end
 
       context "to an initial state and from anything" do
         let(:options) { { from: nil, to: :x } }
+
         it_behaves_like "fails", Statesman::InvalidTransitionError
       end
 
       context "from a terminal state and to multiple states" do
         let(:options) { { from: :y, to: %i[x z] } }
+
         it_behaves_like "fails", Statesman::InvalidTransitionError
       end
 
       context "to an initial state and other states" do
         let(:options) { { from: nil, to: %i[y x z] } }
+
         it_behaves_like "fails", Statesman::InvalidTransitionError
       end
     end
@@ -275,21 +284,25 @@ describe Statesman::Machine do
     context "with validate_states" do
       context "from anything" do
         let(:options) { { from: nil, to: :y } }
+
         it_behaves_like "adds callback"
       end
 
       context "to anything" do
         let(:options) { { from: :x, to: [] } }
+
         it_behaves_like "adds callback"
       end
 
       context "to several" do
         let(:options) { { from: :x, to: %i[y z] } }
+
         it_behaves_like "adds callback"
       end
 
       context "from any to several" do
         let(:options) { { from: nil, to: %i[y z] } }
+
         it_behaves_like "adds callback"
       end
     end
@@ -349,6 +362,8 @@ describe Statesman::Machine do
   end
 
   describe "#current_state" do
+    subject { instance.current_state }
+
     before do
       machine.class_eval do
         state :x, initial: true
@@ -360,7 +375,6 @@ describe Statesman::Machine do
     end
 
     let(:instance) { machine.new(my_model) }
-    subject { instance.current_state }
 
     context "with no transitions" do
       it { is_expected.to eq(machine.initial_state) }
@@ -368,6 +382,7 @@ describe Statesman::Machine do
 
     context "with multiple transitions" do
       before { instance.transition_to!(:y) }
+
       before { instance.transition_to!(:z) }
 
       it { is_expected.to eq("z") }
@@ -375,6 +390,8 @@ describe Statesman::Machine do
   end
 
   describe "#in_state?" do
+    subject { instance.in_state?(state) }
+
     before do
       machine.class_eval do
         state :x, initial: true
@@ -384,21 +401,24 @@ describe Statesman::Machine do
     end
 
     let(:instance) { machine.new(my_model) }
-    subject { instance.in_state?(state) }
+
     before { instance.transition_to!(:y) }
 
     context "when machine is in given state" do
       let(:state) { "y" }
+
       it { is_expected.to eq(true) }
     end
 
     context "when machine is not in given state" do
       let(:state) { "x" }
+
       it { is_expected.to eq(false) }
     end
 
     context "when given a symbol" do
       let(:state) { :y }
+
       it { is_expected.to eq(true) }
     end
 
@@ -406,11 +426,13 @@ describe Statesman::Machine do
       context "when given multiple arguments" do
         context "when one of the states is the current state" do
           subject { instance.in_state?(:x, :y) }
+
           it { is_expected.to eq(true) }
         end
 
         context "when none of the states are the current state" do
           subject { instance.in_state?(:x, :z) }
+
           it { is_expected.to eq(false) }
         end
       end
@@ -418,11 +440,13 @@ describe Statesman::Machine do
       context "when given an array" do
         context "when one of the states is the current state" do
           subject { instance.in_state?(%i[x y]) }
+
           it { is_expected.to eq(true) }
         end
 
         context "when none of the states are the current state" do
           subject { instance.in_state?(%i[x z]) }
+
           it { is_expected.to eq(false) }
         end
       end
@@ -430,6 +454,8 @@ describe Statesman::Machine do
   end
 
   describe "#allowed_transitions" do
+    subject { instance.allowed_transitions(metadata) }
+
     before do
       machine.class_eval do
         state :x, initial: true
@@ -442,7 +468,6 @@ describe Statesman::Machine do
 
     let(:instance) { machine.new(my_model) }
     let(:metadata) { { some: :metadata } }
-    subject { instance.allowed_transitions(metadata) }
 
     context "with multiple possible states" do
       it { is_expected.to eq(%w[y z]) }
@@ -450,6 +475,7 @@ describe Statesman::Machine do
 
     context "with one possible state" do
       before { instance.transition_to!(:y) }
+
       it { is_expected.to eq(["z"]) }
 
       context "guarded using metadata" do
@@ -475,6 +501,7 @@ describe Statesman::Machine do
 
     context "with no possible transitions" do
       before { instance.transition_to!(:z) }
+
       it { is_expected.to eq([]) }
     end
   end
@@ -491,6 +518,8 @@ describe Statesman::Machine do
   end
 
   describe "#can_transition_to?" do
+    subject(:can_transition_to?) { instance.can_transition_to?(new_state, metadata) }
+
     before do
       machine.class_eval do
         state :x, initial: true
@@ -503,38 +532,43 @@ describe Statesman::Machine do
 
     let(:instance) { machine.new(my_model) }
     let(:metadata) { { some: :metadata } }
-    subject { instance.can_transition_to?(new_state, metadata) }
 
     context "when the transition is invalid" do
       context "with an initial to state" do
         let(:new_state) { :x }
+
         it { is_expected.to be_falsey }
       end
 
       context "with a terminal from state" do
         before { instance.transition_to!(:y) }
+
         let(:new_state) { :y }
+
         it { is_expected.to be_falsey }
       end
 
       context "and is guarded" do
         let(:guard_cb) { -> { false } }
         let(:new_state) { :z }
+
         before { machine.guard_transition(to: new_state, &guard_cb) }
 
         it "does not fire guard" do
-          expect(guard_cb).not_to receive(:call)
-          is_expected.to be_falsey
+          expect(guard_cb).to_not receive(:call)
+          expect(can_transition_to?).to be_falsey
         end
       end
     end
 
     context "when the transition valid" do
       let(:new_state) { :y }
+
       it { is_expected.to be_truthy }
 
       context "but it has a failing guard" do
         before { machine.guard_transition(to: :y) { false } }
+
         it { is_expected.to be_falsey }
       end
 
@@ -611,6 +645,7 @@ describe Statesman::Machine do
       context "with a guard" do
         let(:result) { true }
         let(:guard_cb) { ->(*_args) { result } }
+
         before { machine.guard_transition(from: :x, to: :y, &guard_cb) }
 
         context "and an object to act on" do
@@ -643,15 +678,17 @@ describe Statesman::Machine do
   end
 
   describe "#transition_to" do
+    subject { instance.transition_to(:some_state, metadata) }
+
     let(:instance) { machine.new(my_model) }
     let(:metadata) { { some: :metadata } }
-    subject { instance.transition_to(:some_state, metadata) }
 
     context "when it is succesful" do
       before do
         expect(instance).to receive(:transition_to!).once.
           with(:some_state, metadata).and_return(:some_state)
       end
+
       it { is_expected.to be(:some_state) }
     end
 
@@ -660,6 +697,7 @@ describe Statesman::Machine do
         allow(instance).to receive(:transition_to!).
           and_raise(Statesman::GuardFailedError)
       end
+
       it { is_expected.to be_falsey }
     end
 
@@ -669,7 +707,7 @@ describe Statesman::Machine do
           and_raise(RuntimeError, "user defined exception")
       end
 
-      it "should not rescue the exception" do
+      it "does not rescue the exception" do
         expect { instance.transition_to(:some_state, metadata) }.
           to raise_error(RuntimeError, "user defined exception")
       end

data/spec/support/generators_shared_examples.rb

@@ -2,11 +2,12 @@ require "rails/version"
 require "rspec/rails"
 require "ammeter/init"
 
-TMP_GENERATOR_PATH = File.expand_path("../generator-tmp", __FILE__)
+TMP_GENERATOR_PATH = File.expand_path("generator-tmp", __dir__)
 
 shared_examples "a generator" do
   destination TMP_GENERATOR_PATH
   before { prepare_destination }
+
   let(:gen) { generator %w[Yummy::Bacon Yummy::BaconTransition] }
 
   it "invokes create_model_file method" do
@@ -19,6 +20,7 @@ shared_examples "a generator" do
 
     describe "it generates a correctly named file" do
       subject { file(migration_name) }
+
       it { is_expected.to be_a_migration }
     end
   end

data/statesman.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "statesman/version"
 
@@ -19,18 +19,18 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.2"
 
-  spec.add_development_dependency "ammeter",               "~> 1.1"
-  spec.add_development_dependency "bundler",               "~> 1.3"
-  spec.add_development_dependency "mysql2",                "~> 0.4"
-  spec.add_development_dependency "pg",                    "~> 0.18"
+  spec.add_development_dependency "ammeter", "~> 1.1"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "gc_ruboconfig", "~> 2.3.9"
+  spec.add_development_dependency "mysql2", "~> 0.4.0"
+  spec.add_development_dependency "pg", "~> 0.18"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rails",                 ">= 3.2"
-  spec.add_development_dependency "rake",                  "~> 12.3.0"
-  spec.add_development_dependency "rspec",                 "~> 3.1"
-  spec.add_development_dependency "rspec-its",             "~> 1.1"
-  spec.add_development_dependency "rspec-rails",           "~> 3.1"
-  spec.add_development_dependency "rspec_junit_formatter", "~> 0.3.0"
-  spec.add_development_dependency "rubocop", "~> 0.52.0"
+  spec.add_development_dependency "rails", ">= 3.2"
+  spec.add_development_dependency "rake", "~> 12.3.0"
+  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "rspec-its", "~> 1.1"
+  spec.add_development_dependency "rspec-rails", "~> 3.1"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.0"
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "timecop", "~> 0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statesman
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: gc_ruboconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.9
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -261,13 +261,13 @@ files:
 - spec/statesman/adapters/active_record_spec.rb
 - spec/statesman/adapters/active_record_transition_spec.rb
 - spec/statesman/adapters/memory_spec.rb
+- spec/statesman/adapters/memory_transition_spec.rb
 - spec/statesman/adapters/mongoid_spec.rb
 - spec/statesman/adapters/shared_examples.rb
 - spec/statesman/callback_spec.rb
 - spec/statesman/config_spec.rb
 - spec/statesman/guard_spec.rb
 - spec/statesman/machine_spec.rb
-- spec/statesman/transition_spec.rb
 - spec/statesman/utils_spec.rb
 - spec/support/active_record.rb
 - spec/support/generators_shared_examples.rb
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A statesman-like state machine library
@@ -309,13 +309,13 @@ test_files:
 - spec/statesman/adapters/active_record_spec.rb
 - spec/statesman/adapters/active_record_transition_spec.rb
 - spec/statesman/adapters/memory_spec.rb
+- spec/statesman/adapters/memory_transition_spec.rb
 - spec/statesman/adapters/mongoid_spec.rb
 - spec/statesman/adapters/shared_examples.rb
 - spec/statesman/callback_spec.rb
 - spec/statesman/config_spec.rb
 - spec/statesman/guard_spec.rb
 - spec/statesman/machine_spec.rb
-- spec/statesman/transition_spec.rb
 - spec/statesman/utils_spec.rb
 - spec/support/active_record.rb
 - spec/support/generators_shared_examples.rb