nhr-api-ruby-client 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bffe04fc4f2c89a85b1a3a7ae500faf8026113d
-  data.tar.gz: e81bed2787f089463ad428677e07b573c1de0339
+  metadata.gz: 841488238841125567c6d5f39255a869eb0108f6
+  data.tar.gz: ccb1a9b7997c52698190a17893d26611d66258a4
 SHA512:
-  metadata.gz: 998a656a297959061a408c6fc6bb7b9d65182257282dedb913dde5e6334832913b3099ce56289565b002308376524986591092467fd5dc742d1d9ac1d6c867da
-  data.tar.gz: 9868ab0219001b203f5c8e786a6215b5109ec1006cb3c11790bedc98701ed57810ee713cb38005fe1277e67faf16693fab9c025de80fc650080602dbeeb711e0
+  metadata.gz: ec30bef1b1bb8949e55f851bcfaee03c7195634feaa3aea94b1915b898e8fdbb413f8231278c50f0e381c374d9e6da43a51e6bb47f0ff231a83a57ddbddf6a89
+  data.tar.gz: ca52d95b8f7f9f4a1172de450898e5dc005a3327578fd2233023a649a727f69684b24c6c39a6d8b1b7120a3c38b5a8b0927defc48abdf0bf015bea7504182a65

data/Gemfile

@@ -12,6 +12,6 @@ group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "juwelier", "~> 2.1.0"
+  gem "juwelier", "~> 2.2.0"
   gem "simplecov", ">= 0"
 end

data/Gemfile.lock

@@ -23,23 +23,24 @@ GEM
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
       oauth2 (~> 1.0)
-    hashie (3.4.4)
+    hashie (3.4.6)
     highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
-    juwelier (2.1.2)
+    juwelier (2.2.3)
       builder
-      bundler (>= 1.0)
+      bundler (>= 1.13)
       git (>= 1.2.5)
       github_api
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
       semver
-    jwt (1.5.4)
+    jwt (1.5.6)
     mime-types (2.99.2)
     mini_portile2 (2.1.0)
     minitest (5.9.0)
@@ -47,18 +48,17 @@ GEM
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    pkg-config (1.1.7)
+    psych (2.2.1)
     rack (2.0.1)
-    rake (11.2.2)
+    rake (11.3.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.8.0)
@@ -90,11 +90,11 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   json (~> 1.8.1)
-  juwelier (~> 2.1.0)
+  juwelier (~> 2.2.0)
   rdoc (~> 3.12)
   rest-client
   shoulda
   simplecov
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/nhr-api-ruby-client.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'rest-client'
+
 module Nhr
   class Client
 
@@ -20,9 +23,9 @@ module Nhr
       parameter = {token: @token, gateway_id: @gateway_id, action: @action, stime: @stime, etime: @etime, device_ieee: @device_ieee, cmdvalue: @cmdvalue}
       formdata = URI.encode_www_form(parameter)
       response = RestClient::Resource.new(@nhr_url, :ssl_version => 'TLSv1').post(formdata)  
-      raise "response nil" if response == nil
+      raise "response nil，it should must be a json string and could be gsub" unless response
       response = JSON.parse(response.split(';')[-1].gsub("\r\n\t\r\n?>\t",'')) 
-      raise "#{response},gateway_id: #{@gateway_id}" unless response['status'] == true or (@action = 'GetPIRMotionStatus' && response['response'] == 'not found data!!') 
+      raise "#{response['response']}" unless response['status'] == true or (@action = 'GetPIRMotionStatus' && response['response'] == 'not found data!!') 
       @response = response
   	end
   end

data/nhr-api-ruby-client.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nhr-api-ruby-client 0.4.0 ruby lib
+# stub: nhr-api-ruby-client 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nhr-api-ruby-client"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["kaogaau"]
-  s.date = "2016-11-10"
+  s.date = "2016-12-06"
   s.description = "The ruby gem about NHR Device"
   s.email = "kaogaau@gmail.com"
   s.extra_rdoc_files = [
@@ -28,7 +28,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/.DS_Store",
     "lib/nhr-api-ruby-client.rb",
-    "nhr-api-ruby-client.gemspec"
+    "nhr-api-ruby-client.gemspec",
+    "spec/nhr-api-ruby-client_spec.rb"
   ]
   s.homepage = "http://github.com/kaogaau/nhr-api-ruby-client"
   s.licenses = ["MIT"]
@@ -44,7 +45,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<juwelier>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<juwelier>, ["~> 2.2.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])
@@ -52,7 +53,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
+      s.add_dependency(%q<juwelier>, ["~> 2.2.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
@@ -61,7 +62,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
+    s.add_dependency(%q<juwelier>, ["~> 2.2.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

data/spec/nhr-api-ruby-client_spec.rb

@@ -0,0 +1,27 @@
+require './lib/nhr-api-ruby-client'
+
+RSpec.configure do |config|
+  # Use color in STDOUT
+  config.color = true
+
+  # other config options here...    
+
+end
+
+describe Nhr::Client do
+  before(:all) do #itri-tomato.project@insnergy.com
+    @nhr_url = 'http://59.124.104.45/api/getinformation.php'
+    @token = '762a2cd972e278df40f9425ecfdaf486e6efedf8c1be02e3a227ce'
+    @action = 'GetPlugPowerConsumption'
+    @cmdvalue = '1'
+    @device_ieee = '00124B000426162F'
+    @gateway_id = '319'
+    @stime = Time.new('2016','12','01').to_s
+    @etime = Time.new('2017','01','01').to_s
+    #@nhr = Nhr::Client.new(nhr_url: nhr_url, token: token, action: action, device_ieee: device_ieee, cmdvalue: cmdvalue)
+  end
+
+  it 'should get response' do
+    p Nhr::Client.new(nhr_url: @nhr_url, token: @token, action: @action, gateway_id: @gateway_id, device_ieee: @device_ieee, cmdvalue: @cmdvalue, stime: @stime, etime: @etime).response
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nhr-api-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - kaogaau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - lib/.DS_Store
 - lib/nhr-api-ruby-client.rb
 - nhr-api-ruby-client.gemspec
+- spec/nhr-api-ruby-client_spec.rb
 homepage: http://github.com/kaogaau/nhr-api-ruby-client
 licenses:
 - MIT