wifly 0.0.2 → 0.0.3

data/lib/wifly/calculations.rb

@@ -0,0 +1,24 @@
+module Wifly
+  module Calculations
+    ##
+    # Return an array containing the numbers of the pins that are in HIGH state
+    #
+    def high_pins(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|
+        pin if value == "1"
+      end.compact
+    end
+
+    ## 
+    # Given a pin number, return the hex code that corresponds to it
+    #
+    def pin_to_hex(pin)
+      return "0x0" if pin == 0
+      binstr = "0b1" + ("0" * pin) # make a binary string with a 1 in `pin` position
+      base10 = binstr.to_i(2)      # convert to base 10
+      "0x" + base10.to_s(16)       # return hexadecimal string
+    end
+  end
+end

data/lib/wifly/control.rb

@@ -1,5 +1,7 @@
 module Wifly
   class Control
+    include Calculations
+    
     attr_accessor :connection
 
     ##
@@ -20,18 +22,6 @@ module Wifly
       connection.send_command("lites")
     end
 
-    ##
-    # Return an array containing the numbers of the pins that are in HIGH state
-    #
-    def high_pins
-      io=read_io
-                      #"8d08"   36104   "1000110100001000"   make it 16 bits
-      binary_string = io       .hex     .to_s(2)             .rjust(io.size*4, '0')
-      binary_string.reverse.split("").each_with_index.map do |value, pin|
-        pin if value == "1"
-      end.compact
-    end
-
     ##
     # set a pin high
     #
@@ -52,17 +42,7 @@ module Wifly
     # given a pin number, return 1 if high or 0 if low
     #
     def read_pin(pin)
-      high_pins.include?(pin) ? 1 : 0
-    end
-
-    ## 
-    # Given a pin number, return the hex code that corresponds to it
-    #
-    def pin_to_hex(pin)
-      return "0x0" if pin == 0
-      binstr = "0b1" + ("0" * pin) # make a binary string with a 1 in `pin` position
-      base10 = binstr.to_i(2)      # convert to base 10
-      "0x" + base10.to_s(16)       # return hexadecimal string
+      high_pins(read_io).include?(pin) ? 1 : 0
     end
 
     private

data/lib/wifly/version.rb

@@ -1,3 +1,3 @@
 module Wifly
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/wifly.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'wifly/connection'
+require 'wifly/calculations'
 require 'wifly/control'
 require 'wifly/version'
 

data/spec/control_spec.rb

@@ -8,9 +8,10 @@ describe Wifly::Control do
 
   it 'should get high pins' do
     connection = double('connection')
-    connection.should_receive(:send_command).exactly(3).times.and_return("show io\r\r\n8d08\r\n")
+    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
+
+    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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wifly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ files:
 - README.md
 - Rakefile
 - lib/wifly.rb
+- lib/wifly/calculations.rb
 - lib/wifly/connection.rb
 - lib/wifly/control.rb
 - lib/wifly/version.rb
@@ -111,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -937417951
+      hash: -499143373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -937417951
+      hash: -499143373
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25