affairs_of_state 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 71da77675fa54352c44a00554fdde62d56b50881
-  data.tar.gz: d2a0215074c06bc571b51d8b0e918696ec1b027f
+SHA256:
+  metadata.gz: e6950061957896a9e0bf23635b6b97d75c97fd09bf52eb51fa1fb30352842a00
+  data.tar.gz: 8521df3d7183885b795982184e07adb4492a085f2fc46d0457af8f61f16d8f6b
 SHA512:
-  metadata.gz: 777b4d67fde6f03c6ce0320d23ec7879d9dce2f9da70b026d1d70d1c78f8cb15c4c90393e381c46b1fc0935cde20b3f5a6122794fd93b2b81b9a9d08d5bb6b22
-  data.tar.gz: edd41d5cace467b7d629ee7d1596be76491272f6e2f66208a8bb9bb05dcc1ad05f4d10ec4920071a762123b415d834ad2ca9f5715dfe45559ea0297755053083
+  metadata.gz: 637f0bd6245bfc644145f0640fd690231a729b6a6557c034ccf0b8a07582e388335f6e49c9637428c739c4edbf15ccf19d867bb9a45ca87f0fbe5a5412e7f31f
+  data.tar.gz: 9cfb5bff07dea9c39183c89f4469df774dc1470997707eff32b26d725bffa35a7e129dbf72369ef7557b44f0d55b805fce7fe9c8dcec44e5094fc2b88e6ed7e3

data/README.md

@@ -60,6 +60,8 @@ or
 affairs_of_state :active, :inactive, if: :only_validate_if_this_method_returns_true
 ```
 
+Currently it is limited only be called once per model.
+
 
 ## Methods
 

data/affairs_of_state.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "rake"
 
 end

data/lib/affairs_of_state.rb

@@ -1,21 +1,41 @@
+require "active_support"
+require "active_support/concern"
+require "active_record"
+
 require "affairs_of_state/version"
+require "affairs_of_state/config"
 
 module AffairsOfState
   extend ActiveSupport::Concern
 
   class_methods do
-    def affairs_of_state(*args)
-      @_status_options = { column: :status, allow_blank: false, scopes: true, if: nil }.merge(args.extract_options!)
-      @_statuses = args.flatten.map(&:to_s)
+    def affairs_of_state(*statuses, column: :status, allow_blank: false, scopes: true, if: nil)
+      raise ArgumentError.new("Affairs of State: cannot be invoked multiple times on the same model") if @affairs_of_state_config
+
+      affairs_of_state_config.statuses = statuses
+      affairs_of_state_config.column = column
+      affairs_of_state_config.allow_blank = allow_blank
+      affairs_of_state_config.scopes = scopes
+      affairs_of_state_config.if = binding.local_variable_get(:if)
+
+      const_set(:STATUSES, affairs_of_state_config.statuses)
+
+      affairs_of_state_config.statuses.each do |status|
+        define_method("#{ status }?") do
+          self.send(self.class.affairs_of_state_config.column) == status
+        end
 
-      const_set("STATUSES", @_statuses)
+        define_method("#{ status }!") do
+          self.send("#{ self.class.affairs_of_state_config.column }=", status)
+          self.save
+        end
+      end
 
-      validates(@_status_options[:column], inclusion: { in: @_statuses, allow_blank: @_status_options[:allow_blank] }, if: @_status_options[:if])
+      validates(affairs_of_state_config.column, inclusion: { in: affairs_of_state_config.statuses, allow_blank: affairs_of_state_config.allow_blank }, if: affairs_of_state_config.if)
 
-      if @_status_options[:scopes]
-        @_statuses.each do |status|
-          raise ArgumentError.new("Affairs of State: '#{ status }' is not a valid status") unless valid_status?(status)
-          self.scope status.to_sym, -> { where(@_status_options[:column] => status.to_s) }
+      if affairs_of_state_config.scopes
+        affairs_of_state_config.statuses.each do |status|
+          self.scope(status.to_sym, -> { where(affairs_of_state_config.column => status) })
         end
       end
 
@@ -25,41 +45,21 @@ module AffairsOfState
       true
     end
 
-    private
-
-    def valid_status?(status)
-      ![:new].include?(status.to_sym)
+    def affairs_of_state_config
+      @affairs_of_state_config ||= AffairsOfState::Config.new
     end
   end
 
   module InstanceMethods
-    def method_missing(method, *args)
-      if self.class::STATUSES.map{ |s| "#{ s }?".to_sym }.include?(method)
-        self.class.send(:define_method, method) do
-          self.status == method.to_s.gsub(/\?$/, "")
-        end
-
-        send(method)
-
-      elsif self.class::STATUSES.map{ |s| "#{ s }!".to_sym }.include?(method)
-        self.class.send(:define_method, method) do
-          self.send("#{ self.class.instance_variable_get('@_status_options')[:column] }=", method.to_s.gsub(/\!$/, ""))
-          self.save
-        end
-
-        send(method)
-      else
-        super
-      end
-    end
   end
 
   module SingletonMethods
     def statuses_for_select
-      @_statuses.map{ |s| [s.humanize, s] }
+      affairs_of_state_config.statuses.map{ |s| [s.humanize, s] }
     end
   end
-
 end
 
-ActiveRecord::Base.send :include, AffairsOfState
+ActiveSupport.on_load(:active_record) do
+  ::ActiveRecord::Base.send :include, AffairsOfState
+end

data/lib/affairs_of_state/config.rb

@@ -0,0 +1,16 @@
+module AffairsOfState
+  class Config
+    attr_accessor :column, :allow_blank, :scopes, :if
+    attr_reader :statuses
+
+    def statuses=(val)
+      @statuses = val.flatten.map(&:to_s)
+
+      @statuses.each do |status|
+        raise ArgumentError.new("Affairs of State: '#{ status }' is not a valid status") if ["new"].include?(status)
+      end
+
+      @statuses
+    end
+  end
+end

data/lib/affairs_of_state/version.rb

@@ -1,3 +1,3 @@
 module AffairsOfState
-  VERSION = "0.2.0"
+  VERSION = "0.4.1"
 end

data/spec/affairs_of_state_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe AffairsOfState do
-
   describe "with a simple configuration" do
     class Pie < ActiveRecord::Base
       affairs_of_state :active, :inactive, :cancelled
@@ -71,6 +70,16 @@ describe AffairsOfState do
     it "should validate the column is set" do
       expect(Pie2.new(status: nil, super_status: "active")).to be_valid
     end
+
+    it "should know the accessors" do
+      expect(Pie2.new(status: nil, super_status: "inactive").inactive?).to be(true)
+    end
+
+    it "should know the setters" do
+      instance = Pie2.create!(status: nil, super_status: "inactive")
+      expect(instance.active!).to be(true)
+      expect(instance.super_status).to eq("active")
+    end
   end
 
   describe "without validations" do
@@ -167,4 +176,14 @@ describe AffairsOfState do
     end
   end
 
+  describe "multiple invocations" do
+    it "raises an error" do
+      expect(->{
+        class Pie9 < ActiveRecord::Base
+          affairs_of_state :not_important
+          affairs_of_state :something
+        end
+      }).to raise_error(ArgumentError, "Affairs of State: cannot be invoked multiple times on the same model")
+    end
+  end
 end

data/spec/config_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe AffairsOfState::Config do
+  subject{ AffairsOfState::Config.new }
+
+  describe "accessors" do
+    let(:expected){ double }
+
+    it "has :column" do
+      subject.column = expected
+      expect(subject.column).to eq(expected)
+    end
+
+    it "has :allow_blank" do
+      subject.allow_blank = expected
+      expect(subject.allow_blank).to eq(expected)
+    end
+
+    it "has :scopes" do
+      subject.scopes = expected
+      expect(subject.scopes).to eq(expected)
+    end
+
+    it "has :if" do
+      subject.if = expected
+      expect(subject.if).to eq(expected)
+    end
+  end
+
+  describe "#statuses=" do
+    it "converts to string" do
+      subject.statuses = [:a, :b]
+      expect(subject.statuses).to eq(["a", "b"])
+    end
+
+    it "flattens" do
+      subject.statuses = ["a", [:b]]
+      expect(subject.statuses).to eq(["a", "b"])
+    end
+
+    it "makes sure no invalid statuses are allowed" do
+      expect(->{
+        subject.statuses = [:new]
+      }).to raise_error(ArgumentError, "Affairs of State: 'new' is not a valid status")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
-require 'active_record'
-require 'active_support/all'
-require 'affairs_of_state'
-require 'pry'
+require "affairs_of_state"
+
+require "pry"
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: affairs_of_state
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: Add a simple state to a gem, without all the hassle of a complex state
   machine.
 email:
@@ -101,8 +115,10 @@ files:
 - gemfiles/activerecord42.gemfile
 - gemfiles/activerecord50.gemfile
 - lib/affairs_of_state.rb
+- lib/affairs_of_state/config.rb
 - lib/affairs_of_state/version.rb
 - spec/affairs_of_state_spec.rb
+- spec/config_spec.rb
 - spec/db/.gitkeep
 - spec/spec_helper.rb
 homepage: http://github.com/kmcphillips/affairs_of_state
@@ -124,14 +140,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.4
 signing_key: 
 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:
-- spec/affairs_of_state_spec.rb
-- spec/db/.gitkeep
-- spec/spec_helper.rb
+test_files: []