switchbot 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b35104bc79a51e707f6a2295423a135e5ee06380eb4f5b2ad14b1fea15a72288
-  data.tar.gz: d01885018b1ff8759a6ac2c8b1e2c14704d2e15105b282e74c24cc2a937a8f84
+  metadata.gz: e5dbe643e1c26eafa1c841dcf3cffb4e42ec799bba387b139fdd9d72e630ec6f
+  data.tar.gz: 2e243ec43219aab5fdbaf3dd4f20291676d7bdfebd7ee0ccdaee32b6c7cd21a4
 SHA512:
-  metadata.gz: a3ecbbc03b18cbf6e7650f0171b645055a25eb541f1115b689fb7cde2a34a622f2f6ee898944fd45dacbd6cc6ebbbb0b0478bcdfb0e9e6703938fe24716c76e9
-  data.tar.gz: 6c0fcb55db5bb61d78ed247dc2dc9c40a269dc4bed68a27832b1a22f74a718d68055f1fa40483603fc33c771be6f77ff0cd4980deee43f89b9928703162ac7bd
+  metadata.gz: '0468a22f7a997c01e036c473e81af30e6832a8e39fdfb0acbd0155904f19459b20d5944247de05eb165cf98b810844adaf554a6224113ad95a5b12f5b518b5ba'
+  data.tar.gz: 2a434cdcfd1956789526ad7f925871ccae53c7eb9c496b1a909a16cd2f6535b751e1d32abd5a79d3d1c9d4ba05d6306caf0c55d3c40c224bb3b988a227c093f0

data/.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.5, 2.6, 2.7, '3.0', 3.1]
+        ruby: [2.6, 2.7, '3.0', 3.1]
     name: Ruby ${{ matrix.ruby }}
     steps:
     - uses: actions/checkout@v2

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   NewCops: enable
 
 Style/Documentation:

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 ## Unreleased
-[full changelog](http://github.com/ytkg/switchbot/compare/v0.5.1...main)
+[full changelog](http://github.com/ytkg/switchbot/compare/v0.7.0...main)
+
+## v0.7.0
+[full changelog](http://github.com/ytkg/switchbot/compare/v0.6.0...v0.7.0)
+
+* Add Lock
+  * https://github.com/ytkg/switchbot/pull/16
+* :bomb: **[BREAKING CHANGE]** Support SwitchBot API v1.1
+  * https://github.com/ytkg/switchbot/pull/15
+  * The authentication method has been changed.
+
+    ```ruby
+    client = Switchbot::Client.new('YOUR_TOKEN', 'YOUR_SECRET')
+    ```
+
+    You must update the app to the latest version, V6.14 or later, in order to get the secret key.
+
+## v0.6.0
+[full changelog](http://github.com/ytkg/switchbot/compare/v0.5.1...v0.6.0)
+
+* Add ColorBulb
+  * https://github.com/ytkg/switchbot/pull/14
+* :bomb: **[BREAKING CHANGE]** Update faraday v2 and Drop support ruby 2.5
+  * https://github.com/ytkg/switchbot/pull/12
 
 ## v0.5.1
 [full changelog](http://github.com/ytkg/switchbot/compare/v0.5.0...v0.5.1)

data/README-v0.6.0-and-below.md

@@ -0,0 +1,124 @@
+# Switchbot
+
+[SwichBot API](https://github.com/OpenWonderLabs/SwitchBotAPI) client for Ruby
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'switchbot'
+```
+
+And then execute:
+
+    $ bundle install
+
+Or install it yourself as:
+
+    $ gem install switchbot
+
+## Usage
+
+```ruby
+require 'switchbot'
+
+client = Switchbot::Client.new('YOUR_TOKEN')
+```
+
+### Get device list
+GET https://api.switch-bot.com/v1.0/devices
+```ruby
+client.devices
+#=> {:status_code=>100,
+#    :body=>
+#     {:device_list=>
+#       [{:device_id=>"500291B269BE",
+#         :device_name=>"Living Room Humidifier",
+#         :device_type=>"Humidifier",
+#         :enable_cloud_service=>true,
+#         :hub_device_id=>"000000000000"}],
+#      :infrared_remote_list=>
+#       [{:device_id=>"02-202008110034-13",
+#         :device_name=>"Living Room TV",
+#         :remote_type=>"TV",
+#         :hub_device_id=>"FA7310762361"}]},
+#    :message=>"success"}
+```
+
+### Get device status
+GET https://api.switch-bot.com/v1.0/devices/C271111EC0AB/status
+```ruby
+client.status(device_id: 'C271111EC0AB')
+# or
+client.device('C271111EC0AB').status
+#=> {:status_code=>100,
+#    :body=>
+#     {:device_id=>"C271111EC0AB",
+#      :device_type=>"Meter",
+#      :hub_device_id=>"FA7310762361",
+#      :humidity=>52,
+#      :temperature=>26.1},
+#    :message=>"success"}
+```
+
+### Send device control commands
+POST https://api.switch-bot.com/v1.0/devices/210/commands
+```ruby
+client.commands(device_id: '210', command: 'turnOn')
+# or
+client.device('C271111EC0AB').commands(command: 'turnOn')
+# or
+client.device('C271111EC0AB').on
+#=> {:status_code=>100,
+#    :body=>{},
+#    :message=>"success"}
+```
+
+### Get scene list
+GET https://api.switch-bot.com/v1.0/scenes
+```ruby
+client.scenes
+#=> {:status_code=>100,
+#    :body=>
+#     [{:scene_id=>"T02-20200804130110",
+#       :scene_name=>"Close Office Devices"},
+#      {:scene_id=>"T02-202009221414-48924101",
+#       :scene_name=>"Set Office AC to 25"},
+#      {:scene_id=>"T02-202011051830-39363561",
+#       :scene_name=>"Set Bedroom to 24"},
+#      {:scene_id=>"T02-202011051831-82928991",
+#       :scene_name=>"Turn off home devices"},
+#      {:scene_id=>"T02-202011062059-26364981",
+#       :scene_name=>"Set Bedroom to 26 degree"}],
+#    :message=>"success"}
+```
+
+### Execute manual scenes
+POST https://api.switch-bot.com/v1.0/scenes/T02-202009221414-48924101/execute
+```ruby
+client.execute(scene_id: 'T02-202009221414-48924101')
+# or
+client.scene('T02-202009221414-48924101').execute
+#=> {:status_code=>100,
+#    :body=>{},
+#    :message=>"success"}
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/switchbot. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/switchbot/blob/master/CODE_OF_CONDUCT.md).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Switchbot project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/switchbot/blob/master/CODE_OF_CONDUCT.md).

data/README.md

@@ -19,15 +19,16 @@ Or install it yourself as:
     $ gem install switchbot
 
 ## Usage
-
 ```ruby
 require 'switchbot'
 
-client = Switchbot::Client.new('YOUR_TOKEN')
+client = Switchbot::Client.new('YOUR_TOKEN', 'YOUR_SECRET')
 ```
 
+For v0.6.0 and below, refer to README-v0.6.0-and-below.md.
+
 ### Get device list
-GET https://api.switch-bot.com/v1.0/devices
+GET https://api.switch-bot.com/v1.1/devices
 ```ruby
 client.devices
 #=> {:status_code=>100,
@@ -47,7 +48,7 @@ client.devices
 ```
 
 ### Get device status
-GET https://api.switch-bot.com/v1.0/devices/C271111EC0AB/status
+GET https://api.switch-bot.com/v1.1/devices/C271111EC0AB/status
 ```ruby
 client.status(device_id: 'C271111EC0AB')
 # or
@@ -63,7 +64,7 @@ client.device('C271111EC0AB').status
 ```
 
 ### Send device control commands
-POST https://api.switch-bot.com/v1.0/devices/210/commands
+POST https://api.switch-bot.com/v1.1/devices/210/commands
 ```ruby
 client.commands(device_id: '210', command: 'turnOn')
 # or
@@ -76,7 +77,7 @@ client.device('C271111EC0AB').on
 ```
 
 ### Get scene list
-GET https://api.switch-bot.com/v1.0/scenes
+GET https://api.switch-bot.com/v1.1/scenes
 ```ruby
 client.scenes
 #=> {:status_code=>100,
@@ -95,7 +96,7 @@ client.scenes
 ```
 
 ### Execute manual scenes
-POST https://api.switch-bot.com/v1.0/scenes/T02-202009221414-48924101/execute
+POST https://api.switch-bot.com/v1.1/scenes/T02-202009221414-48924101/execute
 ```ruby
 client.execute(scene_id: 'T02-202009221414-48924101')
 # or

data/lib/switchbot/client.rb

@@ -3,15 +3,17 @@
 module Switchbot
   class Client
     API_ENDPOINT = 'https://api.switch-bot.com'
+    API_VERSION = 'v1.1'
 
-    def initialize(token)
+    def initialize(token, secret)
       @token = token
+      @secret = secret
     end
 
     def devices
       request(
         http_method: :get,
-        endpoint: 'v1.0/devices'
+        endpoint: "/#{API_VERSION}/devices"
       )
     end
 
@@ -22,14 +24,14 @@ module Switchbot
     def status(device_id:)
       request(
         http_method: :get,
-        endpoint: "/v1.0/devices/#{device_id}/status"
+        endpoint: "/#{API_VERSION}/devices/#{device_id}/status"
       )
     end
 
     def commands(device_id:, command:, parameter: 'default', command_type: 'command')
       request(
         http_method: :post,
-        endpoint: "/v1.0/devices/#{device_id}/commands",
+        endpoint: "/#{API_VERSION}/devices/#{device_id}/commands",
         params: {
           command: command,
           parameter: parameter,
@@ -41,7 +43,7 @@ module Switchbot
     def scenes
       request(
         http_method: :get,
-        endpoint: 'v1.0/scenes'
+        endpoint: "/#{API_VERSION}/scenes"
       )
     end
 
@@ -52,7 +54,7 @@ module Switchbot
     def execute(scene_id:)
       request(
         http_method: :post,
-        endpoint: "/v1.0/scenes/#{scene_id}/execute"
+        endpoint: "/#{API_VERSION}/scenes/#{scene_id}/execute"
       )
     end
 
@@ -68,24 +70,41 @@ module Switchbot
       Humidifier.new(client: self, device_id: device_id)
     end
 
+    def color_bulb(device_id)
+      ColorBulb.new(client: self, device_id: device_id)
+    end
+
+    def lock(device_id)
+      Lock.new(client: self, device_id: device_id)
+    end
+
     private
 
     def headers
+      t = "#{Time.now.to_i}000"
+      nonce = SecureRandom.alphanumeric
+      sign = Base64.strict_encode64(OpenSSL::HMAC.digest('sha256', @secret, "#{@token}#{t}#{nonce}"))
+
       {
         'User-Agent' => "Switchbot v#{Switchbot::VERSION} (https://github.com/ytkg/switchbot)",
-        'Authorization' => @token
+        'Authorization' => @token,
+        'T' => t,
+        'Sign' => sign,
+        'Nonce' => nonce
       }
     end
 
     def connection
       Faraday.new(url: API_ENDPOINT, headers: headers) do |conn|
         conn.request :json
+        conn.response :json
+        conn.adapter :typhoeus, http_version: :httpv2_0 # rubocop:disable Naming/VariableNumber
       end
     end
 
     def request(http_method:, endpoint:, params: {})
       response = connection.public_send(http_method, endpoint, params)
-      JSON.parse(response.body).deep_transform_keys(&:underscore).deep_symbolize_keys
+      response.body.deep_transform_keys(&:underscore).deep_symbolize_keys
     end
   end
 end

data/lib/switchbot/color_bulb.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Switchbot
+  class ColorBulb < Device
+    def toggle
+      commands(command: 'toggle')
+    end
+
+    def brightness(value)
+      commands(command: 'setBrightness', parameter: value)
+    end
+
+    def color(value)
+      commands(command: 'setColor', parameter: value)
+    end
+
+    def color_temperature(value)
+      commands(command: 'setColorTemperature', parameter: value)
+    end
+  end
+end

data/lib/switchbot/lock.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Switchbot
+  class Lock < Device
+    def lock
+      commands(command: 'lock')
+    end
+
+    def unlock
+      commands(command: 'unlock')
+    end
+  end
+end

data/lib/switchbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchbot
-  VERSION = '0.5.1'
+  VERSION = '0.7.0'
 end

data/lib/switchbot.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+require 'base64'
+require 'openssl'
 require 'faraday'
-require 'faraday_middleware'
-require 'json'
+require 'faraday/typhoeus'
 require 'active_support/all'
 require_relative 'switchbot/version'
 require_relative 'switchbot/client'
@@ -11,6 +13,8 @@ require_relative 'switchbot/scene'
 require_relative 'switchbot/bot'
 require_relative 'switchbot/light'
 require_relative 'switchbot/humidifier'
+require_relative 'switchbot/color_bulb'
+require_relative 'switchbot/lock'
 
 module Switchbot
   class Error < StandardError; end

data/switchbot.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'SwitchBot API client for Ruby'
   spec.homepage      = 'https://github.com/ytkg/switchbot'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -32,8 +32,8 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'faraday', '~> 1.3.0'
-  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'faraday', '>= 2.0.0'
+  spec.add_dependency 'faraday-typhoeus'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: switchbot
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Yoshiki Takagi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,18 +28,18 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,6 +137,7 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
+- README-v0.6.0-and-below.md
 - README.md
 - Rakefile
 - bin/console
@@ -144,9 +145,11 @@ files:
 - lib/switchbot.rb
 - lib/switchbot/bot.rb
 - lib/switchbot/client.rb
+- lib/switchbot/color_bulb.rb
 - lib/switchbot/device.rb
 - lib/switchbot/humidifier.rb
 - lib/switchbot/light.rb
+- lib/switchbot/lock.rb
 - lib/switchbot/scene.rb
 - lib/switchbot/version.rb
 - switchbot.gemspec
@@ -166,14 +169,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: SwitchBot API client for Ruby