rubyonacid 0.1.2 → 0.2.0

data/lib/rubyonacid/factories/loop.rb

@@ -4,6 +4,7 @@ module RubyOnAcid
 
 class LoopFactory < Factory
   
+  #The amount to increment counters by.
   attr_accessor :interval
   def interval=(value)
     raise "assigned #{value} to interval, must be between -1 and 1" if value < -1 or value > 1

data/lib/rubyonacid/factories/rinda.rb

@@ -5,9 +5,11 @@ module RubyOnAcid
 
 class RindaFactory < Factory
   
-  #Time in seconds to wait for a value before giving up and returning the last retrieved value for the given key.
+  #Time in seconds to wait for a value before giving up and returning a default value for the given key.
   #Default is 0, which will return immediately.
   attr_accessor :timeout
+  #A factory to pull requests from if retrieval of values via Rinda times out.
+  attr_accessor :default_factory
   #The URI to connect to.  Default is "druby://127.0.0.1:7632" (7632 == RNDA).
   attr_accessor :uri
   
@@ -15,6 +17,7 @@ class RindaFactory < Factory
     super
     @uri = uri
     @timeout = timeout
+    @default_factory = nil
     @prior_values = {}
   end
   
@@ -30,7 +33,11 @@ class RindaFactory < Factory
       key, value = @space.take([key, Float], @timeout)
       @prior_values[key] = value
     rescue Rinda::RequestExpiredError => exception
-      value = @prior_values[key]
+      if @default_factory
+        value = @default_factory.get_unit(key)
+      else
+        value = @prior_values[key]
+      end
     end
     value
   end

data/lib/rubyonacid/factory.rb

@@ -24,6 +24,15 @@ class Factory
     get_unit(key) >= 0.5
   end
   
+  #Calls get_unit with key to get value between 0.0 and 1.0, then converts that value to an index within the given list of choices.
+  #choices can be an array or an argument list of arbitrary size.
+  def choose(key, *choices)
+    all_choices = choices.flatten
+    index = (get_unit(key) * all_choices.length).floor
+    index = all_choices.length - 1 if index > all_choices.length - 1
+    all_choices[index]
+  end
+  
 end
 
 end

data/spec/factories/combination_spec.rb

@@ -0,0 +1,101 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "rubyonacid/factories/combination"
+require "shared_factory_specs"
+
+include RubyOnAcid
+
+describe CombinationFactory do
+
+  before :each do
+    @it = CombinationFactory.new
+  end
+
+  describe "general behavior" do
+  
+    before :each do
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+      @it.source_factories << mock('Factory', :get_unit => 0.3)
+    end
+  
+    it_should_behave_like "a factory"
+    
+  end
+  
+  describe "#get_unit" do
+      
+    it "retrieves values from source factories and adds them together" do
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+      @it.source_factories << mock('Factory', :get_unit => 0.3)
+      @it.get_unit(:x).should be_close(0.5, MARGIN)
+      @it.source_factories << mock('Factory', :get_unit => 0.1)
+      @it.get_unit(:x).should be_close(0.6, MARGIN)
+    end
+  
+    it "can constrain sum to 0.0 through 1.0" do
+      @it.constrain_mode = CombinationFactory::CONSTRAIN
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+      @it.source_factories << mock('Factory', :get_unit => 0.3)
+      @it.source_factories << mock('Factory', :get_unit => 0.7)
+      @it.get_unit(:x).should be_close(1.0, MARGIN)
+    end
+    
+    it "uses wrap mode by default" do
+      @it.source_factories << mock('Factory', :get_unit => 0.4)
+      @it.source_factories << mock('Factory', :get_unit => 0.7)
+      @it.get_unit(:x).should be_close(0.1, MARGIN)
+    end
+    
+    it "can wrap > 1.0 value around" do
+      @it.constrain_mode = CombinationFactory::WRAP
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+      @it.source_factories << mock('Factory', :get_unit => 0.3)
+      @it.source_factories << mock('Factory', :get_unit => 0.7)
+      @it.get_unit(:x).should be_close(0.2, MARGIN)
+    end
+    
+  end
+  
+  describe "subtraction" do
+    
+    it "can subtract values from source factories" do
+      @it.operation = CombinationFactory::SUBTRACT
+      @it.source_factories << mock('Factory', :get_unit => 0.7)
+      @it.source_factories << mock('Factory', :get_unit => 0.3)
+      @it.get_unit(:x).should be_close(0.4, MARGIN)
+      @it.source_factories << mock('Factory', :get_unit => 0.1)
+      @it.get_unit(:x).should be_close(0.3, MARGIN)
+    end
+    
+    it "can wrap < 0.0 value around" do
+      @it.operation = CombinationFactory::SUBTRACT
+      @it.constrain_mode = CombinationFactory::WRAP
+      @it.source_factories << mock('Factory', :get_unit => 0.5)
+      @it.source_factories << mock('Factory', :get_unit => 0.7)
+      @it.get_unit(:x).should be_close(0.8, MARGIN)
+    end
+    
+  end
+  
+  describe "multiplication" do
+    it "can get product of values from source factories" do
+      @it.operation = CombinationFactory::MULTIPLY
+      @it.source_factories << mock('Factory', :get_unit => 0.7)
+      @it.source_factories << mock('Factory', :get_unit => 0.5)
+      @it.get_unit(:x).should be_close(0.35, MARGIN)
+      @it.source_factories << mock('Factory', :get_unit => 0.1)
+      @it.get_unit(:x).should be_close(0.035, MARGIN)
+    end
+  end
+    
+  describe "division" do
+    it "can divide values from source factories" do
+      @it.operation = CombinationFactory::DIVIDE
+      @it.source_factories << mock('Factory', :get_unit => 0.1)
+      @it.source_factories << mock('Factory', :get_unit => 0.2)
+      @it.get_unit(:x).should be_close(0.5, MARGIN) #0.1 / 0.2 = 0.5
+      @it.source_factories << mock('Factory', :get_unit => 0.9)
+      @it.get_unit(:x).should be_close(0.555, MARGIN) #0.5 / 0.9 = 0.5555...
+    end
+  end
+  
+end

data/spec/{generators → factories}/constant_spec.rb

@@ -6,7 +6,6 @@ include RubyOnAcid
 
 describe ConstantFactory do
   
-  MARGIN = 0.01
   
   before :each do
     @it = ConstantFactory.new

data/spec/{generators → factories}/increment_spec.rb

@@ -6,7 +6,6 @@ include RubyOnAcid
 
 describe IncrementFactory do
   
-  MARGIN = 0.01
   
   before :each do
     @it = IncrementFactory.new

data/spec/{generators → factories}/loop_spec.rb

@@ -6,7 +6,6 @@ include RubyOnAcid
 
 describe LoopFactory do
   
-  MARGIN = 0.01
   
   before :each do
     @it = LoopFactory.new

data/spec/{generators → factories}/rinda_spec.rb

@@ -6,7 +6,6 @@ include RubyOnAcid
 
 describe RindaFactory do
   
-  MARGIN = 0.01
   
   before :each do
     @it = RindaFactory.new
@@ -29,4 +28,12 @@ describe RindaFactory do
     @it.get_unit(:x).should == 0.6
   end
   
+  it "gets keys from a backup factory when it cannot retrieve values via Rinda" do
+    @it.start_service
+    default_factory = mock('Factory')
+    default_factory.stub!(:get_unit).and_return(0.74)
+    @it.default_factory = default_factory
+    @it.get_unit(:a).should == 0.74
+  end
+  
 end

data/spec/{generators → factories}/sine_spec.rb

@@ -6,7 +6,6 @@ include RubyOnAcid
 
 describe SineFactory do
   
-  MARGIN = 0.01
   
   before :each do
     @it = SineFactory.new

data/spec/{generators → factories}/skip_spec.rb

@@ -6,7 +6,6 @@ include RubyOnAcid
 
 describe SkipFactory do
   
-  MARGIN = 0.01
   
   before :each do
     @it = SkipFactory.new

data/spec/factory_spec.rb

@@ -0,0 +1,59 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require "shared_factory_specs"
+require 'rubyonacid/factories/constant'
+
+include RubyOnAcid
+
+describe Factory do
+  
+  before :each do
+    @it = ConstantFactory.new
+  end
+  
+  describe "#choose" do
+    
+    it "chooses an item from a list" do
+      @it.stub!(:get_unit).and_return(0.0)
+      @it.choose(:color, :red, :green, :blue).should == :red
+      @it.stub!(:get_unit).and_return(1.0)
+      @it.choose(:color, :red, :green, :blue).should == :blue
+      @it.stub!(:get_unit).and_return(0.5)
+      @it.choose(:color, :red, :green, :blue).should == :green
+    end
+    
+    it "matches a range of values for each list item" do
+      @it.stub!(:get_unit).and_return(0.0)
+      @it.choose(:foo, :a, :b, :c, :d).should == :a
+      @it.stub!(:get_unit).and_return(0.24)
+      @it.choose(:foo, :a, :b, :c, :d).should == :a
+      @it.stub!(:get_unit).and_return(0.25)
+      @it.choose(:foo, :a, :b, :c, :d).should == :b
+      @it.stub!(:get_unit).and_return(0.49)
+      @it.choose(:foo, :a, :b, :c, :d).should == :b
+      @it.stub!(:get_unit).and_return(0.5)
+      @it.choose(:foo, :a, :b, :c, :d).should == :c
+      @it.stub!(:get_unit).and_return(0.74)
+      @it.choose(:foo, :a, :b, :c, :d).should == :c
+      @it.stub!(:get_unit).and_return(0.75)
+      @it.choose(:foo, :a, :b, :c, :d).should == :d
+      @it.stub!(:get_unit).and_return(1.0)
+      @it.choose(:foo, :a, :b, :c, :d).should == :d
+    end
+    
+    it "accepts multiple arguments" do
+      @it.stub!(:get_unit).and_return(1.0)
+      @it.choose(:color, :red, :green, :blue).should == :blue
+    end
+    
+    it "accepts arrays" do
+      @it.stub!(:get_unit).and_return(1.0)
+      @it.choose(:color, [:red, :green, :blue]).should == :blue
+      @it.stub!(:get_unit).and_return(1.0)
+      @it.choose(:color, [:red, :green, :blue], [:yellow, :orange]).should == :orange
+      @it.stub!(:get_unit).and_return(0.0)
+      @it.choose(:color, [:red, :green, :blue], [:yellow, :orange]).should == :red
+    end
+    
+  end
+  
+end

data/spec/spec_helper.rb

@@ -4,6 +4,9 @@ require 'rubygems'
 require 'spec'
 require 'spec/autorun'
 
+#Allowed margin of error for be_close.
+MARGIN = 0.01
+
 Spec::Runner.configure do |config|
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyonacid
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jay McGavren
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -07:00
+date: 2009-12-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,37 +37,40 @@ files:
 - README.textile
 - Rakefile
 - VERSION
+- examples/ascii.rb
 - examples/midi.rb
 - examples/raw_audio.rb
-- examples/rmagick.rb
-- examples/test.rb
+- examples/rinda_agent.rb
+- examples/wxruby.rb
 - features/rubyonacid.feature
 - features/step_definitions/rubyonacid_steps.rb
 - features/support/env.rb
+- generators.png
 - lib/rubyonacid.rb
+- lib/rubyonacid/factories/combination.rb
 - lib/rubyonacid/factories/constant.rb
 - lib/rubyonacid/factories/flash.rb
 - lib/rubyonacid/factories/increment.rb
 - lib/rubyonacid/factories/loop.rb
 - lib/rubyonacid/factories/meta.rb
-- lib/rubyonacid/factories/modulo.rb
 - lib/rubyonacid/factories/random.rb
 - lib/rubyonacid/factories/repeat.rb
 - lib/rubyonacid/factories/rinda.rb
 - lib/rubyonacid/factories/sine.rb
 - lib/rubyonacid/factories/skip.rb
 - lib/rubyonacid/factory.rb
-- spec/generators/constant_spec.rb
-- spec/generators/flash_spec.rb
-- spec/generators/increment_spec.rb
-- spec/generators/loop_spec.rb
-- spec/generators/meta_spec.rb
-- spec/generators/modulo_spec.rb
-- spec/generators/random_spec.rb
-- spec/generators/repeat_spec.rb
-- spec/generators/rinda_spec.rb
-- spec/generators/sine_spec.rb
-- spec/generators/skip_spec.rb
+- spec/factories/combination_spec.rb
+- spec/factories/constant_spec.rb
+- spec/factories/flash_spec.rb
+- spec/factories/increment_spec.rb
+- spec/factories/loop_spec.rb
+- spec/factories/meta_spec.rb
+- spec/factories/random_spec.rb
+- spec/factories/repeat_spec.rb
+- spec/factories/rinda_spec.rb
+- spec/factories/sine_spec.rb
+- spec/factories/skip_spec.rb
+- spec/factory_spec.rb
 - spec/shared_factory_specs.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -99,24 +102,25 @@ signing_key:
 specification_version: 3
 summary: A framework for creating trippy visuals
 test_files: 
-- spec/generators/constant_spec.rb
-- spec/generators/flash_spec.rb
-- spec/generators/increment_spec.rb
-- spec/generators/loop_spec.rb
-- spec/generators/meta_spec.rb
-- spec/generators/modulo_spec.rb
-- spec/generators/random_spec.rb
-- spec/generators/repeat_spec.rb
-- spec/generators/rinda_spec.rb
-- spec/generators/sine_spec.rb
-- spec/generators/skip_spec.rb
+- spec/factories/combination_spec.rb
+- spec/factories/constant_spec.rb
+- spec/factories/flash_spec.rb
+- spec/factories/increment_spec.rb
+- spec/factories/loop_spec.rb
+- spec/factories/meta_spec.rb
+- spec/factories/random_spec.rb
+- spec/factories/repeat_spec.rb
+- spec/factories/rinda_spec.rb
+- spec/factories/sine_spec.rb
+- spec/factories/skip_spec.rb
+- spec/factory_spec.rb
 - spec/shared_factory_specs.rb
 - spec/spec_helper.rb
+- examples/ascii.rb
 - examples/midi.rb
 - examples/permutations.rb
+- examples/quality_render.rb
+- examples/random_yaml.rb
 - examples/raw_audio.rb
 - examples/rinda_agent.rb
-- examples/rmagick.rb
-- examples/test.rb
-- examples/test2.rb
-- examples/test3.rb
+- examples/wxruby.rb

data/examples/rmagick.rb

@@ -1,59 +0,0 @@
-#!/usr/bin/ruby
-
-require 'rubygems'
-require 'RMagick'
-
-require 'rubyonacid/factories/meta'
-require 'rubyonacid/factories/flash'
-require 'rubyonacid/factories/increment'
-require 'rubyonacid/factories/loop'
-require 'rubyonacid/factories/random'
-require 'rubyonacid/factories/sine'
-require 'rubyonacid/factories/skip'
-
-@f = RubyOnAcid::MetaFactory.new
-@f.factories << RubyOnAcid::LoopFactory.new
-@f.factories << RubyOnAcid::FlashFactory.new
-# @f.factories << RubyOnAcid::RandomFactory.new
-@f.factories << RubyOnAcid::SineFactory.new
-@f.factories << RubyOnAcid::SkipFactory.new
-
-def get(key)
-  @f.within(key, 1, key.to_i)
-end
-
-canvas = Magick::Image.new(240, 300,
-              Magick::HatchFill.new('white','lightcyan2'))
-gc = Magick::Draw.new
-
-while RubyOnAcid::SkipFactory.new(0.001).boolean(:continue_loop)
-
-  # Draw ellipse
-  gc.stroke('red')
-  gc.stroke_width(get(10))
-  gc.fill_opacity(0)
-  gc.ellipse(get(120), get(150), get(80), get(120), 0, get(270))
-
-  # Draw endpoints
-  gc.stroke('gray50')
-  gc.stroke_width(get(1))
-  gc.circle(120, 150, 124, 150)
-  gc.circle(200, 150, 204, 150)
-  gc.circle(120,  30, 124,  30)
-
-  # Draw lines
-  gc.line(get(120), get(150), get(200), get(150))
-  gc.line(get(120), get(150), get(120),  get(30))
-
-  # Annotate
-  gc.stroke('transparent')
-  gc.fill('black')
-  gc.text(130, 35, "End")
-  gc.text(188, 135, "Start")
-  gc.text(130, 95, "'Height=#{get(120)}'")
-  gc.text(55, 155, "'Width=#{get(80)}'")
-
-end
-
-gc.draw(canvas)
-canvas.write('shapes2.gif')

data/examples/test.rb

@@ -1,95 +0,0 @@
-require 'rubygems'
-require 'wx'
-require 'rubyonacid/factories/meta'
-require 'rubyonacid/factories/constant'
-require 'rubyonacid/factories/flash'
-require 'rubyonacid/factories/loop'
-require 'rubyonacid/factories/modulo'
-require 'rubyonacid/factories/random'
-require 'rubyonacid/factories/repeat'
-require 'rubyonacid/factories/sine'
-require 'rubyonacid/factories/skip'
-
-
-
-class MyApp < Wx::App
-
-  WIDTH = 480
-  HEIGHT = 480
-
-  def on_init
-    
-    random_factory = RubyOnAcid::RandomFactory.new
-    
-    #The MetaFactory assigns factories to requested value types.
-    @f = RubyOnAcid::MetaFactory.new
-    #Loop factories loop from 0.0 to 1.0 (or 1.0 to 0.0 if the increment value is negative).
-    @f.factory_pool << RubyOnAcid::LoopFactory.new(0.01)
-    @f.factory_pool << RubyOnAcid::LoopFactory.new(-0.01)
-    @f.factory_pool << RubyOnAcid::LoopFactory.new(0.001)
-    @f.factory_pool << RubyOnAcid::LoopFactory.new(-0.001)
-    #Constant factories always return the same value,
-    @f.factory_pool << RubyOnAcid::ConstantFactory.new(rand)
-    @f.factory_pool << RubyOnAcid::ConstantFactory.new(rand)
-    @f.factory_pool << RubyOnAcid::FlashFactory.new(rand(100))
-    #Sine factories produce a "wave" pattern.
-    @f.factory_pool << RubyOnAcid::SineFactory.new(0.1)
-    @f.factory_pool << RubyOnAcid::SineFactory.new(-0.1)
-    @f.factory_pool << RubyOnAcid::SineFactory.new(0.01)
-    @f.factory_pool << RubyOnAcid::SineFactory.new(-0.01)
-    @f.factory_pool << RubyOnAcid::RepeatFactory.new(
-      RubyOnAcid::LoopFactory.new(random_factory.within(:increment, -0.1, 0.1)),
-      random_factory.within(:interval, 2, 100)
-    )
-    # @f.factory_pool << RubyOnAcid::RepeatFactory.new(
-    #   RubyOnAcid::RandomFactory.new,
-    #   random_factory.within(:interval, 2, 1000)
-    # )
-    @f.factory_pool << RubyOnAcid::RepeatFactory.new(
-      RubyOnAcid::SineFactory.new(random_factory.within(:increment, -0.1, 0.1)),
-      random_factory.within(:interval, 2, 100)
-    )
-    @f.factory_pool << RubyOnAcid::ModuloFactory.new(RubyOnAcid::LoopFactory.new(0.00001))
-    
-    #A skip factory, in charge of randomly resetting the meta factory.
-    @resetter = RubyOnAcid::SkipFactory.new(0.9999)
-    
-    #Containing frame.
-    frame = Wx::Frame.new(nil, :size => [WIDTH, HEIGHT])
-    frame.show
- 
-    #Displays drawing.
-    window = Wx::Window.new(frame, :size => [WIDTH, HEIGHT])
- 
-    #Animate periodically.
-    t = Wx::Timer.new(self, 55)
-    evt_timer(55) {animate(window)}
-    t.start(33)
- 
-  end
- 
-  def animate(window)
-     window.paint do |surface|
-       surface.pen = Wx::Pen.new(
-           Wx::Colour.new(
-             @f.within(:red, 0, 255).to_i,
-             @f.within(:green, 0, 255).to_i,
-             @f.within(:blue, 0, 255).to_i,
-             @f.within(:alpha, 50, 255).to_i
-           ),
-           @f.within(:width, 1, 5).to_i
-       )
-       surface.draw_line(
-          @f.get(:x, :max => WIDTH).to_i,
-          @f.get(:y, :max => HEIGHT).to_i,
-          @f.get(:x2, :max => WIDTH).to_i,
-          @f.get(:y2, :max => HEIGHT).to_i
-       )
-     end
-     @f.reset_assignments if @resetter.boolean(:reset)
-  end
-
-end
-
-app = MyApp.new
-app.main_loop

data/examples/test2.rb

@@ -1,85 +0,0 @@
-require 'rubygems'
-require 'wx'
-require 'rubyonacid/factories/meta'
-require 'rubyonacid/factories/constant'
-require 'rubyonacid/factories/flash'
-require 'rubyonacid/factories/increment'
-require 'rubyonacid/factories/loop'
-require 'rubyonacid/factories/modulo'
-require 'rubyonacid/factories/random'
-require 'rubyonacid/factories/repeat'
-require 'rubyonacid/factories/sine'
-require 'rubyonacid/factories/skip'
-
-
-
-class MyApp < Wx::App
-
-  WIDTH = 1920
-  HEIGHT = 1080
-
-  def on_init
-    
-    ARGV.each do |file_name|
-      
-      puts "Processing #{file_name}"
-      
-      @f = YAML.load_file(file_name)
-    
-      frame = Wx::Frame.new(nil, :size => [WIDTH, HEIGHT])
-
- 
-      #Displays drawing.
-      bitmap = Wx::Bitmap.new(WIDTH, HEIGHT)
-      bitmap.draw do |surface|
-        # surface.pen = black_pen
-        surface.brush = Wx::BLACK_BRUSH
-        surface.draw_rectangle(0, 0, WIDTH, HEIGHT)
-      end
-      1000.times do
-        bitmap.draw {|surface| render(surface)}
-      end
-      # bitmap.draw do |surface|
-      #   surface.text_foreground = Wx::Colour.new(255, 255, 255, 255)
-      #   # surface.text_background = Wx::Colour.new(0, 0, 0)
-      #   y = 0
-      #   @f.to_yaml.split("\n").each do |line|
-      #     surface.draw_text(line, 0, y)
-      #     y += 10
-      #   end
-      # end
-      bitmap.draw do |surface|
-        surface.text_foreground = Wx::Colour.new(255, 255, 255, 255)
-        surface.draw_text("©2009 Jay McGavren. Licensed under a Creative Commons Attribution-Share Alike 3.0 United States License: http://creativecommons.org/licenses/by-sa/3.0/us/", 10, HEIGHT - 20)
-      end
-      
-      bitmap.save_file(file_name + ".png", Wx::BITMAP_TYPE_PNG)
-      
-    end
-    
-    exit
- 
-  end
- 
-  def render(surface)
-     surface.pen = Wx::Pen.new(
-         Wx::Colour.new(
-           @f.within(:red, 0, 255).to_i,
-           @f.within(:green, 0, 255).to_i,
-           @f.within(:blue, 0, 255).to_i,
-           @f.within(:alpha, 50, 100).to_i
-         ),
-         @f.within(:width, 1, 5).to_i
-     )
-     surface.draw_line(
-        @f.within(:x, 0, WIDTH).to_i,
-        @f.within(:y, 0, HEIGHT).to_i,
-        @f.within(:x2, 0, WIDTH).to_i,
-        @f.within(:y2, 0, HEIGHT).to_i
-     )
-  end
-
-end
-
-app = MyApp.new
-app.main_loop