ceml 0.7.4 → 0.7.5

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/ceml.gemspec

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

data/lib/ceml/casting_statement.rb

@@ -7,7 +7,10 @@ module CEML
     def roles_to_cast(script)
       return [] unless type == :await
       roles.list.map do |r|
-        c = Criteria.new(r.qualifiers, [], radius ? [:city] : [], radius, timewindow)
+        matching = []
+        matching << matching_text if matching_text
+        matching += [:city] if radius
+        c = Criteria.new(r.qualifiers, [], matching, radius, timewindow)
         Role.new r.name, c, r.min..r.max, []
       end
     end
@@ -30,6 +33,15 @@ module CEML
       modifiers.elements.select{ |m| m.respond_to? :duration }.first
     end
 
+    def with_matching_phrase
+      return if modifiers.empty?
+      modifiers.elements.select{ |m| m.respond_to? :thing }.first
+    end
+
+    def matching_text
+      with_matching_phrase && with_matching_phrase.thing.text_value
+    end
+
     def timewindow
       over_phrase && over_phrase.duration.seconds
     end

data/lib/ceml/driver.rb

@@ -17,6 +17,12 @@ module CEML
       INCIDENTS[id] ||= CEML::Incident.new to_bytecode(script), id if script
       raise "no incident #{id}" unless INCIDENTS[id]
       yield INCIDENTS[id], PLAYERS[id], metadata if block_given?
+
+      PLAYERS[id].select{ |p| p[:released] }.each do |p|
+        release p
+        ping_all p[:script_collection_id], p
+      end
+
       id
     end
     alias_method :start, :with_incident
@@ -48,15 +54,24 @@ module CEML
       SCRIPTS[script_collection_id].each{ |s| release script_collection_id, s.roles_to_cast, candidate }
     end
 
+    def release p
+      p[:tags] -= ['new']
+      if p[:released] =~ /^(\w+)=/
+        p[:tags].delete_if{ |t| t =~ /^#{$1}=/ }
+      end
+      p[:tags] += [p[:released]]
+      [:pc, :roles, :released].each{ |sym| p.delete(sym) }
+      (p[:matchables]||={}).update (p[:qs_answers]||{})
+    end
 
-    def launch script_collection_id, roleset, *cast
+    def launch id, script_collection_id, roleset, *cast
       script = SCRIPTS[script_collection_id].select{ |s| s.roles_to_cast == roleset }.sort_by{ rand }.first
       unless script
         rolesets = SCRIPTS[script_collection_id].map(&:roles_to_cast)
         raise "matching roleset not found: #{roleset.inspect} in #{rolesets.inspect}"
       end
       log "launching #{script.bytecode.inspect} with cast #{cast.inspect}"
-      push nil, script.bytecode, *cast
+      push id, script.bytecode, *cast
     end
 
 
@@ -69,29 +84,34 @@ module CEML
       return unless roleset.any?{ |r| r.fits? candidate }
       candidate[:ts] = CEML.clock
       already_launched_with = nil
+      run_after = []
 
       with_confluences script_collection_id, roleset do |confluences|
-        live_with = confluences.select{ |c| c.live_with?(candidate) }
-        if not live_with.empty?
-          already_launched_with = live_with.first.incident_id
-          live_with.each{ |c| c.rm candidate } if involvement != :sticky
-          break if involvement != :released
-        end
+        already_launched_with = nil
+        # live_with = confluences.select{ |c| c.live_with?(candidate) }
+        # if not live_with.empty?
+        #   already_launched_with = live_with.first.incident_id
+        #   live_with.each{ |c| c.rm candidate } if involvement != :sticky
+        #   break if involvement != :released
+        # end
 
         locs = confluences.group_by{ |l| l.stage_with_candidate(candidate) }
         if locs[:joinable]
           log "joining..."
           first = locs[:joinable].shift
           first.push candidate unless first.incident_id == already_launched_with
-          push first.incident_id, nil, candidate     # JOIN THEM
+          # JOIN THEM
+          run_after << [:push, first.incident_id, nil, candidate]
 
         elsif locs[:launchable]
           log "launching..."
           first = locs[:launchable].shift
           first.push candidate
           cast = first.cast
-          first.incident_id = launch script_collection_id, roleset, *cast
+          first.incident_id = gen_code
           (locs[:launchable] + (locs[:listable]||[])).each{ |l| l.rm *cast }
+          # LAUNCH
+          run_after << [:launch, first.incident_id, script_collection_id, roleset, *cast]
 
         elsif locs[:listable]
           log "listing..."
@@ -103,7 +123,8 @@ module CEML
           if c.stage_with_candidate(candidate) == :launchable
             log "start-launching..."
             c.push candidate
-            c.incident_id = launch script_collection_id, roleset, candidate
+            c.incident_id = gen_code
+            run_after << [:launch, c.incident_id, script_collection_id, roleset, candidate]
           else
             c.push candidate
           end
@@ -112,10 +133,14 @@ module CEML
         confluences.delete_if(&:over?)
       end
 
-      if already_launched_with and involvement == :sticky
-        puts "PUSHING INSTEAD"
-        push already_launched_with, nil, candidate
+      run_after.each do |cmd|
+        send(*cmd)
       end
+
+      # if already_launched_with and involvement == :sticky
+      #   puts "PUSHING INSTEAD"
+      #   push already_launched_with, nil, candidate
+      # end
     end
 
     def push incident_id, script, *updated_players
@@ -164,21 +189,5 @@ module CEML
     # def player_start(data, what)
     #   puts "STARTED #{data[:player].inspect}"
     # end
-
-    def player_released(data, tag)
-      p = data[:player].dup
-      p[:tags] -= ['new']
-      if tag =~ /^(\w+)=/
-        p[:tags].delete_if{ |t| t =~ /^#{$1}=/ }
-      end
-      p[:tags] += [tag]
-      p.delete :pc
-      p.delete :roles
-      data[:player][:released] = true
-      # data[:players].delete_if{ |pl| pl[:id] == p[:id] }
-      puts "released: #{p.inspect} with #{tag}"
-      # puts "remaining players: #{data[:players].inspect}"
-      ping_all p[:script_collection_id], p, true
-    end
   end
 end

data/lib/ceml/incident.rb

@@ -28,22 +28,30 @@ module CEML
     def run(players, &blk)
       @players = players
       @callback = blk
-      puts "playing with #{@players.map{|p|p[:id]}}"
-      :loop while @players.any? do |thing|
-        @this = thing
-        next if thing[:released]
-        puts "trying #{@this[:id]}"
-        puts "not yet released"
-        next unless instr = seq[pc]
-        instr = instr.dup
-        if rolematch(instr.shift)
-          instr << role_info if instr.first == :start  #tmp hack
-          next unless send(*instr)
-          cb(*instr)
+
+      loop do
+        players = @players.select{ |p| !p[:released] }
+        # puts "playing with #{players.map{|p|p[:id]}}"
+        advanced = false
+        players.each do |p|
+          @this = p
+          # puts "trying #{@this[:id]}"
+          next unless instr = seq[pc]
+          instr = instr.dup
+          if not rolematch(instr.shift)
+            this[:pc]+=1
+            advanced = true
+          else
+            instr << role_info if instr.first == :start  #tmp hack
+            next unless send(*instr)
+            cb(*instr)
+            this[:pc]+=1
+            advanced = true
+          end
         end
-        # next if @this[:released]
-        this[:pc]+=1
+        break unless advanced
       end
+
       @callback = @players = nil
     end
 
@@ -171,6 +179,7 @@ module CEML
 
     def release x
       return true if x[:cond] and not expectation(*x[:cond])
+      this[:released] = x[:tag]
       cb :released, x[:tag]
       false
     end

data/lib/ceml/role.rb

@@ -41,7 +41,10 @@ module CEML
       return true unless star
       c = criteria
       if c.matching
-        return unless c.matching.all?{ |g| candidate[:matchables][g] == star[:matchables][g] }
+        return unless c.matching.all? do |g|
+          candidate[:matchables][g] && star[:matchables][g] &&
+          candidate[:matchables][g].downcase.strip == star[:matchables][g].downcase.strip
+        end
       end
       if c.radius
         c_ll = Geokit::LatLng(candidate[:lat], candidate[:lng])

data/test/test_release.rb

@@ -44,40 +44,13 @@ await 1 new signup
 ask signup re first_name:
  Thanks for signing up for Infatuated!
  What's your first name?
-ask signup re couple:
- Do you have an Infatuated Match Card you want to use?
- (These are available at the Infatuated table on the first floor.)
-release signup as stage=couple if yes
-ask signup re tags:
- Who are you and who are you looking for tonight? (text back one: w4w, w4m, m4m, or m4w)
-
-await stage=couple player
-ask player re code:
+ask signup re code:
  Type in your Infatuated Match Card code now.
-release player as stage=coded
-
-await 1 stage=coded alpha and 1 stage=coded beta with matching code
-release alpha as alpha
-release beta as beta
-
-await 1 w4w alpha and 1 w4w beta
-release alpha as alpha
-release beta as beta
-
-await 1 w4m alpha and 1 m4w beta
-release alpha as alpha
-release beta as beta
-
-await 1 m4m alpha and 1 m4m beta
-release alpha as alpha
-release beta as beta
-
-await 1 m4w alpha and 1 w4m beta
-release alpha as alpha
-release beta as beta
+release signup as coded
 
-await 1 alpha alpha, 1 beta beta over 5 minutes
-tell both: Your date has started, |her.first_name|, |buddy.first_name|
+await 1 coded alpha and 1 coded beta with matching code
+tell alpha: You are alpha |her.first_name|, beta is |buddy.first_name|
+tell beta: You are beta |her.first_name|, alpha is |buddy.first_name|
 XXXX
 
 
@@ -88,18 +61,17 @@ XXXX
       ping f, :id => 'Jon',  :tags => ['new']
       asked 'Sara', /Thanks/
       says 'Sara', 'Sara'
-      asked 'Sara', /Match Card/
-      says 'Sara', 'y'
+
       asked 'Jon',  /Thanks/
       says 'Jon',  'Jon'
+
+      asked 'Sara', /Match Card/
       asked 'Jon',  /Match Card/
-      says 'Jon',  'y'
-      asked 'Sara', /code now/
       says 'Sara', 'xyzzy'
-      asked 'Jon', /code now/
       says 'Jon', 'xyZZy '
-      told 'Sara', /started, Sara, Jon/
-      told 'Jon', /started, Jon, Sara/
+
+      told 'Sara', /alpha Sara, beta is Jon/
+      told 'Jon', /beta Jon, alpha is Sara/
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Joe Edelman