stateology 0.1.8 → 0.2.0

data/CHANGELOG

@@ -1,4 +1,5 @@
-
+13-6-09
+* now supports ruby 1.9.1 and ruby 1.8.6
 
 3-12-08
 * nested states now supported

data/README.markdown

@@ -117,12 +117,11 @@ In the above the string "hello" is passed as a parameter to the state\_entry() m
 
 * The #state method can accept either a Symbol (e.g :Happy) or a Module (e.g Happy or Sample::Happy). The following are equivalent:
 s.state :Happy #=> change state to Happy
+s.state Sample::Happy #=> equivalent to above (note the fully qualified name; as Happy is a module defined under the Sample class)
 
 * The #state method can take a block; the block will be executed after the successful change of state:
 e.g s.state(:Happy) { s.hello }    #=> hello method invoked immediately after change of state as it's in the block
 
-s.state Sample::Happy #=> equivalent to above (note the fully qualified name; as Happy is a module defined under the Sample class)
-
 * alternatively; if the #state method is invoked internally by another instance method of the Sample class then a fully qualified module name is not required:
 state Happy #=> Fully qualified module name not required when #state invoked in an instance method
 

data/lib/stateology.rb

@@ -1,6 +1,7 @@
 # stateology.rb
 # (C) John Mair 2008
 # This program is distributed under the terms of the MIT License
+# now supports BOTH ruby 1.8.6 and ruby 1.9.1
 
 begin
     require 'rubygems'
@@ -11,7 +12,7 @@ end
 require 'mixology'
 
 module Stateology
-    VERSION = "0.1.8"
+    VERSION = "0.2.0"
 
     # alternative to 'nil'
     Default = nil
@@ -21,18 +22,25 @@ module Stateology
         c.extend(SM_Class_Methods)
     end
 
+
     # class methods
     module SM_Class_Methods
         def state(name, &block)
+            
+            if RUBY_VERSION =~ /1.9/
+                    pram = [false]
+                else
+                    pram = []
+            end
 
             # if const is defined here then module_eval
-            if constants.include?(name.to_s) && const_defined?(name) then
+            if const_defined?(name, *pram) then
                 self.module_eval(&block)
             else
 
                 m = Module.new
                 # if the state is defined further up the chain then "inherit it"
-                if constants.include?(name.to_s) && !const_defined?(name) then
+                if constants.include?(name) || constants.include?(name.to_s) then
                     # if constant not defined here then must be inherited
                     inherited_state = const_get(name)
 
@@ -50,7 +58,7 @@ module Stateology
 
     # strip the class path and return just the constant name, i.e Hello::Fren -> Fren
     def __elided_class_path(sym)
-        "#{sym}".split(/::/).last.intern
+        sym.to_s.split(/::/).last.to_sym
     end
 
     def __sym_to_mod(sym)
@@ -58,8 +66,9 @@ module Stateology
     end
 
     def __mod_to_sym(mod)
+        
         # weird case where module does not have name (i.e when a state created on the eigenclass)
-        if mod.name == "" then
+        if mod.name == nil || mod.name == "" then
             class << self; self; end.constants.each do |v|
                 return v.to_sym if __sym_to_mod(v.to_sym) == mod
             end
@@ -72,13 +81,19 @@ module Stateology
     # is state_name a nested state?
     def __nested_state?(new_state)
 
+        if RUBY_VERSION =~ /1.9/
+            pram = [false]
+        else
+            pram = []
+        end
+
         # test is:
         # (1) are we currently in a state? (non nil)
         # (2) is the new state a state? (non nil)
         # (3) is the new state defined under the current state? (i.e it's nested)
         __current_state &&
             new_state &&
-            __current_state.const_defined?(__elided_class_path(__mod_to_sym(new_state)))
+            __current_state.const_defined?(__elided_class_path(__mod_to_sym(new_state)), *pram)
     end
 
     # instance methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stateology
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors: 
 - John Mair
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-03 00:00:00 +13:00
+date: 2009-06-13 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency