affairs_of_state 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82cee7ae333311fa7e78ad67e2dadf4519588278
-  data.tar.gz: c9e55851f6777e1c0db00e04752b620537cfdf4f
+  metadata.gz: 71da77675fa54352c44a00554fdde62d56b50881
+  data.tar.gz: d2a0215074c06bc571b51d8b0e918696ec1b027f
 SHA512:
-  metadata.gz: 9a6113b5f54561f269db052207e4cdc352495ff90af4919422b16704db46b9c3da3898f41dd8660b68dab77fc7db6be71d523f374bc81bbd7088522bcfc527d7
-  data.tar.gz: 207c299cae44330886c9ba4a93dbbff7a1d1d15eb119d05ebbff8153957a56df780ea01ad855e77846a76e68cf7f05f9decc0ad4ad1e5479d172de4d3fe2bd4d
+  metadata.gz: 777b4d67fde6f03c6ce0320d23ec7879d9dce2f9da70b026d1d70d1c78f8cb15c4c90393e381c46b1fc0935cde20b3f5a6122794fd93b2b81b9a9d08d5bb6b22
+  data.tar.gz: edd41d5cace467b7d629ee7d1596be76491272f6e2f66208a8bb9bb05dcc1ad05f4d10ec4920071a762123b415d834ad2ca9f5715dfe45559ea0297755053083

data/.travis.yml

@@ -1,6 +1,21 @@
 language: ruby
+script: bundle exec rspec
+sudo: false
 rvm:
-  - "1.9.3"
-  - "2.0.0"
   - "2.1.0"
-script: bundle exec rspec
+  - "2.2.2"
+  - "2.3.1"
+
+gemfile:
+- Gemfile
+- gemfiles/activerecord40.gemfile
+- gemfiles/activerecord41.gemfile
+- gemfiles/activerecord42.gemfile
+- gemfiles/activerecord50.gemfile
+
+matrix:
+  exclude:
+    - rvm: "2.1.0"
+      gemfile: Gemfile
+    - rvm: "2.1.0"
+      gemfile: gemfiles/activerecord50.gemfile

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/kmcphillips/affairs_of_state.png?branch=master)](https://travis-ci.org/kmcphillips/affairs_of_state)
 
-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.
+You have an Active Record model. It nees to have multiple states, boolean convenience methods, simple validation, but not complex rules. This gem gives you this in a single line class method.
 
 ## Installation
 
@@ -12,13 +12,7 @@ Add this line to your application's Gemfile:
 gem 'affairs_of_state'
 ```
 
-And then execute:
-
-```ruby
-$ bundle
-```
-
-Or install it yourself as:
+Or install it with:
 
 ```ruby
 $ gem install affairs_of_state
@@ -29,7 +23,7 @@ $ gem install affairs_of_state
 The gem assumes you have a string column named `status` on your model:
 
 ```ruby
-add_column :model_name, :status, :default => "active"
+add_column :model_name, :status, default: "active"
 ```
 
 Then you just list your states in the model:
@@ -41,13 +35,13 @@ affairs_of_state :active, :inactive
 If you'd like to use another column, lets say `state`, pass it in as a configuration option:
 
 ```ruby
-affairs_of_state :active, :inactive, :column => :state
+affairs_of_state :active, :inactive, column: :state
 ```
 
 You can also turn off validation:
 
 ```ruby
-affairs_of_state :active, :inactive, :allow_blank => true
+affairs_of_state :active, :inactive, allow_blank: true
 ```
 
 Or give it a long list of statuses:
@@ -59,9 +53,11 @@ affairs_of_state :ordered, :cancelled, :shipped, :lost, :in_transit
 You can also pass a proc or a method name symbol to the :if option to bypass validation:
 
 ```ruby
-affairs_of_state :active, :inactive, :if => lambda{|object| only_validate_if_this_is_true(object) }
-# or
-affairs_of_state :active, :inactive, :if => :only_validate_if_this_method_returns_true
+affairs_of_state :active, :inactive, if: ->(object) { only_validate_if_this_is_true(object) }
+```
+or
+```ruby
+affairs_of_state :active, :inactive, if: :only_validate_if_this_method_returns_true
 ```
 
 
@@ -114,6 +110,6 @@ rspec
 
 ## The usual
 
-Author: Kevin McPhillips - github@kevinmcphillips.ca
+By Kevin McPhillips (github@kevinmcphillips.ca)
 
-License: [MIT](http://opensource.org/licenses/MIT)
+[MIT License](http://opensource.org/licenses/MIT)

data/affairs_of_state.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = AffairsOfState::VERSION
 
-  gem.add_dependency "activerecord", "> 3.0"
+  gem.add_dependency "activerecord", ">= 4.0"
+  gem.add_dependency "activesupport", ">= 4.0"
 
-  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "rspec"
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "pry"
 

data/gemfiles/activerecord40.gemfile

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

data/gemfiles/activerecord41.gemfile

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

data/gemfiles/activerecord42.gemfile

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

data/gemfiles/activerecord50.gemfile

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

data/lib/affairs_of_state.rb

@@ -1,29 +1,27 @@
 require "affairs_of_state/version"
 
 module AffairsOfState
+  extend ActiveSupport::Concern
 
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
+  class_methods do
     def affairs_of_state(*args)
-      @_status_options = ({:column => :status, :allow_blank => false, :scopes => true, :if => nil}).merge(args.extract_options!)
+      @_status_options = { column: :status, allow_blank: false, scopes: true, if: nil }.merge(args.extract_options!)
       @_statuses = args.flatten.map(&:to_s)
 
       const_set("STATUSES", @_statuses)
 
-      validates(@_status_options[:column], :inclusion => {:in => @_statuses, :allow_blank => @_status_options[:allow_blank]}, :if => @_status_options[:if])
+      validates(@_status_options[:column], inclusion: { in: @_statuses, allow_blank: @_status_options[:allow_blank] }, if: @_status_options[:if])
 
       if @_status_options[:scopes]
         @_statuses.each do |status|
-          raise "Affairs of State: '#{ status }' is not a valid status" unless valid_status?(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) }
         end
       end
 
       include InstanceMethods
       extend SingletonMethods
+
       true
     end
 
@@ -36,20 +34,20 @@ module AffairsOfState
 
   module InstanceMethods
     def method_missing(method, *args)
-      if self.class::STATUSES.map{|s| "#{s}?".to_sym }.include?(method)
+      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
+        send(method)
 
-      elsif self.class::STATUSES.map{|s| "#{s}!".to_sym }.include?(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.send("#{ self.class.instance_variable_get('@_status_options')[:column] }=", method.to_s.gsub(/\!$/, ""))
           self.save
         end
 
-        send method
+        send(method)
       else
         super
       end
@@ -58,7 +56,7 @@ module AffairsOfState
 
   module SingletonMethods
     def statuses_for_select
-      @_statuses.map{|s| [s.humanize, s]}
+      @_statuses.map{ |s| [s.humanize, s] }
     end
   end
 

data/lib/affairs_of_state/version.rb

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

data/spec/affairs_of_state_spec.rb

@@ -163,7 +163,7 @@ 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("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
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'active_support/all'
 require 'affairs_of_state'
 require 'pry'
 
@@ -6,13 +7,12 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 end
 
-
 ## Create an AR model to test with
 I18n.enforce_available_locales = false
 
 ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => "#{File.expand_path(File.join(File.dirname(__FILE__), '..'))}/spec/db/test.sqlite3"
+  adapter: "sqlite3",
+  database: "#{File.expand_path(File.join(File.dirname(__FILE__), '..'))}/spec/db/test.sqlite3"
 )
 
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'pies'")

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: affairs_of_state
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Kevin McPhillips
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +96,10 @@ files:
 - README.md
 - Rakefile
 - affairs_of_state.gemspec
+- gemfiles/activerecord40.gemfile
+- gemfiles/activerecord41.gemfile
+- gemfiles/activerecord42.gemfile
+- gemfiles/activerecord50.gemfile
 - lib/affairs_of_state.rb
 - lib/affairs_of_state/version.rb
 - spec/affairs_of_state_spec.rb
@@ -107,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: You have an Active Record model. It nees to have multiple states, but not