reco4life 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f31ff989799d3444b18b212898126fdfe0778b
-  data.tar.gz: 57a6394d4a65c88376b515c960f5226fe1dc91c9
+  metadata.gz: 2c82c14ee5fec5864cbb7bcf3dfa9a7ecb812e30
+  data.tar.gz: 4940993e395714a5f9594061e825bf817e5a8577
 SHA512:
-  metadata.gz: fbedb7e4f13fbbabb359a54b15c3f3d2f0e3bdf9ca0063c24f67142a5482779ffc790192ea37fa59f719293c24158721bc1ae060b3ad5c9a377ad0ae65d8d405
-  data.tar.gz: d2c06489c03fc857d1e7e217cdcbf8a841b05bc4c5efb116a6cae2bf250728ada5f3194d0fb5fcdaac171db52a8b1b4b3d11415ee3d9b4d6892fbad6bac03c56
+  metadata.gz: 3019a7f038dbdf18476a48e1f7151e0e81b095239f0387d34185f6918128c10522c772c4162572b086ae948f358e4c2df2ba1018d7487a4922786cf76b98f4b4
+  data.tar.gz: 9f5b9233d6b5325cba81a839eef9d1b15adb3fee2bd8924654b7615d1703256b45fcc1bf1afb8670466e923a61e22fa51723acd01ee3c5b8cafb381aa54425c5

data/README.md

@@ -28,8 +28,7 @@ begin
   Reco4life.api_key ='your_api_key'
 
   Reco4life.devices.each do |sn|
-    next unless Reco4life.online? sn
-    Reco4life.turn_on sn
+    Reco4life.turn_on(sn) if Reco4life.online?(sn)
     puts Reco4life.powered_on? sn
   end
 rescue => e

data/lib/reco4life.rb

@@ -27,13 +27,11 @@ module Reco4life
     end
 
     def turn_on(sn)
-      return if powered_on?(sn)
-      switch(sn, 1)
+      switch(sn, 1) unless powered_on?(sn)
     end
 
     def turn_off(sn)
-      return unless powered_on?(sn)
-      switch(sn, 0)
+      switch(sn, 0) if powered_on?(sn)
     end
 
     def online?(sn)
@@ -54,8 +52,11 @@ module Reco4life
     end
 
     def token_valid?
-      return true if !@token.nil? && !@token_expire_time.nil? && Time.now < @token_expire_time
-      false
+      @token && !token_expired?
+    end
+
+    def token_expired?
+      @token_expire_time && @token_expire_time < Time.now
     end
 
     def fetch_devices

data/lib/reco4life/version.rb

@@ -1,3 +1,3 @@
 module Reco4life
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/reco4life.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'http', '2.1.0'
+  spec.add_development_dependency 'http', '~>2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reco4life
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - aaron67
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,14 +42,14 @@ dependencies:
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 description: Reco4life提供HTTP API来管理智能插座，封装这些接口