statesman 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0139bf848dacbe81fcca09b0efcbe931d773125
-  data.tar.gz: ef0b4400a4629ed4bebf641e5161e17b27901485
+  metadata.gz: 854b8cc89e069fa3322067960b77dd3cf82364bc
+  data.tar.gz: 8b9dd4292751c9323ebcf59b4ee9373ef9ed42eb
 SHA512:
-  metadata.gz: 514b488888819643db51e1618b2109d6150aab9b4aa2bd7b5f21ac324523a0a4facc6a442e99ef7d486199bc140b9dc53eaa0d1ff0ffa5ed49fb988ac5d1dc06
-  data.tar.gz: 293d1464c01cb538666dc1f84393054209cbd6f0f243e48945bcf8d023b9076b0767805dcb89cf9017b1be23be80bc314e8442fff8c4e6131c891cb103b1d16c
+  metadata.gz: 6df28629b85027c1a3d3ae6e04e676d6037f500ad9448a5f50afaf2ad21d3d7159537acbeb33786f99293ced225ed487fcfa897068adff2a10447df31ad333bc
+  data.tar.gz: 5300f0546e4929cb29b5ab4d86af48a1e9232a443e179c9cec180ee82109e481e34a317e43b3fe5f077bbd1320d3b027e8976bdcdf89dea36d7b8f11fc02d0fa

data/.travis.yml

@@ -1,8 +1,11 @@
 rvm:
-  - 2.1.0
+  - 2.1
   - 2.0.0
   - 1.9.3
 services: mongodb
 script:
  - bundle exec rubocop
  - bundle exec rake
+env:
+  - "RAILS_VERSION=4.1.7"
+  - "RAILS_VERSION=4.2.0.rc2"

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in statesman.gemspec
 gemspec
+
+gem "rails", "~> #{ENV["RAILS_VERSION"]}" if ENV["RAILS_VERSION"]

data/lib/statesman/adapters/active_record.rb

@@ -7,7 +7,7 @@ module Statesman
       attr_reader :parent_model
 
       def initialize(transition_class, parent_model, observer)
-        serialized = transition_class.serialized_attributes.include?("metadata")
+        serialized = serialized?(transition_class)
         column_type = transition_class.columns_hash['metadata'].sql_type
         if !serialized && column_type != 'json'
           raise UnserializedMetadataError,
@@ -75,6 +75,15 @@ module Statesman
       def next_sort_key
         (last && last.sort_key + 10) || 0
       end
+
+      def serialized?(transition_class)
+        if ::ActiveRecord.gem_version >= Gem::Version.new('4.2.0.a')
+          transition_class.columns_hash["metadata"]
+            .cast_type.is_a?(::ActiveRecord::Type::Serialized)
+        else
+          transition_class.serialized_attributes.include?("metadata")
+        end
+      end
     end
   end
 end

data/lib/statesman/adapters/active_record_queries.rb

@@ -41,7 +41,7 @@ module Statesman
         end
 
         def model_foreign_key
-          reflections[transition_name].foreign_key
+          reflect_on_association(transition_name).foreign_key
         end
 
         def transition1_join
@@ -56,7 +56,7 @@ module Statesman
         end
 
         def state_inclusion_where(states)
-          if initial_state.in?(states)
+          if initial_state.to_s.in?(states.map(&:to_s))
             'transition1.to_state IN (?) OR ' \
             'transition1.to_state IS NULL'
           else

data/lib/statesman/adapters/memory_transition.rb

@@ -7,7 +7,7 @@ module Statesman
       attr_accessor :sort_key
       attr_accessor :metadata
 
-      def initialize(to, sort_key, metadata = nil)
+      def initialize(to, sort_key, metadata = {})
         @created_at = Time.now
         @updated_at = Time.now
         @to_state = to

data/lib/statesman/machine.rb

@@ -202,7 +202,7 @@ module Statesman
       @storage_adapter.last
     end
 
-    def can_transition_to?(new_state, metadata = nil)
+    def can_transition_to?(new_state, metadata = {})
       validate_transition(from: current_state,
                           to: new_state,
                           metadata: metadata)
@@ -215,7 +215,7 @@ module Statesman
       @storage_adapter.history
     end
 
-    def transition_to!(new_state, metadata = nil)
+    def transition_to!(new_state, metadata = {})
       initial_state = current_state
       new_state = new_state.to_s
 
@@ -228,7 +228,7 @@ module Statesman
       true
     end
 
-    def trigger!(event_name, metadata = nil)
+    def trigger!(event_name, metadata = {})
       transitions = self.class.events.fetch(event_name) do
         raise Statesman::TransitionFailedError,
               "Event #{event_name} not found"
@@ -248,13 +248,13 @@ module Statesman
       callbacks.each { |cb| cb.call(@object, transition) }
     end
 
-    def transition_to(new_state, metadata = nil)
+    def transition_to(new_state, metadata = {})
       self.transition_to!(new_state, metadata)
     rescue TransitionFailedError, GuardFailedError
       false
     end
 
-    def trigger(event_name, metadata = nil)
+    def trigger(event_name, metadata = {})
       self.trigger!(event_name, metadata)
     rescue TransitionFailedError, GuardFailedError
       false

data/lib/statesman/version.rb

@@ -1,3 +1,3 @@
 module Statesman
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/statesman/adapters/active_record_queries_spec.rb

@@ -14,7 +14,7 @@ describe Statesman::Adapters::ActiveRecordQueries do
       end
 
       def self.initial_state
-        MyStateMachine.initial_state
+        :initial
       end
     end
   end

data/spec/statesman/adapters/active_record_spec.rb

@@ -24,8 +24,12 @@ describe Statesman::Adapters::ActiveRecord do
         allow(metadata_column).to receive_messages(sql_type: '')
         allow(MyActiveRecordModelTransition).to receive_messages(columns_hash:
                                            { 'metadata' => metadata_column })
-        allow(MyActiveRecordModelTransition)
-          .to receive_messages(serialized_attributes: {})
+        if ::ActiveRecord.gem_version >= Gem::Version.new('4.2.0.a')
+          allow(metadata_column).to receive_messages(cast_type: '')
+        else
+          allow(MyActiveRecordModelTransition)
+            .to receive_messages(serialized_attributes: {})
+        end
       end
 
       it "raises an exception" do
@@ -42,8 +46,17 @@ describe Statesman::Adapters::ActiveRecord do
         allow(metadata_column).to receive_messages(sql_type: 'json')
         allow(MyActiveRecordModelTransition).to receive_messages(columns_hash:
                                            { 'metadata' => metadata_column })
-        allow(MyActiveRecordModelTransition)
-          .to receive_messages(serialized_attributes: { 'metadata' => '' })
+        if ::ActiveRecord.gem_version >= Gem::Version.new('4.2.0.a')
+          serialized_type = ::ActiveRecord::Type::Serialized.new(
+            '', ::ActiveRecord::Coders::JSON
+          )
+          expect(metadata_column)
+            .to receive(:cast_type)
+            .and_return(serialized_type)
+        else
+          expect(MyActiveRecordModelTransition)
+            .to receive_messages(serialized_attributes: { 'metadata' => '' })
+        end
       end
 
       it "raises an exception" do

data/spec/statesman/machine_spec.rb

@@ -527,6 +527,11 @@ describe Statesman::Machine do
         expect(instance.history.first.metadata).to eq(meta)
       end
 
+      it "sets an empty hash as the metadata if not specified" do
+        instance.transition_to!(:y)
+        expect(instance.history.first.metadata).to eq({})
+      end
+
       it "returns true" do
         expect(instance.transition_to!(:y)).to be_truthy
       end
@@ -541,7 +546,7 @@ describe Statesman::Machine do
 
           it "passes the object to the guard" do
             expect(guard_cb).to receive(:call).once
-              .with(my_model, instance.last_transition, nil).and_return(true)
+              .with(my_model, instance.last_transition, {}).and_return(true)
             instance.transition_to!(:y)
           end
         end
@@ -703,6 +708,11 @@ describe Statesman::Machine do
         expect(instance.history.first.metadata).to eq(meta)
       end
 
+      it "sets an empty hash as the metadata if not specified" do
+        instance.trigger!(:event_1)
+        expect(instance.history.first.metadata).to eq({})
+      end
+
       it "returns true" do
         expect(instance.trigger!(:event_1)).to eq(true)
       end
@@ -719,7 +729,7 @@ describe Statesman::Machine do
 
           it "passes the object to the guard" do
             expect(guard_cb).to receive(:call).once
-              .with(my_model, instance.last_transition, nil).and_return(true)
+              .with(my_model, instance.last_transition, {}).and_return(true)
             instance.trigger!(:event_1)
           end
         end

data/spec/support/active_record.rb

@@ -32,7 +32,7 @@ class CreateMyActiveRecordModelMigration < ActiveRecord::Migration
   def change
     create_table :my_active_record_models do |t|
       t.string :current_state
-      t.timestamps
+      t.timestamps(null: false)
     end
   end
 end
@@ -45,7 +45,7 @@ class CreateMyActiveRecordModelTransitionMigration < ActiveRecord::Migration
       t.integer :my_active_record_model_id
       t.integer :sort_key
       t.text    :metadata
-      t.timestamps
+      t.timestamps(null: false)
     end
 
     add_index :my_active_record_model_transitions, :sort_key, unique: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statesman
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Harry Marr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler