insnergy-api-ruby-client 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a35a351cc4e1c56fa2859ae98c5689a92d95a61
-  data.tar.gz: 3a459fd0f9c7c743adc368440002a8facc3a555c
+  metadata.gz: 8728279bc391df17e4a5727f35bcdedb4055494a
+  data.tar.gz: 45f413e3b1886d7044e0708daf222325926ce8d4
 SHA512:
-  metadata.gz: 95ea86908078ae67f638586e7b65cbbacd49b677db0cf10a56003c4b6b28b894abf4251fde3990a0d669aeba76601533468e12565083df01ab5c5671d37ece21
-  data.tar.gz: a8a585ad1bdb52d9a24a794df10a44a4deda087ad1118f4c569abcfd489d9ee2e242ed357a6e6489ea8109a72fe7af0cea625f63d4b51b9c31509fbeefe914f9
+  metadata.gz: 4c684e0a06d9ceb673a9b505e8c0e224f39173b69cbb49f27c209dc0af211eecd5098cef16a114def233af8d82433e92d67c17163de71a72052efc41c17c0727
+  data.tar.gz: 41d6431347024d67fdb965adfd9e095625738cc0265df56a4b3b89137376a86a22fd883f374d27a95925c9a671ac1160503d68a03bc4de261680149e0d6e809a

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0

data/insnergy-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: insnergy-api-ruby-client 0.11.0 ruby lib
+# stub: insnergy-api-ruby-client 0.12.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "insnergy-api-ruby-client"
-  s.version = "0.11.0"
+  s.version = "0.12.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-10-04"
+  s.date = "2016-10-05"
   s.description = "The ruby gem about In-Snergy Family"
   s.email = "kaogaau@gmail.com"
   s.extra_rdoc_files = [

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

@@ -2,78 +2,140 @@ require 'json'
 require 'rest-client'
 
 module Insnergy
+  module Client
+    class Token
+      attr_accessor :domain, :oauth_key, :oauth_secert, :refresh_token
+  	  attr_reader :access_token, :user_id
+
+  	  def initialize(domain: nil, oauth_key: nil, oauth_secert: nil, refresh_token: nil)
+  	    @domain = domain
+        @oauth_key = oauth_key
+  	    @oauth_secert = oauth_secert
+  	    @refresh_token = refresh_token
+        @access_token = nil
+        @user_id = nil
+  	    token!
+        user_id!
+  	  end
+
+  	  def token!
+        response = JSON.parse(RestClient.post "#{@domain}/if/oauth/token" ,{:client_id => @oauth_key, :client_secret => @oauth_secert, :absytem => 'IFA', :grant_type => 'refresh_token', :refresh_token => @refresh_token }, :accept => :json)
+        raise "<no got refresh_token>\n#{response}" unless response.key?('refresh_token')
+        raise "<no got access_token>\n#{response}" unless response.key?('access_token')
+        @refresh_token = response['refresh_token']
+        @access_token = response['access_token']		
+  	  end
+
+  	  def user_id!
+        response = JSON.parse(RestClient.get "#{@domain}/if/3/user/me" ,{:Authorization => "Bearer #{@access_token}"})
+        raise "<no got user_id>\n#{response}" unless response.key?('user') && response['user'].key?('user_id')
+        @user_id = response['user']['user_id']
+  	  end
+    end
+
+    class Power
+      attr_accessor :device_ids, :start_time, :end_time 
+      attr_reader :response
+
+      def initialize(client: nil, device_ids: [], start_time: nil, end_time: nil)
+        @access_token = client.access_token
+        @user_id = client.user_id
+        @domain = client.domain
+        @device_ids = device_ids
+        @dev_ids = ''
+        device_ids = Array(device_ids)
+        device_ids.each do |ele|
+          @dev_ids += ele
+          @dev_ids += ';'
+        end
+        @start_time = start_time
+        @end_time = end_time
+        @response = nil
+        response!
+      end   
+
+      def response!
+        parameter = {:params => {:apsystem => "IFA", :email => @user_id, :attr => "dm1mi", :start_time => @start_time, :end_time => @end_time, :dev_ids => @dev_ids}, :Authorization => "Bearer #{@access_token}"}
+        @response = JSON.parse(RestClient.get "#{@domain}/if/3/device/history_ext", parameter)
+        raise "#{response['err']['code']}" unless response['err']['code'] == '0' 
+        @response      
+      end
+    end
 
-  class Client
-    attr_accessor :domain, :oauth_key, :oauth_secert, :refresh_token
-	  attr_reader :access_token, :user_id
-
-	  def initialize(domain: nil, oauth_key: nil, oauth_secert: nil, refresh_token: nil)
-	    @domain = domain
-      @oauth_key = oauth_key
-	    @oauth_secert = oauth_secert
-	    @refresh_token = refresh_token
-      @access_token = nil
-      @user_id = nil
-	    token!
-      user_id!
-	  end
-
-	  def token!
-      response = JSON.parse(RestClient.post "#{@domain}/if/oauth/token" ,{:client_id => @oauth_key, :client_secret => @oauth_secert, :absytem => 'IFA', :grant_type => 'refresh_token', :refresh_token => @refresh_token }, :accept => :json)
-      raise "<no got refresh_token>\n#{response}" unless response.key?('refresh_token')
-      raise "<no got access_token>\n#{response}" unless response.key?('access_token')
-      @refresh_token = response['refresh_token']
-      @access_token = response['access_token']		
-	  end
-
-	  def user_id!
-      response = JSON.parse(RestClient.get "#{@domain}/if/3/user/me" ,{:Authorization => "Bearer #{@access_token}"})
-      raise "<no got user_id>\n#{response}" unless response.key?('user') && response['user'].key?('user_id')
-      @user_id = response['user']['user_id']
-	  end
-
-	  #def sensor
-		#  Client::Sensor.new(client: self, category: 'sensor')
-	  #end
-
-    #def power(device_id: nil, start_time: nil, end_time: nil)
-    #  client = Client::Power.new(client: self, device_id: device_id, start_time: start_time, end_time: end_time)
-    #  client.get_device
-    #end
+    class Widgets
+      attr_accessor :category, :client 
+      attr_reader :response
+
+      def initialize(client: nil,category: nil)
+        @access_token = client.access_token
+        @user_id = client.user_id
+        @domain = client.domain
+        @category = category
+        @response = nil
+        response!
+      end
+
+      def response!
+        parameter = {:params => {:apsystem => "IFA", :email => @user_id, :type_code => 1, :dev_category => "#{@category}"}, :Authorization => "Bearer #{@access_token}"}
+        @response = JSON.parse(RestClient.get "#{@domain}/if/3/user/widgets", parameter)
+        raise "#{response['err']['code']}" unless response['err']['code'] == '0'  
+        @response
+      end
+    end
+
+    class Control
+      attr_accessor :device_id, :action
+      attr_reader :response
+      def initialize(client: nil, device_id: nil, action: nil)
+        @access_token = client.access_token
+        @user_id = client.user_id
+        @domain = client.domain
+        @device_id = device_id
+        @action = action
+        @response = nil
+        response!
+      end
+
+      def response!
+        parameter = {:params => {:apsystem => "IFA", :email => @user_id,  :dev_id => @device_id ,:action => @action}, :Authorization => "Bearer #{@access_token}"}
+        @response = JSON.parse(RestClient.get "#{@domain}/if/3/device/control" , parameter)
+        raise "#{response['err']['code']}" unless response['err']['code'] == '0' 
+        @response 
+      end      
+    end
   end
 
-  class Power
-    attr_accessor :device_ids, :start_time, :end_time 
-    attr_reader :response
-
-    def initialize(client: nil, device_ids: [], start_time: nil, end_time: nil)
-      @access_token = client.access_token
-      @user_id = client.user_id
-      @domain = client.domain
-      @device_ids = device_ids
-      @dev_ids = ''
-      device_ids = Array(device_ids)
-      device_ids.each do |ele|
-        @dev_ids += ele
-        @dev_ids += ';'
+  class Widget
+    attr_reader :widget_alias, :widget_dev_id, :widget_dev_type_name, :widget_status
+    
+    def initialize(opts = {})
+      @infos = Hash.new
+      @widget_dev_id = opts['dev_id']
+      @widget_dev_type_name = opts['dev_type_name']
+      @widget_alias = opts['alias']
+      @widget_status = opts['status']
+      opts['widget_infos'].each do |ele|
+        @infos[ele['info_name']] = ele['info_value']
       end
-      @start_time = start_time
-      @end_time = end_time
-      @response = nil
-      response!
-    end   
-
-    #def get_device
-    #  Power.new(@response)
-    #end
-
-    def response!
-      parameter = {:params => {:apsystem => "IFA", :email => @user_id, :attr => "dm1mi", :start_time => @start_time, :end_time => @end_time, :dev_ids => @dev_ids}, :Authorization => "Bearer #{@access_token}"}
-      @response = JSON.parse(RestClient.get "#{@domain}/if/3/device/history_ext", parameter)
-      raise "#{response['err']['code']}" unless response['err']['code'] == '0' 
-      @response      
     end
+
+    def widget_info_value
+      @widget_dev_type_name
+    end
+
+    def co_meter
+      @infos['400700']
+    end
+
+    def co2_meter
+      @infos['400600']
+    end
+
+    def sensor_th_ty
+      "#{@infos['400100']}|#{@infos['400200']}"
+    end      
   end
+end
 
 =begin
   class Power
@@ -106,70 +168,4 @@ module Insnergy
       @alias = opts['devices'][0]['alias']
     end
   end
-=end
-  class Widgets
-    attr_accessor :category, :client 
-    attr_reader :response
-
-    def initialize(client: nil,category: nil)
-      @access_token = client.access_token
-      @user_id = client.user_id
-      @domain = client.domain
-      @category = category
-      @response = nil
-      response!
-    end
-
-    #def get_device
-    #  @widgets = Array.new
-    #  get_response!['widgets'].each do |ele|
-    #      @widgets << Sensor.new(ele)
-    #  end 
-    #end
-
-    #def each
-    #  @widgets.each do |ele|
-    #    yield ele
-    #  end
-    #end
-
-    def response!
-      parameter = {:params => {:apsystem => "IFA", :email => @user_id, :type_code => 1, :dev_category => "#{@category}"}, :Authorization => "Bearer #{@access_token}"}
-      @response = JSON.parse(RestClient.get "#{@domain}/if/3/user/widgets", parameter)
-      raise "#{response['err']['code']}" unless response['err']['code'] == '0'  
-      @response
-    end
-  end
-=begin
-  class Sensor
-    attr_reader :widgets_alias, :dev_id, :dev_type_name, :status
-
-    def initialize(opts = {})
-      @infos = Hash.new
-      @widgets_alias = opts['alias']
-      @dev_id = opts['dev_id']
-      @dev_type_name = opts['dev_type_name']
-      @status = opts['status']
-      opts['widget_infos'].each do |ele|
-        @infos[ele['info_name']] = ele['info_value']
-      end
-    end
-
-    def widgets_info_value
-      @dev_type_name
-    end
-
-    def co_meter
-      @infos['400700']
-    end
-
-    def co2_meter
-      @infos['400600']
-    end
-
-    def sensor_th_ty
-      "#{@infos['400100']}|#{@infos['400200']}"
-    end
-  end
-=end
-end
+=end

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

@@ -8,16 +8,16 @@ RSpec.configure do |config|
 
 end
 
-describe Insnergy do
+describe Insnergy::Client do
   before(:all) do #itri-tomato.project@insnergy.com
     domain = 'https://if3.insnergy.com'
     oauth_key = 'aac61d6e-b9df-4cf6-a44e-dbba0518b339'
     oauth_secert = 'ffaa37d1-74eb-42db-a555-91aa59d4f540'
     refresh_token = '43add8e7-621d-41e9-bd14-e8153d95b3ac'
-    @insnergy = Insnergy::Client.new(domain: domain, oauth_key: oauth_key, oauth_secert: oauth_secert, refresh_token: refresh_token)  
+    @insnergy = Insnergy::Client::Token.new(domain: domain, oauth_key: oauth_key, oauth_secert: oauth_secert, refresh_token: refresh_token)  
   end
 
-  describe Insnergy::Client do
+  describe Insnergy::Client::Token do
     before(:all) do
       @access_token = @insnergy.access_token
       @user_id = @insnergy.user_id
@@ -60,9 +60,9 @@ describe Insnergy do
     end
   end
 
-  describe Insnergy::Widgets do
+  describe Insnergy::Client::Widgets do
     before(:all) do
-    	@widgets = Insnergy::Widgets.new(client: @insnergy, category: 'sensor')
+    	@widgets = Insnergy::Client::Widgets.new(client: @insnergy, category: 'sensor')
     end 
 
     describe "#initialize" do
@@ -102,7 +102,7 @@ describe Insnergy do
     end
   end
 
-  describe Insnergy::Power do
+  describe Insnergy::Client::Power do
     
     def this_month_day1
       Time.new(Time.now.year, Time.now.month, 1).to_i*1000
@@ -114,7 +114,7 @@ describe Insnergy do
 
     before(:all) do
     	device_ids = ['RS06000D6F0003BB8B88','II09000D6F0003BBAE83']	
-     	@power = Insnergy::Power.new(client: @insnergy, device_ids: device_ids, start_time: this_month_day1, end_time: next_month_day1)
+     	@power = Insnergy::Client::Power.new(client: @insnergy, device_ids: device_ids, start_time: this_month_day1, end_time: next_month_day1)
     end 
 
     describe "#initialize" do
@@ -126,4 +126,26 @@ describe Insnergy do
   	  end
     end
   end
+
+  describe Insnergy::Client::Control do
+    before(:all) do
+      @device_id = 'II09000D6F0003BBAE83'
+      @control = Insnergy::Client::Control.new(client: @insnergy, device_id: @device_id, action: 'on')
+    end 
+    
+    describe "#initialize" do
+      context "when initialize a new object" do
+        it "must exist response" do
+          @control_response = @control.response
+          expect(@control_response).not_to eq(nil)
+        end
+
+        it "response'structre must exist relay_status and br on" do
+          @control_response = @control.response
+          expect(@control_response['relay_status']).to eq('on')
+        end
+      end 
+    end    
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insnergy-api-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - kaogaau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client