stator 0.4.0 → 0.9.0.beta

data/spec/support/models.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
-  extend Stator::Model
+  include Stator::Model
 
   before_save :set_tagged_at
 
@@ -15,7 +17,7 @@ class User < ActiveRecord::Base
       to :deactivated
 
       conditional do |condition|
-        before_save :set_deactivated, :if => condition
+        before_save :set_deactivated, if: condition
       end
     end
 
@@ -24,7 +26,7 @@ class User < ActiveRecord::Base
       to :semiactivated
 
       conditional do |condition|
-        validate :check_email_validity, :if => condition
+        validate :check_email_validity, if: condition
       end
     end
 
@@ -34,19 +36,18 @@ class User < ActiveRecord::Base
     end
 
     conditional :semiactivated, :activated do |condition|
-      validate :check_email_presence, :if => condition
+      validate :check_email_presence, if: condition
     end
 
-    state_alias :active, :constant => true, :scope => true do
+    state_alias :active, constant: true, scope: true do
       is :activated, :hyperactivated
-      opposite :inactive, :constant => true, :scope => true
+      opposite :inactive, constant: true, scope: true
     end
 
-    state_alias :luke_warm, :constant => :luke_warmers, :scope => :luke_warmers do
+    state_alias :luke_warm, constant: :luke_warmers, scope: :luke_warmers do
       is :semiactivated
       opposite :iced_tea
     end
-
   end
 
   validate :email_is_right_length
@@ -54,8 +55,8 @@ class User < ActiveRecord::Base
   protected
 
   def check_email_presence
-    unless self.email.present?
-      self.errors.add(:email, 'needs to be present')
+    if email.nil? || email.empty?
+      errors.add(:email, 'needs to be present')
       return false
     end
 
@@ -63,8 +64,8 @@ class User < ActiveRecord::Base
   end
 
   def check_email_validity
-    unless self.email.to_s =~ /example\.com$/
-      self.errors.add(:email, 'format needs to be example.com')
+    unless /example\.com$/.match?(email.to_s)
+      errors.add(:email, 'format needs to be example.com')
       return false
     end
 
@@ -72,8 +73,8 @@ class User < ActiveRecord::Base
   end
 
   def email_is_right_length
-    unless self.email.to_s.length == 'four@example.com'.length
-      self.errors.add(:email, 'needs to be the right length')
+    unless email.to_s.length == 'four@example.com'.length
+      errors.add(:email, 'needs to be the right length')
       return false
     end
 
@@ -86,32 +87,29 @@ class User < ActiveRecord::Base
   end
 
   def set_tagged_at
-    self.tagged_at = self.semiactivated_state_at
+    self.tagged_at = semiactivated_state_at
   end
 end
 
 class Animal < ActiveRecord::Base
-  extend Stator::Model
+  include Stator::Model
 
   # initial state = unborn
-  stator :field => :status, :helpers => true, :track => true do
-
+  stator field: :status, track: true do
     transition :birth do
       from :unborn
       to :born
     end
 
     state :grown_up
-
   end
 end
 
 class Zoo < ActiveRecord::Base
-  extend Stator::Model
+  include Stator::Model
 
   # initial state = closed
   stator do
-
     transition :open do
       from :closed
       to :opened
@@ -123,7 +121,7 @@ class Zoo < ActiveRecord::Base
     end
 
     conditional :opened do |c|
-      validate :validate_lights_are_on, :if => c
+      validate :validate_lights_are_on, if: c
     end
   end
 
@@ -135,7 +133,7 @@ class Zoo < ActiveRecord::Base
 end
 
 class ZooKeeper < ActiveRecord::Base
-  extend Stator::Model
+  include Stator::Model
 
   stator namespace: 'employment', field: 'employment_state', track: true do
     transition :hire do
@@ -163,20 +161,18 @@ class ZooKeeper < ActiveRecord::Base
 end
 
 class Farm < ActiveRecord::Base
-  extend Stator::Model
+  include Stator::Model
 
   # initial state = dirty
   stator do
     transition :cleanup do
-     from :dirty
-     to :clean
+      from :dirty
+      to :clean
     end
   end
 
-
   # initial state = dirty
-  stator :field => 'house_state', :namespace => 'house' do
-
+  stator namespace: 'house', field: 'house_state' do
     transition :cleanup do
       from :dirty
       to :clean
@@ -191,11 +187,10 @@ class Farm < ActiveRecord::Base
       is_not :dirty, :disgusting
     end
   end
-
 end
 
 class Factory < ActiveRecord::Base
-  extend Stator::Model
+  include Stator::Model
 
   # initial state = nil
   stator do
@@ -209,5 +204,4 @@ class Factory < ActiveRecord::Base
       to :on_the_ground
     end
   end
-
 end

data/spec/support/schema.rb

@@ -1,55 +1,55 @@
-ActiveRecord::Schema.define(:version => 20130628161227) do
+# frozen_string_literal: true
 
-  create_table "users", :force => true do |t|
-    t.string   "name"
-    t.string   "email"
-    t.datetime "tagged_at"
-    t.string   "state",                                 :default => 'pending'
-    t.boolean  "activated",                             :default => true
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.datetime "semiactivated_state_at"
-    t.datetime "activated_state_at"
+ActiveRecord::Schema.define(version: 20_130_628_161_227) do
+  create_table 'users', force: true do |t|
+    t.string   'name'
+    t.string   'email'
+    t.datetime 'tagged_at'
+    t.string   'state',                                 default: 'pending'
+    t.boolean  'activated',                             default: true
+    t.datetime 'created_at',                            null: false
+    t.datetime 'updated_at',                            null: false
+    t.datetime 'semiactivated_state_at'
+    t.datetime 'activated_state_at'
   end
 
-  create_table "animals", :force => true do |t|
-    t.string   "name"
-    t.string   "status",                                :default => 'unborn'
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
-    t.datetime "status_changed_at"
-    t.datetime "unborn_status_at"
-    t.datetime "born_status_at"
+  create_table 'animals', force: true do |t|
+    t.string   'name'
+    t.string   'status',                                default: 'unborn'
+    t.datetime 'created_at',                            null: false
+    t.datetime 'updated_at',                            null: false
+    t.datetime 'status_changed_at'
+    t.datetime 'unborn_status_at'
+    t.datetime 'born_status_at'
   end
 
-  create_table "zoo_keepers", :force => true do |t|
-    t.string   "name"
-    t.string   "employment_state",                      :default => 'hired'
-    t.datetime "hired_employment_state_at"
-    t.datetime "fired_employment_state_at"
-    t.string   "working_state"
-    t.datetime "started_working_state_at"
-    t.datetime "ended_working_state_at"
+  create_table 'zoo_keepers', force: true do |t|
+    t.string   'name'
+    t.string   'employment_state', default: 'hired'
+    t.datetime 'hired_employment_state_at'
+    t.datetime 'fired_employment_state_at'
+    t.string   'working_state'
+    t.datetime 'started_working_state_at'
+    t.datetime 'ended_working_state_at'
   end
 
-  create_table "zoos", :force => true do |t|
-    t.string   "name"
-    t.string   "state",                                 :default => 'closed'
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
+  create_table 'zoos', force: true do |t|
+    t.string   'name'
+    t.string   'state',                                 default: 'closed'
+    t.datetime 'created_at',                            null: false
+    t.datetime 'updated_at',                            null: false
   end
 
-  create_table "farms", :force => true do |t|
-    t.string   "name"
-    t.string   "state",                                 :default => 'dirty'
-    t.string   "house_state",                           :default => 'dirty'
-    t.datetime "created_at",                            :null => false
-    t.datetime "updated_at",                            :null => false
+  create_table 'farms', force: true do |t|
+    t.string   'name'
+    t.string   'state',                                 default: 'dirty'
+    t.string   'house_state',                           default: 'dirty'
+    t.datetime 'created_at',                            null: false
+    t.datetime 'updated_at',                            null: false
   end
 
-  create_table "factories", :force => true do |t|
-    t.string "name"
-    t.string "state"
+  create_table 'factories', force: true do |t|
+    t.string 'name'
+    t.string 'state'
   end
-
 end

data/stator.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'activerecord'
+  gem.add_dependency 'activesupport'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stator
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.9.0.beta
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The simplest of ActiveRecord state machines. Intended to be lightweight
   and minimalistic.
 email:
@@ -32,19 +46,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/ar40.gemfile
-- gemfiles/ar41.gemfile
-- gemfiles/ar42.gemfile
-- gemfiles/ar52.gemfile
+- gemfiles/activerecord_5.1.gemfile
+- gemfiles/activerecord_5.1.gemfile.lock
+- gemfiles/activerecord_5.2.gemfile
+- gemfiles/activerecord_5.2.gemfile.lock
+- gemfiles/activerecord_5.gemfile
+- gemfiles/activerecord_5.gemfile.lock
+- gemfiles/activerecord_6.0.gemfile
+- gemfiles/activerecord_6.0.gemfile.lock
+- gemfiles/activerecord_6.1.gemfile
+- gemfiles/activerecord_6.1.gemfile.lock
+- gemfiles/activerecord_7.0.gemfile
+- gemfiles/activerecord_7.0.gemfile.lock
 - lib/stator.rb
 - lib/stator/alias.rb
 - lib/stator/integration.rb
@@ -71,11 +94,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: The simplest of ActiveRecord state machines

data/.travis.yml

@@ -1,41 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.0.0
-  - 2.1.6
-  - 2.2.3
-  - 2.4.5
-  - 2.5.3
-
-gemfile:
-  - gemfiles/ar40.gemfile
-  - gemfiles/ar41.gemfile
-  - gemfiles/ar42.gemfile
-  - gemfiles/ar52.gemfile
-
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/ar42.gemfile
-    - gemfile: gemfiles/ar52.gemfile
-
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/ar52.gemfile
-
-    - rvm: 2.1.6
-      gemfile: gemfiles/ar52.gemfile
-
-    - rvm: 2.2.3
-      gemfile: gemfiles/ar52.gemfile
-
-    - rvm: 2.4.5
-      gemfile: gemfiles/ar40.gemfile
-
-    - rvm: 2.4.5
-      gemfile: gemfiles/ar41.gemfile
-
-    - rvm: 2.5.3
-      gemfile: gemfiles/ar40.gemfile
-
-    - rvm: 2.5.3
-      gemfile: gemfiles/ar41.gemfile

data/gemfiles/ar40.gemfile

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

data/gemfiles/ar41.gemfile

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

data/gemfiles/ar42.gemfile

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

data/gemfiles/ar52.gemfile

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