stator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b05270b7332e9e7a783e90c7c88436fd54ae7056
-  data.tar.gz: bfe49f8f6174be19b87b1f94e8986050474509e0
+  metadata.gz: 79f3afdff7482b4d1cb783a7bdee4941e78bb3c8
+  data.tar.gz: 1015c2937be4daef19f9c270f8f5e20a47539232
 SHA512:
-  metadata.gz: d39f7b87b6a727b42d9dcdf5d28afdd0cfd9978dece9817f4f5f7614e632b076048e9fad28d42cbeb2fc9c7af5a2cbd7c5983ce311510e10b1a2751b89faf3ce
-  data.tar.gz: e3ab4eb10476ab50529ea7e24a4c5e0c9598edc97b7df61a57ebe3c7ac4420d7ef1e2f2a0a9be5755d392a062d357adda44b7881d19bf720af67e66e4d3338d9
+  metadata.gz: 6f1ebc9d9eecf8af87e94d778dd4eb23f146d772d91d9f4e09739c0927225e2ce15a0026fe6b05d425bbb5ccd3babf0b38604279f787951bb312fcd216d181e2
+  data.tar.gz: 055f13839c226f3542bd72da2a8683c9a03ee540cfb31206d6ec3b0b4357f698ba8407d1b76418393767f59efd945abc4dc272895b54b6452405f4a97620b304

data/lib/stator/machine.rb

@@ -16,7 +16,7 @@ module Stator
       @field         = options[:field] || :state
       @namespace     = options[:namespace] || nil
 
-      @initial_state = options[:initial]
+      @initial_state = options[:initial] && options[:initial].to_s
 
       @transitions      = []
       @aliases          = []

data/lib/stator/model.rb

@@ -14,7 +14,7 @@ module Stator
         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)
+        options = options.merge(initial: initial) if initial
       end
 
       machine = (self._stators[options[:namespace].to_s] ||= ::Stator::Machine.new(self, options))

data/lib/stator/version.rb

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

data/spec/model_spec.rb

@@ -293,6 +293,11 @@ describe Stator::Model do
       (!!defined?(User::ICED_TEA_STATES)).should eql(false)
       User.should_not respond_to(:iced_tea)
     end
+
+    it 'should determine the full list of states correctly' do
+      states = User._stator("").states
+      states.should eql(["pending", "activated", "deactivated", "semiactivated", "hyperactivated"])
+    end
   end
 
 end

data/spec/support/models.rb

@@ -3,8 +3,7 @@ class User < ActiveRecord::Base
 
   before_save :set_tagged_at
 
-  # initial state = pending
-  stator track: true do
+  stator track: true, initial: :pending do
 
     transition :activate do
       from :pending, :semiactivated

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord