wattsense-api-client 0.1.3 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5cc59939bd0952db2322c7edb70d025890d9a4f609d1721ce7ced2c60ad259
-  data.tar.gz: c38e19e274bf617810a7d5f917dc88e46eeaeedef1a09c7217b9307fc73f62ff
+  metadata.gz: fdbe56bc224c52dabf5ec031b0c2cacf722500deb3dc11e7eccf886475b0a2a8
+  data.tar.gz: 77dfcb5d92512aec9f5db55410e1d3dca5c756e7a35fc34a4875eca828f945f2
 SHA512:
-  metadata.gz: 96fec947210d528404ade2a792dcf591e2ef37b98139329f878a15183ecde4849dc406267925d4e97f03c87e4e9584a769a698693fd75491b38902d42eeca82e
-  data.tar.gz: eb062bf4ab929d98f0a9d39c6b0c4e7fed3011e68270422b463dbce6f747cb2ce23d6ef1e7f0f6943519153cfa195d5312a9fba8632fe52f67b83d8806f9de7d
+  metadata.gz: e7cc5f941d05d3630ec4ff0562eb1d5a1f2cf4bb69f76d22b60c9dcf4df2eb3f623966ae92440810e024fcea6fde8536ac8d76e871f7a44e84f6e0ab0e1260f6
+  data.tar.gz: 910ec81176e4600489a3f4704aa7cc480161b7191dcb6d3631cc4662d487f6357f1a11b6321e8d90ba2f27a4e41c58f0f15c2f1ae0713e7f42c5cec874dcea10

data/lib/http_requester.rb

@@ -21,8 +21,27 @@ class HttpRequester
   # HTTP GET method
   #
   # TODO: document
-  def get(path, &before_req_callback)
-    do_request(::Net::HTTP::Get.new(uri_from_path(path)), before_req_callback)
+  def get(path, query_parameters = nil, &before_req_callback)
+    uri = uri_from_path_and_query_parameters(path, query_parameters)
+    do_request(::Net::HTTP::Get.new(uri), before_req_callback)
+  end
+
+  # HTTP POST method
+  #
+  # TODO: document
+  def post(path, payload, &before_req_callback)
+    req = ::Net::HTTP::Post.new(uri_from_path_and_query_parameters(path))
+    req.body = payload
+    do_request(req, before_req_callback)
+  end
+
+  # HTTP POST method
+  #
+  # TODO: document
+  def put(path, payload, &before_req_callback)
+    req = ::Net::HTTP::Put.new(uri_from_path_and_query_parameters(path))
+    req.body = payload
+    do_request(req, before_req_callback)
   end
 
   private
@@ -37,7 +56,9 @@ class HttpRequester
     end
   end
 
-  def uri_from_path(path)
-    URI("#{@base_url}/#{path}")
+  def uri_from_path_and_query_parameters(path, query_parameters = nil)
+    uri = URI("#{@base_url}/#{path}")
+    uri.query = ::URI.encode_www_form(query_parameters) if query_parameters
+    uri
   end
 end

data/lib/watt_sense_api/v1/authentication.rb

@@ -5,6 +5,9 @@
 #++
 # frozen_string_literal: true
 
+require 'openssl'
+require 'base64'
+
 module WattSenseApi
   module V1
     # This module gather all the necessary elements for ClientV1 ability to authenticate to the
@@ -19,8 +22,15 @@ module WattSenseApi
       #
       # @param api_key [String] The api's credential key
       # @param api_secret [String] The api's credential secret
-      def api_key_authentication(_api_key, _api_secret)
-        raise(::WattSenseApi::NotImplementedError, 'Please use (username, password) couple for now.')
+      def api_key_authentication(api_key, api_secret)
+        @auth_block =
+          lambda do |request|
+            time = now_in_ms
+            to_sign = to_sign_from_request(request, time)
+            signed = ::OpenSSL::HMAC.digest('SHA512', api_secret, to_sign.join("\n"))
+            request['X-API-Auth'] = "#{api_key}:#{::Base64.strict_encode64(signed)}"
+            request['X-API-Timestamp'] = time.to_s
+          end
       end
 
       # This method allows to use username/password credentials with HTTP Basic user authentication
@@ -31,6 +41,21 @@ module WattSenseApi
       def basic_user_authentication(username, password)
         @auth_block = ->(request) { request.basic_auth(username, password) }
       end
+
+      # @return [Integer] Time now in ms since Epoch
+      def now_in_ms
+        now = ::Time.now
+        now.tv_sec * 1000 + now.tv_usec / 1_000
+      end
+
+      # @return [String] Message to sign
+      def to_sign_from_request(request, time)
+        to_sign = [request.method, request.uri.path]
+        to_sign.push(request.uri.query) if request.uri.query
+        to_sign.push(request.body) if request.body
+        to_sign << time.to_s
+        to_sign
+      end
     end
   end
 end

data/lib/watt_sense_api/v1/client.rb

@@ -11,6 +11,8 @@ require 'http_requester'
 require 'watt_sense_api/v1/authentication'
 require 'watt_sense_api/v1/organization'
 require 'watt_sense_api/v1/user_management'
+require 'watt_sense_api/v1/device_information'
+require 'watt_sense_api/v1/properties_measurements'
 
 module WattSenseApi
   module V1
@@ -20,6 +22,8 @@ module WattSenseApi
       include ::WattSenseApi::V1::Authentication
       include ::WattSenseApi::V1::Organization
       include ::WattSenseApi::V1::UserManagement
+      include ::WattSenseApi::V1::DeviceInformation
+      include ::WattSenseApi::V1::PropertiesMeasurements
 
       # You can create a client V1 with both user's credentials or api creddentials.
       #
@@ -44,7 +48,16 @@ module WattSenseApi
             'Please give one of either couples: (api_key, api_secret) or (username, password)'
           )
         end
-        super(::WattSenseApi::V1::BASE_URL, auth_callback: @auth_block)
+        super(::WattSenseApi::V1::BASE_URL, auth_callback: @auth_block, headers_callback: headers_callback)
+      end
+
+      private
+
+      def headers_callback
+        lambda do |req|
+          req['Accept'] = 'application/json'
+          req['Content-Type'] = 'application/json'
+        end
       end
     end
   end

data/lib/watt_sense_api/v1/device_information.rb

@@ -0,0 +1,61 @@
+#--
+# Copyright (C) 2021 - Octopus Lab SAS
+# All rights are described by the GPLv3 license present in the file /LICENSE available in the
+# original repository of this file or [here](https://www.gnu.org/licenses/gpl-3.0.fr.html).
+#++
+# frozen_string_literal: true
+
+require 'net/http'
+require 'json'
+
+module WattSenseApi
+  module V1
+    # This module gather all the methods to deal with [Device Information](https://api.wattsense.com/#tag/Device-Information).
+    #
+    # In WattSense Api, the Wattsense Box is designated as device in all this API.
+    module DeviceInformation
+      # List all your devices
+      #
+      # @note: filters not implemented yet.
+      #
+      # @return [Array<Hash>] The devices information as a Hash in an Array.
+      # @raise [::WattSenseApi::HTTPError] when server response is not as expected (HTTPSuccess with a body)
+      def devices
+        response = get('devices')
+        raise(::WattSenseApi::HTTPError, response) unless response.is_a?(::Net::HTTPSuccess)
+
+        return [] if response.is_a?(::Net::HTTPNoContent)
+
+        ::JSON.parse(response.body)
+      end
+
+      # Get the information of the specified one
+      #
+      # @param deviceId [String] The ID of the device which you seek the informations
+      #
+      # @return [Hash] The device information as a Hash when id is not nil.
+      # @raise [::WattSenseApi::HTTPError] when server response is not as expected (HTTPSuccess with a body)
+      def device(id)
+        response = get("devices/#{id}")
+        raise(::WattSenseApi::HTTPError, response) unless response.is_a?(::Net::HTTPSuccess) && !response.body&.empty?
+
+        ::JSON.parse(response.body)
+      end
+
+      # Activate a device
+      #
+      # @note No check implemented nor tests.
+      #
+      # @param params [Hash] Parameters as expected by WattSense documentation.
+      #
+      # @return [Hash] The device information as a Hash
+      # @raise [::WattSenseApi::HTTPError] when server response is not as expected (HTTPSuccess with a body)
+      def device_activate(params)
+        response = post('devices', params)
+        raise(::WattSenseApi::HTTPError, response) unless response.is_a?(::Net::HTTPSuccess) && !response.body&.empty?
+
+        ::JSON.parse(response.body)
+      end
+    end
+  end
+end

data/lib/watt_sense_api/v1/properties_measurements.rb

@@ -0,0 +1,69 @@
+#--
+# Copyright (C) 2021 - Octopus Lab SAS
+# All rights are described by the GPLv3 license present in the file /LICENSE available in the
+# original repository of this file or [here](https://www.gnu.org/licenses/gpl-3.0.fr.html).
+#++
+# frozen_string_literal: true
+
+require 'net/http'
+require 'json'
+
+module WattSenseApi
+  module V1
+    # This module gather all the methods to deal with [Properties Measurements](https://api.wattsense.com/#tag/Properties-Measurements)
+    module PropertiesMeasurements
+      # Get the specified device's properties list with values.
+      #
+      # @see https://api.wattsense.com/#operation/listDevicePropertiesValues API documentation
+      #
+      # @param device_id [String] The device id
+      #
+      # @return [Array<Hash>|NilClass] Array of the properties' values or nil if your device is not configured
+      #   and/or has no properties.
+      # @raise [::WattSenseApi::HTTPError] when server response is not as expected (HTTPSuccess with a body)
+      def device_properties(device_id)
+        response = get("devices/#{device_id}/properties")
+        return ::JSON.parse(response.body) if response.is_a?(::Net::HTTPOK)
+
+        return if response.is_a?(::Net::HTTPNoContent)
+
+        raise(::WattSenseApi::HTTPError, response)
+      end
+
+      # Get a specified device's property to a given value.
+      #
+      # @see https://api.wattsense.com/#operation/getPropertyMeasurement API documentation
+      #
+      # @param device_id [String] The device id
+      # @param property_id [String] The property id or slug for which we ask the latest value
+      #
+      # @return [Hash|NilClass] Hash of the property's latest value (nil if property is unreachable)
+      # @raise [::WattSenseApi::HTTPError] when server response is not as expected (HTTPAccepted with a body)
+      def device_property(device_id, property_id)
+        response = get("devices/#{device_id}/properties/#{property_id}")
+        return ::JSON.parse(response.body) if response.is_a?(::Net::HTTPOK)
+
+        return if response.is_a?(::Net::HTTPNoContent)
+
+        raise(::WattSenseApi::HTTPError, response)
+      end
+
+      # Set a specified device's property to a given value.
+      #
+      # @see https://api.wattsense.com/#operation/setPropertyValue API documentation
+      #
+      # @param device_id [String] The device id
+      # @param property_id [String] The property id or slug for which we ask to set the value
+      # @param body [Hash] The body of the request. Hash that will be transformed to json.
+      #
+      # @return [Hash] Hash of the resulted action.
+      # @raise [::WattSenseApi::HTTPError] when server response is not as expected (HTTPAccepted with a body)
+      def device_property_set(device_id, property_id, body)
+        response = put("devices/#{device_id}/properties/#{property_id}", body.to_json)
+        return ::JSON.parse(response.body) if response.is_a?(::Net::HTTPAccepted)
+
+        raise(::WattSenseApi::HTTPError, response)
+      end
+    end
+  end
+end

data/lib/watt_sense_api/version.rb

@@ -6,6 +6,6 @@
 # frozen_string_literal: true
 
 module WattSenseApi
-  VERSION = '0.1.3'
+  VERSION = '0.3.2'
   public_constant :VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wattsense-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.2
 platform: ruby
 authors:
 - Roland Laurès
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -17,7 +17,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -31,7 +31,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -45,7 +45,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.20.0
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.2
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +87,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -107,7 +107,9 @@ files:
 - lib/watt_sense_api/v1.rb
 - lib/watt_sense_api/v1/authentication.rb
 - lib/watt_sense_api/v1/client.rb
+- lib/watt_sense_api/v1/device_information.rb
 - lib/watt_sense_api/v1/organization.rb
+- lib/watt_sense_api/v1/properties_measurements.rb
 - lib/watt_sense_api/v1/user_management.rb
 - lib/watt_sense_api/version.rb
 - lib/wattsense-api-client.rb
@@ -115,10 +117,10 @@ homepage: https://rubygems.org/gems/wattsense-api-client
 licenses:
 - GPL v3
 metadata:
-  bug_tracker_uri: https://gitlab.com/octopuslab-public/wattsense-api-client/-/issues
-  changelog_uri: https://gitlab.com/octopuslab-public/wattsense-api-client/-/blob/main/CHANGELOG.md
-  documentation_uri: https://octopuslab-public.gitlab.io/wattsense-api-client/0.1.3
-  homepage_uri: https://gitlab.com/octopuslab-public/wattsense-api-client
+  bug_tracker_uri: https://gitlab.com/fr-octopuslab/wattsense-api-client/-/issues
+  changelog_uri: https://gitlab.com/octopuslab/wattsense-api-client/-/blob/main/CHANGELOG.md
+  documentation_uri: https://fr-octopuslab.gitlab.io/wattsense-api-client/0.3.2
+  homepage_uri: https://gitlab.com/octopuslab/wattsense-api-client
 post_install_message: 
 rdoc_options: []
 require_paths: