james 0.0.11-universal-darwin-10 → 0.0.12-universal-darwin-10

data/lib/james/state_api.rb

@@ -38,8 +38,8 @@ module James
     # Example for staying in the same state:
     #   hear 'What time is it?' # Implicitly staying.
     #
-    # Note: We could expand on this with
-    #   hear 'What time is it?' => lambda { Do something here with the time, returns to same state }
+    # Example for staying in the same state and doing something:
+    #   hear 'What time is it?' => ->() { "I'm staying in the same state" }
     #
     def hear transitions
       transitions = { transitions => name } unless transitions.respond_to?(:to_hash)
@@ -58,6 +58,12 @@ module James
       @exit_block = block
     end
 
+    #
+    #
+    def transition &block
+      
+    end
+
     # By default, a state is not chainable.
     #
     def chainable?

data/lib/james/state_internals.rb

@@ -29,6 +29,9 @@ module James
     def __exit__
       @exit_block && context.instance_eval(&@exit_block)
     end
+    def __transition__ &block
+      context.instance_eval &block
+    end
 
   end
 

data/lib/james/visitor.rb

@@ -8,6 +8,9 @@ module James
   # Note: A visitor should generally be very stupid.
   # Note 2: We could call this Hearing, or Ear ;)
   #
+  # TODO Add a timer which resets the state to the
+  #      initial state.
+  #
   class Visitor
 
     attr_reader   :initial, :timer
@@ -46,7 +49,7 @@ module James
     def transition phrase
       state_or_lambda = current.next_for phrase
       if state_or_lambda.respond_to?(:call)
-        state_or_lambda.call # Don't transition.
+        current.__transition__ &state_or_lambda # Don't transition.
       else
         self.current = state_or_lambda
       end

data/spec/integration/test_dialogue_spec.rb

@@ -36,22 +36,6 @@ describe 'TestDialogue' do
         visitor.hear('stay') {}
         visitor.current.name.should == :first
       end
-      it 'calls the entrance/exits correctly' do
-        dialogue.should_receive(:respond_to?).once.with(:enter_second).and_return true
-        dialogue.should_receive(:enter_second).once
-
-        dialogue.should_receive(:respond_to?).once.with(:exit_second).and_return true
-        dialogue.should_receive(:exit_second).once
-
-        dialogue.should_receive(:respond_to?).once.with(:enter_first).and_return true
-        dialogue.should_receive(:enter_first).once
-
-        dialogue.should_receive(:respond_to?).once.with(:exit_first).and_return true
-        dialogue.should_receive(:exit_first).once
-
-        visitor.hear 'go'
-        visitor.hear 'back'
-      end
     end
   end
   

data/spec/lib/james/dialogue_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 #
+require File.expand_path '../../../../lib/james/state_api', __FILE__
 require File.expand_path '../../../../lib/james/dialogue_api', __FILE__
 require File.expand_path '../../../../lib/james/dialogue_internals', __FILE__
 require File.expand_path '../../../../lib/james/builtin/core_dialogue', __FILE__
@@ -44,6 +45,29 @@ describe James::Dialogue do
     end
   end
   
+  describe 'hear with lambda' do
+    let(:dialogue) do
+      class Test
+        include James::Dialogue
+        
+        def initialize
+          @bla = 'some bla'
+        end
+        
+        state :test do
+          hear 'bla' => ->(){ @bla }
+        end
+      end
+      Test.new
+    end
+    it "is instance eval'd" do
+      test_state = dialogue.state_for :test
+      test_state.hear 'bla' do |result|
+        result.should == 'some bla'
+      end
+    end
+  end
+  
   describe 'initialization' do
     it 'can be included' do
       expect do

metadata

@@ -2,14 +2,14 @@
 name: james
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.11
+  version: 0.0.12
 platform: universal-darwin-10
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-15 00:00:00 +10:00
+date: 2011-05-17 00:00:00 +10:00
 default_executable: james
 dependencies:
 - !ruby/object:Gem::Dependency