ceml 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/ceml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]
-  s.date = %q{2011-01-09}
+  s.date = %q{2011-01-17}
   s.description = %q{a language for coordinating real world events}
   s.email = %q{joe@citizenlogistics.com}
   s.extra_rdoc_files = [
@@ -31,11 +31,10 @@ Gem::Specification.new do |s|
      "examples/breakfast-exchange.ceml",
      "examples/citizen-investigation.ceml",
      "examples/high-fives.ceml",
-     "examples/sample_delegate.rb",
      "lib/ceml.rb",
      "lib/ceml/casting_criterion.rb",
      "lib/ceml/casting_statement.rb",
-     "lib/ceml/delegate.rb",
+     "lib/ceml/driver.rb",
      "lib/ceml/incident.rb",
      "lib/ceml/instruction_statements.rb",
      "lib/ceml/script.rb",
@@ -60,8 +59,7 @@ Gem::Specification.new do |s|
      "test/test_casting.rb",
      "test/test_incident.rb",
      "test/test_instructions.rb",
-     "test/test_scripts.rb",
-     "examples/sample_delegate.rb"
+     "test/test_scripts.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/ceml/driver.rb

@@ -0,0 +1,58 @@
+require 'set'
+
+module Kernel
+  def gen_code(size = 8)
+    rand(36**size).to_s(36)
+  end
+end
+
+module CEML
+  class Driver
+    LOCATIONS = {}
+    PLAYERS   = {}
+    INCIDENTS = {}
+    JUST_SAID = {}
+
+    def start(script)
+      x = CEML::Incident.new script
+      iid = x.id
+      INCIDENTS[iid] = x
+      PLAYERS[iid] = []
+      iid
+    end
+
+    def run(incident_id)
+      INCIDENTS[incident_id].run(PLAYERS[incident_id]) do |player, meth, what|
+        case meth
+        when :said
+          JUST_SAID[player[:id]] = what
+          puts "Said #{what.inspect}"
+        end
+      end
+    end
+
+    def post incident_id, player
+      player_id = player[:id]
+      player[:roles] = Set.new([*player[:roles]]) if player[:roles]
+      if existing_player = PLAYERS[incident_id].find{ |p| p[:id] == player_id }
+        existing_player.update player
+      else
+        PLAYERS[incident_id] << player
+      end
+      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
+      end
+    end
+  end
+end

data/lib/ceml/incident.rb

@@ -2,40 +2,37 @@ require 'set'
 
 module CEML
   class Incident
-    attr_reader :script, :id, :players
-    def this;       @players[@current_id]; end
+    attr_reader :script, :id, :this
     def roles;      this[:roles] ||= Set.new; end
     def got;        this[:received];   end
     def recognized; this[:recognized]; end
     def pc;         this[:pc] ||= 0;   end
     def qs_answers; this[:qs_answers] ||= Hash.new; end
 
-    def initialize(script, cast = {}, id = rand(36**10).to_s(36))
+    def handled!
+      this.delete :received
+      this.delete :recognized
+    end
+
+    def initialize(script, id = rand(36**10).to_s(36))
       @id = id
       @script = Script === script ? script : CEML.parse(:script, script)
-      run do
-        cast.each{ |guy,role| add guy, role }
-      end
     end
 
-    def add(id, *roles)
-      obj = Hash === roles[-1] ? roles.pop : {}
-      @players[id] = obj.merge :roles => Set.new(roles)
+    def cb *stuff
+      @callback.call this, *stuff if @callback
     end
 
-    def run
-      CEML.delegate.with_players(@id) do |players|
-        @players = players
-        yield self if block_given?
-        :loop while players.keys.any? do |@current_id|
-          # puts "seq for roles: #{roles.inspect} #{seq.inspect}"
-          # puts "trying: #{@current_id}: #{seq[pc]}"
-          next unless seq[pc] and send(*seq[pc])
-          CEML.delegate.send(*seq[pc] + [@iid, @current_id])
-          this[:pc]+=1
-        end
-        @players = nil
+    def run(players, &blk)
+      @players = players
+      @callback = blk
+      :loop while players.any? do |@this|
+        # puts "seq for roles: #{roles.inspect} #{seq.inspect}"
+        next unless seq[pc] and send(*seq[pc])
+        cb(*seq[pc])
+        this[:pc]+=1
       end
+      @callback = @players = nil
     end
 
     def seq
@@ -65,18 +62,13 @@ module CEML
       end
     end
 
-    def say x, params = {}
-      this[:said] = x
-      this.merge! params
-    end
-
     def expand(role, var)
       role = nil if role == 'otherguy'
       role = role.to_sym if role
-      @players.each do |key, thing|
-        next if key == @current_id
-        next if role and not thing[:roles].include? role
-        value = (thing[:qs_answers]||{})[var] and return value
+      @players.each do |p|
+        next if p == this
+        next if role and not p[:roles].include? role
+        value = (p[:qs_answers]||{})[var] and return value
       end
       nil
     end
@@ -85,6 +77,10 @@ module CEML
     # = basic flow =
     # ==============
 
+    def say x, params = {}
+      cb :said, params.merge(:said => x)
+    end
+
     def start
       # roles.include? :agent or return false
       true
@@ -99,6 +95,7 @@ module CEML
     def answered_q q
       got or return false
       qs_answers[q.key] = got
+      handled!
       true
     end
 
@@ -118,9 +115,11 @@ module CEML
       got or return false
       if recognized == :done
         say :ok
+        handled!
         true
       else
-        CEML.delegate.send :did_report
+        cb :did_report
+        handled!
         false
       end
     end

data/lib/ceml/script.rb

@@ -9,12 +9,10 @@ module CEML
     # ===========
 
     # public
-    def post candidate
+    def post candidate, locs
       return unless candidate = candidate.dup.load(awaited_criteria)
-      delegate.with_locations(self) do |locs|
-        locs.each{ |l| l.push candidate }
-        locs << CastingLocation.create(self, candidate) if locs.none?(&:added)
-      end
+      locs.each{ |l| l.push candidate }
+      locs << CastingLocation.create(self, candidate) if locs.none?(&:added)
     end
 
     def awaited_criteria

data/lib/ceml.rb

@@ -9,14 +9,14 @@ require 'ceml/tt/casting'
 require 'ceml/tt/instructions'
 require 'ceml/tt/scripts'
 
-require 'ceml/delegate'
 require 'ceml/casting_criterion'
 require 'ceml/incident'
+require 'ceml/driver'
 
 module CEML
   extend self
   attr_accessor :delegate
-  @delegate = Delegate.new
+  # @delegate = Delegate.new
 end
 
 module CEML

data/test/helper.rb

@@ -6,47 +6,40 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'ceml'
 
 class Test::Unit::TestCase
+  DRIVER = CEML::Driver.new
+
   def play script = nil
-    @e = CEML::Incident.new(script) if script
+    @iid = script && DRIVER.start(script)
     yield
-    CEML::Delegate::PLAYERS.clear
+    CEML::Driver::JUST_SAID.clear
+  end
+
+  def ping s, candidate
+    DRIVER.ping s, candidate
+  end
+
+  def says id, str
+    DRIVER.post @iid, :id => id, :received => str
   end
 
   def player id, *roles
-    @e.run do |script|
-      script.add id, *roles
-    end
+    DRIVER.post @iid, :id => id, :roles => roles
   end
 
   def asked id, rx
-    assert g = CEML::Delegate::PLAYERS.values.find{ |game| game[id] }
-    p = g[id]
+    assert p = CEML::Driver::JUST_SAID[id]
     assert_equal :ask, p[:said]
     assert_match rx, p[:q]
-    p.delete :said
+    CEML::Driver::JUST_SAID.delete id
   end
 
   def silent id
-    if g = CEML::Delegate::PLAYERS.values.find{ |game| game[id] }
-      p = g[id]
-      assert !p[:msg]
-    end
+    assert !CEML::Driver::JUST_SAID[id]
   end
 
   def told id, rx
-    assert g = CEML::Delegate::PLAYERS.values.find{ |game| game[id] }
-    p = g[id]
+    assert p = CEML::Driver::JUST_SAID[id]
     assert_match rx, p[:msg]
-    p.delete :said
-  end
-
-  def says id, str
-    @e.run do |incident|
-      incident.players[id][:received] = str
-    end
-
-    CEML.delegate.with_players(@e.id) do |players|
-      players[id][:received] = nil
-    end
+    CEML::Driver::JUST_SAID.delete id
   end
 end

data/test/test_casting.rb

@@ -71,7 +71,7 @@ class TestCasting < Test::Unit::TestCase
 
   def test_radius
     assert_equal 600, pcs("gather 3 runners and 5 hot_babes within 3 blocks").radius
-    assert pcs("gather 3 runners and 5 hot_babes").radius > 50000
+    assert !pcs("gather 3 runners and 5 hot_babes").radius
   end
 
 end

data/test/test_incident.rb

@@ -8,22 +8,12 @@ ask organizer re target: Describe their appearance and location
 tell agents: Look for |otherguy.target| and compliment them briefly, then move on.
 XXX
 
-ASKCHAIN_SCRIPT = <<XXX
-"Meet your neighbor"
-gather 2 players within 1 block
-ask players re color: what's your favorite color?
-ask players re observation: find someone near you with the color |otherguy.color|. what are they wearing?
-ask players re rightmatch: are you wearing |otherguy.observation|?
-ask players re task: take your new partner and see if you can find something beautiful in the park.
-XXX
-
-
 class TestIncident < Test::Unit::TestCase
 
   def test_signup_1
     s = CEML.parse(:script, "await 1 new signup\ntell signup: thanks")
     play do
-      s.post CEML::Candidate.new('fred', ['new'], {})
+      ping s, CEML::Candidate.new('fred', ['new'], {})
       told 'fred', /thanks/
     end
   end
@@ -31,11 +21,11 @@ class TestIncident < Test::Unit::TestCase
   def test_signup_2
     s = CEML.parse(:script, "await 2 new signups\ntell signups: thanks")
     play do
-      s.post CEML::Candidate.new('fred', ['new'], {})
+      ping s, CEML::Candidate.new('fred', ['new'], {})
       silent 'fred'
-      s.post CEML::Candidate.new('wilma', ['old'], {})
+      ping s, CEML::Candidate.new('wilma', ['old'], {})
       silent 'fred'
-      s.post CEML::Candidate.new('betty', ['new'], {})
+      ping s, CEML::Candidate.new('betty', ['new'], {})
       told 'fred', /thanks/
     end
   end
@@ -43,12 +33,12 @@ class TestIncident < Test::Unit::TestCase
   def test_await
     s = CEML.parse(:script, "await a,b,c\ntell a: foo\ntell b: bar\ntell c: baz")
     play do
-      s.post CEML::Candidate.new('fred', [], {})
+      ping s, CEML::Candidate.new('fred', [], {})
       silent 'fred'
-      s.post CEML::Candidate.new('wilma', [], {})
+      ping s, CEML::Candidate.new('wilma', [], {})
       silent 'fred'
       silent 'wilma'
-      s.post CEML::Candidate.new('betty', [], {})
+      ping s, CEML::Candidate.new('betty', [], {})
       told 'fred', /foo/
       told 'betty', /baz/
     end
@@ -66,6 +56,16 @@ class TestIncident < Test::Unit::TestCase
     end
   end
 
+ASKCHAIN_SCRIPT = <<XXX
+"Meet your neighbor"
+gather 2 players within 1 block
+ask players re color: what's your favorite color?
+ask players re observation: find someone near you with the color |otherguy.color|. what are they wearing?
+ask players re rightmatch: are you wearing |otherguy.observation|?
+ask players re task: take your new partner and see if you can find something beautiful in the park.
+XXX
+
+
   def test_askchain
     play ASKCHAIN_SCRIPT do
       player :joe, :players, :agent

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 -08:00
+date: 2011-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,11 +53,10 @@ files:
 - examples/breakfast-exchange.ceml
 - examples/citizen-investigation.ceml
 - examples/high-fives.ceml
-- examples/sample_delegate.rb
 - lib/ceml.rb
 - lib/ceml/casting_criterion.rb
 - lib/ceml/casting_statement.rb
-- lib/ceml/delegate.rb
+- lib/ceml/driver.rb
 - lib/ceml/incident.rb
 - lib/ceml/instruction_statements.rb
 - lib/ceml/script.rb
@@ -107,4 +106,3 @@ test_files:
 - test/test_incident.rb
 - test/test_instructions.rb
 - test/test_scripts.rb
-- examples/sample_delegate.rb

data/examples/sample_delegate.rb

@@ -1,4 +0,0 @@
-class CEMLDelegate
-  def locations(script)
-  end
-end

data/lib/ceml/delegate.rb

@@ -1,28 +0,0 @@
-module Kernel
-  def gen_code(size = 8)
-    rand(36**size).to_s(36)
-  end
-end
-
-module CEML
-  class Delegate
-    LOCATIONS = {}
-    PLAYERS   = {}
-
-    # yields thing w. #keys, #each, #[], #[]=
-    def with_players id
-      yield PLAYERS[id] ||= {}
-    end
-
-    # yields a thing with #each and #<<
-    def with_locations script
-      yield LOCATIONS[script] ||= []
-      LOCATIONS[script].delete_if{ |loc| loc.cast and Incident.new(script, loc.cast).run }
-    end
-
-    def method_missing(meth, *args, &blk)
-      puts "#{meth}: #{args.map(&:to_s).join(', ')}"
-    end
-
-  end
-end