yasm 0.0.10 → 0.0.11

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.0.11
+    -- bug fix: now, whether you're finding documents via get, find, or by_*, yasm state will be restored.
+    -- fixed a bug with namespaced action symbols
+    -- fixed a bug with two types of the same state getting loaded on initialization from the database
+
 v0.0.10
   -- you can now access the context from the state
 

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/features/persistance/couchrest_model_persistance.feature

@@ -14,9 +14,15 @@ Feature: CouchRest::Model Persistance
     When I save that context to CouchDB
     Then the states should be saved in the document
 
-  Scenario: Loading state from CouchRest::Model::Base derived classes
+  @focus
+  Scenario Outline: Loading state from CouchRest::Model::Base derived classes
     Given a couchrest model context with state saved in the database
-    When I load that context
+    When I load that context via "<method>"
     Then the states should be restored
     And the states should be fast forwarded
 
+    Examples:
+      |method|
+      |get|
+      |find|
+      |by_user|

data/features/step_definitions/persistence/couchrest_model_persistence_steps.rb

@@ -53,7 +53,10 @@ end
 
 Given /^a couchrest model context with state saved in the database$/ do
   class CouchContext < CouchRest::Model::Base
+    use_database YASM_COUCH_DB
     include Yasm::Context
+    property :user
+    view_by :user
 
     start :couch_state1
   end
@@ -68,16 +71,22 @@ Given /^a couchrest model context with state saved in the database$/ do
   end
   class GoToState2; include Yasm::Action; triggers :couch_state2; end
   class GoToState3; include Yasm::Action; triggers :couch_state3; end
-  @couch_context = CouchContext.new 
+  @couch_context = CouchContext.new :user => "moonmaster9000"
   @couch_context.do! GoToState2
   @state_start_time = @couch_context.state.value.instantiated_at
   @couch_context.save
 end
 
-When /^I load that context$/ do
+When /^I load that context via "([^\"]*)"$/ do |method|
   ten_minutes_from_now = 10.minutes.from_now
   Time.stub(:now).and_return ten_minutes_from_now
-  @couch_context = CouchContext.find @couch_context.id
+ 
+  case method
+    when "get"      then @couch_context = CouchContext.get @couch_context.id
+    when "find"     then @couch_context = CouchContext.find @couch_context.id
+    when "by_user"  then @couch_context = CouchContext.by_user(:key => @couch_context.user).first
+    else raise "Unknown Method!"
+  end
 end
 
 Then /^the states should be restored$/ do

data/lib/yasm/persistence/couchrest_model.rb

@@ -6,14 +6,18 @@ module Yasm
           base.extend GetMethods
           base.before_save :save_yasm_states
           class << base
-            alias_method_chain :get, :load_yasm_states
-            alias_method_chain :find, :load_yasm_states
+            alias_method_chain :create_from_database, :load_yasm_states
           end
         end
         
         module GetMethods
-          def get_with_load_yasm_states(id, db = database)
-            doc = get_without_load_yasm_states id, db
+          def create_from_database_with_load_yasm_states(doc = {})
+            result = create_from_database_without_load_yasm_states doc
+            setup_document_state result
+          end
+          
+          private
+          def setup_document_state(doc)
             doc.class.state_configurations.keys.each do |state_name|
               Yasm::Manager.change_state(
                 :to => doc["yasm"]["states"][state_name.to_s]["class"].to_sym.to_class,
@@ -24,8 +28,6 @@ module Yasm
             doc.fast_forward if doc
             doc
           end
-
-          alias :find_with_load_yasm_states :get_with_load_yasm_states
         end
         
         private
@@ -34,7 +36,7 @@ module Yasm
           self["yasm"]["states"] ||= {}
           self.class.state_configurations.keys.each do |state_name|
             container = state_container state_name
-            self["yasm"]["states"][state_name] = {
+            self["yasm"]["states"][state_name.to_s] = {
               :class => container.value.class.to_s,
               :instantiated_at => container.value.instantiated_at
             }

data/lib/yasm/state.rb

@@ -15,7 +15,7 @@ module Yasm
 
       def is_allowed?(action)
         return true if @allowed_actions.nil?
-        @allowed_actions.include? action.to_sym
+        @allowed_actions.map(&:to_class).include? action.to_class
       end
 
       def final!

metadata

@@ -2,7 +2,7 @@
 name: yasm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Matt Parker