stator 0.5.0 → 0.9.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed80bf93083d69f85339e493f1e2512344590bb769481bf35ae56a2d84697805
-  data.tar.gz: fb06422dde19bcd74c2cf9c3dfb2f9dfa506ca922c3a923919d96490eadacc0f
+  metadata.gz: 11dfad97bef44bb60c060b086dce2f327f2fca47d309510337533f31f62e105f
+  data.tar.gz: 578888569b569b4e35c7c180ed3ddfe96ea4547f296394c2c81fbc44bee72105
 SHA512:
-  metadata.gz: 129800a5b02be2a8b2ac2fdc4d038cf7b51f147ad5090731e6de2a272312d01abe58569d462ddf2b51ebc397c3af5fe903ff1aa84588e234a8088a2694b9296d
-  data.tar.gz: 9d36dfc17db1d95e72843c18f4ee7f6392ebfbf3c5bcc3950e2bdd091808a9df2e646e1d5ee6d3532bcbf40772958eef8af2c4cd6e7ae0c1baab8982ee246818
+  metadata.gz: 959635a8a2eebce12473a7f79844e25de1038fe3a1e692fa97e5d1edc430778a3148a4a7b6ca2e488f248c318a19d74fb69c489c28928ff44731c0e3e8319823
+  data.tar.gz: a13fa8a216bc2fd590d1abea7be2eab258a5e29b58c0017314a083938b5c6f6f0acebf3179b5c4cf7b122dbc2a62ba1342bdc0937fed82365ad2b23d49ce3201

data/.github/workflows/build.yml

@@ -3,15 +3,21 @@ on:
   pull_request:
   push:
       branches:
-        - main
+        - master
 jobs:
   build:
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7.5]
+        ruby-version: [2.7.5, 2.7.6]
         experimental: [false]
+        include:
+          - ruby-version: 3.0
+            experimental: true
+          - ruby-version: 3.1
+            experimental: true
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.envrc

data/Appraisals

@@ -1,3 +1,7 @@
+appraise "activerecord-5" do
+  gem "activerecord", "~> 5.0.0"
+end
+
 appraise "activerecord-5.1" do
   gem "activerecord", "~> 5.1.0"
 end

data/Gemfile

@@ -5,6 +5,7 @@ gem 'activerecord', '~> 5.2.8'
 gemspec
 
 gem 'appraisal'
+gem 'debug'
 gem 'activerecord-nulldb-adapter'
 gem 'rake'
 gem 'rspec'

data/gemfiles/activerecord_5.1.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.0"
 gem "appraisal"
+gem "debug"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"

data/gemfiles/activerecord_5.1.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.9.0.beta)
       activerecord
+      activesupport
 
 GEM
   remote: https://rubygems.org/
@@ -26,11 +27,19 @@ GEM
       thor (>= 0.14.0)
     arel (8.0.0)
     concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     minitest (5.16.2)
     rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -56,9 +65,10 @@ DEPENDENCIES
   activerecord (~> 5.1.0)
   activerecord-nulldb-adapter
   appraisal
+  debug
   rake
   rspec
   stator!
 
 BUNDLED WITH
-   2.3.25
+   2.3.16

data/gemfiles/activerecord_5.2.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.2.0"
 gem "appraisal"
+gem "debug"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"

data/gemfiles/activerecord_5.2.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.9.0.beta)
       activerecord
+      activesupport
 
 GEM
   remote: https://rubygems.org/
@@ -26,11 +27,19 @@ GEM
       thor (>= 0.14.0)
     arel (9.0.0)
     concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     minitest (5.16.2)
     rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -56,9 +65,10 @@ DEPENDENCIES
   activerecord (~> 5.2.0)
   activerecord-nulldb-adapter
   appraisal
+  debug
   rake
   rspec
   stator!
 
 BUNDLED WITH
-   2.3.25
+   2.3.16

data/gemfiles/activerecord_5.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+gem "appraisal"
+gem "debug"
+gem "activerecord-nulldb-adapter"
+gem "rake"
+gem "rspec"
+
+gemspec path: "../"

data/gemfiles/activerecord_5.gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: ..
+  specs:
+    stator (0.9.0.beta)
+      activerecord
+      activesupport
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.7.2)
+      activesupport (= 5.0.7.2)
+    activerecord (5.0.7.2)
+      activemodel (= 5.0.7.2)
+      activesupport (= 5.0.7.2)
+      arel (~> 7.0)
+    activerecord-nulldb-adapter (0.4.0)
+      activerecord (>= 2.0.0)
+    activesupport (5.0.7.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.4)
+    concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
+    diff-lcs (1.5.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    minitest (5.16.2)
+    rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.10)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.0)
+  activerecord-nulldb-adapter
+  appraisal
+  debug
+  rake
+  rspec
+  stator!
+
+BUNDLED WITH
+   2.3.16

data/gemfiles/activerecord_6.0.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 6.0.0"
 gem "appraisal"
+gem "debug"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"

data/gemfiles/activerecord_6.0.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.9.0.beta)
       activerecord
+      activesupport
 
 GEM
   remote: https://rubygems.org/
@@ -25,11 +26,19 @@ GEM
       rake
       thor (>= 0.14.0)
     concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     minitest (5.16.2)
     rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -56,9 +65,10 @@ DEPENDENCIES
   activerecord (~> 6.0.0)
   activerecord-nulldb-adapter
   appraisal
+  debug
   rake
   rspec
   stator!
 
 BUNDLED WITH
-   2.3.25
+   2.3.16

data/gemfiles/activerecord_6.1.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.0"
 gem "appraisal"
+gem "debug"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"

data/gemfiles/activerecord_6.1.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.9.0.beta)
       activerecord
+      activesupport
 
 GEM
   remote: https://rubygems.org/
@@ -25,11 +26,19 @@ GEM
       rake
       thor (>= 0.14.0)
     concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     minitest (5.16.2)
     rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -55,9 +64,10 @@ DEPENDENCIES
   activerecord (~> 6.1.0)
   activerecord-nulldb-adapter
   appraisal
+  debug
   rake
   rspec
   stator!
 
 BUNDLED WITH
-   2.3.25
+   2.3.16

data/gemfiles/activerecord_7.0.gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
 gem "appraisal"
+gem "debug"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"

data/gemfiles/activerecord_7.0.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.9.0.beta)
       activerecord
+      activesupport
 
 GEM
   remote: https://rubygems.org/
@@ -24,11 +25,19 @@ GEM
       rake
       thor (>= 0.14.0)
     concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
     diff-lcs (1.5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     minitest (5.16.2)
     rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -53,9 +62,10 @@ DEPENDENCIES
   activerecord (~> 7.0.0)
   activerecord-nulldb-adapter
   appraisal
+  debug
   rake
   rspec
   stator!
 
 BUNDLED WITH
-   2.3.25
+   2.3.16

data/lib/stator/alias.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Stator
   class Alias
+    attr_reader :machine, :name, :namespace, :attr_name, :states, :not, :opposite_args, :constant, :scope
 
     def initialize(machine, name, options = {})
       @machine    = machine
       @name       = name
-      @namespace  = @machine.namespace
-      @full_name  = [@namespace, @name].compact.join('_')
+      @namespace  = machine.namespace
       @states     = []
       @not        = false
       @opposite   = nil
@@ -13,8 +15,12 @@ module Stator
       @scope      = options[:scope]
     end
 
+    def attr_name
+      @attr_name ||= generate_attr_name
+    end
+
     def is(*args)
-      @states |= args.map(&:to_s)
+      @states |= args.map(&:to_sym)
     end
 
     def is_not(*args)
@@ -22,60 +28,75 @@ module Stator
       is(*args)
     end
 
+    alias not? not
+
     def opposite(*args)
-      @opposite = args
+      # set the incoming args for opposite as opposite
+      @opposite_args = args
     end
 
     def evaluate
       generate_methods
 
-      if @opposite
-        op = @machine.state_alias(*@opposite)
+      return if opposite_args.blank?
 
-        op.is(*@states)     if @not
-        op.is_not(*@states) if !@not
-      end
+      # this will generate the alias for the opposite
+      op = machine.state_alias(*opposite_args)
+
+      op.is(*states)     if not?
+      op.is_not(*states) unless not?
     end
 
-    protected
+    private
+
+    def inverse_states
+      (machine.states - states).map(&:to_sym)
+    end
 
     def inferred_constant_name
-      [@full_name.upcase, @machine.field.to_s.pluralize.upcase].join('_')
+      [attr_name.upcase, machine.field.to_s.pluralize.upcase].join('_')
+    end
+
+    def generate_attr_name
+      if namespace == Stator.default_namespace
+        name
+      else
+        [namespace, name].compact.join('_').to_sym
+      end
     end
 
     def generate_methods
+      expected_states = (not? ? inverse_states : states)
 
-      not_states = (@machine.states - @states)
+      if scope
+        name = (scope == true ? attr_name : scope)
 
-      if @scope
-        name = @scope == true ? @full_name : @scope
-        @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-          scope #{name.inspect}, lambda {
-            where(_stator(#{@namespace.inspect}).field => #{(@not ? not_states : @states).inspect})
-          }
+        machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+          scope :#{name}, -> { where(_stator(#{namespace.inspect}).field => #{expected_states}) }
         EV
       end
 
-      if @constant
-        name = @constant == true ? inferred_constant_name : @constant.to_s.upcase
-        if @not
-          @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-            #{name} = #{not_states.inspect}.freeze
+      if constant
+        name = (constant == true ? inferred_constant_name : constant.to_s.upcase)
+
+        if not?
+          machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+            #{name} = #{inverse_states}.freeze
           EV
         else
-          @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-            #{name} = #{@states.inspect}.freeze
+          machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+            #{name} = #{states}.freeze
           EV
         end
       end
 
-      @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-        def #{@full_name}?
-          integration = _stator(#{@namespace.inspect}).integration(self)
-          #{(@not ? not_states : @states).inspect}.include?(integration.state)
+      machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+        def #{attr_name}?
+          integration = _stator_integration(:#{namespace})
+
+          #{expected_states}.include?(integration.state.to_sym)
         end
       EV
     end
-
   end
 end