wiot-sdk 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2eb71783d82d2813cf8909bf9f6ce4ac8f9591e
-  data.tar.gz: 6c9f22bcd220078cedd04bee1fa0ec2fef3a594f
+  metadata.gz: 64f41d47a05c9fac883320334b45cb4a006c5195
+  data.tar.gz: 02dec3deb466eb2e3fbfc4b0e9f43eb1ffedfdae
 SHA512:
-  metadata.gz: e76ba9cd40b6272489993d3d4243fbf2003d08cd3a6b3c79c01cbe550355ccae900ef224bf2010c265cd7c9011482d1826ec08d367f965adffc7053263eb2464
-  data.tar.gz: 5ccb98d28134b8e1acd29fcbd2a12c7e232e262f97121d5accb9960053baa0f00ecdf23a3918559fba4b66f690749ecd8deb491505fd2b6d7f42bedb9c15370f
+  metadata.gz: 78bc57cbb137ecaced9a56466c14db04fd4b58dbc9e6f26fc99757fb5be8bd33c00be0bea5040e6ef059372d3efb70f09956acd7674cf8aa7372ecd5c5f7b6b9
+  data.tar.gz: bb3fa4ed3086ab801085371de0645a45d6ccfdaaccdf221b53aa32e191ed76cc63b0526b6c1f23586055fd6c28ca494e7c001185b229ceb41f953c0f497a658c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wiot-sdk (0.1.1)
+    wiot-sdk (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/wiot-sdk/client.rb

@@ -8,20 +8,20 @@ module WiotSdk
 
   class Client
 
-    def self.init_yaml(file_path)
-      api_key, space, project = WiotSdk::Config::ParserYml.parser file_path
+    def self.init_yaml(file_path, base_url)
+      username, api_key, space, project = WiotSdk::Config::ParserYml.parser file_path
 
-      Request.new api_key, space, project
+      Request.new username, api_key, space, project, base_url
     end
 
-    def self.init_json(file_path)
-      api_key, space, project = WiotSdk::Config::ParserJson.parser file_path
+    def self.init_json(file_path, base_url)
+      username, api_key, space, project = WiotSdk::Config::ParserJson.parser file_path
 
-      Request.new api_key, space, project
+      Request.new username, api_key, space, project, base_url
     end
 
-    def self.init(api_key, space, project)
-      Request.new api_key, space, project
+    def self.init(username, api_key, space, project, base_url)
+      Request.new username, api_key, space, project, base_url
     end
   end
 

data/lib/wiot-sdk/payload.rb

@@ -0,0 +1,20 @@
+require 'json'
+
+module WiotSdk
+
+  class Payload
+    def initialize
+      @metric = {}
+    end
+
+    def addMetric(key, value)
+      @metric[key] = value
+    end
+
+    def to_s
+      payload = { metrics: @metric }
+      payload.to_json
+    end
+  end
+
+end

data/lib/wiot-sdk/request.rb

@@ -1,34 +1,36 @@
 require 'rest-client'
 require 'json'
 
-require_relative 'metric'
+require_relative 'payload'
 require_relative 'response'
 
 module WiotSdk
 
   class Request
 
-    BASE_URL = 'http://api.watchiot.org/'
-
-    def initialize(api_key, space, project)
+    def initialize(username, api_key, space, project, base_url)
+      @username = username
       @api_key = api_key
       @space = space
       @project = project
+      @base_url = base_url
     end
 
-    def send(metric)
-      uri = BASE_URL + @space + '/' + @project
-      payload = '{ api: ' + @api_key + ', data: { ' + JSON.generate(metric.values).to_s + '}'
+    def send(payload)
+      uri = @base_url + '/' + @space + '/' + @project
 
-      req uri, payload
+      req uri, payload.to_s
     rescue => ex
-      Response.new nil, 500, ex.message
+      Response.new ex.response
     end
 
     private
 
     def req(url, payload)
-      response = RestClient.post url, payload, content_type: 'json', accept: 'json'
+      response = RestClient.post url, payload,
+                                 Authorization: "#{@username} #{@api_key}",
+                                 content_type: 'json',
+                                 accept: 'json'
 
       Response.new response
     end

data/lib/wiot-sdk/response.rb

@@ -1,41 +1,43 @@
-require 'wiot-sdk/data/errors'
-require 'wiot-sdk/data/rate'
+require 'json'
 
 module WiotSdk
 
   class Response
-    def initialize(response, code = nil, message = nil)
-      @code = code || response.code
-      @rate = Rate.new response.headers
+    def initialize(response)
+      @rate_limit = parse_rate response.headers
 
-      @message = message || parser_message(response.body)
-      @errors = Errors.new response.body
+      response = JSON.parse(JSON.parse(response, :quirks_mode => true))
+
+      @code   = response['code']
+      @msg    = response['msg']
+      @error  = response['error'] || nil
     end
 
     def code
       @code
     end
 
-    def rate
-      @rate
-    end
-
-    def message
-      @message
+    def rate_limit
+      @rate_limit
     end
 
-    def errors
-      @errors
+    def msg
+      @msg
     end
 
-    def has_errors?
-      !@errors.nil? && @errors.has_errors?
+    def error
+      @error
     end
 
     private
 
-    def parser_message(body)
-      body
+    def parse_rate(headers)
+      {
+          limit:        headers[:x_ratelimit_limit],
+          remaining:    headers[:x_ratelimit_remaining],
+          reset:        headers[:x_ratelimit_reset],
+          retry_after:  headers[:x_retry_after] || nil
+      }
     end
   end
 

data/lib/wiot-sdk/version.rb

@@ -1,3 +1,3 @@
 module WiotSdk
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/wiot-sdk.rb

@@ -1,18 +1,21 @@
 require 'wiot-sdk/client'
-require 'wiot-sdk/metric'
+require 'wiot-sdk/payload'
+require 'wiot-sdk/version'
 
 module WiotSdk
 
-  def self.init(api_key, space, project)
-    Client.init api_key, space, project
+  DEFAULT_BASE_URL = 'http://api.watchiot.com'
+
+  def self.init(username:, api_key:, space:, project:, base_url: DEFAULT_BASE_URL)
+    Client.init username, api_key, space, project, base_url
   end
 
-  def self.init_yaml(file_path)
-    Client.init_yaml file_path
+  def self.init_yaml(file_path:, base_url: DEFAULT_BASE_URL)
+    Client.init_yaml file_path, base_url
   end
 
-  def self.init_json(file_path)
-    Client.init_json file_path
+  def self.init_json(file_path:, base_url: DEFAULT_BASE_URL)
+    Client.init_json file_path, base_url
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiot-sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - watchiot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,10 +72,7 @@ files:
 - lib/wiot-sdk/client.rb
 - lib/wiot-sdk/config/parser_json.rb
 - lib/wiot-sdk/config/parser_yml.rb
-- lib/wiot-sdk/data/error.rb
-- lib/wiot-sdk/data/errors.rb
-- lib/wiot-sdk/data/rate.rb
-- lib/wiot-sdk/metric.rb
+- lib/wiot-sdk/payload.rb
 - lib/wiot-sdk/request.rb
 - lib/wiot-sdk/response.rb
 - lib/wiot-sdk/version.rb

data/lib/wiot-sdk/data/error.rb

@@ -1,18 +0,0 @@
-module WiotSdk
-  module Data
-    class Error
-      def initialize(field, msg)
-        @field = field
-        @msg = msg
-      end
-
-      def field
-        @field
-      end
-
-      def msg
-        @msg
-      end
-    end
-  end
-end

data/lib/wiot-sdk/data/errors.rb

@@ -1,23 +0,0 @@
-module WiotSdk
-  module Data
-    class Errors
-      def initialize(body)
-        @errors = parser_errors body
-      end
-
-      def errors
-        @errors
-      end
-
-      def has_errors?
-        !@errors.nil? && @errors.size > 0
-      end
-
-      private
-
-      def parser_errors(body)
-        []
-      end
-    end
-  end
-end

data/lib/wiot-sdk/data/rate.rb

@@ -1,29 +0,0 @@
-module WiotSdk
-  module Data
-    class Rate
-      def initialize(header)
-        parser_rate header
-      end
-
-      def rate_limit
-        @rate_limit
-      end
-
-      def rate_remaining
-        @rate_remaining
-      end
-
-      def rate_reset
-        @rate_reset
-      end
-
-      private
-
-      def parser_rate(header)
-        @rate_limit = ''
-        @rate_remaining = ''
-        @rate_reset = ''
-      end
-    end
-  end
-end

data/lib/wiot-sdk/metric.rb

@@ -1,17 +0,0 @@
-module WiotSdk
-
-  class Metric
-    def initialize
-      @metric = {}
-    end
-
-    def add(key, value)
-      @metric[key] = value
-    end
-
-    def values
-      @metric
-    end
-  end
-
-end