stateful.rb 0.14.2 → 0.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8bee17b4fed729bf32325ec72f662a7175e8b267f944354b7ace17245a12e99
-  data.tar.gz: '039f8fb6263d7df0dd86b5e2f5140ea1c836197b7fdee00758d1ab104a9cb1ba'
+  metadata.gz: faf29ed4e3307bdd9dcd36b495f7e79d5d994f5ab246e788a5f15a602abda118
+  data.tar.gz: ca78f276718cd475c2442162246709b7768390bd413c276e7f97aa9e73b467ba
 SHA512:
-  metadata.gz: b16d65a49c0dc0cd613a31f50f7afb005634a7c806bfd5b072ceef00742e9d35216d5b59695284caf0cf2330f6a70eb124c23b69355f9907dd73498afe9fa0f4
-  data.tar.gz: 0b145b211f8ce4d022599e5f24d48f410744e13886d7b24542573873ea5d733ee5b5d4d47a1b472ade695a725057e751f34e1a87280ec7b147450eac93e401f3
+  metadata.gz: 90cb00e9c62ea416cbb7f53b61698d6cb1606376b6c2061c83de25ce2ed9e032b77530cddd8d7333f90b4f211973cfef254784e9d2b115a4e02c9de9f31b7822
+  data.tar.gz: b6b4d4e1bc0730b40e9dbe32d97568f2f0ed4e8a64750f3dc17544159fe461401beb405c443c52ad21a7c261901787a6d6cd9170656c227852756d0f64618330

data/lib/Stateful.rb

@@ -1,56 +1,19 @@
 # Stateful.rb
 # Stateful
 
-require_relative File.join('Stateful', 'ClassMethods')
-require_relative File.join('Stateful', 'InstanceMethods')
-
 module Stateful
 
   class << self
 
-    def set_column_name(klass)
-      if defined?(::ActiveRecord::Base) && klass < ::ActiveRecord::Base
-        unless klass.instance_variable_get(:@stateful_column_name)
-          klass.instance_variable_set(:@stateful_column_name, 'current_state')
-        end
-      else
-        unless klass.instance_variable_get(:@stateful_variable_name)
-          klass.instance_variable_set(:@stateful_variable_name, 'current_state')
-        end
-      end
-    end
-
-    def load_persistence_class_methods(klass)
+    def extended(klass)
       if defined?(::ActiveRecord::Base) && klass < ::ActiveRecord::Base
         require_relative File.join('Stateful', 'ActiveRecord')
-        klass.extend(Stateful::ActiveRecord::ClassMethods)
+        klass.extend(Stateful::ActiveRecord)
       else
         require_relative File.join('Stateful', 'Poro')
-        klass.extend(Stateful::Poro::ClassMethods)
+        klass.extend(Stateful::Poro)
       end
     end
-
-    def define_instance_methods(klass)
-      if defined?(::ActiveRecord::Base) && klass < ::ActiveRecord::Base
-        klass.define_stateful_column_name_setter_method
-        klass.define_stateful_column_name_getter_method
-      else
-        klass.define_stateful_variable_name_setter_method
-        klass.define_stateful_variable_name_getter_method
-      end
-      klass.define_next_state_method
-      klass.define_transitions_method
-      klass.define_initial_stateQ_method
-      klass.define_final_stateQ_method
-    end
-
-    def extended(klass)
-      klass.extend(Stateful::ClassMethods)
-      klass.send(:include, Stateful::InstanceMethods)
-      set_column_name(klass)
-      load_persistence_class_methods(klass)
-      define_instance_methods(klass)
-    end
     alias_method :included, :extended
 
   end # class << self

data/lib/Stateful/ActiveRecord.rb

@@ -1,7 +1,8 @@
 # Stateful/ActiveRecord.rb
 # Stateful::ActiveRecord
 
-require_relative File.join('..', 'Stateful')
+require_relative 'ClassMethods'
+require_relative 'InstanceMethods'
 require_relative File.join('ActiveRecord', 'ClassMethods')   
 
 module Stateful

data/lib/Stateful/ActiveRecord/ClassMethods.rb

@@ -22,7 +22,7 @@ module Stateful
         end
       end
 
-      def define_status_boolean_method(state_name)
+      def define_status_predicate_method(state_name)
         stateful_column_name = self.instance_variable_get(:@stateful_column_name)
         define_method("#{state_name}?") do
           self.send(stateful_column_name).name == state_name

data/lib/Stateful/ClassMethods.rb

@@ -12,10 +12,18 @@ module Stateful
 
     # start DSL
 
+    def stateful(options = {}, &block)
+      stateful_states.stateful(options, &block)
+    end
+
     def initial_state(state_name = nil, options = {}, &block)
       stateful_states.initial_state(state_name, options, &block)
     end
 
+    def state(state_name, options = {}, &block)
+      stateful_states.state(state_name, options, &block)
+    end
+
     def final_state(*state_names)
       stateful_states.final_state(*state_names)
     end
@@ -24,17 +32,9 @@ module Stateful
       stateful_states.final_states(*state_names)
     end
 
-    def state(state_name, options = {}, &block)
-      stateful_states.state(state_name, options, &block)
-    end
-
-    def stateful(options = {}, &block)
-      stateful_states.stateful(options, &block)
-    end
-
     # end DSL
 
-    # boolean methods
+    # predicate methods
 
     def final_state?
       !final_states.empty?

data/lib/Stateful/InstanceMethods.rb

@@ -20,7 +20,7 @@ module Stateful
       self.class.final_states
     end
 
-    # boolean methods
+    # predicate methods
 
     def active?
       !final_state?

data/lib/Stateful/Poro.rb

@@ -1,7 +1,8 @@
 # Stateful/Poro.rb
 # Stateful::Poro
 
-require_relative File.join('..', 'Stateful')
+require_relative 'ClassMethods'
+require_relative 'InstanceMethods'
 require_relative File.join('Poro', 'ClassMethods')
 
 module Stateful

data/lib/Stateful/Poro/ClassMethods.rb

@@ -22,7 +22,7 @@ module Stateful
         end
       end
 
-      def define_status_boolean_method(state_name)
+      def define_status_predicate_method(state_name)
         stateful_variable_name = self.instance_variable_get(:@stateful_variable_name)
         define_method("#{state_name}?") do
           self.send(stateful_variable_name).name == state_name

data/lib/Stateful/States.rb

@@ -79,7 +79,7 @@ module Stateful
       state.transitions.each do |transition|
         @klass.define_event_method(transition)
       end
-      @klass.define_status_boolean_method(state_name)
+      @klass.define_status_predicate_method(state_name)
       state
     end
 

data/lib/Stateful/VERSION.rb

@@ -1,5 +1,5 @@
 module Stateful
 
-  VERSION = '0.14.2'
+  VERSION = '0.14.9'
 
 end

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: stateful.rb
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.9
 platform: ruby
 authors:
 - thoran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
-dependencies: []
+date: 2019-12-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-spec-context
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily add state and manage it with Poro and ActiveRecord objects.
 email: code@thoran.com
 executables: []
@@ -47,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.0.pre3
 signing_key: 
 specification_version: 4
 summary: A Ruby state machine.