state_machines-activerecord 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39ffabae392d2245edfc14f96386bdc60cc9d1b2
-  data.tar.gz: '009d02fa4fd25a08870d33d11cc08d45b9bf0247'
+SHA256:
+  metadata.gz: e3b0f15bfdc4b116addd104136821751286e8f8452f5513141cd633560e6e004
+  data.tar.gz: 76a1a6abed537af626d8a312cb7e2cb382d1b360a04111179c3808dacc940cf5
 SHA512:
-  metadata.gz: 61f7c05dc35a5dbae42d1f52308fef39d3231b96974d682489ccec45dd504ac6d5bf0938dbac52ff26bec1b169e899f4599beee11227935868e6e0426674fe65
-  data.tar.gz: '06097651876fc34fb69e767c2ca15a6e35675dfc20b91ca4a7d6fd3a7d1f7b2bded792c06b135d55d799ce1d6247fc1f76870777f41d715cc3332b281c99dfa7'
+  metadata.gz: 439cfcd6eadd8abbaf6dd7de97ec584bf582465f1f2ff0dce0988c2b6c73af81a664f185a0b46c38cf7a8184d1365836d07ed3bc04acd117a78fb6b3ac372540
+  data.tar.gz: f37e758e101e747a8e135eea316316271ef5881eb3bff6606e17ceaa3ddf05ad09dc23d96dda2fd3aa22d5ea6fca9be224b19a07e2e0331677b3b9e9208007f9

data/.travis.yml

@@ -4,9 +4,10 @@ cache: bundler
 
 rvm:
   - 2.1
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - jruby
   - rbx-2
 
@@ -17,26 +18,38 @@ gemfile:
 matrix:
   include:
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.2.7
+      rvm: 2.2.9
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.3.4
+      rvm: 2.3.6
     - gemfile: gemfiles/active_record_5.0.gemfile
-      rvm: 2.4.1
+      rvm: 2.4.3
+    - gemfile: gemfiles/active_record_5.0.gemfile
+      rvm: 2.5.0
     - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.2.7
+      rvm: 2.2.9
     - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.3.4
+      rvm: 2.3.6
     - gemfile: gemfiles/active_record_5.1.gemfile
-      rvm: 2.4.1
-    - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.2.7
+      rvm: 2.4.3
+    - gemfile: gemfiles/active_record_5.1.gemfile
+      rvm: 2.5.0
+    - gemfile: gemfiles/active_record_5.2.gemfile
+      rvm: 2.2.9
+    - gemfile: gemfiles/active_record_5.2.gemfile
+      rvm: 2.3.6
+    - gemfile: gemfiles/active_record_5.2.gemfile
+      rvm: 2.4.3
+    - gemfile: gemfiles/active_record_5.2.gemfile
+      rvm: 2.5.0
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.3.4
+      rvm: 2.4.3
     - gemfile: gemfiles/active_record_edge.gemfile
-      rvm: 2.4.1
+      rvm: 2.5.0
   exclude:
     - gemfile: gemfiles/active_record_4.1.gemfile
-      rvm: 2.4.1
+      rvm: 2.4.3
+    - gemfile: gemfiles/active_record_4.1.gemfile
+      rvm: 2.5.0
   allow_failures:
     - rvm: jruby
     - rvm: rbx-2

data/Appraisals

@@ -24,6 +24,13 @@ appraise "active_record_5.1" do
   gem "activemodel", github: 'rails/rails', branch: '5-1-stable'
 end
 
+appraise "active_record_5.2" do
+  gem "sqlite3", platforms: [:mri, :rbx]
+  gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+  gem "activerecord", github: 'rails/rails',  branch: '5-2-stable'
+  gem "activemodel", github: 'rails/rails', branch: '5-2-stable'
+end
+
 appraise "active_record_edge" do
   gem "sqlite3", platforms: [:mri, :rbx]
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby

data/README.md

@@ -64,6 +64,38 @@ Vehicle.with_state(:parked)                         # also plural #with_states
 Vehicle.without_states(:first_gear, :second_gear)   # also singular #without_state
 ```
 
+### State driven validations
+
+As mentioned in `StateMachines::Machine#state`, you can define behaviors,
+like validations, that only execute for certain states. One *important*
+caveat here is that, due to a constraint in ActiveRecord's validation
+framework, custom validators will not work as expected when defined to run
+in multiple states. For example:
+
+~~~
+class Vehicle < ActiveRecord::Base
+  state_machine do
+    state :first_gear, :second_gear do
+      validate :speed_is_legal
+    end
+  end
+end
+~~~
+
+In this case, the <tt>:speed_is_legal</tt> validation will only get run
+for the <tt>:second_gear</tt> state.  To avoid this, you can define your
+custom validation like so:
+
+~~~
+  class Vehicle < ActiveRecord::Base
+    state_machine do
+      state :first_gear, :second_gear do
+        validate {|vehicle| vehicle.speed_is_legal}
+      end
+    end
+  end
+~~~
+
 ## Contributing
 
 1. Fork it ( https://github.com/state-machines/state_machines-activerecord/fork )

data/gemfiles/active_record_5.2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", platforms: [:mri, :rbx]
+gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+gem "activerecord", github: "rails/rails", branch: "5-2-stable"
+gem "activemodel", github: "rails/rails", branch: "5-2-stable"
+
+platforms :mri_20, :mri_21 do
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/lib/state_machines/integrations/active_record.rb

@@ -439,10 +439,18 @@ module StateMachines
       end
 
       # Gets the db default for the machine's attribute
-      def owner_class_attribute_default
-        if owner_class.connected? && owner_class.table_exists?
-          if column = owner_class.columns_hash[attribute.to_s]
-            column.default
+      if ::ActiveRecord.gem_version >= Gem::Version.new('4.2.0')
+        def owner_class_attribute_default
+          if owner_class.connected? && owner_class.table_exists?
+            owner_class.column_defaults[attribute.to_s]
+          end
+        end
+      else
+        def owner_class_attribute_default
+          if owner_class.connected? && owner_class.table_exists?
+            if column = owner_class.columns_hash[attribute.to_s]
+              column.default
+            end
           end
         end
       end

data/lib/state_machines/integrations/active_record/version.rb

@@ -1,7 +1,7 @@
 module StateMachines
   module Integrations
     module ActiveRecord
-      VERSION = '0.5.0'
+      VERSION = '0.5.1'
     end
   end
 end

data/state_machines-activerecord.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'state_machines-activemodel', '>= 0.5.0'
-  spec.add_dependency 'activerecord' , '>= 4.1', '< 5.2'
+  spec.add_dependency 'activerecord' , '>= 4.1', '< 6.0'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'appraisal', '>= 1'

data/test/machine_with_same_integer_column_default_test.rb

@@ -0,0 +1,30 @@
+require_relative 'test_helper'
+require 'stringio'
+
+class MachineWithSameIntegerColumnDefaultTest < BaseTestCase
+  def setup
+    @original_stderr, $stderr = $stderr, StringIO.new
+
+    @model = new_model do
+      connection.add_column table_name, :status, :integer, :default => 1
+    end
+    @machine = StateMachines::Machine.new(@model, :status, :initial => :parked) do
+      state :parked, :value => 1
+    end
+    @record = @model.new
+  end
+
+  def test_should_use_machine_default
+    assert_equal 1, @record.status
+  end
+
+  def test_should_not_generate_a_warning
+    assert_no_match(/have defined a different default/, $stderr.string)
+  end
+
+  def teardown
+    $stderr = @original_stderr
+    super
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
@@ -34,7 +34,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - gemfiles/active_record_4.2.gemfile
 - gemfiles/active_record_5.0.gemfile
 - gemfiles/active_record_5.1.gemfile
+- gemfiles/active_record_5.2.gemfile
 - gemfiles/active_record_edge.gemfile
 - lib/state_machines-activerecord.rb
 - lib/state_machines/integrations/active_record.rb
@@ -179,6 +180,7 @@ files:
 - test/machine_with_loopback_test.rb
 - test/machine_with_non_column_state_attribute_defined_test.rb
 - test/machine_with_same_column_default_test.rb
+- test/machine_with_same_integer_column_default_test.rb
 - test/machine_with_scopes_and_joins_test.rb
 - test/machine_with_scopes_and_owner_subclass_test.rb
 - test/machine_with_scopes_test.rb
@@ -212,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: State machines Active Record Integration
@@ -255,6 +257,7 @@ test_files:
 - test/machine_with_loopback_test.rb
 - test/machine_with_non_column_state_attribute_defined_test.rb
 - test/machine_with_same_column_default_test.rb
+- test/machine_with_same_integer_column_default_test.rb
 - test/machine_with_scopes_and_joins_test.rb
 - test/machine_with_scopes_and_owner_subclass_test.rb
 - test/machine_with_scopes_test.rb