insnergy-api-ruby-client 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328a474003cee9ef80e2ff401edcfa893459ec2d
-  data.tar.gz: 4554709f3a064f3b1c03ef26eb3e54fb87b2a993
+  metadata.gz: 5a35a351cc4e1c56fa2859ae98c5689a92d95a61
+  data.tar.gz: 3a459fd0f9c7c743adc368440002a8facc3a555c
 SHA512:
-  metadata.gz: 9d50d45a95404e920ef3f24a721d5370e90cb110949af9aa10f3fb2a51a0bde549cd8a6b427d8749eac62045b363efc5aae6bce2ecf2a2b6953aa24a94fd604c
-  data.tar.gz: f0f5a564e56c615b0941d936cf9f821ca06e0156fd5235a53b79fa8abd8fe4b93f6858ac4a69b02ee9e5ab128bb8ad2b2fa0e162a379f2d6fae765ae27477ed0
+  metadata.gz: 95ea86908078ae67f638586e7b65cbbacd49b677db0cf10a56003c4b6b28b894abf4251fde3990a0d669aeba76601533468e12565083df01ab5c5671d37ece21
+  data.tar.gz: a8a585ad1bdb52d9a24a794df10a44a4deda087ad1118f4c569abcfd489d9ee2e242ed357a6e6489ea8109a72fe7af0cea625f63d4b51b9c31509fbeefe914f9

data/Gemfile

@@ -16,4 +16,5 @@ group :development do
   gem "simplecov", ">= 0"
   gem 'rest-client'
   gem 'json', '~> 1.8.1'
+  gem 'rspec'
 end

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
     concurrent-ruby (1.0.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     docile (1.1.5)
     domain_name (0.5.20160310)
       unf (>= 0.0.5, < 1.0.0)
@@ -65,6 +66,19 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     semver (1.0.1)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
@@ -93,6 +107,7 @@ DEPENDENCIES
   juwelier (~> 2.1.0)
   rdoc (~> 3.12)
   rest-client
+  rspec
   shoulda
   simplecov
 

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.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.10.0 ruby lib
+# stub: insnergy-api-ruby-client 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "insnergy-api-ruby-client"
-  s.version = "0.10.0"
+  s.version = "0.11.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-09-30"
+  s.date = "2016-10-04"
   s.description = "The ruby gem about In-Snergy Family"
   s.email = "kaogaau@gmail.com"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".DS_Store",
     ".document",
     "Gemfile",
     "Gemfile.lock",
@@ -27,7 +28,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "insnergy-api-ruby-client.gemspec",
-    "lib/insnergy-api-ruby-client.rb"
+    "lib/insnergy-api-ruby-client.rb",
+    "spec/insnergy-api-ruby-client_spec.rb"
   ]
   s.homepage = "http://github.com/kaogaau/insnergy-api-ruby-client"
   s.licenses = ["MIT"]
@@ -47,6 +49,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rest-client>, [">= 0"])
       s.add_development_dependency(%q<json>, ["~> 1.8.1"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<json>, ["~> 1.8.1"])
@@ -57,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<json>, ["~> 1.8.1"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 0"])
@@ -68,6 +72,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<json>, ["~> 1.8.1"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
 

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

@@ -1,3 +1,6 @@
+require 'json'
+require 'rest-client'
+
 module Insnergy
 
   class Client
@@ -9,58 +12,70 @@ module Insnergy
       @oauth_key = oauth_key
 	    @oauth_secert = oauth_secert
 	    @refresh_token = refresh_token
-	    @user_id = nil
-	    refresh!
+      @access_token = nil
+      @user_id = nil
+	    token!
       user_id!
 	  end
 
-	  def refresh!
+	  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 "<refresh_token is nil>\n#{response}" unless response['refresh_token'] != nil
-      raise "<access_token is nil>\n#{response}" unless response['access_token'] != nil
+      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 "<user_id is nil>\n#{response}" unless response['user']['user_id'] != nil
+      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 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
+    #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
   end
 
-  class Client::Power
-    attr_reader :access_token, :user_id, :device_type_pointer, :response, :parameter
+  class Power
+    attr_accessor :device_ids, :start_time, :end_time 
+    attr_reader :response
 
-    def initialize(client: nil, device_id: nil, start_time: nil, end_time: nil)
+    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_id = device_id
+      @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
-    end
-
-    def get_device
-      Power.new(@response)
-    end
-
-    def get_response
-      @parameter = {:params => {:apsystem => "IFA", :email => @user_id, :attr => "dm1mi", :start_time => @start_time, :end_time => @end_time, :dev_ids => @device_id}, :Authorization => "Bearer #{@access_token}"}
-      @response = JSON.parse(RestClient.get "#{@domain}/if/3/device/history_ext", @parameter)
+      @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
   end
 
+=begin
   class Power
     attr_reader :device_type_pointer, :type, :month_total_power_value, :alias
 
@@ -91,39 +106,41 @@ module Insnergy
       @alias = opts['devices'][0]['alias']
     end
   end
-
-  class Client::Sensor
-    attr_reader :access_token, :user_id, :widgets
+=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
-      get_device
+      @response = nil
+      response!
     end
 
-    def get_device
-      @widgets = Array.new
-      get_response['widgets'].each do |ele|
-          @widgets << Sensor.new(ele)
-      end 
-    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 each
+    #  @widgets.each do |ele|
+    #    yield ele
+    #  end
+    #end
 
-    def get_response
+    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 "err code is not zero\n#{response}" unless response['err']['code'] == '0'  
-      response
+      @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
 
@@ -154,5 +171,5 @@ module Insnergy
       "#{@infos['400100']}|#{@infos['400200']}"
     end
   end
-
+=end
 end

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

@@ -0,0 +1,129 @@
+require './lib/insnergy-api-ruby-client'
+
+RSpec.configure do |config|
+  # Use color in STDOUT
+  config.color = true
+
+  # other config options here...    
+
+end
+
+describe Insnergy 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)  
+  end
+
+  describe Insnergy::Client do
+    before(:all) do
+      @access_token = @insnergy.access_token
+      @user_id = @insnergy.user_id
+    end 
+
+    describe "#initialize" do
+    	context "when initialize a new object" do
+  	    it "must exist access_token" do
+  	      expect(@access_token).not_to eq(nil)
+  	    end
+
+  	    it "must exist user_id" do
+  	  	  expect(@user_id).not_to eq(nil)
+  	    end
+  	  end
+    end
+
+    describe "#token!" do
+    	context "when excute token!" do
+    	  before do	
+    	    @insnergy.token!
+    	  end
+
+    	  it "must get different access_token" do
+    	  	expect(@insnergy.access_token).not_to eq(@access_token)
+    	  end
+    	end
+    end
+
+    describe "#user_id!" do
+    	context "when excute user_id!" do
+    	  before do	
+    	    @insnergy.user_id!
+    	  end
+
+    	  it "must get same user_id" do
+    	  	expect(@insnergy.user_id).to eq(@user_id)
+    	  end
+    	end
+    end
+  end
+
+  describe Insnergy::Widgets do
+    before(:all) do
+    	@widgets = Insnergy::Widgets.new(client: @insnergy, category: 'sensor')
+    end 
+
+    describe "#initialize" do
+    	context "when initialize a new object" do
+  	    it "must exist response" do
+  	  	  @sensor_response = @widgets.response
+  	      expect(@sensor_response).not_to eq(nil)
+  	      #puts @sensor_response
+  	    end
+      end 
+
+  	  context "when change object's category" do
+        before(:all) do
+          @widgets.category = 'outlet'
+          @widgets.response!
+          @outlet_response = @widgets.response
+          @widgets.category = 'gateway'
+          @widgets.response!
+          @gateway_response = @widgets.response
+        end      
+          
+        it "must exist response" do
+  	      expect(@outlet_response).not_to eq(nil)
+  	      #puts @outlet_response
+  	    end	
+
+  	    it "must exist response" do
+  	      expect(@gateway_response).not_to eq(nil)
+  	      #puts @gateway_response
+  	    end
+
+  	    it "it's response must different" do
+  	  	  expect(@outlet_response).not_to eq(@sensor_response)
+  	  	  expect(@gateway_response).not_to eq(@sensor_response)
+  	    end
+  	  end
+    end
+  end
+
+  describe Insnergy::Power do
+    
+    def this_month_day1
+      Time.new(Time.now.year, Time.now.month, 1).to_i*1000
+    end
+
+    def next_month_day1
+      Time.new(Time.now.year, Time.now.month + 1, 1).to_i*1000
+    end  
+
+    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)
+    end 
+
+    describe "#initialize" do
+  	  context "when initialize a new object" do
+  	    it "must exist response" do
+  	      expect(@power.response).not_to eq(nil)
+  	      #puts @client_power.response
+  	    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.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - kaogaau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The ruby gem about In-Snergy Family
 email: kaogaau@gmail.com
 executables: []
@@ -144,6 +158,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- ".DS_Store"
 - ".document"
 - Gemfile
 - Gemfile.lock
@@ -153,6 +168,7 @@ files:
 - VERSION
 - insnergy-api-ruby-client.gemspec
 - lib/insnergy-api-ruby-client.rb
+- spec/insnergy-api-ruby-client_spec.rb
 homepage: http://github.com/kaogaau/insnergy-api-ruby-client
 licenses:
 - MIT