state_attr 0.1.12 → 0.1.13

data/lib/state_attr/state.rb

@@ -5,11 +5,20 @@ module StateAttr
       def initialize(parent, field, machine, logger, options)
         @parent = parent
         @field = field
-        #convert different types of input to array of symbols
+        @options = options
+        groups = @options[:groups] || {}
         @machine = {}
-        machine.each { |key, value| @machine[key] = value.nil? ? [nil] : Array(value).map(&:to_sym) }
+        #convert different types of input to array of symbols
+        machine.each { |key, value|
+          @machine[key] = if value.nil?
+            [nil]
+          elsif groups.keys.include? value
+            Array(groups[value]).map(&:to_sym)
+          else
+            Array(value).map(&:to_sym)
+          end
+        }
         @logger = logger
-        @options = options
         @callback = "on_#{@field}_change".to_sym
       end
 
@@ -34,7 +43,8 @@ module StateAttr
 
       # array of allowed stated
       def allowed
-        @machine[read_state] || []
+        result = @machine[read_state] || []
+        result
       end
 
       #validate if can switch to given state

data/state_attr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "state_attr"
-  s.version = "0.1.12"
-  s.date = "2011-05-16"
+  s.version = "0.1.13"
+  s.date = "2011-06-29"
   s.summary = "Minimalistic state machine approach allowing multiple state attributes at the same time."
   s.email = "mpapis@gmail.com"
   s.homepage = "http://github.com/mpapis/state_attr/tree/master"

data/test/unit/state_attr_test.rb

@@ -17,6 +17,18 @@ class FakeModel < ActiveRecord::Base
     nil => :g,
     :g => :h,
   }
+
+  state_attr :group_state, {
+    nil => :a,
+    :a => :all,
+  }, :groups => {
+    :all => %w( a b c d)
+  }
+  
+#  state_attr :state_initial, {
+#    :a => [:b, :c],
+#    :b => :c,
+#  }, :initial => :a
 end
 
 class StateAttrTest < Test::Unit::TestCase
@@ -76,4 +88,16 @@ class StateAttrTest < Test::Unit::TestCase
     assert model.state2.allowed?(:d)
     assert model.state2.allowed?(:e)
   end
+  def test_group
+    model = FakeModel.new
+    assert_equal [:a], model.group_state.allowed
+    model.group_state.switch(:a)
+    assert_equal [:a,:b,:c,:d], model.group_state.allowed
+  end
+#  def test_state_initial
+#    model = FakeModel.new
+#    assert_equal :a, model.state_initial.value
+#    model.state_initial.switch(:b)
+#    assert_equal :b, model.state_initial.value
+#  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: state_attr
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Michal Papis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 +02:00
+date: 2011-06-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Minimalistic state machine approach allowing multiple state attributes at the same time.