udooneorest 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8423f087b238671a8fe5502d8fbf21576baa1d96
-  data.tar.gz: 83933c1d73407f6061f1959a5d8d4a2a3372c872
+  metadata.gz: 34262ec7219cedb8d2adbe2f6572bc85051bddc1
+  data.tar.gz: 922373c8b181a581882583375c2eb718f518dfb9
 SHA512:
-  metadata.gz: 9248abf15b708af872b9a35ae9b337a21af46bca99f6fc80a6bdfe3e6b6ad3d4adf8aa02265051caa83602c5e45afa5e14fdc685b21d0fb94726f0e9d81b602d
-  data.tar.gz: ba619decc1c3d2d05510f5b09e4fa9575bef4d5c779a9df008471b56987274b93c246ebc5429e183d00e219091bd36a941249a3e86bb2fa4d49a08b57856a927
+  metadata.gz: 6f981131c2732cc2064c0b88804fb5a76f0c3e24d43be544a70152c1b4b8bdfbea4cc8496939e039cb42630d00b37a74ec0c5f9bc6400a5ee309a5d6b6a7730c
+  data.tar.gz: 6c6ee991662b996d85f89eacc8b6b513ff33abffa6354b4db381a1edb08af1419659516b297c5c131cb21d8d245fd68b85ecd162e69c82ed4f9b6f8d2a15d2fa

data/lib/udooneorest.rb

@@ -11,7 +11,7 @@ require_relative 'udooneorest/barometer'
 require_relative 'udooneorest/temperature'
 
 
-GPIOS             =  %w(106 107 180 181 172 173 182 124 25 22 14 15 16 17 18 19 20 21 203 202 177 176 175 174 119 124 127 116 7 6 5 4)
+GPIOS             =  %w(178 179 104 143 142 141 140 149 105 148 146 147 100 102 NA NA 106 107 180 181 172 173 182 124 25 22 14 15 16 17 18 19 20 21 203 202 177 176 175 174 119 124 127 116 7 6 5 4)
 HELP_URL          = 'http://github.com/marksull/udooneorest'
 BASE_PATH         = '/sys/class/gpio/'
 VALUE_LOW         = '0'
@@ -79,7 +79,11 @@ module UdooNeoRest
     # file       : the file to cat
     #
     def self.cat(file)
-      File.read(file).chomp
+      begin
+        return File.read(file).chomp
+      rescue Exception => e
+        return nil
+      end
     end
 
     #############################################################################
@@ -133,7 +137,12 @@ module UdooNeoRest
     # file       : the file to cat
     #
     def self.cat_and_status(file)
-      UdooNeoRest::Base.status_ok(UdooNeoRest::Base.cat file)
+      result = UdooNeoRest::Base.cat file
+      unless result.nil?
+        return UdooNeoRest::Base.status_ok result
+      end
+
+      return UdooNeoRest::Base.status_error 'GPIO/PIN could not be read. Have you already exported the GPIO/PIN?'
     end
 
     #############################################################################

data/lib/udooneorest/direction.rb

@@ -64,7 +64,7 @@ module UdooNeoRest
       return gpio_.error_message unless gpio_.valid?
 
       # get the direction
-      UdooNeoRest::Base.status_ok(UdooNeoRest::Base.cat "#{BASE_PATH}gpio#{gpio}/direction")
+      UdooNeoRest::Base.cat_and_status "#{BASE_PATH}gpio#{gpio}/direction"
     end
 
     #############################################################################

data/lib/udooneorest/validators.rb

@@ -49,8 +49,8 @@ module UdooNeoRest
   class ValidateGpio < Validate
 
     def valid?
-      unless GPIOS.include?(@value)
-        @error_message = UdooNeoRest::Base.status_error("GPIO value of '#{@value}' is invalid. Should be one of #{GPIOS.sort.join(',')}.")
+      unless GPIOS.include?(@value) && (@value != 'NA')
+        @error_message = UdooNeoRest::Base.status_error("GPIO value of '#{@value}' is invalid. Should be one of #{(GPIOS - ['NA']).sort.join(',')}.")
         return false
       end
 
@@ -93,8 +93,8 @@ module UdooNeoRest
     end
 
     def valid?
-      if (16 > @value || @value > 47)
-        @error_message = UdooNeoRest::Base.status_error("Pin value of '#{@value}' is invalid. Should be between >=16 and <=47.")
+      if (@value > 47) || (GPIOS[@value] == 'NA')
+        @error_message = UdooNeoRest::Base.status_error("Pin value of #{@value} is invalid. Please refer to UDOO Neo documentation.")
         return false
       end
 
@@ -107,7 +107,7 @@ module UdooNeoRest
     #
     def to_gpio
       return nil unless valid?
-      GPIOS[@value-16]
+      GPIOS[@value]
     end
 
   end

data/lib/udooneorest/value.rb

@@ -64,7 +64,7 @@ module UdooNeoRest
       return gpio_.error_message unless gpio_.valid?
 
       # Get the value
-      UdooNeoRest::Base.status_ok(UdooNeoRest::Base.cat "#{BASE_PATH}gpio#{gpio}/value")
+      UdooNeoRest::Base.cat_and_status "#{BASE_PATH}gpio#{gpio}/value"
     end
 
     #############################################################################

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: udooneorest
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mark Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rest API for interacting with UDOO Neo