wifly 0.0.4 → 0.0.5

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 .rvmrc
+.ruby-version
+.ruby-gemset

data/lib/wifly/calculations.rb

@@ -1,9 +1,10 @@
 module Wifly
   module Calculations
     ##
-    # Return an array containing the numbers of the pins that are in HIGH state
+    # Parse the hexadecimal string returned from the show_io command
+    # into an array of pins that are high 
     #
-    def high_pins(hex_str)
+    def parse_io(hex_str)
                       #"8d08"   36104   "1000110100001000"   make it 16 bits
       binary_string = hex_str   .hex     .to_s(2)             .rjust(hex_str.size*4, '0')
       binary_string.reverse.split("").each_with_index.map do |value, pin|

data/lib/wifly/control.rb

@@ -42,7 +42,14 @@ module Wifly
     # given a pin number, return 1 if high or 0 if low
     #
     def read_pin(pin)
-      high_pins(read_io).include?(pin) ? 1 : 0
+      high_pins.include?(pin) ? 1 : 0
+    end
+
+    ##
+    # Return an array of all the pins which are currently high 
+    #
+    def high_pins
+      parse_io(read_io)
     end
 
     private

data/lib/wifly/version.rb

@@ -1,3 +1,3 @@
 module Wifly
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/calculations_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+class WiflyControlShim
+  include Wifly::Calculations
+end
+
+describe Wifly::Calculations do
+  it 'should convert pin to hex' do
+    control = WiflyControlShim.new
+    control.pin_to_hex(5).should eq("0x20")
+    control.pin_to_hex(0).should eq("0x0")
+  end 
+
+  it 'should get high pins' do
+    control = WiflyControlShim.new
+    result = control.parse_io('8d08')
+    result.should eq([3, 8, 10, 11, 15])
+  end
+end

data/spec/connection_spec.rb

@@ -1,4 +1,4 @@
-require 'wifly'
+require 'spec_helper'
 class Wifly::TestServer
   attr_accessor :input
 

data/spec/control_spec.rb

@@ -1,28 +1,20 @@
-require 'wifly'
+require 'spec_helper'
 describe Wifly::Control do
-  it 'should convert pin to hex' do
-    control = Wifly::Control.new('localhost', 2000, '1.2', {})
-    control.pin_to_hex(5).should eq("0x20")
-    control.pin_to_hex(0).should eq("0x0")
-  end 
+  it 'should set high and low' do
+    connection = double('connection')
+    connection.should_receive(:send_command).with("set sys output 0x20 0x20", Wifly::AOK.length)
+    connection.should_receive(:send_command).with("set sys output 0x00 0x20", Wifly::AOK.length)
+    control = Wifly::Control.new('localhost', 2000, '1.2', connection)
+    control.set_high(5)
+    control.set_low(5)
+  end
 
   it 'should get high pins' do
     connection = double('connection')
     connection.should_receive(:send_command).exactly(2).times.and_return("show io\r\r\n8d08\r\n")
     control = Wifly::Control.new('localhost', 2000, '1.2', connection)
 
-    result = control.high_pins('8d08')
-    result.should eq([3, 8, 10, 11, 15])
     control.read_pin(8).should eq(1)
     control.read_pin(7).should eq(0)
   end
-
-  it 'should set high and low' do
-    connection = double('connection')
-    connection.should_receive(:send_command).with("set sys output 0x20 0x20", Wifly::AOK.length)
-    connection.should_receive(:send_command).with("set sys output 0x00 0x20", Wifly::AOK.length)
-    control = Wifly::Control.new('localhost', 2000, '1.2', connection)
-    control.set_high(5)
-    control.set_low(5)
-  end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'wifly'
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wifly
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,6 +93,7 @@ files:
 - lib/wifly/connection.rb
 - lib/wifly/control.rb
 - lib/wifly/version.rb
+- spec/calculations_spec.rb
 - spec/connection_spec.rb
 - spec/control_spec.rb
 - spec/spec_helper.rb
@@ -110,12 +111,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3199720615391178109
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3199720615391178109
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -123,6 +130,7 @@ signing_key:
 specification_version: 3
 summary: This gem can be used to talk to a WiFly RN-XV device at a specified address.
 test_files:
+- spec/calculations_spec.rb
 - spec/connection_spec.rb
 - spec/control_spec.rb
 - spec/spec_helper.rb