rubyonacid 0.3.0 → 0.3.1

data/.gitignore

@@ -3,4 +3,5 @@
 coverage
 rdoc
 pkg
-log
+log
+rubyonacid.gemspec

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/examples/ascii.rb

@@ -41,3 +41,7 @@ factories_to_combine = [
   RubyOnAcid::SineFactory.new(-0.2)
 ]
 make_lines RubyOnAcid::CombinationFactory.new(:source_factories => factories_to_combine)
+
+#A RoundingFactory rounds values from a source factory to a multiple of a given number.
+factory_to_round = RubyOnAcid::LoopFactory.new(0.1)
+make_lines RubyOnAcid::RoundingFactory.new(factory_to_round, 0.25)

data/examples/ascii2.rb

@@ -0,0 +1,23 @@
+require 'rubyonacid/factories/all'
+
+#This method takes any Factory and uses it to determine the length of lines to print.
+def make_lines(factory)
+  #Show what factory we're working with.
+  puts factory.class.name
+  1000.times do
+    #Get the length of the line.
+    #The :max option scales the returned length to be between 0 and 79.
+    line_length = factory.get(:length, :max => 79)
+    puts "|" * line_length
+  end
+end
+
+#A CombinationFactory combines the values of two or more other factories.
+factories_to_combine = [
+  RubyOnAcid::SineFactory.new(0.2),
+  RubyOnAcid::SineFactory.new(-0.5)
+]
+make_lines RubyOnAcid::CombinationFactory.new(
+  :source_factories => factories_to_combine,
+  :constrain_mode => RubyOnAcid::CombinationFactory::CONSTRAIN
+)

data/examples/rinda_agent.rb

@@ -54,28 +54,28 @@ class MyApp < Wx::App
     )
     when :line
       surface.draw_line(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
+        @f.get(:x, :max => WIDTH).to_i,
+        @f.get(:y, :max => HEIGHT).to_i,
         @f.get(:x1, :max => WIDTH).to_i,
         @f.get(:y1, :max => HEIGHT).to_i
       )
     when :rectangle
       surface.draw_rectangle(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
+        @f.get(:x, :max => WIDTH).to_i,
+        @f.get(:y, :max => HEIGHT).to_i,
         @f.get(:x1, :max => WIDTH).to_i,
         @f.get(:y1, :max => HEIGHT).to_i
       )
     when :circle
       surface.draw_circle(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
+        @f.get(:x, :max => WIDTH).to_i,
+        @f.get(:y, :max => HEIGHT).to_i,
         @f.get(:width, :max => WIDTH).to_i
       )
     when :arc
       surface.draw_elliptic_arc(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
+        @f.get(:x, :max => WIDTH).to_i,
+        @f.get(:y, :max => HEIGHT).to_i,
         @f.get(:width, :max => WIDTH).to_i,
         @f.get(:height, :max => HEIGHT).to_i,
         @f.get(:arc_start, :max => 360).to_i,

data/examples/tk.rb

@@ -0,0 +1,52 @@
+require 'rubyonacid/factories/example'
+require 'tk'
+
+#This factory will be in charge of all drawing coordinates, colors, etc.
+f = RubyOnAcid::ExampleFactory.new
+
+#A skip factory, in charge of randomly resetting the meta factory.
+resetter = RubyOnAcid::SkipFactory.new(0.999)
+
+#The window to draw to.
+canvas = TkCanvas.new(:width => 400, :height => 400)
+canvas.pack
+
+#The line objects we create will be stored here.
+lines = []
+
+#Create a thread to update the window while it's displayed.
+Thread.new do
+  loop do
+    
+    #Get red, green, and blue values for a color from the factory.
+    #Format is #RRGGBB in hexadecimal (like HTML).
+    color = sprintf("#%02x%02x%02x",
+      f.get(:red, :max => 254).to_i,
+      f.get(:green, :max => 254).to_i,
+      f.get(:blue, :max => 254).to_i
+    )
+    
+    #Create and store a line of the chosen color.
+    #Get width and locations of the endpoints from the factory.
+    lines << TkcLine.new(
+      canvas,
+      f.get(:x1, :max => 400),
+      f.get(:y1, :max => 400),
+      f.get(:x2, :max => 400),
+      f.get(:y2, :max => 400),
+      :width => f.get(:width, :min => 5, :max => 30),
+      :fill => color
+    )
+    
+    #If the resetter returns true, tell the ExampleFactory to reassign
+    #its source factories to different keys.
+    f.reset_assignments if resetter.boolean(:reset)
+    
+    #Delete the oldest line if we have accumulated too many.
+    lines.shift.delete if lines.length > 1000
+    
+  end
+end
+
+#Display the window.
+canvas.mainloop

data/lib/rubyonacid/factories/all.rb

@@ -9,5 +9,6 @@ require 'rubyonacid/factories/random'
 require 'rubyonacid/factories/random_walk'
 require 'rubyonacid/factories/repeat'
 require 'rubyonacid/factories/rinda'
+require 'rubyonacid/factories/rounding'
 require 'rubyonacid/factories/sine'
 require 'rubyonacid/factories/skip'

data/lib/rubyonacid/factories/attraction.rb

@@ -0,0 +1,40 @@
+require 'rubyonacid/factory'
+
+module RubyOnAcid
+
+class AttractionFactory < Factory
+  
+  SQUARE_ROOT_OF_TWO = Math.sqrt(2.0)
+  
+  #Factory to get values from.
+  attr_accessor :source_factory
+  
+  #Values from source_factory will be "pulled" toward values from this factory.
+  attr_accessor :attractor_factory
+  
+  def initialize(source_factory = nil, attractor_factory = nil)
+    super
+    @source_factory = source_factory
+    @attractor_factory = attractor_factory
+  end
+  
+  #Get a value from the source_factory and a value from the attractor_factory.
+  #The source_factory value will be adjusted to be closer to the attractor_factory value.
+  #The closer the values are, the greater the adjustment.
+  def get_unit(key)
+    # force = delta * @magnetism / (distance * Jemini::Math::SQUARE_ROOT_OF_TWO)
+    value = @source_factory.get_unit(key)
+    attractor_value = @attractor_factory.get_unit(key)
+    distance = value - attractor_value
+    return_value = value - (0.1 / (distance * SQUARE_ROOT_OF_TWO))
+    if value > attractor_value and return_value < attractor_value
+      return_value = attractor_value
+    elsif value < attractor_value and return_value > attractor_value
+      return_value = attractor_value
+    end
+    return_value
+  end
+
+end
+
+end

data/lib/rubyonacid/factories/combination.rb

@@ -69,6 +69,8 @@ class CombinationFactory < Factory
         end
       when WRAP
         return value % 1.0
+      else
+        raise "invalid constrain mode - must be CONSTRAIN or WRAP"
       end
     end
   

data/lib/rubyonacid/factories/example.rb

@@ -35,6 +35,9 @@ class ExampleFactory < MetaFactory
       source_factories << RubyOnAcid::FlashFactory.new(
         random_factory.get(:interval, :max => 100)
       )
+      source_factories << RubyOnAcid::RandomWalkFactory.new(
+        random_factory.get(:interval, :max => 0.1)
+      )
       4.times do
         factory = RubyOnAcid::SineFactory.new
         factory.interval = random_factory.get(:increment, :min => -0.1, :max => 0.1)
@@ -43,19 +46,28 @@ class ExampleFactory < MetaFactory
       2.times do
         factory = RubyOnAcid::RepeatFactory.new
         factory.repeat_count = random_factory.get(:interval, :min => 2, :max => 100)
-        factory.source_factory = source_factories[rand(source_factories.length)]
+        factory.source_factory = random_element(source_factories)
         source_factories << factory
       end
+      2.times do
+        source_factories << RubyOnAcid::RoundingFactory.new(
+          random_element(source_factories),
+          random_factory.get(:interval, :min => 0.1, :max => 0.5)
+        )
+      end
       combination_factory = RubyOnAcid::CombinationFactory.new
       2.times do
-        combination_factory.source_factories << source_factories[rand(source_factories.length)]
+        combination_factory.source_factories << random_element(source_factories)
       end
       source_factories << combination_factory
-      source_factories << RubyOnAcid::RandomWalkFactory.new(0.1)
       
       source_factories
 
     end
+    
+    def random_element(array)
+      array[rand(array.length)]
+    end
 
 
 end

data/lib/rubyonacid/factories/flash.rb

@@ -5,6 +5,7 @@ module RubyOnAcid
 #Returns 0.0 for a given number of queries, then 1.0 for the same number of queries, then goes back to 0.0 and repeats.
 class FlashFactory < Factory
   
+  #The number of times to return a value before switching.
   attr_accessor :interval
   
   def initialize(interval = 3)

data/lib/rubyonacid/factories/input.rb

@@ -2,8 +2,10 @@ require 'rubyonacid/factory'
 
 module RubyOnAcid
 
+#Allows values to be assigned from an external source.
 class InputFactory < Factory
 
+  #A factory to pull values from in the event no values are stored for a given key.
   attr_accessor :default_factory
   
   def initialize
@@ -14,6 +16,8 @@ class InputFactory < Factory
     @smallest_seen_values = {}
   end
   
+  #Retrieves the next stored value for the given key.
+  #The key that values are pulled from will not necessarily be the same as that passed to put() - value queue keys are assigned to get_unit() keys at random.
   def get_unit(key)
     current_key = assigned_key(key)
     if @input_values[current_key] and @input_values[current_key].length > 0
@@ -22,11 +26,9 @@ class InputFactory < Factory
       return default_value(key)
     end
   end
-  
-  def default_value(key)
-    @default_factory ? @default_factory.get_unit(key) : 0.0
-  end
-  
+
+  #Store a value for the given key.
+  #Values will be scaled to the range 0 to 1 - the largest value yet seen will be scaled to 1.0, the smallest yet seen to 0.0.
   def put(key, value)
     value = value.to_f
     @input_values[key] ||= []
@@ -39,16 +41,22 @@ class InputFactory < Factory
     @largest_seen_values[key] = value if value > @largest_seen_values[key]
   end
   
+  #Clears all stored input values for all keys.
   def clear_input_values
     @input_values = {}
   end
   
+  #Clear all value queue key assignments.
   def clear_assigned_keys
     @assigned_keys = {}
   end
   
   private
   
+    def default_value(key)
+      @default_factory ? @default_factory.get_unit(key) : 0.0
+    end
+  
     def assigned_key(key)
       return @key_assignments[key] if @key_assignments[key]
       key_pool = @input_values.keys - @key_assignments.values

data/lib/rubyonacid/factories/random.rb

@@ -12,5 +12,4 @@ class RandomFactory < Factory
 
 end
 
-
 end

data/lib/rubyonacid/factories/rounding.rb

@@ -0,0 +1,36 @@
+require 'rubyonacid/factory'
+
+module RubyOnAcid
+
+#Rounds values from a source factory, useful for clustering values into groups.
+class RoundingFactory < Factory
+  
+  #Factory to get values from.
+  attr_accessor :source_factory
+  #Source values will be rounded to the nearest multiple of this value.
+  attr_accessor :nearest
+  
+  def initialize(source_factory = nil, nearest = 0.1)
+    super
+    @source_factory = source_factory
+    @nearest = nearest
+  end
+  
+  def get_unit(key)
+    round_to(@source_factory.get_unit(key), @nearest)
+  end
+
+  private
+
+    def round_to(value, multiple_of)
+      quotient, modulus = value.divmod(multiple_of)
+      if modulus / multiple_of < 0.5
+        return multiple_of * quotient
+      else
+        return multiple_of * (quotient + 1)
+      end
+    end  
+
+end
+
+end

data/spec/factories/attraction_spec.rb

@@ -0,0 +1,50 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require "rubyonacid/factories/attraction"
+require "shared_factory_specs"
+
+include RubyOnAcid
+
+describe AttractionFactory do
+
+  before :each do
+    @it = AttractionFactory.new
+  end
+
+  describe "general behavior" do
+  
+    before :each do
+      @it.source_factory = mock('Factory', :get_unit => 0.2)
+      @it.attractor_factory = mock('Factory', :get_unit => 0.3)
+    end
+  
+    it_should_behave_like "a factory"
+    
+  end
+  
+  describe "#get_unit" do
+      
+    it "retrieves values from source factory and attracts them toward values from the attractor factory" do
+      @it.source_factory = mock('Factory', :get_unit => 0.0)
+      @it.attractor_factory = mock('Factory', :get_unit => 1.0)
+      @it.get_unit(:x).should > 0.0
+    end
+  
+    it "exerts greater attraction if values are closer" do
+      @it.source_factory = mock('Factory', :get_unit => 0.0)
+      @it.attractor_factory = mock('Factory')
+      @it.attractor_factory.should_receive(:get_unit).and_return(1.0)
+      distant_value = @it.get_unit(:x)
+      @it.attractor_factory.should_receive(:get_unit).and_return(0.5)
+      close_value = @it.get_unit(:x)
+      close_value.should > distant_value
+    end
+    
+    it "reduces source value if attractor's value is lower" do
+      @it.source_factory = mock('Factory', :get_unit => 0.9)
+      @it.attractor_factory = mock('Factory', :get_unit => 0.1)
+      @it.get_unit(:x).should < 0.9
+    end
+    
+  end
+    
+end

data/spec/factories/rounding_spec.rb

@@ -0,0 +1,67 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'rubyonacid/factories/rounding'
+require "shared_factory_specs"
+
+include RubyOnAcid
+
+describe RoundingFactory do
+  
+  before :each do
+    @it = RoundingFactory.new
+  end
+
+  describe "general behavior" do
+  
+    before :each do
+      @it.source_factory = mock('Factory', :get_unit => 0.2)
+    end
+  
+    it_should_behave_like "a factory"
+    
+  end
+  
+  it "Requests a value from the source factory and rounds it to a multiple of the requested number" do
+    source_factory = mock('Factory')
+    @it.source_factory = source_factory
+    @it.nearest = 0.3
+    source_factory.should_receive(:get_unit).and_return(0.7)
+    @it.get_unit(:x).should be_close(0.6, MARGIN)
+    source_factory.should_receive(:get_unit).and_return(0.8)
+    @it.get_unit(:x).should be_close(0.9, MARGIN)
+    source_factory.should_receive(:get_unit).and_return(0.9)
+    @it.get_unit(:x).should be_close(0.9, MARGIN)
+    source_factory.should_receive(:get_unit).and_return(1.0)
+    @it.get_unit(:x).should be_close(0.9, MARGIN)
+  end
+  
+  it "can round to multiples of 0.2" do
+    @it.source_factory = mock('Factory')
+    @it.nearest = 0.2
+    @it.source_factory.should_receive(:get_unit).and_return(0.0)
+    @it.get_unit(:x).should be_close(0.0, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(0.11)
+    @it.get_unit(:x).should be_close(0.2, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(0.2)
+    @it.get_unit(:x).should be_close(0.2, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(0.31)
+    @it.get_unit(:x).should be_close(0.4, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(0.4)
+    @it.get_unit(:x).should be_close(0.4, MARGIN)
+  end
+  
+  it "can round to multiples of 1.0" do
+    @it.source_factory = mock('Factory')
+    @it.nearest = 1.0
+    @it.source_factory.should_receive(:get_unit).and_return(0.0)
+    @it.get_unit(:x).should be_close(0.0, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(0.4)
+    @it.get_unit(:x).should be_close(0.0, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(0.51)
+    @it.get_unit(:x).should be_close(1.0, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(0.9)
+    @it.get_unit(:x).should be_close(1.0, MARGIN)
+    @it.source_factory.should_receive(:get_unit).and_return(1.0)
+    @it.get_unit(:x).should be_close(1.0, MARGIN)
+  end
+  
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubyonacid
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jay McGavren
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -07:00
+date: 2010-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: A framework for creating trippy visuals
 email: jay@mcgavren.com
 executables: []
@@ -42,13 +49,14 @@ files:
 - examples/raw_audio.rb
 - examples/rinda_agent.rb
 - examples/svg.rb
-- examples/wxruby.rb
+- examples/tk.rb
 - features/rubyonacid.feature
 - features/step_definitions/rubyonacid_steps.rb
 - features/support/env.rb
 - generators.png
 - lib/rubyonacid.rb
 - lib/rubyonacid/factories/all.rb
+- lib/rubyonacid/factories/attraction.rb
 - lib/rubyonacid/factories/combination.rb
 - lib/rubyonacid/factories/constant.rb
 - lib/rubyonacid/factories/example.rb
@@ -61,9 +69,11 @@ files:
 - lib/rubyonacid/factories/random_walk.rb
 - lib/rubyonacid/factories/repeat.rb
 - lib/rubyonacid/factories/rinda.rb
+- lib/rubyonacid/factories/rounding.rb
 - lib/rubyonacid/factories/sine.rb
 - lib/rubyonacid/factories/skip.rb
 - lib/rubyonacid/factory.rb
+- spec/factories/attraction_spec.rb
 - spec/factories/combination_spec.rb
 - spec/factories/constant_spec.rb
 - spec/factories/flash_spec.rb
@@ -75,6 +85,7 @@ files:
 - spec/factories/random_walk_spec.rb
 - spec/factories/repeat_spec.rb
 - spec/factories/rinda_spec.rb
+- spec/factories/rounding_spec.rb
 - spec/factories/sine_spec.rb
 - spec/factories/skip_spec.rb
 - spec/factory_spec.rb
@@ -93,22 +104,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rubyonacid
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A framework for creating trippy visuals
 test_files: 
+- spec/factories/attraction_spec.rb
 - spec/factories/combination_spec.rb
 - spec/factories/constant_spec.rb
 - spec/factories/flash_spec.rb
@@ -120,14 +134,16 @@ test_files:
 - spec/factories/random_walk_spec.rb
 - spec/factories/repeat_spec.rb
 - spec/factories/rinda_spec.rb
+- spec/factories/rounding_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/ascii2.rb
 - examples/midi.rb
 - examples/raw_audio.rb
 - examples/rinda_agent.rb
 - examples/svg.rb
-- examples/wxruby.rb
+- examples/tk.rb

data/examples/wxruby.rb

@@ -1,108 +0,0 @@
-require 'rubygems'
-begin
-  require 'wx'
-rescue LoadError
-  raise "It appears that wxruby is not installed. 'sudo gem install wxruby' to install it."
-end
-require 'rubyonacid/factories/example'
-
-
-class MyApp < Wx::App
-
-  WIDTH = 480
-  HEIGHT = 480
-
-  def on_init
-    
-    #This factory will be in charge of all drawing coordinates, colors, etc.
-    @f = RubyOnAcid::ExampleFactory.new
-        
-    #A skip factory, in charge of randomly resetting the meta factory.
-    @resetter = RubyOnAcid::SkipFactory.new(0.999)
-    
-    #Set up window.
-    frame = Wx::Frame.new(nil, :size => [WIDTH, HEIGHT])
-    frame.show
-    window = Wx::Window.new(frame, :size => [WIDTH, HEIGHT])
- 
-    #Animate periodically.
-    t = Wx::Timer.new(self, 55)
-    evt_timer(55) do
-      window.paint{|surface| render(surface)}
-      @f.reset_assignments if @resetter.boolean(:reset)
-    end
-    t.start(33)
- 
-  end
-  
-  #Choose a shape and color and draw it to the given surface.
-  def render(surface)
-    color = Wx::Colour.new(
-      @f.get(:red, :max => 255).to_i,
-      @f.get(:green, :max => 255).to_i,
-      @f.get(:blue, :max => 255).to_i,
-      @f.get(:alpha, :min => 50, :max => 200).to_i
-    )
-    surface.pen = Wx::Pen.new(color, @f.get(:width, :min => 1, :max => 5).to_i)
-    surface.brush = Wx::Brush.new(color, Wx::SOLID)
-    case @f.choose(:shape,
-      :arc,
-      :polygon,
-      :line,
-      :rectangle,
-      :circle,
-      :spline
-    )
-    when :line
-      surface.draw_line(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
-        @f.get(:x1, :max => WIDTH).to_i,
-        @f.get(:y1, :max => HEIGHT).to_i
-      )
-    when :rectangle
-      surface.draw_rectangle(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
-        @f.get(:x1, :max => WIDTH).to_i,
-        @f.get(:y1, :max => HEIGHT).to_i
-      )
-    when :circle
-      surface.draw_circle(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
-        @f.get(:width, :max => 100).to_i
-      )
-    when :arc
-      surface.draw_elliptic_arc(
-        @f.get(:x0, :max => WIDTH).to_i,
-        @f.get(:y0, :max => HEIGHT).to_i,
-        @f.get(:width, :max => 100).to_i,
-        @f.get(:height, :max => 100).to_i,
-        @f.get(:arc_start, :max => 360).to_i,
-        @f.get(:arc_end, :max => 360).to_i
-      )
-    when :polygon
-      surface.draw_polygon(make_point_array)
-    when :spline
-      surface.draw_spline(make_point_array)
-    end
-  end
-  
-  #Create an array of points for drawing complex shapes.
-  def make_point_array
-    points = []
-    3.times do |i|
-      points << Wx::Point.new(
-        @f.get("x#{i}".to_sym, :max => WIDTH).to_i,
-        @f.get("y#{i}".to_sym, :max => HEIGHT).to_i
-      )
-    end
-    points
-  end
-
-
-end
-
-app = MyApp.new
-app.main_loop