cheeky-dreams 0.0.5 → 0.0.6

data/README.rdoc

@@ -2,6 +2,10 @@
 
 Description goes here.
 
+
+# http://www.krazydad.com/makecolors.php
+
+
 == Contributing to cheeky-dreams
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/cheeky-dreams.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cheeky-dreams"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["simon"]
@@ -27,9 +27,9 @@ Gem::Specification.new do |s|
     "VERSION",
     "cheeky-dreams.gemspec",
     "lib/cheeky-dreams.rb",
+    "samples/fade-to-throb.rb",
     "spec/cheeky-dreams_spec.rb",
     "spec/off.rb",
-    "spec/small-test.rb",
     "spec/spec_helper.rb",
     "spec/support/collecting_auditor.rb",
     "spec/support/stub_driver.rb",

data/lib/cheeky-dreams.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'set'
 
 module CheekyDreams
   
@@ -47,13 +48,13 @@ module CheekyDreams
     end
   end
 
-  class FilteringAuditor
-    def initialize auditor, including
-      @auditor, @including = auditor, Set.new(including)
+  class ForwardingAuditor
+    def initialize rules
+      @rules = rules
     end
     
     def audit type, message
-      @auditor.audit(type, message) if @including.include?(type)
+      @rules[type].audit(type, message) if @rules.has_key?(type)
     end
   end
 
@@ -72,8 +73,28 @@ module CheekyDreams
     end
   end
   
-  def filtering including, auditor
-    FilteringAuditor.new auditor, including
+  AuditEvent = Struct.new(:type, :message)
+  
+  class SuppressDuplicatesAuditor
+    def initialize auditor
+      @auditor, @audits = auditor, Set.new
+    end
+    
+    def audit type, message
+      event = AuditEvent.new type, message
+      unless @audits.include?(event)
+        @auditor.audit(type, message)
+        @audits << event
+      end
+    end
+  end
+  
+  def suppress_duplicates auditor
+    SuppressDuplicatesAuditor.new auditor
+  end
+  
+  def forward rules
+    ForwardingAuditor.new rules
   end
   
   def audit_to *auditors
@@ -136,17 +157,30 @@ module CheekyDreams
     Effects::FadeTo.new to, steps, freq
   end
 
-  def func freq = 1, &block
-    Effects::Func.new freq, &block
+  def func &block
+    Effects::Func.new &block
   end
 
   def throb freq, from, to
     Effects::Throb.new freq, from, to
   end
   
-  def crazy freq = 1, new_effect_freq = 2
+  def throbbing colour, freq = 10
+    rgb_colour = rgb(colour)
+    Effects::Throb.new freq, rgb_colour, [max(rgb_colour[0] - 200, 0), max(rgb_colour[1] - 200, 0), max(rgb_colour[2] - 200, 0)]
+  end
+  
+  def max a, b
+    a > b ? a : b
+  end
+  
+  def crazy freq = 10, new_effect_freq = 10
   	Effects::Crazy.new(freq, new_effect_freq)
   end
+  
+  def light_show *effects
+    Effects::LightShow.new effects
+  end
    
   module Dev
     class Null
@@ -190,24 +224,36 @@ module CheekyDreams
     class Effect
       include CheekyDreams    
       include Math
+    end
+    
+    class LightShow < Effect
+      def initialize effects
+        @effects, @current, @last_freq = effects, nil, nil
+      end
       
-      attr_reader :freq
-      
-      def initialize freq
-        @freq = freq
+      def next current_colour = nil
+        @current = @effects.delete_at(0) unless @current
+        colour, freq = @current.next current_colour
+        if (freq == 0 && !@effects.empty?)
+          @current = @effects.delete_at(0)
+        elsif (freq == 0 && @effects.empty?)
+          @last_freq = 0
+        else
+          @last_freq = freq
+        end
+        [colour, @last_freq]
       end
     end
     
     class Throb2 < Effect      
       def initialize freq, amplitude, centre
-        super freq
-        @amplitude, @centre, @count = amplitude, centre, 1
+        @freq, @amplitude, @centre, @count = freq, amplitude, centre, 1
       end
       
       def next current_colour
-        x = freq * (@count += 1)
+        x = @freq * (@count += 1)
         v = sin(x) * @amplitude + @centre
-        [v, 0, 0]
+        [[v, 0, 0], @freq]
       end
     end
 
@@ -215,7 +261,7 @@ module CheekyDreams
       attr_reader :r_amp, :r_centre, :g_amp, :g_centre, :b_amp, :b_centre
             
       def initialize freq, from, to
-        super freq
+        @freq = freq
         @r_centre, @r_amp = centre_and_amp from[0], to[0]
         @g_centre, @g_amp = centre_and_amp from[1], to[1]
         @b_centre, @b_amp = centre_and_amp from[2], to[2]
@@ -233,7 +279,7 @@ module CheekyDreams
         # [v, 0, 0]
         
         @count += 1
-        [r.floor, g.floor, b.floor]
+        [[r.floor, g.floor, b.floor], @freq]
       end
       
       private 
@@ -242,65 +288,57 @@ module CheekyDreams
         centre = max(from, to) - amp
         [centre, amp]
       end
-      
-      def max a, b
-        a > b ? a : b
-      end
     end
 
     class Crazy < Effect 
 			def initialize freq, new_effect_freq
-				super freq
-				@new_effect_freq = new_effect_freq
-        @count, @effect = 0, nil
+				@freq, @new_effect_freq = freq, new_effect_freq
+        @count, @fade = 0, nil
 			end
 
 			def next current_colour
 				if @count % @new_effect_freq == 0
-					@effect = FadeTo.new([rand(255), rand(255), rand(255)], @new_effect_freq, freq)
+					@fade = FadeTo.new([rand(255), rand(255), rand(255)], @new_effect_freq, @freq)
 			  end
 				@count += 1
-				@effect.next current_colour
+				[@fade.next(current_colour)[0], @freq]
 			end
     end
     
     class Func < Effect
-      def initialize freq, &block
-        super freq
+      def initialize &block
         @block = block
       end
       
       def next current_colour = nil
-        rgb(@block.yield(current_colour))
+        colour, freq = @block.yield(current_colour)
+        [rgb(colour), freq]
       end
     end
     
     class Solid < Effect
       def initialize colour
-        super 0.1
         @rgb = rgb(colour)
       end
       
       def next current_colour = nil
-        @rgb
+        [@rgb, 0]
       end
     end
     
     class Cycle < Effect
       def initialize colours, freq
-        super freq
-        @cycle = colours.cycle
+        @freq, @cycle = freq, colours.cycle
       end
       
       def next current_colour = nil
-        rgb(@cycle.next)
+        [rgb(@cycle.next), @freq]
       end
     end
     
     class Fade < Effect
       def initialize from, to, steps, freq
-        super freq
-        @rgb_from, @rgb_to = rgb(from), rgb(to)
+        @freq, @rgb_from, @rgb_to = freq, rgb(from), rgb(to)
         @fade = [@rgb_from]
         (1..(steps-1)).each { |i| @fade << rgb_between(@rgb_from, @rgb_to, i / steps.to_f) }
         @fade << @rgb_to
@@ -308,23 +346,22 @@ module CheekyDreams
       end
       
       def next current_colour = nil
-        return @rgb_to if @index >= @fade.length
+        return [@rgb_to, 0] if @index >= @fade.length
         next_colour = @fade[@index]
         @index += 1
-        next_colour
+        [next_colour, next_colour == @rgb_to ? 0 : @freq]
       end
     end
     
     class FadeTo < Effect
       def initialize to, steps, freq
-        super freq
-        @to, @steps = to, steps
+        @freq, @to, @steps = freq, to, steps
         @fade = nil
       end
       
       def next current_colour
-        @fade = Fade.new(current_colour, @to, @steps, freq) unless @fade        
-        @fade.next current_colour
+        @fade = Fade.new(current_colour, @to, @steps, @freq) unless @fade        
+        @fade.next(current_colour)
       end
     end
   end
@@ -365,21 +402,25 @@ class Light
   
   private
   def turn_on
-    @on, current_effect = true, nil
+    @on = true
     @run_thread = Thread.new do
-      last_colour = COLOURS[:off]
+      last_colour, current_effect, freq = COLOURS[:off], nil, nil
       while @on
         start = Time.now
         @lock.synchronize { current_effect = @effect }
         begin
-          new_colour = current_effect.next last_colour
+          new_colour, freq = current_effect.next last_colour
           @driver.go new_colour
           @auditor.audit :colour_change, new_colour.to_s
           last_colour = new_colour
         rescue => e
-          auditor.audit :error, e.message
+          auditor.audit :error, "#{e.message}"
+        end
+        if freq > 0
+          sleep_until (start + (1 / freq.to_f))
+        else
+          sleep
         end
-        sleep_until (start + (1 / current_effect.freq.to_f))
       end      
     end
   end

data/{spec/small-test.rb → samples/fade-to-throb.rb}

@@ -1,16 +1,13 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
 require 'cheeky-dreams'
 
-require 'rainbow'
-# http://www.krazydad.com/makecolors.php
 include CheekyDreams
 
 light = Light.new ansi_driver
-# light.auditor = stdio_audit
-light.go :purple
-light.go throb 10, [100,0,0], [255,0,0]
-
+light.auditor = forward(:error => suppress_duplicates(stdio_audit))
+light.go crazy
+sleep 10
+light.go(light_show(fade_to(:red), throbbing(:red)))
 sleep 100
 

data/spec/cheeky-dreams_spec.rb

@@ -117,9 +117,9 @@ describe CheekyDreams do
       end
 
       it "should return [0,0,0] every time called" do
-        @off.next.should == COLOURS[:off]
-        @off.next.should == COLOURS[:off]
-        @off.next.should == COLOURS[:off]
+        @off.next.should == [COLOURS[:off], 0]
+        @off.next.should == [COLOURS[:off], 0]
+        @off.next.should == [COLOURS[:off], 0]
       end
     end
 
@@ -130,9 +130,9 @@ describe CheekyDreams do
         end
 
         it "should return rgb every time called" do
-          @solid.next.should == COLOURS[:purple]
-          @solid.next.should == COLOURS[:purple]
-          @solid.next.should == COLOURS[:purple]
+          @solid.next.should == [COLOURS[:purple], 0]
+          @solid.next.should == [COLOURS[:purple], 0]
+          @solid.next.should == [COLOURS[:purple], 0]
         end
       end
 
@@ -142,9 +142,9 @@ describe CheekyDreams do
         end
 
         it "should return rgb every time called" do
-          @solid.next.should == [123, 123, 123]
-          @solid.next.should == [123, 123, 123]
-          @solid.next.should == [123, 123, 123]
+          @solid.next.should == [[123, 123, 123], 0]
+          @solid.next.should == [[123, 123, 123], 0]
+          @solid.next.should == [[123, 123, 123], 0]
         end
       end
     end
@@ -154,22 +154,18 @@ describe CheekyDreams do
         @cycle = cycle [:red, :blue, [211, 192, 101]], 22
       end
 
-      it "should have a frequency" do
-        @cycle.freq.should == 22
-      end
-
       it "should cycle through the colours as rgb" do
-        @cycle.next.should == [255,   0,   0]
-        @cycle.next.should == [  0,   0, 255]
-        @cycle.next.should == [211, 192, 101]
+        @cycle.next.should == [[255,   0,   0], 22]
+        @cycle.next.should == [[  0,   0, 255], 22]
+        @cycle.next.should == [[211, 192, 101], 22]
 
-        @cycle.next.should == [255,   0,   0]
-        @cycle.next.should == [  0,   0, 255]
-        @cycle.next.should == [211, 192, 101]
+        @cycle.next.should == [[255,   0,   0], 22]
+        @cycle.next.should == [[  0,   0, 255], 22]
+        @cycle.next.should == [[211, 192, 101], 22]
 
-        @cycle.next.should == [255,   0,   0]
-        @cycle.next.should == [  0,   0, 255]
-        @cycle.next.should == [211, 192, 101]
+        @cycle.next.should == [[255,   0,   0], 22]
+        @cycle.next.should == [[  0,   0, 255], 22]
+        @cycle.next.should == [[211, 192, 101], 22]
       end
     end
 
@@ -179,15 +175,11 @@ describe CheekyDreams do
           @fade = fade :blue, :green, 1, 5
         end
 
-        it "should have a freq of 2" do
-          @fade.freq.should == 5
-        end
-
-        it "should be able to provide the steps when asked" do
-          @fade.next.should == [  0,   0, 255]
-          @fade.next.should == [  0, 255,   0]
-          @fade.next.should == [  0, 255,   0]
-          @fade.next.should == [  0, 255,   0]
+        it "should be able to fade to green and then have no frequency" do
+          @fade.next.should == [[  0,   0, 255], 5]
+          @fade.next.should == [[  0, 255,   0], 0]
+          @fade.next.should == [[  0, 255,   0], 0]
+          @fade.next.should == [[  0, 255,   0], 0]
         end
       end
 
@@ -196,25 +188,21 @@ describe CheekyDreams do
           @fade = fade [100, 100, 100], [110, 90, 0], 10, 2
         end
 
-        it "should have a freq of 2" do
-          @fade.freq.should == 2
-        end
-
-        it "should be able to provide the steps when asked" do
-          @fade.next.should == [100, 100, 100]
-          @fade.next.should == [101,  99,  90]
-          @fade.next.should == [102,  98,  80]
-          @fade.next.should == [103,  97,  70]
-          @fade.next.should == [104,  96,  60]
-          @fade.next.should == [105,  95,  50]
-          @fade.next.should == [106,  94,  40]
-          @fade.next.should == [107,  93,  30]
-          @fade.next.should == [108,  92,  20]
-          @fade.next.should == [109,  91,  10]
-          @fade.next.should == [110,  90,   0]
+        it "should be able to fade to 110,90,0 and then have no frequency" do
+          @fade.next.should == [[100, 100, 100], 2]
+          @fade.next.should == [[101,  99,  90], 2]
+          @fade.next.should == [[102,  98,  80], 2]
+          @fade.next.should == [[103,  97,  70], 2]
+          @fade.next.should == [[104,  96,  60], 2]
+          @fade.next.should == [[105,  95,  50], 2]
+          @fade.next.should == [[106,  94,  40], 2]
+          @fade.next.should == [[107,  93,  30], 2]
+          @fade.next.should == [[108,  92,  20], 2]
+          @fade.next.should == [[109,  91,  10], 2]
+          @fade.next.should == [[110,  90,   0], 0]
           # and then continue to provide the same colour
-          @fade.next.should == [110,  90,   0]
-          @fade.next.should == [110,  90,   0]
+          @fade.next.should == [[110,  90,   0], 0]
+          @fade.next.should == [[110,  90,   0], 0]
         end  
       end
     end
@@ -225,23 +213,20 @@ describe CheekyDreams do
           @fade_to = fade_to :green, 11, 2
         end
 
-        it "should have a freq of 2" do
-          @fade_to.freq.should == 2
-        end
-
-        it "should be able to gradually go to colour when asked" do
-          @fade_to.next([0, 145, 0]).should == [0, 145, 0]
-          @fade_to.next([0, 155, 0]).should == [0, 155, 0]
-          @fade_to.next([0, 165, 0]).should == [0, 165, 0]
-          @fade_to.next([0, 165, 0]).should == [0, 175, 0]
-          @fade_to.next([0, 175, 0]).should == [0, 185, 0]
-          @fade_to.next([0, 185, 0]).should == [0, 195, 0]
-          @fade_to.next([0, 195, 0]).should == [0, 205, 0]
-          @fade_to.next([0, 205, 0]).should == [0, 215, 0]
-          @fade_to.next([0, 215, 0]).should == [0, 225, 0]
-          @fade_to.next([0, 225, 0]).should == [0, 235, 0]
-          @fade_to.next([0, 235, 0]).should == [0, 245, 0]
-          @fade_to.next([0, 245, 0]).should == [0, 255, 0]
+        it "should be able to fade to :green and then have no frequency" do
+          @fade_to.next([0, 145, 0]).should == [[0, 145, 0], 2]
+          @fade_to.next([0, 155, 0]).should == [[0, 155, 0], 2]
+          @fade_to.next([0, 165, 0]).should == [[0, 165, 0], 2]
+          @fade_to.next([0, 165, 0]).should == [[0, 175, 0], 2]
+          @fade_to.next([0, 175, 0]).should == [[0, 185, 0], 2]
+          @fade_to.next([0, 185, 0]).should == [[0, 195, 0], 2]
+          @fade_to.next([0, 195, 0]).should == [[0, 205, 0], 2]
+          @fade_to.next([0, 205, 0]).should == [[0, 215, 0], 2]
+          @fade_to.next([0, 215, 0]).should == [[0, 225, 0], 2]
+          @fade_to.next([0, 225, 0]).should == [[0, 235, 0], 2]
+          @fade_to.next([0, 235, 0]).should == [[0, 245, 0], 2]
+          @fade_to.next([0, 245, 0]).should == [[0, 255, 0], 0]
+          @fade_to.next([0, 255, 0]).should == [[0, 255, 0], 0]
         end
       end
 
@@ -250,15 +235,11 @@ describe CheekyDreams do
           @fade_to = fade_to [130, 80, 170], 3, 20
         end
 
-        it "should have a freq of 20" do
-          @fade_to.freq.should == 20
-        end
-
         it "should be able to gradually go to colour when asked" do
-          @fade_to.next([190, 77, 140]).should == [190, 77, 140]
-          @fade_to.next([190, 77, 140]).should == [170, 78, 150]
-          @fade_to.next([170, 78, 150]).should == [150, 79, 160]
-          @fade_to.next([150, 79, 160]).should == [130, 80, 170]
+          @fade_to.next([190, 77, 140]).should == [[190, 77, 140], 20]
+          @fade_to.next([190, 77, 140]).should == [[170, 78, 150], 20]
+          @fade_to.next([170, 78, 150]).should == [[150, 79, 160], 20]
+          @fade_to.next([150, 79, 160]).should == [[130, 80, 170], 0]
         end
       end
     end
@@ -266,25 +247,21 @@ describe CheekyDreams do
     describe CheekyDreams::Effects::Func do
       describe "when the block return rgb values" do
         before :each do
-          @func = func(22) { |current_colour| [current_colour[0] + 1, current_colour[1] + 1, current_colour[2] + 1] }
-        end
-
-        it "should have a freq of 22" do
-          @func.freq.should == 22
+          @func = func { |current_colour| [[current_colour[0] + 1, current_colour[1] + 1, current_colour[2] + 1], 191] }
         end
 
         it "should return the given rgb plus 1 to each of r, g, and b" do
-          @func.next([2, 5, 6]).should == [3, 6, 7]
+          @func.next([2, 5, 6]).should == [[3, 6, 7], 191]
         end
       end
 
-      describe "when the block return symbol" do
+      describe "when the block returns symbol" do
         before :each do
-          @func = func(22) { |current_colour| :purple }
+          @func = func { |current_colour| [:purple, 246] }
         end
 
         it "should return the rgb for the symbol" do
-          @func.next([2, 5, 6]).should == COLOURS[:purple]
+          @func.next([2, 5, 6]).should == [COLOURS[:purple], 246]
         end
       end
     end
@@ -318,24 +295,63 @@ describe CheekyDreams do
         @throb.b_centre.should == 50
       end
     end
+    
+    describe CheekyDreams::Effects::LightShow do
+      before :each do
+        @effect1 = PreStuffedEffect.new([[1, 1, 1], 11], [[2, 2, 2], 0])
+        @effect2 = PreStuffedEffect.new([[3, 3, 3], 0])
+        @effect3 = PreStuffedEffect.new([[4, 4, 4], 12], [[5, 5, 5], 0])
+        @light_show = light_show @effect1, @effect2, @effect3
+      end
+      
+      it 'should go through effects' do
+        @light_show.next.should == [[1, 1, 1], 11]
+        @light_show.next.should == [[2, 2, 2], 11]
+        @light_show.next.should == [[3, 3, 3], 11]
+        @light_show.next.should == [[4, 4, 4], 12]
+        @light_show.next.should == [[5, 5, 5], 0]
+      end
+    end
   end
 end
 
 module CheekyDreams
-  describe FilteringAuditor do
+  describe SuppressDuplicatesAuditor do
     before :each do
       @delegate = mock('delegate auditor')
-      @auditor = FilteringAuditor.new @delegate, [:error]
+      @auditor = SuppressDuplicatesAuditor.new @delegate
+    end
+    
+    it 'should not send duplicate messages through to delegate' do
+      @delegate.should_receive(:audit).with(:type1, 'message1')
+      @delegate.should_receive(:audit).with(:type2, 'message2')
+      @delegate.should_receive(:audit).with(:type3, 'message3')
+      @auditor.audit :type1, 'message1'
+      @auditor.audit :type2, 'message2'
+      @auditor.audit :type1, 'message1'
+      @auditor.audit :type3, 'message3'
+    end
+  end
+  
+  describe ForwardingAuditor do
+    before :each do
+      @errors, @blahs = mock('errors auditor'), mock('blahs auditor')
+      @auditor = ForwardingAuditor.new :error => @errors, :blah => @blahs
+    end
+    
+    it 'should forward audits of type :error' do
+      @errors.should_receive(:audit).with(:error, 'errors here')
+      @auditor.audit :error, 'errors here'
     end
     
-    it 'should allow through audits of type :error' do
-      @delegate.should_receive(:audit).with(:error, 'here')
-      @auditor.audit :error, 'here'
+    it 'should forward audits of type :blah' do
+      @blahs.should_receive(:audit).with(:blah, 'blahs here')
+      @auditor.audit :blah, 'blahs here'
     end
     
     it 'should not allow through other random audits' do
-      @auditor.audit :error1, 'here'
-      @auditor.audit :error2, 'here'
+      @auditor.audit :error1, 'oh'
+      @auditor.audit :blah2, 'no'
     end
   end
   
@@ -478,7 +494,7 @@ describe Light do
     @driver = StubDriver.new
     @light = Light.new @driver
     @collecting_auditor = CollectingAuditor.new
-    @audit_errors = filtering([:error], stdio_audit)
+    @audit_errors = forward(:error => stdio_audit)
     @light.auditor = audit_to @audit_errors, @collecting_auditor
   end
   
@@ -490,7 +506,7 @@ describe Light do
     before :each do
       @error_message = "On purpose error"
       @error = RuntimeError.new @error_message
-      @effect = StubEffect.new(20) { raise @error }
+      @effect = StubEffect.new { raise @error }
       @light.auditor = @collecting_auditor
     end
     
@@ -503,7 +519,7 @@ describe Light do
   describe "frequency of effect" do    
     describe 'when frequency is 1' do
       before :each do      
-        @effect = StubEffect.new 1
+        @effect = StubEffect.new { [[0, 0, 0], 1] }
       end
       
       it 'should call the effect almost immediately, and then about 1 second later' do
@@ -517,7 +533,7 @@ describe Light do
     
     describe 'when frequency is 10' do
       before :each do      
-        @effect = StubEffect.new 10
+        @effect = StubEffect.new { [[0,0,0], 10] }
       end
       
       it 'should call the effect between 9 and 11 times in the next second' do
@@ -531,7 +547,7 @@ describe Light do
     
     describe 'when frequency is 5' do
       before :each do      
-        @effect = StubEffect.new 5
+        @effect = StubEffect.new { [[0, 0, 0], 5] }
       end
       
       it 'should call the effect 5 times in the next second' do
@@ -622,7 +638,7 @@ describe Light do
     
     it "should be able to go different colours based on a function" do
       cycle = [:blue, :red, :green, :purple, :grey, :aqua].cycle
-      @light.go func(10) { cycle.next }
+      @light.go func { [cycle.next, 10] }
       @driver.should_become :blue
       @driver.should_become :red
       @driver.should_become :green

data/spec/support/collecting_auditor.rb

@@ -1,4 +1,3 @@
-AuditEvent = Struct.new(:type, :message)
 
 class CollectingAuditor
   
@@ -9,10 +8,10 @@ class CollectingAuditor
   end
   
   def audit type, message
-    @events << AuditEvent.new(type, message)
+    @events << CheekyDreams::AuditEvent.new(type, message)
   end
   
   def has_received? type, message
-    @events.include? AuditEvent.new(type, message)
+    @events.include? CheekyDreams::AuditEvent.new(type, message)
   end
 end

data/spec/support/stub_effect.rb

@@ -1,18 +1,29 @@
+class PreStuffedEffect < CheekyDreams::Effects::Effect
+  def initialize *results
+    @results = results
+  end
+  
+  def next last_colour = nil
+    result = @results.delete_at 0
+    raise 'no more results in the prestuff effect!' unless result
+    result
+  end
+end
 
 class StubEffect < CheekyDreams::Effects::Effect
   
-  attr_reader :freq, :asked_for_colour_count
+  attr_reader :asked_for_colour_count
   
-  def initialize freq, &block
-    @freq, @asked_for_colour_count = freq, 0
+  def initialize &block
+    @asked_for_colour_count = 0
     if block
       @block = block
     else
-      @block = proc { [0,0,0] }
+      @block = proc { [[0,0,0], 1] }
     end
   end
   
-  def next last_colour
+  def next last_colour = nil
     @asked_for_colour_count += 1
     @block.yield
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cheeky-dreams
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2169112540 !ruby/object:Gem::Requirement
+  requirement: &2168537340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2169112540
+  version_requirements: *2168537340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2169112060 !ruby/object:Gem::Requirement
+  requirement: &2168536860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2169112060
+  version_requirements: *2168536860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2169111580 !ruby/object:Gem::Requirement
+  requirement: &2168536380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2169111580
+  version_requirements: *2168536380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2169111080 !ruby/object:Gem::Requirement
+  requirement: &2168535900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169111080
+  version_requirements: *2168535900
 description: For controlling dream cheeky usb light
 email: simojenki@gmail.com
 executables: []
@@ -73,9 +73,9 @@ files:
 - VERSION
 - cheeky-dreams.gemspec
 - lib/cheeky-dreams.rb
+- samples/fade-to-throb.rb
 - spec/cheeky-dreams_spec.rb
 - spec/off.rb
-- spec/small-test.rb
 - spec/spec_helper.rb
 - spec/support/collecting_auditor.rb
 - spec/support/stub_driver.rb
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1379354147847009735
+      hash: 3090143854865430648
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: