stator 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79f3afdff7482b4d1cb783a7bdee4941e78bb3c8
-  data.tar.gz: 1015c2937be4daef19f9c270f8f5e20a47539232
+  metadata.gz: bd69f892293770471063f818138639b932e78120
+  data.tar.gz: 8f0f90685de79f5fd2d29e9170dc25a8c82bc6bb
 SHA512:
-  metadata.gz: 6f1ebc9d9eecf8af87e94d778dd4eb23f146d772d91d9f4e09739c0927225e2ce15a0026fe6b05d425bbb5ccd3babf0b38604279f787951bb312fcd216d181e2
-  data.tar.gz: 055f13839c226f3542bd72da2a8683c9a03ee540cfb31206d6ec3b0b4357f698ba8407d1b76418393767f59efd945abc4dc272895b54b6452405f4a97620b304
+  metadata.gz: e167050e139b82a6d1004739881e42a90dc711f0465d23823475876bf05254ecb0157e41b4038ae82e2779dcb102df5d334750d86da6da367ca78e237b4a0b40
+  data.tar.gz: 8e5346d2586207932a1bdddff88d828953c2ffaebca9a98861845a2fde0b95a7b0a7b2d0c0f2a534c4b85db960534cd3cea14139ff10a1a41323056e6d3ecb3b

data/.travis.yml

@@ -4,12 +4,38 @@ rvm:
   - 2.0.0
   - 2.1.6
   - 2.2.3
+  - 2.4.5
+  - 2.5.3
 
 gemfile:
   - gemfiles/ar40.gemfile
   - gemfiles/ar41.gemfile
   - gemfiles/ar42.gemfile
+  - gemfiles/ar52.gemfile
 
 matrix:
   allow_failures:
     - gemfile: gemfiles/ar42.gemfile
+    - gemfile: gemfiles/ar52.gemfile
+
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/ar52.gemfile
+
+    - rvm: 2.1.6
+      gemfile: gemfiles/ar52.gemfile
+
+    - rvm: 2.2.3
+      gemfile: gemfiles/ar52.gemfile
+
+    - rvm: 2.4.5
+      gemfile: gemfiles/ar40.gemfile
+
+    - rvm: 2.4.5
+      gemfile: gemfiles/ar41.gemfile
+
+    - rvm: 2.5.3
+      gemfile: gemfiles/ar40.gemfile
+
+    - rvm: 2.5.3
+      gemfile: gemfiles/ar41.gemfile

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stator.gemspec
-gem 'activerecord', '4.0.0'
+gem 'activerecord', '5.2.3'
 
 gemspec
 
 gem 'rake'
-gem 'activerecord-nulldb-adapter', :require => false, :git => 'git@github.com:nulldb/nulldb.git', :ref => 'ffc7dae4697c6b9fb15bed9edca3acb1f00eb5f0'
+gem 'activerecord-nulldb-adapter', '~> 0.4.0', :require => false, :git => 'git@github.com:nulldb/nulldb.git'
 gem 'rspec'

data/gemfiles/ar42.gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stator.gemspec
-gem 'activerecord', '~> 4.2.0'
+gem 'activerecord', '~> 4.0.0'
 
 gemspec :path => '../'
 

data/gemfiles/ar52.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in stator.gemspec
+gem 'activerecord', '~> 5.2.0'
+
+gemspec :path => '../'
+
+gem 'rake'
+gem 'activerecord-nulldb-adapter', '~> 0.4.0', :require => false, :git => 'git@github.com:nulldb/nulldb.git'
+gem 'rspec'

data/lib/stator/machine.rb

@@ -67,7 +67,9 @@ module Stator
     end
 
     def conditional(*states, &block)
-      klass.instance_exec("#{states.map(&:to_s).inspect}.include?(self._stator(#{@namespace.inspect}).integration(self).state)", &block)
+      _namespace = @namespace
+
+      klass.instance_exec(proc { states.map(&:to_s).include?(self._stator(_namespace).integration(self).state) }, &block)
     end
 
     def matching_transition(from, to)

data/lib/stator/transition.rb

@@ -42,7 +42,7 @@ module Stator
     end
 
     def conditional(options = {}, &block)
-      klass.instance_exec(conditional_string(options), &block)
+      klass.instance_exec(conditional_block(options), &block)
     end
 
     def any
@@ -63,19 +63,24 @@ module Stator
       @callbacks[kind] || []
     end
 
-    def conditional_string(options = {})
+    def conditional_block(options = {})
       options[:use_previous] ||= false
-      %Q{
-          (
-            self._stator(#{@namespace.inspect}).integration(self).state_changed?(#{options[:use_previous].inspect})
-          ) && (
-            #{@froms.inspect}.include?(self._stator(#{@namespace.inspect}).integration(self).state_was(#{options[:use_previous].inspect})) ||
-            #{@froms.inspect}.include?(::Stator::Transition::ANY)
-          ) && (
-            self._stator(#{@namespace.inspect}).integration(self).state == #{@to.inspect} ||
-            #{@to.inspect} == ::Stator::Transition::ANY
-          )
-        }
+
+      _namespace = @namespace
+      _froms     = @froms
+      _to        = @to
+
+      Proc.new do
+        (
+          self._stator(_namespace).integration(self).state_changed?(options[:use_previous])
+        ) && (
+          _froms.include?(self._stator(_namespace).integration(self).state_was(options[:use_previous])) ||
+          _froms.include?(::Stator::Transition::ANY)
+        ) && (
+          self._stator(_namespace).integration(self).state == _to ||
+          _to == ::Stator::Transition::ANY
+        )
+      end
     end
 
     def generate_methods

data/lib/stator/version.rb

@@ -1,7 +1,7 @@
 module Stator
   MAJOR       = 0
-  MINOR       = 2
-  PATCH       = 2
+  MINOR       = 3
+  PATCH       = 0
   PRERELEASE  = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRERELEASE].compact.join('.')

data/spec/model_spec.rb

@@ -36,7 +36,9 @@ describe Stator::Model do
 
   it 'should ensure a valid state transition when given an illegal state based on the current state' do
     u = User.new
-    u.stub(:new_record?).and_return(false)
+
+    allow(u).to receive(:new_record?).and_return(false)
+
     u.state = 'hyperactivated'
 
     u.should_not be_valid

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'stator'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.expect_with(:rspec) { |c| c.syntax = :should }
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,6 +44,7 @@ files:
 - gemfiles/ar40.gemfile
 - gemfiles/ar41.gemfile
 - gemfiles/ar42.gemfile
+- gemfiles/ar52.gemfile
 - lib/stator.rb
 - lib/stator/alias.rb
 - lib/stator/integration.rb