open_lighting 0.0.1 → 0.0.2

data/lib/open_lighting/devices/comscan_led.rb

@@ -8,20 +8,20 @@ module OpenLighting
         options[:points] ||= {}
         options[:points][:center] ||= {:pan => 127, :tilt => 127}
 
-        options[:points][:strobe_slow] ||= {:strobe => 16}
-        options[:points][:strobe_fast] ||= {:strobe => 131}
+        options[:points][:strobe_slow]      ||= {:strobe => 16}
+        options[:points][:strobe_fast]      ||= {:strobe => 131}
         options[:points][:strobe_slow_fast] ||= {:strobe => 140}
         options[:points][:strobe_fast_slow] ||= {:strobe => 190}
-        options[:points][:strobe_random] ||= {:strobe => 247}
+        options[:points][:strobe_random]    ||= {:strobe => 247}
 
-        options[:points][:yellow] ||= {:gobo => 8}
-        options[:points][:red] ||= {:gobo => 15}
-        options[:points][:green] ||= {:gobo => 22}
-        options[:points][:blue] ||= {:gobo => 29}
+        options[:points][:yellow]   ||= {:gobo => 8}
+        options[:points][:red]      ||= {:gobo => 15}
+        options[:points][:green]    ||= {:gobo => 22}
+        options[:points][:blue]     ||= {:gobo => 29}
         options[:points][:teardrop] ||= {:gobo => 36}
-        options[:points][:polka] ||= {:gobo => 43}
-        options[:points][:teal] ||= {:gobo => 50}
-        options[:points][:rings] ||= {:gobo => 57}
+        options[:points][:polka]    ||= {:gobo => 43}
+        options[:points][:teal]     ||= {:gobo => 50}
+        options[:points][:rings]    ||= {:gobo => 57}
 
         options[:capabilities] ||= [:pan, :tilt, :strobe, :gobo, :dimmer]
 

data/lib/open_lighting/devices.rb

@@ -0,0 +1 @@
+require 'open_lighting/devices/comscan_led'

data/lib/open_lighting/dmx_controller.rb

@@ -26,12 +26,13 @@ module OpenLighting
     end
 
     def <<(val)
+      val.start_address ||= current_values.count + 1
       val.controller = self
       @devices << val
     end
 
     def set(options = {})
-      @devices.each {|device| device.set(options)}
+      @devices.each {|device| device.set(options.dup)}
     end
 
     def write!(values=current_values)
@@ -44,6 +45,11 @@ module OpenLighting
       self.write_pipe.flush
     end
 
+    def close!
+      self.write_pipe.close if self.write_pipe
+      self.read_pipe.close  if self.read_pipe
+    end
+
     def instant!(options = {})
       set(options)
       write!
@@ -90,5 +96,19 @@ module OpenLighting
       end
       results
     end
+
+    def capabilities
+      @devices.map{|device| device.capabilities + device.points.keys}.flatten.uniq
+    end
+
+    def method_missing(meth, *args, &block)
+      if capabilities.include? meth.to_sym
+        set :point => meth.to_sym
+      else
+        super # You *must* call super if you don't handle the
+              # method, otherwise you'll mess up Ruby's method
+              # lookup.
+      end
+    end
   end
 end

data/lib/open_lighting/dmx_device.rb

@@ -24,7 +24,7 @@ module OpenLighting
 
       capabilities.each_with_index do |c, i|
         unless options[c].nil?
-          current_values[i] = options[c]
+          current_values[i] = options.delete(c)
         end
       end
     end
@@ -39,5 +39,15 @@ module OpenLighting
     def to_dmx
       current_values.join ","
     end
+
+    def method_missing(meth, *args, &block)
+        if points[meth.to_sym]
+          set points[meth.to_sym]
+        else
+          super # You *must* call super if you don't handle the
+                # method, otherwise you'll mess up Ruby's method
+                # lookup.
+        end
+      end
   end
 end

data/lib/open_lighting/version.rb

@@ -1,3 +1,3 @@
 module OpenLighting
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/open_lighting.rb

@@ -1,3 +1,4 @@
 require "open_lighting/version"
 require "open_lighting/dmx_controller"
 require "open_lighting/dmx_device"
+require "open_lighting/devices"

data/spec/open_lighting/devices/comscan_led_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require "open_lighting/devices/comscan_led"
 
 module OpenLighting
   module Devices

data/spec/open_lighting/dmx_controller_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require "open_lighting/dmx_controller"
-require "open_lighting/dmx_device"
 
 module OpenLighting
   describe DmxController do
@@ -33,20 +31,37 @@ module OpenLighting
       end
 
       context 'when adding devices' do
-        before(:each) do
-          @controller << DmxDevice.new(:start_address => 1)
-          @controller << DmxDevice.new(:start_address => 6)
-        end
-
-        it 'should return devices in the same order as added' do
-          @controller.devices.count.should == 2
-          @controller.devices.first.start_address.should == 1
-          @controller.devices.last.start_address.should == 6
+        context 'when :start_address is specified' do
+          before(:each) do
+            @controller << DmxDevice.new(:start_address => 1)
+            @controller << DmxDevice.new(:start_address => 6)
+          end
+
+          it 'should return devices in the same order as added' do
+            @controller.devices.count.should == 2
+            @controller.devices.first.start_address.should == 1
+            @controller.devices.last.start_address.should == 6
+          end
+
+          it 'should attach controller to devices' do
+            @controller.devices.first.controller.should == @controller
+            @controller.devices.last.controller.should == @controller
+          end
         end
 
-        it 'should attach controller to devices' do
-          @controller.devices.first.controller.should == @controller
-          @controller.devices.last.controller.should == @controller
+        context 'when :start_address is not specified' do
+          before(:each) do
+            options = {:capabilities => [:pan, :tilt]}
+            @controller << DmxDevice.new(options)
+            @controller << DmxDevice.new(options)
+            @controller << DmxDevice.new(options)
+          end
+
+          it 'should add default :start_address' do
+            @controller.devices.count.should == 3
+            @controller.devices.first.start_address.should == 1
+            @controller.devices.last.start_address.should == 5
+          end
         end
       end
     end
@@ -54,12 +69,30 @@ module OpenLighting
     describe ".to_dmx" do
       before(:each) do
         @controller = DmxController.new
-        @controller << DmxDevice.new(:start_address => 1, :capabilities => [:pan, :tilt, :dimmer])
-        @controller << DmxDevice.new(:start_address => 4, :capabilities => [:pan, :tilt, :dimmer])
+        @controller << DmxDevice.new(:start_address => 1, :capabilities => [:pan, :tilt, :dimmer], :points => {:center => {:pan => 127, :tilt => 127}})
+        @controller << DmxDevice.new(:start_address => 4, :capabilities => [:pan, :tilt, :dimmer], :points => {:center => {:pan => 127, :tilt => 127}})
+      end
+
+      it "should report correct capabilities" do
+        @controller.capabilities.should == [:pan, :tilt, :dimmer, :center]
       end
 
       it "should serialize all DmxDevices" do
         @controller.to_dmx.should == "0,0,0,0,0,0"
+        @controller.set(:pan => 255)
+        @controller.to_dmx.should == "255,0,0,255,0,0"
+        @controller.set(:point => :center)
+        @controller.to_dmx.should == "127,127,0,127,127,0"
+      end
+
+      it "should do method_missing magics" do
+        @controller.to_dmx.should == "0,0,0,0,0,0"
+        @controller.center
+        @controller.to_dmx.should == "127,127,0,127,127,0"
+      end
+
+      it "but not for incorrect names" do
+        lambda { @controller.offcenter }.should raise_error NoMethodError
       end
 
       it "should honor overlapping start_address" do

data/spec/open_lighting/dmx_device_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require "open_lighting/dmx_controller"
-require "open_lighting/dmx_device"
 
 module OpenLighting
   describe DmxDevice do
@@ -97,6 +95,15 @@ module OpenLighting
             @device.set(:point => :center)
             @device.current_values.should == [127, 127, 0]
           end
+
+          it "should do method_missing magics" do
+            @device.center
+            @device.current_values.should == [127, 127, 0]
+          end
+
+          it "but not for incorrect names" do
+            lambda {@device.offcenter}.should raise_error NoMethodError
+          end
         end
 
         context "when setting multiple points" do

data/spec/spec_helper.rb

@@ -5,3 +5,5 @@ if RUBY_VERSION.to_f == 1.9
   require 'simplecov'
   SimpleCov.start
 end
+
+require "open_lighting"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_lighting
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -122,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - lib/open_lighting.rb
+- lib/open_lighting/devices.rb
 - lib/open_lighting/devices/comscan_led.rb
 - lib/open_lighting/dmx_controller.rb
 - lib/open_lighting/dmx_device.rb