ceml 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/ceml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]

data/lib/ceml/casting_criterion.rb

@@ -2,7 +2,7 @@ require 'geokit'
 require "forwardable"
 
 module CEML
-  class Candidate < Struct.new :uid, :tags, :matchables, :lat, :lng
+  class Candidate < Struct.new :uid, :tags, :matchables, :lat, :lng, :initial_state
     include Geokit::Mappable
     attr_reader :criteria
 
@@ -37,13 +37,18 @@ module CEML
 
     # this method will miss possible castings and does not handle ranges at all
     def cast
-      {}.tap do |casting|
+      [].tap do |casting|
         criteria.each do |c|
           return nil unless folks = hash[c].dup
-          folks -= casting.keys
+          folks -= casting
           return nil unless folks.size >= c.min_match
           c.role_counts.each do |role, minct|
-            folks.shift(minct).each{ |guy| casting[guy.uid] = role.to_sym }
+            folks.shift(minct).each do |guy|
+              guy.initial_state ||= {}
+              guy.initial_state[:id] = guy.uid
+              guy.initial_state[:roles] = role.to_sym
+              casting << guy
+            end
           end
         end
       end

data/lib/ceml/driver.rb

@@ -42,16 +42,13 @@ module CEML
       run incident_id
     end
 
-    # yields a thing with #each and #<<
     def ping script, candidate
       LOCATIONS[script] ||= []
       script.post candidate, LOCATIONS[script]
       LOCATIONS[script].delete_if do |loc|
         next unless loc.cast
         iid = start(script)
-        loc.cast.each do |k, v|
-          post iid, :id => k, :roles => v
-        end
+        loc.cast.each{ |guy| post iid, guy.initial_state }
       end
     end
   end

data/lib/ceml/incident.rb

@@ -42,6 +42,8 @@ module CEML
         instrs = script.instructions_for(roles)
         instrs.each do |inst|
           case inst.cmd
+          when :register
+            bytecode << [:answered_q, inst]
           when :ask
             bytecode << [:ask_q, inst]
             bytecode << [:answered_q, inst]
@@ -63,6 +65,7 @@ module CEML
     end
 
     def expand(role, var)
+      return (this[:qs_answers]||{})[var] if role =~ /^his|her$/
       role = nil if role == 'otherguy'
       role = role.to_sym if role
       @players.each do |p|

data/lib/ceml/tt/instructions.treetop

@@ -3,7 +3,7 @@ grammar Instructions
     include Lexer
 
     rule instruction_stmt
-        (ask_stmt / tell_stmt / assign_stmt) {
+        (ask_stmt / tell_stmt / assign_stmt / register_stmt) {
 
             INTERPOLATE_REGEX = /\|(\w+)\.?(\w+)?\|/
 
@@ -17,15 +17,23 @@ grammar Instructions
 
             def role;  id.text_value.to_sym; end
             def text;  super.text_value; end
-            def var;   (!defined?(:about) || about.empty?) ? nil : about.varname.text_value; end
+            def var
+                return varname.text_value if cmd == :register
+                (!defined?(:about) || about.empty?) ? nil : about.varname.text_value;
+            end
             def key;   var || text; end
             def cmd;
               text_value =~ /^ask/  and return :ask
               text_value =~ /^(tell|assign)/ and return :tell
+              text_value =~ /^register/ and return :register
             end
         }
     end
 
+    rule register_stmt
+        'register' ws id ws varname:id
+    end
+
     rule tell_stmt
         'tell' ws id ':' ws? text
     end

data/test/helper.rb

@@ -12,6 +12,8 @@ class Test::Unit::TestCase
     @iid = script && DRIVER.start(script)
     yield
     CEML::Driver::JUST_SAID.clear
+    CEML::Driver::PLAYERS.clear
+    CEML::Driver::INCIDENTS.clear
   end
 
   def ping s, candidate
@@ -19,7 +21,10 @@ class Test::Unit::TestCase
   end
 
   def says id, str
-    DRIVER.post @iid, :id => id, :received => str
+    iid = CEML::Driver::INCIDENTS.keys.find do |iid|
+      CEML::Driver::PLAYERS[iid].find{ |p| p[:id] == id }
+    end
+    DRIVER.post iid, :id => id, :received => str
   end
 
   def player id, *roles

data/test/test_incident.rb

@@ -8,8 +8,80 @@ ask organizer re target: Describe their appearance and location
 tell agents: Look for |otherguy.target| and compliment them briefly, then move on.
 XXX
 
+JANE_SCRIPT = <<XXX
+
+await 1 new signup
+register signup first_name
+ask signup re shoeless:
+  Hello |his.first_name|. You are Level Zero. Lowly level zero.
+  To advance to Level 1, please remove a shoe. Keep it off,
+  and text back "shoeless".
+tell signup:
+  O ho! Well done |his.first_name|. Now the other players
+  know you're in the game, too. But you're still a sad Level 1.
+ask signup re game:
+  To advance to Level 2, answer this question. What was your
+  favorite game when you were 10 years old? Tell me now.
+tell signup:
+  Ah yes. |his.game| WAS an amazing game. You should try to play
+  it again--sometime this week, perhaps?
+  In the meantime you are but a mere Level 2. Let's see if we can do
+  something about that. (You still have your shoe off, right?)
+ask signup re friend:
+  While you're texting... Pick someone in your address book you
+  haven't talked to in a while. Send them an SMS
+  just to say hello. Then tell me their first name.
+tell signup:
+  That was awfully nice of you to message |his.friend|
+  Welcome to the amazing Level 3. You'll like it here. Stay awhile.
+tell signup:
+  Just kidding. Level 4 is way better than this. To get to
+  Level 4, wait for an appropriate moment in Jane's talk
+  and shout an encouraging "Amen!" Yes. Out loud.
+ask signup re amen:
+  If you're not the spiritual type, a forceful "YEAH!" will do.
+  When you've accomplished your mission, text me "amen".
+tell signup:
+  Wow. I didn't think you had it in you. No one has ever gotten to
+  Level 4 before. This is VERY exciting.
+tell signup:
+  If you get to Level 5, I'll give you a secret password. Tell it to
+  Jane, and you'll get some very fancy loot.
+ask signup re ovation:
+  All you have to do is wait until the end of Jane's talk--and try to
+  spark a standing ovation. Good luck! Text ovation afterward for your
+  password.
+tell signup:
+  You did it! You are Level 5. You are AMAZING. The conquering hero of
+  the entire audience! Now I can give you your password.
+tell signup:
+  Ask Jane to sign a copy of her book to Mr. Gamey McGameful. Of course,
+  this will only work if she saw you standing in that ovation. You were
+  standing, right?
+XXX
+
 class TestIncident < Test::Unit::TestCase
 
+  def test_jane
+    s = CEML.parse(:script, JANE_SCRIPT)
+    play do
+      c = CEML::Candidate.new('fred', ['new'], {})
+      c.initial_state = { :received => 'freddy' }
+      ping s, c
+      asked 'fred', /Hello freddy. You are Level Zero./
+      says 'fred', "shoeless"
+      asked 'fred', /favorite game/
+      says 'fred', "monopoly"
+      asked 'fred', /Pick someone in your address/
+      says 'fred', 'jim'
+      asked 'fred', /forceful/
+      says 'fred', 'okay'
+      asked 'fred', /standing ovation/
+      says 'fred', 'did it'
+      told 'fred', /Gamey/
+    end
+  end
+
   def test_signup_1
     s = CEML.parse(:script, "await 1 new signup\ntell signup: thanks")
     play do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Joe Edelman