insnergy-api-ruby-client 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea314449e29090fba75fb89b8d5f52f3c95cf645
-  data.tar.gz: c882babae6a4734c358dd518bb98a91cc3e079ab
+  metadata.gz: 7a30c6bfc994855b02db2e550374b1198a8caa22
+  data.tar.gz: '0729e068623f42c59f849a4fb8a8b9da686caa5a'
 SHA512:
-  metadata.gz: 8c86ce6dc5811378bbb047c3a90f0b3d0a26a99ce20999f0846b1fe656adbdf333081ea46987bf1c0f24479accf0a200c47e8b678f801e09f9fd0c794652c1d7
-  data.tar.gz: 109f96b2b7c72b5f6817d7c9bdc9a7dfc037278625d765a65d699c31ce8cc95d167566ed901d29e3b0395cc9f15a0c12e4633894df2bb761200b699db7800202
+  metadata.gz: 3a9a4f197ecab38d7e89b5afae026f75e242cb736d4dd83df7901d656e525d593eb620d167d3609d151978a5caeeac22d045c545b3f415e1ef17d714eda8880f
+  data.tar.gz: 384afcaa711c9f8e00742bfe336e5d8aadd79d1c44bb6ee20c226c7882a3c7f596f5aabc2bc11dc1f45ac23c29c3b255eb0f5fb027c8ccc77395382ad53155fe

data/Gemfile

@@ -12,7 +12,7 @@ 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"
   gem 'rest-client'
   gem 'json', '~> 1.8.1'

data/Gemfile.lock

@@ -24,23 +24,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)
@@ -48,18 +49,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)
@@ -104,7 +104,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   json (~> 1.8.1)
-  juwelier (~> 2.1.0)
+  juwelier (~> 2.2.0)
   rdoc (~> 3.12)
   rest-client
   rspec
@@ -112,4 +112,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/VERSION

@@ -1 +1 @@
-0.13.1
+0.14.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.13.1 ruby lib
+# stub: insnergy-api-ruby-client 0.14.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "insnergy-api-ruby-client"
-  s.version = "0.13.1"
+  s.version = "0.14.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-11"
+  s.date = "2016-12-21"
   s.description = "The ruby gem about In-Snergy Family"
   s.email = "kaogaau@gmail.com"
   s.extra_rdoc_files = [
@@ -45,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"])
       s.add_development_dependency(%q<rest-client>, [">= 0"])
       s.add_development_dependency(%q<json>, ["~> 1.8.1"])
@@ -56,7 +56,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"])
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<json>, ["~> 1.8.1"])
@@ -68,7 +68,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"])
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<json>, ["~> 1.8.1"])

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

@@ -3,9 +3,10 @@ require 'rest-client'
 
 module Insnergy
   module Client
+
     class Token
       attr_accessor :domain, :oauth_key, :oauth_secert, :refresh_token
-  	  attr_reader :access_token, :user_id
+  	  attr_reader :access_token, :user_id, :expires_at
 
   	  def initialize(domain: nil, oauth_key: nil, oauth_secert: nil, refresh_token: nil)
   	    @domain = domain
@@ -30,7 +31,22 @@ module Insnergy
         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']
+        @expires_at = Time.at(response['token']['expires_at']/1000)
   	  end
+
+      def ok?
+        begin
+          JSON.parse(RestClient.get "#{@domain}/if/3/user/me" ,{:Authorization => "Bearer #{@access_token}"})
+          return true
+        rescue Exception => e
+          if %w(401\ Unauthorized 7104).include? e.message
+            return false
+          else
+            raise e
+          end
+        end
+      end
+      
     end
 
     class Power

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

@@ -13,7 +13,7 @@ describe Insnergy::Client do
     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'
+    refresh_token = 'a8f1cea8-ff8e-4e88-b280-551eafe894a7'
     @insnergy = Insnergy::Client::Token.new(domain: domain, oauth_key: oauth_key, oauth_secert: oauth_secert, refresh_token: refresh_token)  
   end
 
@@ -21,20 +21,35 @@ describe Insnergy::Client do
     before(:all) do
       @access_token = @insnergy.access_token
       @user_id = @insnergy.user_id
+      @expires_at = @insnergy.expires_at
     end 
 
     describe "#initialize" do
     	context "when initialize a new object" do
   	    it "must exist access_token" do
   	      expect(@access_token).not_to eq(nil)
+          p @access_token
   	    end
 
   	    it "must exist user_id" do
   	  	  expect(@user_id).not_to eq(nil)
+          p @user_id
   	    end
+
+        it "must exist expires_at" do
+          expect(@expires_at).not_to eq(nil)
+          p @expires_at
+        end        
   	  end
     end
 
+    describe "#ok?" do
+      it 'return true' do
+        expect(@insnergy.ok?).to eq(true)
+        p @insnergy.ok?
+      end
+    end
+
     describe "#token!" do
     	context "when excute token!" do
     	  before do	
@@ -105,11 +120,11 @@ describe Insnergy::Client do
   describe Insnergy::Client::Power do
     
     def this_month_day1
-      Time.new(Time.now.year, Time.now.month, 1).to_i*1000
+      Time.new(2016,01,01).to_i*1000
     end
 
     def next_month_day1
-      Time.new(Time.now.year, Time.now.month + 1, 1).to_i*1000
+      Time.new(2016,02,01).to_i*1000
     end  
 
     before(:all) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insnergy-api-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - kaogaau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-12-21 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