amazon-drs 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd05c5984943ffa279e99ad7505294c457a08d40
-  data.tar.gz: 9956785a162a929d1762c5ce944fe4a54e3c6281
+  metadata.gz: f6dddd1e7901f7b68d205c6c434eaf426b3bd4c1
+  data.tar.gz: df15a2b0f9de225a50e87dd1e84833d97862c4b2
 SHA512:
-  metadata.gz: e33ea67ba8b0d9f1798870e02839eb764d9f95fbdd5bf4ef5242073884561b0ddca501ca8470a1edde1ec6eaa9a46c28a4501cb77901fd1f4ed125dd063c08b0
-  data.tar.gz: cd8c1a39f3f9ffabe438bad67c047291c1aa2c5dffde97d377d1d3998cca813c9273b983d6d6e56bd5560a92fed95bc29179ce41a58e98a428a97635cb2a3cd2
+  metadata.gz: 6372c95d4bbc790017082fffbb0fb722ec9a37aaa1268085634dde811310e8b77240a5002840286426797566ad7e6fbf1da4412633a9beffed1b00eb1f24f203
+  data.tar.gz: b7e54e17b3f5ee8cd6f5928fc9987c54ecff4ad47e1030dcdddf97917fc4e994625afb1c20f73ece70bc70e8e767299c769e9b083399eccf0eb2a129e585c14e

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
+group :development do
+  gem 'webmock'
+end
+
 # Specify your gem's dependencies in adash.gemspec
 gemspec

data/Rakefile

@@ -1,3 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-task :default => :spec
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = Dir[ 'test/**/*_test.rb' ]
+end
+
+task :default => :test

data/amazon-drs.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "webmock"
 end

data/lib/amazon-drs/access_token.rb

@@ -0,0 +1,15 @@
+require 'amazon-drs/base'
+
+module AmazonDrs
+  class AccessToken < Base
+    attr_accessor :access_token, :refresh_token, :token_type, :expires_in
+
+    def parse_body(body)
+      json = JSON.parse(body)
+      @access_token = json['access_token']
+      @refresh_token = json['refresh_token']
+      @token_type = json['token_type']
+      @expires_in = json['expires_in']
+    end
+  end
+end

data/lib/amazon-drs/base.rb

@@ -0,0 +1,40 @@
+require 'time'
+
+module AmazonDrs
+  class Base
+    attr_accessor :status_code, :request_id, :date, :error_type, :error_description_url
+
+    def initialize(response)
+      @response = response
+      @status_code = response.code.to_i
+      parse_header(response.header)
+      parse_body(response.body)
+    end
+
+    def parse_header(headers)
+      headers.each do |key, value|
+        case key.downcase
+        when 'x-amzn-errortype'
+          # Value examples:
+          #   InvalidTokenException:http://internal.amazon.com/coral/com.amazon.parkeraccioservice/
+          #   OA2InvalidRequestException:http://internal.amazon.com/coral/com.amazon.panda/
+          @error_type, @error_description_url = value.split(':', 2)
+        when 'x-amzn-requestid'
+          # Example:
+          #   X-Amzn-Requestid: d296d296-d1d1-1111-8c8c-0b43820b4382
+          @request_id = value
+        when 'x-amz-date'
+          # Example:
+          #   X-Amz-Date: Mon, 02 Jan 2017 22:35:53 GMT
+          @date = Time.rfc2822(value)
+        end
+      end
+    end
+    private :parse_header
+
+    def parse_body(body)
+      # abstract
+    end
+    private :parse_body
+  end
+end

data/lib/amazon-drs/client.rb

@@ -4,9 +4,15 @@ require 'json'
 require 'yaml'
 require 'time'
 require 'date'
+require 'amazon-drs/deregistrate_device'
+require 'amazon-drs/subscription_info'
+require 'amazon-drs/replenish'
+require 'amazon-drs/error'
+require 'amazon-drs/slot_status'
+require 'amazon-drs/access_token'
 
 class Net::HTTPResponse
-    attr_accessor :json
+  attr_accessor :json
 end
 
 module AmazonDrs
@@ -40,7 +46,12 @@ module AmazonDrs
         'x-amzn-type-version': 'com.amazon.dash.replenishment.DrsDeregisterInput@1.0'
       }
       path = "/deviceModels/#{@device_model}/devices/#{@serial}/registration"
-      request_drs(:delete, path, headers: headers)
+      response = request_drs(:delete, path, headers: headers)
+      if response.code == '200'
+        ::AmazonDrs::DeregistrateDevice.new(response)
+      else
+        ::AmazonDrs::Error.new(response)
+      end
     end
 
     def device_status(most_recently_active_date)
@@ -50,6 +61,11 @@ module AmazonDrs
       }
       path = '/deviceStatus'
       request_drs(:post, path, headers: headers, params: { 'mostRecentlyActiveDate' =>  convert_to_iso8601(most_recently_active_date) })
+      if response.code == '200'
+        ::AmazonDrs::DeviceStatus.new(response)
+      else
+        ::AmazonDrs::Error.new(response)
+      end
     end
 
     def subscription_info
@@ -58,7 +74,12 @@ module AmazonDrs
         'x-amzn-type-version': 'com.amazon.dash.replenishment.DrsSubscriptionInfoInput@1.0'
       }
       path = '/subscriptionInfo'
-      request_drs(:get, path, headers: headers)
+      response = request_drs(:get, path, headers: headers)
+      if response.code == '200'
+        ::AmazonDrs::SubscriptionInfo.new(response)
+      else
+        ::AmazonDrs::Error.new(response)
+      end
     end
 
     def slot_status(slot_id, expected_replenishment_date, remaining_quantity_in_unit, original_quantity_in_unit, total_quantity_on_hand, last_use_date)
@@ -74,7 +95,12 @@ module AmazonDrs
         'totalQuantityOnHand' => total_quantity_on_hand,
         'lastUseDate' => convert_to_iso8601(last_use_date)
       }
-      request_drs(:post, path, headers: headers, params: params)
+      response = request_drs(:post, path, headers: headers, params: params)
+      if response.code == '200'
+        ::AmazonDrs::SlotStatus.new(response)
+      else
+        ::AmazonDrs::Error.new(response)
+      end
     end
 
     def replenish(slot_id)
@@ -84,12 +110,11 @@ module AmazonDrs
       }
       path = "/replenish/#{slot_id}"
       response = request_drs(:post, path, headers: headers)
-      # TODO: imprement response processing
-      # https://developer.amazon.com/public/solutions/devices/dash-replenishment-service/docs/dash-replenish-endpoint
-      # response examples:
-      #   {"message":"Unable to place order - slot : <01234567-89ab-cdef-0123-456789abcdef> is unsubscribed."}
-      #   {"detailCode":"STANDARD_ORDER_PLACED","eventInstanceId":"amzn1.dash.v2.o.xxxxxx......"}
-      #   {"detailCode":"ORDER_INPROGRESS","eventInstanceId":"amzn1.dash.v2.o.xxxxxx......"}
+      if response.code == '200'
+        ::AmazonDrs::Replenish.new(response)
+      else
+        ::AmazonDrs::Error.new(response)
+      end
     end
 
     def get_token
@@ -98,11 +123,10 @@ module AmazonDrs
       else
         resp = request_token
         process_token_response(resp)
+        resp
       end
     end
 
-    private
-
     def convert_to_iso8601(input)
       case input
       when Date, Time
@@ -113,19 +137,19 @@ module AmazonDrs
         input.to_s
       end
     end
+    private :convert_to_iso8601
 
     def process_token_response(resp)
-      if resp.json['error']
-        puts resp.json['error']
-        puts resp.json['error_description']
+      if resp.kind_of?(AmazonDrs::Error)
         nil
       else
-        @access_token = resp.json['access_token']
-        @refresh_token = resp.json['refresh_token']
+        @access_token = resp.access_token
+        @refresh_token = resp.refresh_token
         @on_new_token.call(@access_token, @refresh_token) if @on_new_token
         @access_token
       end
     end
+    private :process_token_response
 
     def request_drs(method, path, headers: {}, params: {})
       url = "https://#{@drs_host}#{path}"
@@ -134,7 +158,7 @@ module AmazonDrs
       end
       if @access_token.nil?
         token = get_token
-        if token.nil?
+        if resp.kind_of?(AmazonDrs::Error)
           raise 'Failed to get token'
         end
       end
@@ -147,6 +171,7 @@ module AmazonDrs
         resp
       end
     end
+    private :request_drs
 
     def refresh_access_token
       params = {
@@ -158,6 +183,7 @@ module AmazonDrs
       @access_token = nil
       request(:post, "https://#{@amazon_host}/auth/o2/token", params: params)
     end
+    private :refresh_access_token
 
     def request_token
       params = {
@@ -167,8 +193,14 @@ module AmazonDrs
         client_secret: @client_secret,
         redirect_uri: @redirect_uri
       }
-      request(:post, "https://#{@amazon_host}/auth/o2/token", params: params)
+      response = request(:post, "https://#{@amazon_host}/auth/o2/token", params: params)
+      if response.code == '200'
+        ::AmazonDrs::AccessToken.new(response)
+      else
+        ::AmazonDrs::Error.new(response)
+      end
     end
+    private :request_token
 
     def request(method, url, headers: {}, params: {})
       uri = URI.parse(url)
@@ -210,5 +242,6 @@ module AmazonDrs
       response.json = JSON.parse(response.body)
       response
     end
+    private :request
   end
 end

data/lib/amazon-drs/deregistrate_device.rb

@@ -0,0 +1,6 @@
+require 'amazon-drs/base'
+
+module AmazonDrs
+  class DeregistrateDevice < Base
+  end
+end

data/lib/amazon-drs/device_status.rb

@@ -0,0 +1,7 @@
+require 'amazon-drs/base'
+
+module AmazonDrs
+  class DeviceStatus < Base
+  end
+end
+

data/lib/amazon-drs/error.rb

@@ -0,0 +1,15 @@
+require 'amazon-drs/base'
+
+module AmazonDrs
+  class Error < Base
+    attr_accessor :message, :error_description, :error
+
+    def parse_body(body)
+      json = JSON.parse(body)
+      @message = json['message'] if json['message']
+      @error = json['error'] if json['error']
+      @error_description = json['error_description'] if json['error_description']
+    end
+  end
+end
+

data/lib/amazon-drs/replenish.rb

@@ -0,0 +1,20 @@
+require 'amazon-drs/base'
+
+module AmazonDrs
+  class Replenish < Base
+    attr_accessor :event_instance_id, :detail_code, :message
+
+    def parse_body(body)
+      json = JSON.parse(body)
+      @event_instance_id = json['eventInstanceId'] if json['eventInstanceId']
+      if json['detailCode']
+        # STANDARD_ORDER_PLACED, TEST_ORDER_PLACED or ORDER_INPROGRESS
+        @detail_code = json['detailCode']
+      else
+        @detail_code = 'ERROR'
+      end
+      @message = json['message'] if json['message']
+    end
+  end
+end
+

data/lib/amazon-drs/slot_status.rb

@@ -0,0 +1,7 @@
+require 'amazon-drs/base'
+
+module AmazonDrs
+  class SlotStatus < Base
+  end
+end
+

data/lib/amazon-drs/subscription_info.rb

@@ -0,0 +1,17 @@
+require 'json'
+require 'amazon-drs/base'
+
+module AmazonDrs
+  class SubscriptionInfo < Base
+    attr_accessor :slots
+
+    def parse_body(body)
+      json = JSON.parse(body)
+      @slots = {}
+      json['slotsSubscriptionStatus'].each_pair do |slot_id, available|
+        @slots[slot_id] = available
+      end
+    end
+  end
+end
+

data/lib/amazon-drs/version.rb

@@ -1,3 +1,3 @@
 module AmazonDrs
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-drs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   amazon-drs is for Amazon Dash Replenishment Service.
   You can use this after authorized by Login with Amazon.
@@ -58,7 +86,15 @@ files:
 - bin/setup
 - data/client
 - lib/amazon-drs.rb
+- lib/amazon-drs/access_token.rb
+- lib/amazon-drs/base.rb
 - lib/amazon-drs/client.rb
+- lib/amazon-drs/deregistrate_device.rb
+- lib/amazon-drs/device_status.rb
+- lib/amazon-drs/error.rb
+- lib/amazon-drs/replenish.rb
+- lib/amazon-drs/slot_status.rb
+- lib/amazon-drs/subscription_info.rb
 - lib/amazon-drs/version.rb
 homepage: https://github.com/aycabta/amazon-drs
 licenses:
@@ -80,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: amazon-drs is for Amazon Dash Replenishment Service