stator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a6f7658cce7debea62b3e18c89fd2e4bf35952f
-  data.tar.gz: f4e21740be88736d70f1b84c94a74e698a9fc8fa
+  metadata.gz: 214097ce2a773c6b9757680971d7a760543432df
+  data.tar.gz: 9c49c056f533f3674a7084d9faf4dc23ea2bc90f
 SHA512:
-  metadata.gz: 20a70d26947f2a01572583fd393da0a054bd172dd7e5507b63fff0058f5c3b35c53477b464b2ede20f54fabd8101638f25d54da895b2d6c910f73fc6c550ac3a
-  data.tar.gz: b991dc3e5d5f19f97f24c7bb133ca84ae4e3e02c3a4c6d93d0fb967c7f51dc4f48996c21c199c56772cb4844b38443d9b7b0fdad4b609fb507ff761da271d23b
+  metadata.gz: 12fe01cec42c2d9d0197128fc12dbb4a3d3890103a6d4627421054d82d52ee63d06e0b58b43c19a98a3bdee9c658fd2f40b25ea6f0e2c715348bead72cf30b3c
+  data.tar.gz: 62854fb511cb9a3b2805c6e6554721e810a13c0f105f387f786c918c22fad4abfbe6ccc478ed57bf60526533996e8b0c54773e6443c6297b41b3a0a7eb6c0b95

data/.travis.yml

@@ -1,11 +1,15 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.6
+  - 2.2.3
 
 gemfile:
-  - gemfiles/ar30.gemfile
-  - gemfiles/ar31.gemfile
-  - gemfiles/ar32.gemfile
   - gemfiles/ar40.gemfile
+  - gemfiles/ar41.gemfile
+  - gemfiles/ar42.gemfile
+
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/ar42.gemfile

data/gemfiles/ar42.gemfile

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

data/lib/stator/machine.rb

@@ -15,8 +15,7 @@ module Stator
       @field         = options[:field] || :state
       @namespace     = options[:namespace] || nil
 
-      # rescue nil since the table may not exist yet.
-      @initial_state = klass.columns_hash[@field.to_s].default rescue nil
+      @initial_state = options[:initial]
 
       @transitions      = []
       @aliases          = []

data/lib/stator/model.rb

@@ -9,6 +9,14 @@ module Stator
       include TrackerMethods    if options[:track] == true
 
       self._stators ||= {}
+
+      unless self.abstract_class?
+        f = options[:field] || :state
+        # rescue nil since the table may not exist yet.
+        initial = self.columns_hash[f.to_s].default rescue nil
+        options = options.reverse_merge(initial: initial)
+      end
+
       machine = (self._stators[options[:namespace].to_s] ||= ::Stator::Machine.new(self, options))
 
       if block_given?

data/lib/stator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -41,11 +41,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/ar30.gemfile
-- gemfiles/ar31.gemfile
-- gemfiles/ar32.gemfile
 - gemfiles/ar40.gemfile
 - gemfiles/ar41.gemfile
+- gemfiles/ar42.gemfile
 - lib/stator.rb
 - lib/stator/alias.rb
 - lib/stator/integration.rb

data/gemfiles/ar30.gemfile

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

data/gemfiles/ar31.gemfile

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

data/gemfiles/ar32.gemfile

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