ceml 0.6.0 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/ceml.gemspec

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

data/lib/ceml/confluence.rb

@@ -19,8 +19,9 @@ module CEML
     end
 
     def best_role_for candidate
+      # puts "confluence finding best role #{object_id} #{candidate[:id]} #{star}"
       winner = @roles_to_cast.max_by{ |role| role.affinity(candidate, star) }
-      winner unless winner[0] == -1
+      winner unless winner.affinity(candidate, star)[0] == -1
     end
 
     def stage_with_candidate candidate
@@ -36,6 +37,7 @@ module CEML
       best_role = best_role_for(candidate)
       candidate[:roles] = best_role.name.to_sym
       best_role.casted << candidate
+      @star ||= candidate
       @dirty = true
     end
 

data/lib/ceml/driver.rb

@@ -21,21 +21,25 @@ module CEML
     end
     alias_method :start, :with_incident
 
+    def log(s)
+      # puts s
+    end
+
     LOCATIONS = Hash.new{ |h,k| h[k] = [] }
     def ping script, candidate
       return unless script.fits? candidate
-      candidate[:ts] = Time.now.utc.to_i
+      candidate[:ts] = CEML.clock
       script_id = script.text_value
 
       locs = LOCATIONS[script_id].group_by{ |l| l.stage_with_candidate(candidate) }
       if locs[:joinable]
-        # puts "joining..."
+        log "joining..."
         first = locs[:joinable].shift
         first.push candidate
         push first.incident_id, nil, candidate
 
       elsif locs[:launchable]
-        # puts "launching..."
+        log "launching..."
         first = locs[:launchable].shift
         first.push candidate
         cast = first.cast
@@ -43,18 +47,18 @@ module CEML
         (locs[:launchable] + (locs[:listable]||[])).each{ |l| l.rm *cast }
 
       elsif locs[:listable]
-        # puts "listing..."
+        log "listing..."
         locs[:listable].each{ |l| l.push candidate }
 
       else
         c = Confluence.new(script)
         case c.stage_with_candidate(candidate)
         when :launchable
-          # puts "start-launching..."
+          log "start-launching..."
           c.push candidate
           push nil, script, candidate
         when :listable
-          # puts "start-listing..."
+          log "start-listing..."
           c.push candidate
           LOCATIONS[script_id] << c
         else raise "what?"

data/lib/ceml/incident.rb

@@ -95,13 +95,12 @@ module CEML
     def finish; true; end
 
     def start_delay seconds
-      this[:continue_at] = Time.now.utc.to_i + seconds
-      cb :delay, seconds
+      this[:continue_at] = CEML.clock + seconds
       true
     end
 
     def complete_delay
-      return false unless Time.now.utc.to_i >= this[:continue_at]
+      return false unless CEML.clock >= this[:continue_at]
       this.delete(:continue_at)
       true
     end

data/lib/ceml/role.rb

@@ -28,7 +28,8 @@ module CEML
         return unless c_ll.distance_to(s_ll, :meters) <= c.radius
       end
       if c.timewindow
-        return unless star.ts - candidate.ts <= c.timewindow
+        # puts "checking timewindow #{c.timewindow} #{candidate[:ts] - star[:ts]}"
+        return unless candidate[:ts] - star[:ts] <= c.timewindow
       end
       return true
     end

data/lib/ceml/script.rb

@@ -1,8 +1,6 @@
 module CEML
   module Script
     extend Forwardable
-    attr_writer :delegate
-    def delegate; @delegate || CEML.delegate; end
 
     # ===========
     # = casting =

data/lib/ceml.rb

@@ -16,8 +16,9 @@ require 'ceml/driver'
 
 module CEML
   extend self
-  attr_accessor :delegate
-  # @delegate = Delegate.new
+  @extra_seconds = 0
+  def clock; Time.now.utc.to_i + @extra_seconds; end
+  def incr_clock(s); @extra_seconds += s; end
 end
 
 module CEML

data/test/test_incident.rb

@@ -86,7 +86,7 @@ class TestIncident < Test::Unit::TestCase
       player :bill, :agent
       told :bill, /hello/
       silent :bill
-      sleep 5
+      CEML.incr_clock 5
       roll
       told :bill, /goodbye/
     end
@@ -112,6 +112,29 @@ class TestIncident < Test::Unit::TestCase
     end
   end
 
+
+  def test_inside_timewindow
+    s = CEML.parse(:script, "await 2 new signups over 10s\ntell signups: thanks")
+    play do
+      ping s, :id => 'fred', :tags => ['new']
+      silent 'fred'
+      CEML.incr_clock 5
+      ping s, :id => 'betty', :tags => ['new']
+      told 'fred', /thanks/
+    end
+  end
+
+  def test_outside_timewindow
+    s = CEML.parse(:script, "await 2 new signups over 10s\ntell signups: thanks")
+    play do
+      ping s, :id => 'fred', :tags => ['new']
+      silent 'fred'
+      CEML.incr_clock 15
+      ping s, :id => 'betty', :tags => ['new']
+      silent 'fred'
+    end
+  end
+
   def test_await
     s = CEML.parse(:script, "await a,b,c\ntell a: foo\ntell b: bar\ntell c: baz")
     play do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-01-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency