statesman 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bcb79a19d0e00628ae28cc7dbfb5f97977f3aa1
-  data.tar.gz: b085866e8bb72e8b48eec5b08e5243553dcf6264
+  metadata.gz: a4d4aa46f593b25a40fdb2ce22c437d06edf7ec4
+  data.tar.gz: 9b734682ee2d770977863fff48db0e0606fea028
 SHA512:
-  metadata.gz: 8132a5e0e581c1b9fa6e6858fc85b7b2c35a703e7ce092c0841e15d63d09984ccc6e4df46aaa6eda319f0842266992a575a90195061b24e0bd209e929d2eaef5
-  data.tar.gz: d2afbe9e9fb2aec84cffa7719aceaf71959a48b04924427374cb056d3a91c484e11ffab3bd4a02520217817c2d3ec728904073ad38c714af6b1ace774e661c45
+  metadata.gz: 890add9a875cfa4bda6a926059b57bdc03c64c8aa3d525d0ee7ff3530a0d2c4c6b0230acfebd2079e89e4eafb655b368acc7d64492650fce6464bcb5958e29ae
+  data.tar.gz: 289d75e87a6a8ba34493fde16d24b3747840b3c865bae67b0bf9fbb991de86e2f0006e9cf48679c89a6bcbbe66deaec19bfaf1e4023b60918ce4088c9ab43e2c

data/.circleci/config.yml

@@ -1,3 +1,4 @@
+---
 version: 2
 
 references:
@@ -30,14 +31,6 @@ references:
       path: /tmp/test-results
 
 jobs:
-  build-ruby241-rails-429-mongo:
-    docker:
-      - image: circleci/ruby:2.4.1-node
-        environment:
-          - RAILS_VERSION=4.2.9
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby241-rails-429-mysql:
     docker:
       - image: circleci/ruby:2.4.1-node
@@ -66,14 +59,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby241-rails-505-mongo:
-    docker:
-      - image: circleci/ruby:2.4.1-node
-        environment:
-          - RAILS_VERSION=5.0.5
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby241-rails-505-mysql:
     docker:
       - image: circleci/ruby:2.4.1-node
@@ -102,14 +87,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby241-rails-513-mongo:
-    docker:
-      - image: circleci/ruby:2.4.1-node
-        environment:
-          - RAILS_VERSION=5.1.3
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby241-rails-513-mysql:
     docker:
       - image: circleci/ruby:2.4.1-node
@@ -138,19 +115,11 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby262-rails-600-mongo:
-    docker:
-      - image: circleci/ruby:2.6.2-node
-        environment:
-          - RAILS_VERSION=6.0.0.rc1
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby262-rails-600-mysql:
     docker:
       - image: circleci/ruby:2.6.2-node
         environment:
-          - RAILS_VERSION=6.0.0.rc1
+          - RAILS_VERSION=6.0.0
           - DATABASE_URL=mysql2://root@127.0.0.1/statesman_test
           - EXCLUDE_MONGOID=true
           - DATABASE_DEPENDENCY_PORT=3306
@@ -165,7 +134,7 @@ jobs:
     docker:
       - image: circleci/ruby:2.6.2-node
         environment:
-          - RAILS_VERSION=6.0.0.rc1
+          - RAILS_VERSION=6.0.0
           - DATABASE_URL=postgres://postgres@localhost/statesman_test
           - EXCLUDE_MONGOID=true
           - DATABASE_DEPENDENCY_PORT=5432
@@ -174,13 +143,33 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby241-rails-523-mongo:
+  build-ruby262-rails-master-mysql:
     docker:
-      - image: circleci/ruby:2.4.1-node
+      - image: circleci/ruby:2.6.2-node
         environment:
-          - RAILS_VERSION=5.2.3
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
+          - RAILS_VERSION=master
+          - DATABASE_URL=mysql2://root@127.0.0.1/statesman_test
+          - EXCLUDE_MONGOID=true
+          - DATABASE_DEPENDENCY_PORT=3306
+      - image: circleci/mysql:5.7.18
+        environment:
+          - MYSQL_ALLOW_EMPTY_PASSWORD=true
+          - MYSQL_USER=root
+          - MYSQL_PASSWORD=
+          - MYSQL_DATABASE=statesman_test
+    steps: *steps
+  build-ruby262-rails-master-postgres:
+    docker:
+      - image: circleci/ruby:2.6.2-node
+        environment:
+          - RAILS_VERSION=master
+          - DATABASE_URL=postgres://postgres@localhost/statesman_test
+          - EXCLUDE_MONGOID=true
+          - DATABASE_DEPENDENCY_PORT=5432
+      - image: circleci/postgres:9.6
+        environment:
+          - POSTGRES_USER=postgres
+          - POSTGRES_DB=statesman_test
     steps: *steps
   build-ruby241-rails-523-mysql:
     docker:
@@ -210,14 +199,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby233-rails-429-mongo:
-    docker:
-      - image: circleci/ruby:2.3.3-node
-        environment:
-          - RAILS_VERSION=4.2.9
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby233-rails-429-mysql:
     docker:
       - image: circleci/ruby:2.3.3-node
@@ -246,14 +227,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby233-rails-505-mongo:
-    docker:
-      - image: circleci/ruby:2.3.3-node
-        environment:
-          - RAILS_VERSION=5.0.5
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby233-rails-505-mysql:
     docker:
       - image: circleci/ruby:2.3.3-node
@@ -282,14 +255,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby233-rails-513-mongo:
-    docker:
-      - image: circleci/ruby:2.3.3-node
-        environment:
-          - RAILS_VERSION=5.1.3
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby233-rails-513-mysql:
     docker:
       - image: circleci/ruby:2.3.3-node
@@ -318,14 +283,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby227-rails-429-mongo:
-    docker:
-      - image: circleci/ruby:2.2.7-node
-        environment:
-          - RAILS_VERSION=4.2.9
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby227-rails-429-mysql:
     docker:
       - image: circleci/ruby:2.2.7-node
@@ -354,14 +311,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby227-rails-505-mongo:
-    docker:
-      - image: circleci/ruby:2.2.7-node
-        environment:
-          - RAILS_VERSION=5.0.5
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby227-rails-505-mysql:
     docker:
       - image: circleci/ruby:2.2.7-node
@@ -390,14 +339,6 @@ jobs:
           - POSTGRES_USER=postgres
           - POSTGRES_DB=statesman_test
     steps: *steps
-  build-ruby227-rails-513-mongo:
-    docker:
-      - image: circleci/ruby:2.2.7-node
-        environment:
-          - RAILS_VERSION=5.1.3
-          - DATABASE_DEPENDENCY_PORT=27017
-      - image: circleci/mongo:3
-    steps: *steps
   build-ruby227-rails-513-mysql:
     docker:
       - image: circleci/ruby:2.2.7-node
@@ -431,36 +372,27 @@ workflows:
   version: 2
   tests:
     jobs:
-      - build-ruby241-rails-429-mongo
       - build-ruby241-rails-429-mysql
       - build-ruby241-rails-429-postgres
-      - build-ruby241-rails-505-mongo
       - build-ruby241-rails-505-mysql
       - build-ruby241-rails-505-postgres
-      - build-ruby241-rails-513-mongo
       - build-ruby241-rails-513-mysql
       - build-ruby241-rails-513-postgres
-      - build-ruby241-rails-523-mongo
       - build-ruby241-rails-523-mysql
       - build-ruby241-rails-523-postgres
-      - build-ruby262-rails-600-mongo
       - build-ruby262-rails-600-mysql
       - build-ruby262-rails-600-postgres
-      - build-ruby233-rails-429-mongo
+      - build-ruby262-rails-master-mysql
+      - build-ruby262-rails-master-postgres
       - build-ruby233-rails-429-mysql
       - build-ruby233-rails-429-postgres
-      - build-ruby233-rails-505-mongo
       - build-ruby233-rails-505-mysql
       - build-ruby233-rails-505-postgres
-      - build-ruby233-rails-513-mongo
       - build-ruby233-rails-513-mysql
       - build-ruby233-rails-513-postgres
-      - build-ruby227-rails-429-mongo
       - build-ruby227-rails-429-mysql
       - build-ruby227-rails-429-postgres
-      - build-ruby227-rails-505-mongo
       - build-ruby227-rails-505-mysql
       - build-ruby227-rails-505-postgres
-      - build-ruby227-rails-513-mongo
       - build-ruby227-rails-513-mysql
       - build-ruby227-rails-513-postgres

data/.rubocop_todo.yml

@@ -1,20 +1,28 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-06-07 12:21:30 +0100 using RuboCop version 0.56.0.
+# on 2019-08-17 15:19:58 +0100 using RuboCop version 0.61.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
+# Offense count: 5
 Metrics/AbcSize:
   Max: 18
 
 # Offense count: 4
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 14
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: SkipBlocks, EnforcedStyle.
+# SupportedStyles: described_class, explicit
+RSpec/DescribedClass:
+  Exclude:
+    - 'spec/statesman/adapters/active_record_queries_spec.rb'
+
 # Offense count: 7
 # Configuration parameters: Max.
 RSpec/ExampleLength:
@@ -29,6 +37,12 @@ RSpec/ExpectInHook:
     - 'spec/statesman/adapters/active_record_spec.rb'
     - 'spec/statesman/machine_spec.rb'
 
+# Offense count: 3
+RSpec/ImplicitBlockExpectation:
+  Exclude:
+    - 'spec/statesman/adapters/active_record_spec.rb'
+    - 'spec/statesman/adapters/shared_examples.rb'
+
 # Offense count: 1
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
@@ -40,6 +54,11 @@ RSpec/IteratedExpectation:
   Exclude:
     - 'spec/statesman/machine_spec.rb'
 
+# Offense count: 1
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/statesman/adapters/active_record_queries_spec.rb'
+
 # Offense count: 3
 RSpec/LetSetup:
   Exclude:
@@ -71,7 +90,7 @@ RSpec/ScatteredSetup:
     - 'spec/statesman/machine_spec.rb'
 
 # Offense count: 8
-# Configuration parameters: IgnoreSymbolicNames.
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/generators/statesman/active_record_transition_generator_spec.rb'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v4.1.2, 17th August 2019
+
+- Add support for Rails 6 [@greysteil](https://github.com/gocardless/statesman/pull/360)
+
 ## v4.1.1, 6th July 2019
 
 - Fix statesman index detection for indexes that start t-z [@hmarr](https://github.com/gocardless/statesman/pull/354)

data/Gemfile

@@ -2,7 +2,13 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "rails", "~> #{ENV['RAILS_VERSION']}" if ENV["RAILS_VERSION"]
+# rubocop:disable Bundler/DuplicatedGem
+if ENV['RAILS_VERSION'] == 'master'
+  gem "rails", git: "https://github.com/rails/rails"
+elsif ENV['RAILS_VERSION']
+  gem "rails", "~> #{ENV['RAILS_VERSION']}"
+end
+# rubocop:enable Bundler/DuplicatedGem
 
 group :development do
   gem "mongoid", ">= 3.1" unless ENV["EXCLUDE_MONGOID"]

data/lib/statesman/adapters/active_record.rb

@@ -200,6 +200,14 @@ module Statesman
         @connection = ::ActiveRecord::Base.connection
       end
 
+      def self.trigger_transactional_callbacks?
+        true
+      end
+
+      def trigger_transactional_callbacks?
+        true
+      end
+
       # rubocop: disable Naming/PredicateName
       def has_transactional_callbacks?
         true

data/lib/statesman/version.rb

@@ -1,3 +1,3 @@
 module Statesman
-  VERSION = "4.1.1".freeze
+  VERSION = "4.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statesman
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2019-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter