maintain 0.2.23 → 0.3.0

data/lib/maintain/value.rb

@@ -88,7 +88,8 @@ module Maintain
                 self == #{value_name.inspect}
               end
             EOC
-            # Calling `method` on ourselves fails. Something to do w/subclasses. Meh.
+            # Calling `method` on ourselves fails. Something to do
+            # w/subclasses. Meh.
             return self == value_name
           when '!'
             self.class.class_eval <<-EOC
@@ -125,7 +126,7 @@ module Maintain
     end
 
     def state_value_for(state, value)
-      if (state.is_a?(String) || state.is_a?(Symbol))
+      if state.is_a?(String) || state.is_a?(Symbol)
         if !state.to_s.strip.empty? && state_hash = @state.states[state.to_sym]
           state_hash[value]
         else
@@ -136,4 +137,4 @@ module Maintain
       end
     end
   end
-end
+end

data/spec/active_record_spec.rb

@@ -1,34 +1,21 @@
 # Some specs to check against ActiveRecord conflicts. Rails tends to blow
 # shit up when you build it outside of Rails. We'll see how this goes...
 
-proceed = false
-begin
-  require 'rubygems'
-  gem 'activerecord', '>= 2.3.5'
-  require 'active_record'
-  require 'logger'
-  proceed = true
-  ActiveRecord::Base.logger = Logger.new(STDOUT)
-  ActiveRecord::Base.logger.level = Logger::Severity::UNKNOWN
-rescue Gem::LoadError, LoadError
-  puts 'Not testing ActiveRecord (unavailable)'
-end
-
-if proceed
-  # Use load to have it evaluate the ActiveRecord::Base extension logic again, in the event
-  # that we've already done that with a previous test.
+active_record_tests = lambda do |version|
+  # Use load to have it evaluate the ActiveRecord::Base extension logic again,
+  # in the event that we've already done that with a previous test.
   load 'maintain.rb'
-  describe Maintain, "ActiveRecord::Base" do
+  describe Maintain, "ActiveRecord::Base version #{version}" do
     it "should automatically be extended" do
       ActiveRecord::Base.should respond_to(:maintain)
     end
 
     before :each do
-      ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:', :pool => 5, :timeout => 5000})
+      ActiveRecord::Base.establish_connection({adapter: 'sqlite3', database: ':memory:', pool: 5, timeout: 5000})
       class ::ActiveMaintainTest < ActiveRecord::Base; end
       silence_stream(STDOUT) do
         ActiveRecord::Schema.define do
-          create_table :active_maintain_tests, :force => true do |t|
+          create_table :active_maintain_tests, force: true do |t|
             t.string :status
             t.integer :permissions
           end
@@ -39,12 +26,12 @@ if proceed
     describe "accessors" do
       before :all do
         ActiveMaintainTest.maintain :status do
-          state :new, :default => true
+          state :new, default: true
           state :old
           state :foo
           state :bar
-          aggregate :everything, :as => [:new, :old, :foo, :bar]
-          aggregate :fakes, :as => [:foo, :bar]
+          aggregate :everything, as: [:new, :old, :foo, :bar]
+          aggregate :fakes, as: [:foo, :bar]
         end
       end
 
@@ -54,7 +41,7 @@ if proceed
       end
 
       it "should allow us to update its status to 'old'" do
-        active_maintain_test = ActiveMaintainTest.new(:status => 'old')
+        active_maintain_test = ActiveMaintainTest.new(status: 'old')
         active_maintain_test.status.should == 'old'
         lambda {
           active_maintain_test.save!
@@ -64,7 +51,7 @@ if proceed
 
       it "should allow us to update statuses using update_attributes" do
         active_maintain_test = ActiveMaintainTest.new
-        active_maintain_test.update_attributes(:status => :bar)
+        active_maintain_test.update_attributes(status: :bar)
         ActiveMaintainTest.first.status.should == :bar
       end
 
@@ -75,66 +62,73 @@ if proceed
       end
 
       it "should return the correct name when told to" do
-        active_maintain_test = ActiveMaintainTest.create(:status => 'old')
+        ActiveMaintainTest.create!(status: 'old')
         ActiveMaintainTest.first.status.name.should == 'old'
       end
+
+      it "sets the value with a bang method" do
+        active_maintain_test = ActiveMaintainTest.create!
+        active_maintain_test.bar!
+        active_maintain_test.save!
+        ActiveMaintainTest.first.status.should == :bar
+      end
     end
 
     describe "bitmasks" do
       before :all do
-        ActiveMaintainTest.maintain :permissions, :bitmask => true do
+        ActiveMaintainTest.maintain :permissions, bitmask: true do
           state :add, 0
           state :delete, 1
           state :foo, 2
           state :bar, 3
 
-          aggregate :everything, :as => [:new, :old, :foo, :bar]
-          aggregate :fakes, :as => [:foo, :bar]
+          aggregate :everything, as: [:new, :old, :foo, :bar]
+          aggregate :fakes, as: [:foo, :bar]
         end
       end
 
       it "should allow me to set a bitmask value" do
-        active_maintain_test = ActiveMaintainTest.create(:permissions => 'add')
-        ActiveMaintainTest.last.permissions.add?.should be_true
+        active_maintain_test = ActiveMaintainTest.create(permissions: 'add')
+        active_maintain_test.permissions.add?.should be_true
       end
 
       it "should allow me to set multiple bitmask values" do
-        active_maintain_test = ActiveMaintainTest.create(:permissions => ['add', 'delete'])
-        ActiveMaintainTest.last.permissions.add?.should be_true
-        ActiveMaintainTest.last.permissions.delete?.should be_true
+        active_maintain_test = ActiveMaintainTest.create(permissions: ['add', 'delete'])
+        active_maintain_test.permissions.add?.should be_true
+        active_maintain_test.permissions.delete?.should be_true
       end
 
       it "should allow me to set a blank string as bitmask values" do
-        active_maintain_test = ActiveMaintainTest.create(:permissions => '')
-        ActiveMaintainTest.last.permissions.should == 0
+        active_maintain_test = ActiveMaintainTest.create(permissions: '')
+        active_maintain_test.permissions.should == 0
       end
 
       it "should allow me to set an empty array as bitmask values" do
-        active_maintain_test = ActiveMaintainTest.create(:permissions => [])
-        ActiveMaintainTest.last.permissions.should == 0
+        active_maintain_test = ActiveMaintainTest.create(permissions: [])
+        active_maintain_test.permissions.should == 0
       end
 
       it "should allow me to set an array with empty strings as bitmask values" do
-        active_maintain_test = ActiveMaintainTest.create(:permissions => [''])
-        ActiveMaintainTest.last.permissions.should == 0
+        active_maintain_test = ActiveMaintainTest.create(permissions: [''])
+        active_maintain_test.permissions.should == 0
       end
     end
 
     describe "hooks" do
       before :all do
         ActiveMaintainTest.maintain :status do
-          state :new, :default => true
+          state :new, default: true
           state :old
           state :foo
           state :bar
-          aggregate :everything, :as => [:new, :old, :foo, :bar]
-          aggregate :fakes, :as => [:foo, :bar]
+          aggregate :everything, as: [:new, :old, :foo, :bar]
+          aggregate :fakes, as: [:foo, :bar]
 
           on :enter, :old, :do_something
           on :exit, :foo, :do_something_else
-          on :enter, :bar, lambda { hello! }, :if => :run_hello?
-          on :exit, :bar, lambda { hello! }, :unless => :run_hello?
-          on :enter, :bar, :show_my_id, :after => true
+          on :enter, :bar, lambda { hello! }, if: :run_hello?
+          on :exit, :bar, lambda { hello! }, unless: :run_hello?
+          on :enter, :bar, :show_my_id, after: true
         end
 
         ActiveMaintainTest.class_eval do
@@ -147,11 +141,11 @@ if proceed
           end
 
           def hello!
-            
+
           end
 
           def run_hello!
-            @run_hello = !@run_hello# ? false : true
+            @run_hello = !@run_hello
           end
 
           def run_hello?
@@ -159,7 +153,7 @@ if proceed
           end
 
           def show_my_id
-            puts id
+            logger.info id
           end
         end
       end
@@ -202,7 +196,7 @@ if proceed
       end
 
       it "should not run the :bar exit hook if run_hello? returns true" do
-        active_maintain_test = ActiveMaintainTest.create(:status => :bar)
+        active_maintain_test = ActiveMaintainTest.create(status: :bar)
         active_maintain_test.run_hello!
         active_maintain_test.run_hello?.should be_true
         active_maintain_test.should_not_receive(:hello!)
@@ -211,7 +205,7 @@ if proceed
       end
 
       it "should run the :bar exit hook if run_hello? returns false" do
-        active_maintain_test = ActiveMaintainTest.create(:status => :bar)
+        active_maintain_test = ActiveMaintainTest.create(status: :bar)
         active_maintain_test.run_hello?.should be_false
         active_maintain_test.should_receive(:hello!)
         active_maintain_test.status = :foo
@@ -219,9 +213,9 @@ if proceed
       end
 
       it "should ONLY run the :bar / :show_my_id exit hook AFTER the record is saved" do
-        active_maintain_test = ActiveMaintainTest.new(:status => :foo)
+        active_maintain_test = ActiveMaintainTest.new(status: :foo)
         active_maintain_test.status = :bar
-        active_maintain_test.should_receive(:puts).with(1)
+        ActiveRecord::Base.logger.should_receive(:info).with(1)
         active_maintain_test.save!
       end
     end
@@ -229,12 +223,12 @@ if proceed
     describe "named_scopes" do
       before :all do
         ActiveMaintainTest.maintain :status do
-          state :new, :default => true
+          state :new, default: true
           state :old
           state :foo
           state :bar
-          aggregate :everything, :as => [:new, :old, :foo, :bar]
-          aggregate :fakes, :as => [:foo, :bar]
+          aggregate :everything, as: [:new, :old, :foo, :bar]
+          aggregate :fakes, as: [:foo, :bar]
         end
       end
 
@@ -250,10 +244,10 @@ if proceed
 
       it "should return the correct collections on aggregates" do
         ActiveMaintainTest.destroy_all
-        one = ActiveMaintainTest.create(:status => :foo)
-        two = ActiveMaintainTest.create(:status => :bar)
-        three = ActiveMaintainTest.create(:status => :new)
-        four = ActiveMaintainTest.create(:status => :old)
+        one = ActiveMaintainTest.create(status: :foo)
+        two = ActiveMaintainTest.create(status: :bar)
+        three = ActiveMaintainTest.create(status: :new)
+        four = ActiveMaintainTest.create(status: :old)
         ActiveMaintainTest.fakes.should == [one, two]
         ActiveMaintainTest.everything.should == [one, two, three, four]
       end
@@ -263,21 +257,39 @@ if proceed
     describe "serialization" do
       before :all do
         ActiveMaintainTest.maintain :status do
-          state :new, :default => true
+          state :new, default: true
           state :old
           state :foo
           state :bar
-          aggregate :everything, :as => [:new, :old, :foo, :bar]
-          aggregate :fakes, :as => [:foo, :bar]
+          aggregate :everything, as: [:new, :old, :foo, :bar]
+          aggregate :fakes, as: [:foo, :bar]
         end
       end
 
       it "should not screw with to_json" do
         foo = ActiveMaintainTest.create
-        json_hash = {:active_maintain_test => {:id => foo.id, :permissions => 0, :status => :new}.stringify_keys}.stringify_keys
+        json_hash = {id: foo.id, permissions: 0, status: :new}.stringify_keys
         foo.as_json.should == json_hash
         json_hash.to_json.should == json_hash.to_json
       end
     end
   end
 end
+
+active_record_versions = ENV["VERSIONS"] && ENV["VERSIONS"].split(",") || %w(2 3 4)
+require 'rubygems'
+active_record_versions.each do |version|
+  begin
+    gem 'activerecord', "< #{version.to_i + 1}"
+    require 'active_record'
+    require 'logger'
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.logger.level = Logger::Severity::UNKNOWN
+    ActiveRecord::Base.include_root_in_json = false
+    puts "Testing ActiveRecord version #{version}"
+    active_record_tests.call(version)
+  rescue Gem::LoadError, LoadError
+    puts "Cannot test ActiveRecord #{version} (unavailable)"
+  end
+end
+

data/spec/bitwise_spec.rb

@@ -12,9 +12,9 @@ describe Maintain do
 
   describe "bitmask", "class methods" do
     it "should allow multiple defaults" do
-      MaintainTest.maintain :permissions, :bitmask => true do
-        state :edit, 1, :default => true
-        state :delete, 2, :default => true
+      MaintainTest.maintain :permissions, bitmask: true do
+        state :edit, 1, default: true
+        state :delete, 2, default: true
         state :update, 3
       end
       @maintainer = MaintainTest.new
@@ -26,7 +26,7 @@ describe Maintain do
 
   describe "bitmask", "instance methods" do
     before :each do
-      MaintainTest.maintain :permissions, :bitmask => true do
+      MaintainTest.maintain :permissions, bitmask: true do
         state :edit, 1
         state :delete, 2
         state :update, 3

data/spec/class_methods_spec.rb

@@ -21,7 +21,7 @@ describe Maintain do
   end
 
   it "should provide a hash of key/value stores in an Integer case, too" do
-    MaintainTest.maintain :state_two, :integer => true do
+    MaintainTest.maintain :state_two, integer: true do
       state :new, 1
       state :overdue, 2
       state :closed, 3
@@ -42,4 +42,4 @@ describe Maintain do
     MaintainTest.foo.should == "foo"
     MaintainTest.maintain_foo.should == [:new, :overdue, :closed]
   end
-end
+end

data/spec/comparing_state_spec.rb

@@ -17,7 +17,7 @@ describe Maintain do
 
       extend Maintain
 
-      maintains :state, :default => :new do
+      maintains :state, default: :new do
         state :new
         state :overdue
         state :closed
@@ -28,7 +28,7 @@ describe Maintain do
   describe "testing" do
     describe "string states" do
       before :each do
-        MaintainTest.maintain :state, :default => :new do
+        MaintainTest.maintain :state, default: :new do
           state :new
           state :overdue
           state :closed
@@ -48,7 +48,7 @@ describe Maintain do
       describe "boolean methods" do
         describe "on the accessor" do
           it "should work" do
-            MaintainTest.maintain :state, :default => :new do
+            MaintainTest.maintain :state, default: :new do
               state :new
               state :overdue
               state :closed
@@ -69,7 +69,7 @@ describe Maintain do
 
         describe "on the class itself" do
           it "should work, too" do
-            MaintainTest.maintain :state, :default => :new do
+            MaintainTest.maintain :state, default: :new do
               state :new
               state :overdue
               state :closed
@@ -81,7 +81,7 @@ describe Maintain do
           end
 
           it "should work with an attribute name prefix, too!" do
-            MaintainTest.maintain :state, :default => :new do
+            MaintainTest.maintain :state, default: :new do
               state :new
               state :overdue
               state :closed
@@ -99,7 +99,7 @@ describe Maintain do
       end
 
       it "greater than method" do
-        MaintainTest.maintain :state, :default => :closed do
+        MaintainTest.maintain :state, default: :closed do
           state :new
           state :overdue
           state :closed
@@ -116,7 +116,7 @@ describe Maintain do
       end
 
       it "greater-than-or-equal-to method" do
-        MaintainTest.maintain :state, :default => :closed do
+        MaintainTest.maintain :state, default: :closed do
           state :new
           state :overdue
           state :closed
@@ -130,7 +130,7 @@ describe Maintain do
       end
 
       it "less-than-or-equal-to method" do
-        MaintainTest.maintain :state, :default => :new do
+        MaintainTest.maintain :state, default: :new do
           state :new
           state :overdue
           state :closed
@@ -147,7 +147,7 @@ describe Maintain do
 
     describe "identity comparison" do
       before :each do
-        MaintainTest.maintain :state, :default => :new do
+        MaintainTest.maintain :state, default: :new do
           state :new, 1
           state :overdue, 2
           state :closed, 3
@@ -172,7 +172,7 @@ describe Maintain do
 
     describe "integer states" do
       before :each do
-        MaintainTest.maintain :state, :default => :new do
+        MaintainTest.maintain :state, default: :new do
           state :new, 1
           state :overdue, 2
           state :closed, 3
@@ -188,7 +188,7 @@ describe Maintain do
       end
 
       it "greater than method" do
-        MaintainTest.maintain :state, :default => :closed do
+        MaintainTest.maintain :state, default: :closed do
           state :new, 1
           state :overdue, 2
           state :closed, 3
@@ -205,7 +205,7 @@ describe Maintain do
       end
 
       it "greater-than-or-equal-to method" do
-        MaintainTest.maintain :state, :default => :closed do
+        MaintainTest.maintain :state, default: :closed do
           state :new, 1
           state :overdue, 2
           state :closed, 3
@@ -219,7 +219,7 @@ describe Maintain do
       end
 
       it "less-than-or-equal-to method" do
-        MaintainTest.maintain :state, :default => :new do
+        MaintainTest.maintain :state, default: :new do
           state :new, 1
           state :overdue, 2
           state :closed, 3
@@ -233,4 +233,4 @@ describe Maintain do
       end
     end
   end
-end
+end