affairs_of_state 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 393e826c50c889d987390c00c48332b5f25b36dacc8977a4b6ae872b031507c0
-  data.tar.gz: 268729f4f4e5d03616028ae9ad663e9333ec77be659c1eb17ff4ba78f9ea44f1
+  metadata.gz: b6e957966743ad1594fb59e99fe593d5caa5cb485e127aa32b6e22a4a3f2ae65
+  data.tar.gz: df9d8acf31cbca9d763b15cecd9fe1d3d0ef6425cd6c8022473225d6b67bc9fc
 SHA512:
-  metadata.gz: b28c839c99db9cf1a7560766f46bda687825c23e6d17c2f20b1246d239990f26a450e5a9350c10f1ea191678b929ecf88c0a389be7620d13f37e26d3d02525eb
-  data.tar.gz: 88a2b5f1cefe5ac0017eeaa9b2c2d480895b51f31497adf049a8ce54dbd3966f3c9e8f472d1b300e9d650c644ca1cb3b67063ddcbf7067e914e21c42d96a05f6
+  metadata.gz: c7c813fce85044e3b2c5b1cd7317445753ba29f27ec81bc77563bccab82ad4296beb031860eaecc1f2b8d261a6a63312a804af7f60d103da7b551a6e542c9d08
+  data.tar.gz: 4669e4abd461e51f2af767f021beed0d18c17eeb484cc41284d54b4895c009d3f6328c8fc125803d2c29bbcef5c29fcc1aeeedbe25e3f5b90dc3c8a856e492fb

data/affairs_of_state.gemspec

@@ -10,18 +10,16 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
+  gem.files         = `git ls-files`.split("\n").reject { |f| f.match?(/gemfiles\/|\.github|\.gitignore|Gemfile\.lock|\.ruby_version|\.gitkeep/) }
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "affairs_of_state"
   gem.require_paths = ["lib"]
   gem.version       = AffairsOfState::VERSION
 
-  gem.add_dependency "activerecord", "~> 6.0"
-  gem.add_dependency "activesupport", "~> 6.0"
-
-  gem.add_development_dependency "rspec", "~> 3.0"
-  gem.add_development_dependency "sqlite3", "~> 1.4.0"
-  gem.add_development_dependency "pry", "~> 0.12.0"
-  gem.add_development_dependency "rake", "~> 12"
+  gem.add_dependency "activerecord", ">= 8.0"
+  gem.add_dependency "activesupport", ">= 8.0"
 
+  gem.add_development_dependency "rspec", ">= 3.0"
+  gem.add_development_dependency "sqlite3", ">= 1.4.0"
+  gem.add_development_dependency "rake", ">= 12"
 end

data/lib/affairs_of_state/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module AffairsOfState
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/spec/affairs_of_state_spec.rb

@@ -2,13 +2,19 @@
 require 'spec_helper'
 
 describe AffairsOfState do
+  def create_class(&block)
+    klass = Class.new(ActiveRecord::Base, &block)
+    klass.table_name = "pies"
+    klass
+  end
+
   describe "with a simple configuration" do
-    class Pie < ActiveRecord::Base
-      affairs_of_state :active, :inactive, :cancelled
+    subject do
+       create_class do
+        affairs_of_state :active, :inactive, :cancelled
+      end
     end
 
-    subject { Pie }
-
     it "should validate the column is set" do
       expect(subject.new(status: nil)).to_not be_valid
     end
@@ -68,14 +74,12 @@ describe AffairsOfState do
   end
 
   describe "with a non-standard column name" do
-    class Pie2 < ActiveRecord::Base
-      self.table_name = "pies"
-
-      affairs_of_state :active, :inactive, column: :super_status
+    subject do
+      create_class do
+        affairs_of_state :active, :inactive, column: :super_status
+      end
     end
 
-    subject { Pie2 }
-
     it "should validate the column is set" do
       expect(subject.new(status: nil, super_status: "active")).to be_valid
     end
@@ -92,58 +96,50 @@ describe AffairsOfState do
   end
 
   describe "without validations" do
-    class Pie3 < ActiveRecord::Base
-      self.table_name = "pies"
-
-      affairs_of_state :active, :inactive, allow_blank: true
+    subject do
+      create_class do
+        affairs_of_state :active, :inactive, allow_blank: true
+      end
     end
 
-    subject { Pie3 }
-
     it "should validate the column is set" do
       expect(subject.new(status: nil)).to be_valid
     end
   end
 
   describe "with an array rather than *args" do
-    class Pie4 < ActiveRecord::Base
-      self.table_name = "pies"
-
-      affairs_of_state [:on, :off]
+    subject do
+      create_class do
+        affairs_of_state [:on, :off]
+      end
     end
 
-    subject { Pie4 }
-
     it "should work too if that's what floats your boat" do
       expect(subject.statuses).to eq(["on", "off"])
     end
   end
 
   describe "without the scopes" do
-    class Pie5 < ActiveRecord::Base
-      self.table_name = "pies"
-
-      affairs_of_state :active, :inactive, scopes: false
+    subject do
+      create_class do
+        affairs_of_state :active, :inactive, scopes: false
+      end
     end
 
-    subject { Pie5 }
-
     it "should not respond if the scopes are not needed" do
       expect(subject).to_not respond_to(:active)
     end
   end
 
   describe "with a conditional proc" do
-    class Pie6 < ActiveRecord::Base
-      self.table_name = "pies"
-
-      affairs_of_state :active, :inactive, if: lambda{|p| p.is_going_to_validate }
+    subject do
+      create_class do
+        affairs_of_state :active, :inactive, if: lambda{|p| p.is_going_to_validate }
 
-      attr_accessor :is_going_to_validate
+        attr_accessor :is_going_to_validate
+      end
     end
 
-    subject { Pie6 }
-
     it "should enforce the validation if the :if param is true" do
       p = subject.new
       p.is_going_to_validate = true
@@ -160,20 +156,18 @@ describe AffairsOfState do
   end
 
   describe "with a conditional method name" do
-    class Pie7 < ActiveRecord::Base
-      self.table_name = "pies"
+    subject do
+      create_class do
+        affairs_of_state :active, :inactive, if: :validation_method?
 
-      affairs_of_state :active, :inactive, if: :validation_method?
+        attr_accessor :is_going_to_validate
 
-      attr_accessor :is_going_to_validate
-
-      def validation_method?
-        self.is_going_to_validate
+        def validation_method?
+          self.is_going_to_validate
+        end
       end
     end
 
-    subject { Pie7 }
-
     it "should enforce the validation if the :if param is true" do
       p = subject.new
       p.is_going_to_validate = true
@@ -191,20 +185,18 @@ describe AffairsOfState do
 
   describe "invalid status name" do
     it "should raise a good warning" do
-      expect(->{ class Pie8 < ActiveRecord::Base ; affairs_of_state :new ; end }).to raise_error(ArgumentError, "Affairs of State: 'new' is not a valid status")
+      expect{ class Pie8 < ActiveRecord::Base ; affairs_of_state :new ; end }.to raise_error(ArgumentError, "Affairs of State: 'new' is not a valid status")
     end
   end
 
   describe "multiple invocations" do
-    class Pie9 < ActiveRecord::Base
-      self.table_name = "pies"
-
-      affairs_of_state :active, :inactive
-      affairs_of_state :moderated, :unmoderated, column: :super_status
+    subject do
+      create_class do
+        affairs_of_state :active, :inactive
+        affairs_of_state :moderated, :unmoderated, column: :super_status
+      end
     end
 
-    subject { Pie9 }
-
     it "declares two status columns" do
       p = subject.new
       p.inactive!
@@ -215,9 +207,7 @@ describe AffairsOfState do
 
     it "raises if called twice on the same column" do
       expect {
-        class Pie10 < ActiveRecord::Base
-          self.table_name = "pies"
-
+        create_class do
           affairs_of_state :active, :inactive
           affairs_of_state :moderated, :unmoderated
         end
@@ -226,9 +216,7 @@ describe AffairsOfState do
 
     it "raises if called twice with the same status in both" do
       expect {
-        class Pie11 < ActiveRecord::Base
-          self.table_name = "pies"
-
+        create_class do
           affairs_of_state :active, :inactive
           affairs_of_state :dormant, :active, column: :super_status
         end
@@ -237,9 +225,7 @@ describe AffairsOfState do
 
     it "raises if collision between prefixes" do
       expect {
-        class Pie12 < ActiveRecord::Base
-          self.table_name = "pies"
-
+        create_class do
           affairs_of_state :admin_active, :admin_inactive
           affairs_of_state :dormant, :active, column: :super_status, prefix: :admin
         end
@@ -270,16 +256,14 @@ describe AffairsOfState do
   end
 
   describe "multiple invocations with prefix" do
-    class Pie13 < ActiveRecord::Base
-      self.table_name = "pies"
-
-      affairs_of_state :active, :inactive
-      affairs_of_state :moderated, :unmoderated, column: :super_status
-      affairs_of_state :positive, :mixed, :negative, column: :sentiment, prefix: :sentiment
+    subject do
+      create_class do
+        affairs_of_state :active, :inactive
+        affairs_of_state :moderated, :unmoderated, column: :super_status
+        affairs_of_state :positive, :mixed, :negative, column: :sentiment, prefix: :sentiment
+      end
     end
 
-    subject { Pie13 }
-
     it "returns the statuses" do
       expect(subject.statuses(:sentiment)).to eq([ "positive", "mixed", "negative" ])
     end
@@ -300,4 +284,25 @@ describe AffairsOfState do
       expect(subject.sentiment_positive).to eq([p])
     end
   end
+
+  describe "with mixed prefix and column" do
+    subject do
+      create_class do
+        affairs_of_state :uploaded, :pending, :blank, column: :avatar_status, prefix: :avatar
+      end
+    end
+
+    it "adds the expected methods" do
+      p = subject.create! avatar_status: "uploaded"
+      expect(p).to be_avatar_uploaded
+      expect(p).to_not be_avatar_pending
+      expect(p).to_not be_avatar_blank
+      p.avatar_pending!
+      expect(p).to be_avatar_pending
+      expect(p).to_not be_avatar_uploaded
+      expect(p).to_not be_avatar_blank
+      p.avatar_blank!
+      expect(p).to be_avatar_blank
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 require "affairs_of_state"
 
-require "pry"
 require "sqlite3"
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run_when_matching :focus
+  # config.raise_errors_for_deprecations!
 end
 
 # Create an AR model to test with
@@ -22,4 +22,5 @@ ActiveRecord::Base.connection.create_table(:pies) do |t|
   t.string :status
   t.string :super_status
   t.string :sentiment
+  t.string :avatar_status
 end

metadata

@@ -1,97 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: affairs_of_state
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Kevin McPhillips
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '12'
 description: Add a simple state to a gem, without all the hassle of a complex state
@@ -102,17 +87,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
 - ".rspec"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - affairs_of_state.gemspec
-- gemfiles/activerecord-6.0.gemfile
-- gemfiles/activerecord-6.1.gemfile
-- gemfiles/activerecord-latest.gemfile
 - lib/affairs_of_state.rb
 - lib/affairs_of_state/active_record_extension.rb
 - lib/affairs_of_state/config.rb
@@ -125,7 +105,6 @@ homepage: http://github.com/kmcphillips/affairs_of_state
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,10 +119,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: You have an Active Record model. It nees to have multiple states, but not
   complex rules. This gem gives you validation, easy check and change methods, and
   a single configuration line.
-test_files: []
+test_files:
+- spec/affairs_of_state_spec.rb
+- spec/config_spec.rb
+- spec/db/.gitkeep
+- spec/spec_helper.rb

data/.github/workflows/ci.yml

@@ -1,25 +0,0 @@
-name: CI
-
-on: [ push, pull_request ]
-
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        gemfile:
-          - "activerecord-6.0.gemfile"
-          - "activerecord-6.1.gemfile"
-          - "activerecord-latest.gemfile"
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.2
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Run tests
-        run: |
-          bundle exec rspec --format doc

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-spec/db/test.sqlite3
-

data/gemfiles/activerecord-6.0.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord', '~> 6.0'

data/gemfiles/activerecord-6.1.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord', '~> 6.1'

data/gemfiles/activerecord-latest.gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: '..'
-
-gem 'activerecord'