statesman 3.0.0 → 3.1.0

data/spec/statesman/utils_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe Statesman::Utils do
+  describe ".rails_major_version" do
+    subject { described_class.rails_major_version }
+
+    context "for Rails 4" do
+      before { allow(Rails).to receive(:version).and_return("4.1.2") }
+
+      it { is_expected.to eq(4) }
+    end
+
+    context "for Rails 5" do
+      before { allow(Rails).to receive(:version).and_return("5.0.0") }
+
+      it { is_expected.to eq(5) }
+    end
+  end
+
+  describe ".rails_5_or_higher?" do
+    subject { described_class.rails_5_or_higher? }
+
+    context "for a pre-Rails 5 Rails version" do
+      before { allow(Rails).to receive(:version).and_return("4.1.2") }
+
+      it { is_expected.to be(false) }
+    end
+
+    context "for Rails 5 or a later version" do
+      before { allow(Rails).to receive(:version).and_return("5.0.0") }
+
+      it { is_expected.to be(true) }
+    end
+  end
+
+  describe ".rails_4_or_higher?" do
+    subject { described_class.rails_4_or_higher? }
+
+    context "for a pre-Rails 4 Rails version" do
+      before { allow(Rails).to receive(:version).and_return("3.0.0") }
+
+      it { is_expected.to be(false) }
+    end
+
+    context "for Rails 4 or a later version" do
+      before { allow(Rails).to receive(:version).and_return("4.1.2") }
+
+      it { is_expected.to be(true) }
+    end
+  end
+end

data/spec/support/active_record.rb

@@ -1,6 +1,12 @@
-require "support/active_record"
 require "json"
 
+MIGRATION_CLASS = if Rails.version.split(".").map(&:to_i).first >= 5
+                    migration_version = ActiveRecord::Migration.current_version
+                    ActiveRecord::Migration[migration_version]
+                  else
+                    ActiveRecord::Migration
+                  end
+
 class MyStateMachine
   include Statesman::Machine
 
@@ -8,17 +14,18 @@ class MyStateMachine
   state :succeeded
   state :failed
 
-  transition from: :initial, to: [:succeeded, :failed]
+  transition from: :initial, to: %i[succeeded failed]
   transition from: :failed,  to: :initial
 end
 
 class MyActiveRecordModel < ActiveRecord::Base
   has_many :my_active_record_model_transitions, autosave: false
-  alias_method :transitions, :my_active_record_model_transitions
+  alias transitions my_active_record_model_transitions
 
   def state_machine
     @state_machine ||= MyStateMachine.new(
-      self, transition_class: MyActiveRecordModelTransition)
+      self, transition_class: MyActiveRecordModelTransition
+    )
   end
 
   def metadata
@@ -33,7 +40,7 @@ class MyActiveRecordModelTransition < ActiveRecord::Base
   serialize :metadata, JSON
 end
 
-class CreateMyActiveRecordModelMigration < ActiveRecord::Migration
+class CreateMyActiveRecordModelMigration < MIGRATION_CLASS
   def change
     create_table :my_active_record_models do |t|
       t.string :current_state
@@ -44,7 +51,7 @@ end
 
 # TODO: make this a module we can extend from the app? Or a generator?
 # rubocop:disable MethodLength
-class CreateMyActiveRecordModelTransitionMigration < ActiveRecord::Migration
+class CreateMyActiveRecordModelTransitionMigration < MIGRATION_CLASS
   def change
     create_table :my_active_record_model_transitions do |t|
       t.string  :to_state
@@ -68,19 +75,19 @@ class CreateMyActiveRecordModelTransitionMigration < ActiveRecord::Migration
     end
 
     add_index :my_active_record_model_transitions,
-              [:my_active_record_model_id, :sort_key],
+              %i[my_active_record_model_id sort_key],
               unique: true, name: "sort_key_index"
 
     if Statesman::Adapters::ActiveRecord.database_supports_partial_indexes?
       add_index :my_active_record_model_transitions,
-                [:my_active_record_model_id, :most_recent],
+                %i[my_active_record_model_id most_recent],
                 unique: true,
                 where: "most_recent",
                 name: "index_my_active_record_model_transitions_"\
                       "parent_most_recent"
     else
       add_index :my_active_record_model_transitions,
-                [:my_active_record_model_id, :most_recent],
+                %i[my_active_record_model_id most_recent],
                 unique: true,
                 name: "index_my_active_record_model_transitions_"\
                       "parent_most_recent"
@@ -91,11 +98,12 @@ end
 
 class OtherActiveRecordModel < ActiveRecord::Base
   has_many :other_active_record_model_transitions, autosave: false
-  alias_method :transitions, :other_active_record_model_transitions
+  alias transitions other_active_record_model_transitions
 
   def state_machine
     @state_machine ||= MyStateMachine.new(
-      self, transition_class: OtherActiveRecordModelTransition)
+      self, transition_class: OtherActiveRecordModelTransition
+    )
   end
 
   def metadata
@@ -110,7 +118,7 @@ class OtherActiveRecordModelTransition < ActiveRecord::Base
   serialize :metadata, JSON
 end
 
-class CreateOtherActiveRecordModelMigration < ActiveRecord::Migration
+class CreateOtherActiveRecordModelMigration < MIGRATION_CLASS
   def change
     create_table :other_active_record_models do |t|
       t.string :current_state
@@ -121,7 +129,7 @@ class CreateOtherActiveRecordModelMigration < ActiveRecord::Migration
 end
 
 # rubocop:disable MethodLength
-class CreateOtherActiveRecordModelTransitionMigration < ActiveRecord::Migration
+class CreateOtherActiveRecordModelTransitionMigration < MIGRATION_CLASS
   def change
     create_table :other_active_record_model_transitions do |t|
       t.string  :to_state
@@ -145,19 +153,19 @@ class CreateOtherActiveRecordModelTransitionMigration < ActiveRecord::Migration
     end
 
     add_index :other_active_record_model_transitions,
-              [:other_active_record_model_id, :sort_key],
+              %i[other_active_record_model_id sort_key],
               unique: true, name: "other_sort_key_index"
 
     if Statesman::Adapters::ActiveRecord.database_supports_partial_indexes?
       add_index :other_active_record_model_transitions,
-                [:other_active_record_model_id, :most_recent],
+                %i[other_active_record_model_id most_recent],
                 unique: true,
                 where: "most_recent",
                 name: "index_other_active_record_model_transitions_"\
                       "parent_most_recent"
     else
       add_index :other_active_record_model_transitions,
-                [:other_active_record_model_id, :most_recent],
+                %i[other_active_record_model_id most_recent],
                 unique: true,
                 name: "index_other_active_record_model_transitions_"\
                       "parent_most_recent"
@@ -166,7 +174,7 @@ class CreateOtherActiveRecordModelTransitionMigration < ActiveRecord::Migration
 end
 # rubocop:enable MethodLength
 
-class DropMostRecentColumn < ActiveRecord::Migration
+class DropMostRecentColumn < MIGRATION_CLASS
   def change
     remove_index :my_active_record_model_transitions,
                  name: "index_my_active_record_model_transitions_"\
@@ -188,7 +196,8 @@ module MyNamespace
     def state_machine
       @state_machine ||= MyStateMachine.new(
         self, transition_class: MyNamespace::MyActiveRecordModelTransition,
-              association_name: :my_active_record_model_transitions)
+              association_name: :my_active_record_model_transitions
+      )
     end
 
     def metadata
@@ -207,7 +216,7 @@ module MyNamespace
   end
 end
 
-class CreateNamespacedARModelMigration < ActiveRecord::Migration
+class CreateNamespacedARModelMigration < MIGRATION_CLASS
   def change
     create_table :my_namespace_my_active_record_models do |t|
       t.string :current_state
@@ -217,7 +226,7 @@ class CreateNamespacedARModelMigration < ActiveRecord::Migration
 end
 
 # rubocop:disable MethodLength
-class CreateNamespacedARModelTransitionMigration < ActiveRecord::Migration
+class CreateNamespacedARModelTransitionMigration < MIGRATION_CLASS
   def change
     create_table :my_namespace_my_active_record_model_transitions do |t|
       t.string  :to_state
@@ -245,14 +254,14 @@ class CreateNamespacedARModelTransitionMigration < ActiveRecord::Migration
 
     if Statesman::Adapters::ActiveRecord.database_supports_partial_indexes?
       add_index :my_namespace_my_active_record_model_transitions,
-                [:my_active_record_model_id, :most_recent],
+                %i[my_active_record_model_id most_recent],
                 unique: true,
                 where: "most_recent",
                 name: "index_namespace_model_transitions_"\
                       "parent_most_recent"
     else
       add_index :my_namespace_my_active_record_model_transitions,
-                [:my_active_record_model_id, :most_recent],
+                %i[my_active_record_model_id most_recent],
                 unique: true,
                 name: "index_namespace_model_transitions_"\
                       "parent_most_recent"

data/spec/support/generators_shared_examples.rb

@@ -7,7 +7,7 @@ TMP_GENERATOR_PATH = File.expand_path('../generator-tmp', __FILE__)
 shared_examples 'a generator' do
   destination TMP_GENERATOR_PATH
   before { prepare_destination }
-  let(:gen) { generator %w(Yummy::Bacon Yummy::BaconTransition) }
+  let(:gen) { generator %w[Yummy::Bacon Yummy::BaconTransition] }
 
   it 'invokes create_model_file method' do
     expect(gen).to receive(:create_model_file)
@@ -15,7 +15,7 @@ shared_examples 'a generator' do
   end
 
   describe 'it runs the generator and check things out' do
-    before { run_generator %w(Yummy::Bacon Yummy::BaconTransition) }
+    before { run_generator %w[Yummy::Bacon Yummy::BaconTransition] }
 
     describe 'it generates a correctly named file' do
       subject { file(migration_name) }

data/statesman.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'statesman/version'
@@ -6,28 +7,30 @@ require 'statesman/version'
 Gem::Specification.new do |spec|
   spec.name          = "statesman"
   spec.version       = Statesman::VERSION
-  spec.authors       = ["Harry Marr", "Andy Appleton"]
+  spec.authors       = ["GoCardless"]
   spec.email         = ["developers@gocardless.com"]
-  spec.description   = %q{A statesmanlike state machine library}
+  spec.description   = 'A statesman-like state machine library'
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/gocardless/statesman"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.2'
-  spec.add_development_dependency "bundler",       "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec",         "~> 3.1"
-  spec.add_development_dependency "rspec-rails",   "~> 3.1"
-  spec.add_development_dependency "rspec-its",     "~> 1.1"
-  spec.add_development_dependency "rubocop",       "~> 0.30.0"
-  spec.add_development_dependency "sqlite3",       "~> 1.3"
-  spec.add_development_dependency "rails",         ">= 3.2"
-  spec.add_development_dependency "pg",            "~> 0.18"
-  spec.add_development_dependency "mysql2",        "~> 0.4"
-  spec.add_development_dependency "ammeter",       "~> 1.1"
+
+  spec.add_development_dependency "bundler",               "~> 1.3"
+  spec.add_development_dependency "rake",                  "~> 12.0.0"
+  spec.add_development_dependency "rspec",                 "~> 3.1"
+  spec.add_development_dependency "rspec-rails",           "~> 3.1"
+  spec.add_development_dependency "rspec-its",             "~> 1.1"
+  spec.add_development_dependency "rubocop",               "~> 0.49.1"
+  spec.add_development_dependency "sqlite3",               "~> 1.3"
+  spec.add_development_dependency "rails",                 ">= 3.2"
+  spec.add_development_dependency "pg",                    "~> 0.18"
+  spec.add_development_dependency "mysql2",                "~> 0.4"
+  spec.add_development_dependency "ammeter",               "~> 1.1"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.3.0"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statesman
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
-- Harry Marr
-- Andy Appleton
+- GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -29,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -165,16 +164,31 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: A statesmanlike state machine library
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    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
+description: A statesman-like state machine library
 email:
 - developers@gocardless.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -205,6 +219,7 @@ files:
 - lib/statesman/guard.rb
 - lib/statesman/machine.rb
 - lib/statesman/railtie.rb
+- lib/statesman/utils.rb
 - lib/statesman/version.rb
 - lib/tasks/statesman.rake
 - spec/fixtures/add_constraints_to_most_recent_for_bacon_transitions_with_partial_index.rb
@@ -225,6 +240,7 @@ files:
 - 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
 - spec/support/mongoid.rb
@@ -249,10 +265,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: A statesmanlike state machine library
+summary: A statesman-like state machine library
 test_files:
 - spec/fixtures/add_constraints_to_most_recent_for_bacon_transitions_with_partial_index.rb
 - spec/fixtures/add_constraints_to_most_recent_for_bacon_transitions_without_partial_index.rb
@@ -272,6 +288,7 @@ test_files:
 - 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
 - spec/support/mongoid.rb

data/.travis.yml

@@ -1,37 +0,0 @@
-language: ruby
-
-cache: bundler
-
-rvm:
-  - 2.4.1
-  - 2.3.3
-  - 2.2.6
-
-sudo: false
-
-services: mongodb
-
-before_install:
- - gem update --system
- - gem install bundler
-
-branches:
-  only:
-    - "master"
-
-before_script:
-  - mysql -e 'CREATE DATABASE statesman_test;'
-  - psql -c 'CREATE DATABASE statesman_test;' -U postgres
-
-script:
-  - bundle exec rubocop
-  - bundle exec rake
-
-env:
-  - "RAILS_VERSION=4.2.8"
-  - "RAILS_VERSION=4.2.8 DATABASE_URL=mysql2://root@localhost/statesman_test"
-  - "RAILS_VERSION=4.2.8 DATABASE_URL=postgres://postgres@localhost/statesman_test"
-  - "RAILS_VERSION=5.0.0 EXCLUDE_MONGOID=true"
-
-matrix:
-  exclude: []