statelogic 1.1 → 1.2

data/CHANGELOG

@@ -1,8 +1,14 @@
+1.2 - 2010-03-16
+- for all defined states also adds named_scopes :"#{attr_name}_is_#{state_name}"
+  for example if state is :new, tries to add named_scope :new (it fails) and then
+  it adds :state_is_new so the named_scope for state :new is still accessible
+  [by Petr Chalupa (http://github.com/pitrch)]
+
 1.1 - 2009-08-11
 - adds finder methods in the form of find_all_#{state}(*args)
 - adds named scope named after corresponding state
 - no longer redefines existing methods with the same names, issues warnings instead
 - forces state names to underscore notation when used as part of method/scope names
 
-0.1.2 - 2009-01-10
-- Support scoping arbitrary callbacks beyond ActiveRecord's
+0.1.2 - 2009-01-10
+- Support scoping arbitrary callbacks beyond ActiveRecord's

data/README.rdoc

@@ -12,6 +12,13 @@ consistency over merely formal... whatever...
 - ???????
 - PROFIT!!!11
 
+=== Changes in v1.2
+_Please review these carefully as they may be incompatible with your existing code._
+- for all defined states also adds named_scopes :"#{attr_name}_is_#{state_name}"
+  for example if state is :new, tries to add named_scope :new (it fails) and then
+  it adds :state_is_new so the named_scope for state :new is still accessible
+  [by Petr Chalupa (http://github.com/pitrch)]
+
 === Changes in v1.1
 _Please review these carefully as they may be incompatible with your existing code._
 - adds finder methods in the form of +find_all_#{state}(*args)+ (Order.find_all_ready) sugg. by ares
@@ -20,7 +27,7 @@ _Please review these carefully as they may be incompatible with your existing co
 - forces state names to underscore notation when used as part of method names
 
 === Installation
-  gem install omg-statelogic --source http://gems.github.com
+  gem install statelogic
 
 Installable as a plugin too.
 
@@ -39,7 +46,7 @@ Please report via Github issue tracking.
         initial_state 'unpaid' do
           transitions_to 'ready', 'suspended' # won't let you change to wrong states
         end
-        state 'ready' do # you get +ready?+, +was_ready?+, +Order.ready+ named scope and +Order.find_all_ready+ finder
+        state 'ready' do # you get +ready?+, +was_ready?+; +Order.ready+, +Order.state_is_ready+; named scopes and +Order.find_all_ready+ finder
           transitions_to 'redeemed', 'suspended'
           validates_presence_of :txref # scoped validations
           before_save :prepare_for_plucking # scoped callbacks
@@ -69,13 +76,13 @@ Please report via Github issue tracking.
                  # for something more specific if it's to be displayed to user.
 
 
+=== Contributors:
+- Petr Chalupa (http://github.com/pitrch)
+
 === See also
 * http://github.com/omg/threadpool -- Thread pool implementation
-* http://github.com/omg/peanuts -- Ruby <-> XML mapping
-
-
-Hint: If you feel like generous today you can tip me at http://tipjoy.com/u/pisuka
-
+* http://github.com/omg/peanuts    -- Ruby <-> XML mapping
+* http://github.com/omg/slash      -- HTTP/REST client
 
 Copyright (c) 2009 Igor Gunko, released under the MIT license
 

data/lib/statelogic/activerecord.rb

@@ -14,7 +14,7 @@ module Statelogic
       c = meta ? cls.metaclass : cls
       unless c.method_defined?(name)
         c.send(:define_method, name, &block)
-        Util.debug { "Statelogic created #{meta ? 'class' : 'instance'} method #{name} on #{cls.name}." }
+        debug { "Statelogic created #{meta ? 'class' : 'instance'} method #{name} on #{cls.name}." }
       else
         warn { "Statelogic won't override #{meta ? 'class' : 'instance'} method #{name} already defined on #{cls.name}." }
         nil
@@ -81,15 +81,16 @@ module Statelogic
           Util.defmethod(@class, "#{uname}?") { send(attr) == name }
           Util.defmethod(@class, "was_#{uname}?") { send(attr_was) == name }
 
-          unless @class.respond_to?(name)
-            @class.send(:named_scope, uname, :conditions => {attr.to_sym => name })
-            Util.debug { "Statelogic has defined named scope #{uname} on #{@class.name}." }
-          else
-            Util.warn { "Statelogic won't override class method #{uname} already defined on #{@class.name}." }
+          [uname, "#{attr}_is_#{uname}".to_sym].each do |named_scope_name|
+            unless @class.respond_to?(named_scope_name)
+              @class.send(:named_scope, named_scope_name, :conditions => {attr.to_sym => name })
+              Util.debug { "Statelogic has defined named scope #{named_scope_name} on #{@class.name}." }
+            else
+              Util.warn { "Statelogic won't override class method #{named_scope_name} already defined on #{@class.name}." }
+            end
           end
 
           Util.defmethod(@class, "find_all_#{uname}", true) {|*args| send(find_all_by_attr, name, *args) }
-
           StateScopeHelper.new(@class, name, @config).instance_eval(&block) if block_given?
 
           @config[:states] << name

data/lib/statelogic.rb

@@ -1 +1 @@
-# undisturbed void
+# undisturbed void

data/test/fixtures/orders.yml

@@ -1,8 +1,9 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
 unpaid:
   state: unpaid
 
+new:
+  state: new
+
 ready:
   state: ready
 

data/test/statelogic_test.rb

@@ -8,11 +8,12 @@ class OrderTest < ActiveSupport::TestCase
 
   fixtures :orders
   
-  should_have_class_methods :unpaid,          :ready,          :redeemed,          :suspended
-  should_have_class_methods :find_all_unpaid, :find_all_ready, :find_all_redeemed, :find_all_suspended
+  should_have_class_methods                 :unpaid,         :ready,          :redeemed,          :suspended
+  should_have_class_methods :state_is_new, :state_is_unpaid, :state_is_ready, :state_is_redeemed, :state_is_suspended
+  should_have_class_methods :find_all_new, :find_all_unpaid, :find_all_ready, :find_all_redeemed, :find_all_suspended
 
-  should_have_instance_methods :unpaid?,     :ready?,     :redeemed?,     :suspended?
-  should_have_instance_methods :was_unpaid?, :was_ready?, :was_redeemed?, :was_suspended?
+  should_have_instance_methods :new?,     :unpaid?,     :ready?,     :redeemed?,     :suspended?
+  should_have_instance_methods :was_new?, :was_unpaid?, :was_ready?, :was_redeemed?, :was_suspended?
 
   context 'Finders and scopes' do
     should 'return adequate shit' do
@@ -28,12 +29,22 @@ class OrderTest < ActiveSupport::TestCase
   context 'A fresh order' do
     subject { Order.new }
 
-    should_allow_values_for :state, 'unpaid'
+    should_allow_values_for :state, 'unpaid', 'new'
     should_not_allow_values_for :state, 'ready', 'redeemed', 'suspended', 'screwed_up',
       :message => default_error_message(:inclusion)
     should_not_require_attributes :txref, :redeemed_at, :facility_id
   end
 
+  context 'A new order' do
+    subject { orders(:new) }
+
+    should_allow_values_for :state, 'redeemed', 'suspended'
+    should_not_allow_values_for :state, 'ready', 'screwed_up',
+      :message => default_error_message(:inclusion)
+    should_validate_presence_of :txref
+    should_not_require_attributes :redeemed_at, :facility_id
+  end
+
   context 'An unpaid order' do
     subject { orders(:unpaid) }
 

data/test/test_helper.rb

@@ -12,7 +12,7 @@ require 'shoulda_macros/statelogic'
 #ActiveRecord::TestFixtures.fixture_path = 'test/fixtures'
 
 ActiveRecord::Base.configurations = {
-  'test' => {:adapter => 'sqlite3', :dbfile => ':memory:'}
+  'test' => {:adapter => 'sqlite3', :database => ':memory:'}
 }
 ActiveRecord::Base.establish_connection(:test)
 

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: statelogic
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Igor Gunko
@@ -9,39 +13,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 +03:00
+date: 2010-03-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 2
         version: 2.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.10.2
-    version: 
+        segments: 
+        - 2
+        - 10
+        - 3
+        version: 2.10.3
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.4
-    version: 
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  type: :development
+  version_requirements: *id003
 description: "    Statelogic does kinda this and that... you know.\n"
 email: tekmon@gmail.com
 executables: []
@@ -58,7 +74,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/statelogic.rb
-- lib/omg-statelogic.rb
 - lib/statelogic/activerecord.rb
 - lib/statelogic/callbacks_ext.rb
 - rails/init.rb
@@ -77,18 +92,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Another state machine for ActiveRecord

data/lib/omg-statelogic.rb

@@ -1 +0,0 @@
-require 'statelogic'