ondotori-ruby-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a4619b075e477a48b7a78b6f5f64647fded6a28e4c1f43206cb557aa3064365
-  data.tar.gz: e0952edf54eb7d0712f9278e243cbdf75af4cc6c0d79f8d7ca19b7f3e19578ad
+  metadata.gz: a629b226e96126e7f1164d71fcd36700b7af8d2229c2e16a2ccbb6c5a44213a8
+  data.tar.gz: 5a134e0ca23f3fb706566f86fb335fddf2ae3ce3fcbbe035bcefeb546dfc35a7
 SHA512:
-  metadata.gz: fe2a855fed3c7b8b91a8da14532ef4513753b0820245a1289311fbb5068d26645e333fece2733f0d2d38d1d5818845472f379e6ab98ab56c8730357a09e78258
-  data.tar.gz: fc96e7f92398ed90e1325e83afb8557b63d68b5376295fc75e03c49c2a189766c743696fec59a7b6bd1bcd4ef9c839c26b6c91afa1790192de37a1c419e22575
+  metadata.gz: d0044b0473197e69e7f978f399ec29c24e62f406118f1e1808f76d822b371e4f41cf311e66727953fd8e1ba446f535aba101d8d92552ad0e658e21e8136d85b1
+  data.tar.gz: 1a0826dcc6e452c31f15f6c364559f8102d7403731659c1d55bb5974375fc0832199d63f9d40c8ca9e629be37e1d9ef1633a90f8553162e141536d79057d5444

data/README.md

@@ -68,6 +68,20 @@ client = Ondotori::WebAPI::Client.new(params)
 response = client.latest_data_rtr500(base: "BaseUnit Serial", remote: "RemoteUnit Serial")
 ```
 
+#### Get Data (TR-7wb/nw/wf, TR4)
+
+To get data (TR-7wb/nw/wf, TR4), do the following.
+
+```
+from = Time.now - (3600 * 24)
+to   = Time.now
+limit = 173
+params = { "api-key" => "API Key you create", "login-id" => "tbxxxx", "login-pass" => "password"}
+client = Ondotori::WebAPI::Client.new(params)
+response = client.data("Device Serial", from: from, to: to, limit: limit)
+```
+from, to and limit parameter is optional.
+
 #### Error Handling
 
 Ondotori Errors

data/lib/ondotori/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ondotori
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ondotori/webapi/api/params.rb

@@ -3,9 +3,24 @@
 module Ondotori
   module WebAPI
     module Api
-      class CurrentParams
-        def initialize(param, remote: [], base: [])
+      class ParamsBase
+        def initialize(param)
           @param = param
+        end
+
+        def to_ondotori_param
+          params = {}
+          params[Api::Param::API_KEY] = @param.api_key
+          params[Api::Param::LOGIN_ID] = @param.login_id
+          params[Api::Param::LOGIN_PASS] = @param.login_pass
+
+          params
+        end
+      end
+
+      class CurrentParams < ParamsBase
+        def initialize(param, remote: [], base: [])
+          super(param)
 
           if remote.length.positive? && base.length.positive?
             raise Ondotori::WebAPI::Api::Errors::InvaildParameter.new(
@@ -17,10 +32,7 @@ module Ondotori
         end
 
         def to_ondotori_param
-          params = {}
-          params[Api::Param::API_KEY] = @param.api_key
-          params[Api::Param::LOGIN_ID] = @param.login_id
-          params[Api::Param::LOGIN_PASS] = @param.login_pass
+          params = super
           params["remote-serial"] = @remote_serial_list if @remote_serial_list.length.positive?
           params["base-serial"] = @base_serial_list if @base_serial_list.length.positive?
 
@@ -28,51 +40,81 @@ module Ondotori
         end
       end
 
-      class LatestDataParams
+      class LatestDataParams < ParamsBase
         def initialize(param, serial: "")
+          super(param)
           if serial.empty?
             raise Ondotori::WebAPI::Api::Errors::InvaildParameter.new(
               "latest-data need remote-serial", 9994
             )
           end
-          @param = param
           @remote_serial = serial
         end
 
         def to_ondotori_param
-          params = {}
-          params[Api::Param::API_KEY] = @param.api_key
-          params[Api::Param::LOGIN_ID] = @param.login_id
-          params[Api::Param::LOGIN_PASS] = @param.login_pass
+          params = super
           params["remote-serial"] = @remote_serial
 
           params
         end
       end
 
-      class LatestDataRTR500Params
+      class LatestDataRTR500Params < ParamsBase
         def initialize(param, base: "", remote: "")
+          super(param)
           if base.empty? || remote.empty?
             raise Ondotori::WebAPI::Api::Errors::InvaildParameter.new(
               "latest-data-rtr500 need both the  baseunit serial and remote unit serial.", 9993
             )
           end
-          @param = param
           @base_serial = base
           @remote_serial = remote
         end
 
         def to_ondotori_param
-          params = {}
-          params[Api::Param::API_KEY] = @param.api_key
-          params[Api::Param::LOGIN_ID] = @param.login_id
-          params[Api::Param::LOGIN_PASS] = @param.login_pass
+          params = super
           params["base-serial"] = @base_serial
           params["remote-serial"] = @remote_serial
 
           params
         end
       end
+
+      class DataParams < ParamsBase
+        def initialize(param, serial, from: nil, to: nil, limit: nil)
+          super(param)
+          validate(serial, from, to, limit)
+          @serial = serial
+          @from = from
+          @to = to
+          @limit = limit.nil? ? 0 : [0, limit].max
+        end
+
+        def validate(serial, from, to, _limit)
+          unless serial.instance_of?(String)
+            raise Ondotori::WebAPI::Api::Errors::InvaildParameter.new(
+              "serial must be String.", 9991
+            )
+          end
+          [from, to].each do |param|
+            next if param.nil? || param.instance_of?(Time)
+
+            raise Ondotori::WebAPI::Api::Errors::InvaildParameter.new(
+              "from and to parameter must be nil or Time.", 9992
+            )
+          end
+        end
+
+        def to_ondotori_param
+          params = super
+          params["remote-serial"] = @serial
+          params["unixtime-from"] = @from.to_i unless @from.nil?
+          params["unixtime-to"] = @to.to_i unless @to.nil?
+          params["number"] = @limit if @limit != 0
+
+          params
+        end
+      end
     end
   end
 end

data/lib/ondotori/webapi/client.rb

@@ -31,6 +31,13 @@ module Ondotori
         ondotori_response.result
       end
 
+      def data(serial, from: nil, to: nil, limit: nil)
+        param = Api::DataParams.new(@param, serial, from: from, to: to, limit: limit)
+        response = @web_access.access("#{base_uri}data", param.to_ondotori_param)
+        ondotori_response = Ondotori::WebAPI::Api::Response.new(response)
+        ondotori_response.result
+      end
+
       def base_uri
         return @uri unless @uri.empty?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ondotori-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kazuya Hatano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies: []
 description: You can use this gem to get the recorded data from WebStorage.
 email: