state_machines-activerecord 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a08515c6e6c44049b7473b3140fd0e96f3eb3d8
-  data.tar.gz: 1722de2ecf4eb65aee81221d5725c49bcac361ec
+  metadata.gz: 83184c4ea1136843d9a2b5a6638ffe4af34502d5
+  data.tar.gz: d5c732fd76e6a9bd4f96cf391fa360f5d526bc24
 SHA512:
-  metadata.gz: 43826d053ae3d06a3c2fa966245b70e6a56e71223567f7e4f1f622136016cbb24da5bae787c20f07d87f85645a8fcdad37bde872ae7778a334e38298fa87465e
-  data.tar.gz: a5cee9e813ce7adebed5027b0b68ba64be155f54db35df8943282556cab82d9fa89c467bdf0109879e8a3ea0bc8844532b9e8e86e73ed3377b7c58c2d5a277d5
+  metadata.gz: 844e338a3c7c50cad3c3c6de08944cb9b81d7bcb6a81d6428c597feb09c09141f6a3d983cbcae804f89133b65bd87348ece794ca585e61dca9818cd34210a023
+  data.tar.gz: b9c56c10217e4d74b667ad1a4e56bec12635f921e8fa908b41da0922ae8f7810c371864c47aec04443e82c483bf5a4dc4c0cb1e69f17d6be868f089f14435246

data/.travis.yml

@@ -5,7 +5,6 @@ cache: bundler
 rvm:
   - 2.1
   - 2.2
-  - jruby-19mode
   - jruby
   - rbx-2
 
@@ -16,5 +15,4 @@ gemfile:
 matrix:
   allow_failures:
     - rvm: jruby
-    - rvm: jruby-19mode
-    - rvm: rbx-2
+    - rvm: rbx-2

data/lib/state_machines/integrations/active_record.rb

@@ -447,47 +447,41 @@ module StateMachines
         end
       end
 
-      # Defines an initialization hook into the owner class for setting the
-      # initial state of the machine *before* any attributes are set on the
-      # object
       def define_state_initializer
-        define_static_state_initializer
-        define_dynamic_state_initializer
-      end
-
-      # Initializes static states
-      def define_static_state_initializer
-        # This is the only available hook where the default set of attributes
-        # can be overridden for a new object *prior* to the processing of the
-        # attributes passed into #initialize
-        define_helper :class, <<-end_eval, __FILE__, __LINE__ + 1
-          if  ActiveRecord.gem_version >= Gem::Version.new('4.2')
-             def _default_attributes #:nodoc:
-              result = super
-              self.state_machines.initialize_states(nil, :static => :force, :dynamic => false, :to => result)
-              result
-             end
-          else
-             def column_defaults(*) #:nodoc:
+        if ::ActiveRecord.gem_version >= Gem::Version.new('4.2')
+          define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
+            def initialize(attributes = nil, options = {})
+              super(attributes, options) do |*args|
+                self.class.state_machines.initialize_states(self, {}, attributes || {})
+                yield(*args) if block_given?
+              end
+            end
+          end_eval
+        else
+          # Initializes static states
+          #
+          # This is the only available hook where the default set of attributes
+          # can be overridden for a new object *prior* to the processing of the
+          # attributes passed into #initialize
+          define_helper :class, <<-end_eval, __FILE__, __LINE__ + 1
+            def column_defaults(*) #:nodoc:
               result = super
               # No need to pass in an object, since the overrides will be forced
               self.state_machines.initialize_states(nil, :static => :force, :dynamic => false, :to => result)
               result
-             end
-          end
-        end_eval
-      end
+            end
+          end_eval
 
-      # Initializes dynamic states
-      def define_dynamic_state_initializer
-        define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
-            def initialize(*)
-              super do |*args|
-                self.class.state_machines.initialize_states(self)
+          # Initializes dynamic states
+          define_helper :instance, <<-end_eval, __FILE__, __LINE__ + 1
+            def initialize(attributes = nil, options = {})
+              super(attributes, options) do |*args|
+                self.class.state_machines.initialize_states(self, {}, attributes || {})
                 yield(*args) if block_given?
               end
             end
-        end_eval
+          end_eval
+        end
       end
 
       # Uses around callbacks to run state events if using the :save hook
@@ -566,23 +560,4 @@ module StateMachines
         end
     end
   end
-  class Machine
-    # FIXME
-    def initialize_state(object, options = {})
-      state = initial_state(object)
-      if state && (options[:force] || initialize_state?(object))
-        value = state.value
-
-        if hash = options[:to]
-          if hash.is_a?(Hash)
-            hash[attribute.to_s] = value
-          else # in ActiveRecord 4.2 hash is an Activerecord::AttributeSet
-            hash.write_from_user(attribute.to_s, value)
-          end
-        else
-          write(object, :state, value)
-        end
-      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.0.1'
+      VERSION = '0.1.0'
     end
   end
 end

data/test/integration_test.rb

@@ -5,6 +5,12 @@ class IntegrationTest < BaseTestCase
     assert_equal :active_record, StateMachines::Integrations::ActiveRecord.integration_name
   end
 
+  def test_should_be_before_activemodel
+    integrations = StateMachines::Integrations.list.to_a
+    assert StateMachines::Integrations::ActiveRecord, integrations.first
+    assert StateMachines::Integrations::ActiveModel, integrations.last
+  end
+
   def test_should_match_if_class_inherits_from_active_record
     assert StateMachines::Integrations::ActiveRecord.matches?(new_model)
   end

data/test/machine_with_non_column_state_attribute_defined_test.rb

@@ -3,13 +3,7 @@ require_relative 'test_helper'
 class MachineWithNonColumnStateAttributeDefinedTest < BaseTestCase
   def setup
     @model = new_model do
-      def status=(value)
-        self['status'] = value
-      end
-
-      def status
-        self['status']
-      end
+      attr_accessor :status
     end
 
     @machine = StateMachines::Machine.new(@model, :status, :initial => :parked)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
@@ -169,7 +169,6 @@ files:
 - test/machine_with_internationalization_test.rb
 - test/machine_with_loopback_test.rb
 - test/machine_with_non_column_state_attribute_defined_test.rb
-- test/machine_with_non_column_state_attribute_undefined_test.rb
 - test/machine_with_same_column_default_test.rb
 - test/machine_with_scopes_and_joins_test.rb
 - test/machine_with_scopes_and_owner_subclass_test.rb
@@ -204,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: State machines Active Record Integration
@@ -246,7 +245,6 @@ test_files:
 - test/machine_with_internationalization_test.rb
 - test/machine_with_loopback_test.rb
 - test/machine_with_non_column_state_attribute_defined_test.rb
-- test/machine_with_non_column_state_attribute_undefined_test.rb
 - test/machine_with_same_column_default_test.rb
 - test/machine_with_scopes_and_joins_test.rb
 - test/machine_with_scopes_and_owner_subclass_test.rb

data/test/machine_with_non_column_state_attribute_undefined_test.rb

@@ -1,33 +0,0 @@
-require_relative 'test_helper'
-
-class MachineWithNonColumnStateAttributeUndefinedTest < BaseTestCase
-  def setup
-    @model = new_model do
-      def initialize
-        # Skip attribute initialization
-        @initialized_state_machines = true
-        super
-      end
-    end
-
-    @machine = StateMachines::Machine.new(@model, :status, :initial => :parked)
-    @machine.other_states(:idling)
-    @record = @model.new
-  end
-
-  def test_should_not_define_a_column_for_the_attribute
-    assert_nil @model.columns_hash['status']
-  end
-
-  def test_should_define_a_reader_attribute_for_the_attribute
-    assert @record.respond_to?(:status)
-  end
-
-  def test_should_define_a_writer_attribute_for_the_attribute
-    assert @record.respond_to?(:status=)
-  end
-
-  def test_should_define_an_attribute_predicate
-    assert @record.respond_to?(:status?)
-  end
-end