beebotte 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd37c393fe2779c46d062e6d63e5857aef14b607
-  data.tar.gz: 5042564e8a7228df947b303bfe34665d884c4b20
+  metadata.gz: 61b32c7b793ae9010f8d2759efb44a5b850852fa
+  data.tar.gz: 5f62dc24d1a0421731dfae18311855b57e1b6e21
 SHA512:
-  metadata.gz: ee1382b295f31a6440f925e2b2153c17212e29c76d03cba9d594f92c3cdadb7553c6dc5dd831c77e7d77612e3cbe44b414050ad73b70a1f65000cd405ff0e912
-  data.tar.gz: 6c0de50a52d1ba9764f91267366b07c1c98861edebdb177055134faef10317f95578ea2dde89173abc276ec288d5becba00329b71507ab76c35464f16149d312
+  metadata.gz: 8010f6f099a33a21cfc410d86f33122266628eb9c5a7ce780027c174768d91e6528cf22e338eb9e1be758b3d0b76eb568a87d4b7e7a23bd65ee84c0f5a1f8087
+  data.tar.gz: f4a105dc940ecf3871ae3402185cc277961730af4ac441c0a25cce1754e6cf6a87c1aaeba148723326a6e58f59305ef66be20fe29d5695db7206529dfec7862d

data/beebotte.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Beebotte REST API connector"
   spec.description   = "A pure ruby implementation of the BBT connector for beebotte's REST api"
   spec.homepage      = "https://github.com/DaKaZ/bbt_ruby"
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -19,10 +20,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency 'openssl'
+  spec.add_runtime_dependency 'ruby-hmac'
   spec.add_runtime_dependency 'json'
-  spec.add_runtime_dependency 'rest-client', '>= 1.8.0'
+  spec.add_runtime_dependency 'rest-client', '>= 1.8.0', '< 2.0.0'
   spec.add_runtime_dependency 'classy_hash'
   spec.add_runtime_dependency 'mqtt'
   spec.add_development_dependency "rspec"

data/lib/beebotte.rb

@@ -1,7 +1,7 @@
-require "beebotte/version"
-
 module Beebotte
-  require 'openssl'
+  require "beebotte/version"
+  require 'hmac-sha1'
+  require 'base64'
   require 'json'
   require 'rest-client'
   require 'base64'
@@ -83,7 +83,11 @@ module Beebotte
 
       body = {data: data}
       response = post_data("/v1/data/write/#{channel}/#{resource}", body.to_json)
-      block.call(response.body, response.code) if block
+      if block
+        block.call(response.body, response.code)
+      else
+        (response.code >= 200 && response.code < 300) ? true : false
+      end
     end
 
     # publish transient information
@@ -93,7 +97,11 @@ module Beebotte
       raise ArgumentError, 'Data must be a hash object' unless data.is_a?(Hash)
       body = {data: data}
       response = post_data("/v1/data/publish/#{channel}/#{resource}", body.to_json)
-      block.call(response.body, response.code) if block
+      if block
+        block.call(response.body, response.code)
+      else
+        (response.code >= 200 && response.code < 300) ? true : false
+      end
     end
 
     # Read persisted messages from the specified channel and resource
@@ -110,18 +118,26 @@ module Beebotte
       rtn = {}
       uri = "/v1/data/read/#{params[:channel]}/#{params[:resource]}"
       [:channel, :resource].each {|k| params.delete(k) }
-      puts "PARAMS: #{params.inspect}"
       response = get_data(uri, params)
       rtn = JSON.parse(response.body) if response.code >= 200 && response.code < 300
-      block.call(rtn, response.code) if block
+      if block
+        block.call(rtn, response.code)
+      else
+        (response.code >= 200 && response.code < 300) ? rtn : nil
+      end
+
     end
 
     def get_connections(user=nil, &block)
       resource = user.nil? ? [] : {}
       uri = "/v1/connections" + (resource.is_a?(String) ? "/#{resource}" : '')
       response = get_data(uri)
-      resource = JSON.parse(response.body) if response.code >= 200 && response.code < 300
-      block.call(resource, response.code) if block
+      resource = JSON.parse(response.body) if
+      if block
+        block.call(resource, response.code)
+      else
+        (response.code >= 200 && response.code < 300) ? resource : nil
+      end
     end
 
     def get_conection(user, &block)
@@ -136,7 +152,11 @@ module Beebotte
       uri = "/v1/channels" + (channel.is_a?(String) ? "/#{channel}" : '')
       response = get_data(uri)
       rtn = JSON.parse(response.body) if response.code >= 200 && response.code < 300
-      block.call(rtn, response.code) if block
+      if block
+        block.call(rtn, response.code)
+      else
+        (response.code >= 200 && response.code < 300) ? rtn : nil
+      end
     end
 
     def get_channel(channel, &block)
@@ -155,14 +175,22 @@ module Beebotte
       if response.code >= 200 && response.code < 300
         get_channel(channel[:name], &block)
       else
-        block.call({}, response.code) if block
+        if block
+          block.call({}, response.code)
+        else
+          return false
+        end
       end
     end
 
     def del_channel(channel, &block)
       raise ArgumentError, 'Channel name must be a string' unless channel.is_a?(String)
       response = del_data("/v1/channels/#{channel}")
-      block.call(response.body, response.code) if block
+      if block
+        block.call(response.body, response.code)
+      else
+        return (response.code >= 200 && response.code < 300) ? true : false
+      end
     end
 
     def get_resources(channel, resource='*', &block)
@@ -173,7 +201,11 @@ module Beebotte
       }
       response = get_data("/v1/channels/#{channel}/resources", params)
       rtn = JSON.parse(response.body) if response.code >= 200 && response.code < 300
-      block.call(rtn, response.code) if block
+      if block
+        block.call(rtn, response.code)
+      else
+        return (response.code >= 200 && response.code < 300) ? rtn : nil
+      end
     end
 
     def get_resource(channel, resource, &block)
@@ -194,7 +226,12 @@ module Beebotte
       if response.code >= 200 && response.code < 300
         get_resource(channel, resource[:name], &block)
       else
-        block.call({}, response.code) if block
+        if block
+          block.call({}, response.code)
+        else
+          return false
+        end
+
       end
     end
 
@@ -202,7 +239,11 @@ module Beebotte
       raise ArgumentError, 'Channel name must be a string' unless channel.is_a?(String)
       raise ArgumentError, 'Resource name must be a string' unless resource.is_a?(String)
       response = del_data("/v1/channels/#{channel}/resources/#{resource}")
-      block.call(response.body, response.code) if block
+      if block
+        block.call(response.body, response.code)
+      else
+        return (response.code >= 200 && response.code < 300) ? true : false
+      end
     end
 
     private
@@ -218,7 +259,6 @@ module Beebotte
       signature = get_signature('GET', uri, @headers, @secretKey)
       @headers["Authorization"] = "#{@apiKey}:#{signature}"
       url = "#{@protocol}://#{@hostname}:#{@port}#{uri}"
-      puts "URL: #{url}"
       response = RestClient.get(url, @headers)
     end
 
@@ -227,8 +267,6 @@ module Beebotte
       signature = get_signature('POST', uri, @headers, @secretKey)
       @headers["Authorization"] = "#{@apiKey}:#{signature}"
       url = "#{@protocol}://#{@hostname}:#{@port}#{uri}"
-      puts "URL: #{url}"
-      puts "BODY: #{body}"
       response = RestClient.post(url, body, @headers)
     end
 
@@ -237,7 +275,6 @@ module Beebotte
       signature = get_signature('DELETE', uri, @headers, @secretKey)
       @headers["Authorization"] = "#{@apiKey}:#{signature}"
       url = "#{@protocol}://#{@hostname}:#{@port}#{uri}"
-      puts "URL: #{url}"
       response = RestClient.delete(url, @headers)
     end
 
@@ -247,14 +284,13 @@ module Beebotte
       raise ArgumentError, 'Invalid method' unless (method == 'GET' || method == 'PUT' || method == 'POST' || method == 'DELETE')
       raise ArgumentError, 'Invalid path' unless path.is_a?(String) && path.match(/^\//)
       stringToSign = "#{method}\n#{headers['Content-MD5']}\n#{headers["Content-type"]}\n#{headers["Date"]}\n#{path}"
-      puts "stiringToSign= \"#{stringToSign}\""
       signature = sha1_sign(secretKey, stringToSign)
     end
 
     def sha1_sign(secretKey, stringToSign)
-      digest = OpenSSL::Digest.new('sha1')
-      hmac = OpenSSL::HMAC.digest(digest, secretKey, stringToSign)
-      signature = Base64.strict_encode64(hmac)
+      hmac = HMAC::SHA1.new(secretKey)
+      hmac.update(stringToSign)
+      Base64.strict_encode64("#{hmac.digest}")
     end
 
     def get_useragent_string

data/lib/beebotte/version.rb

@@ -1,3 +1,3 @@
 module Beebotte
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: beebotte
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Mike Kazmier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: openssl
+  name: ruby-hmac
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,6 +45,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: classy_hash
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +217,8 @@ files:
 - lib/beebotte.rb
 - lib/beebotte/version.rb
 homepage: https://github.com/DaKaZ/bbt_ruby
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []