amazon-drs 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f902912f543efa10b1c721d6fdd269434cdf4cc
-  data.tar.gz: 7a28d74b215e5b3cd29d60d2b71e8ce24e075171
+  metadata.gz: 3f23a9a21b66bde11b05b063c7dc4a6912a07382
+  data.tar.gz: 9e223b19d1d422db163640bcf4ab6517d1b98a4b
 SHA512:
-  metadata.gz: eadcbf854b6bf1234b211b51debd7067d4514fbb052d53d1c06696f6fe41b782de973e188559152b54a2cd93c30cc674c833d7102fdc9e7ace604cf8e4cada8d
-  data.tar.gz: 2de9412108eec58f8924821842d9911064905da0ec7550f321c9109ed7fb1d8e7f87abc95163b9c56a80570f93e8d61b8e2fd2c26f00bc2cdedcc56c54011b55
+  metadata.gz: 9df1544a33d6f403083778f753f9d4f8804a9506925b5bd7c1e7116c968fa7eb960b5e2c9690ca79bd644ef0a4e47ded41fdef255008a7d7b28fe88002fc5050
+  data.tar.gz: c3874e6436e91063abb4d90ba6648994f035a21914d005b77786efdc2ff9182b9611f2603d83b9a4c94a22ec162f9ee9961af30470543d03917ddcd319317423

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.ruby-version
 /Gemfile.lock
 /_yardoc/
 /coverage/

data/.jrubyrc

@@ -0,0 +1 @@
+compat.version=2.0

data/.travis.yml

@@ -1,5 +1,14 @@
+---
 sudo: false
 language: ruby
 rvm:
+  - 2.2.6
   - 2.3.3
-before_install: gem install bundler -v 1.13.6
+  - 2.4.0
+  - jruby-1.7.26
+  - jruby-9.1.7.0
+script: bundle exec rake
+matrix:
+  allow_failures:
+    - rvm: jruby-1.7.26
+    - rvm: jruby-9.1.7.0

data/Gemfile

@@ -4,5 +4,5 @@ group :development do
   gem 'webmock'
 end
 
-# Specify your gem's dependencies in adash.gemspec
+# Specify your gem's dependencies in amazon-drs.gemspec
 gemspec

data/amazon-drs.gemspec

@@ -11,16 +11,16 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{amazon-drs is for Amazon Dash Replenishment Service}
   spec.description   = %Q{amazon-drs is for Amazon Dash Replenishment Service.\nYou can use this after authorized by Login with Amazon.}
-  spec.homepage      = "https://github.com/aycabta/amazon-drs"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/aycabta/amazon-drs'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f| f.match(%r{^(test|spec|features)/}) end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  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"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'webmock'
 end

data/bin/console

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "adash"
+require 'bundler/setup'
+require 'amazon-drs'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+# require 'pry'
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/lib/amazon-drs/base.rb

@@ -7,12 +7,12 @@ module AmazonDrs
     def initialize(response)
       @response = response
       @status_code = response.code.to_i
-      parse_header(response.header)
+      parse_header(response)
       parse_body(response.body)
     end
 
-    def parse_header(headers)
-      headers.each do |key, value|
+    def parse_header(response)
+      response.each do |key, value|
         case key.downcase
         when 'x-amzn-errortype'
           # Value examples:
@@ -36,5 +36,16 @@ module AmazonDrs
       # abstract
     end
     private :parse_body
+
+    def inspect
+      if @status_code == 200
+        self.class.name
+      else
+        resp = "ERROR #{@status_code} : "
+        resp += @message if instance_variable_defined?(:@message) && @message
+        resp += @error_description if instance_variable_defined?(:@error_description) && @error_description
+        resp
+      end
+    end
   end
 end

data/lib/amazon-drs/client.rb

@@ -11,10 +11,6 @@ require 'amazon-drs/error'
 require 'amazon-drs/slot_status'
 require 'amazon-drs/access_token'
 
-class Net::HTTPResponse
-  attr_accessor :json
-end
-
 module AmazonDrs
   class Client
     attr_accessor :device_model, :serial, :authorization_code, :redirect_uri, :access_token, :refresh_token, :client_id, :client_secret
@@ -37,7 +33,7 @@ module AmazonDrs
     end
 
     def user_agent
-      @user_agent ||= "AdashRubyGem/#{AmazonDrs::VERSION}/#{RUBY_DESCRIPTION}"
+      @user_agent ||= "AmazonDrsRubyGem/#{AmazonDrs::VERSION}/#{RUBY_DESCRIPTION}"
     end
 
     def deregistrate_device
@@ -163,7 +159,8 @@ module AmazonDrs
         end
       end
       resp = request(method, url, headers: headers, params: params)
-      if resp.code == '400' && resp.json['message'] == 'Invalid token' && @refresh_token
+      json = JSON.parse(resp.body)
+      if resp.code == '400' && json['message'] == 'Invalid token' && @refresh_token
         resp = refresh_access_token
         process_token_response(resp)
         request(method, url, headers: headers, params: params)
@@ -231,16 +228,14 @@ module AmazonDrs
       request['Content-Type'] = 'application/x-www-form-urlencoded'
       request['User-Agent'] = user_agent
       headers.each do |key, value|
-        request[key] = value
+        request[key.to_s] = value
       end
       if not @access_token.nil?
         request["Authorization"] = "Bearer #{@access_token}"
       end
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
-      response = http.request(request)
-      response.json = JSON.parse(response.body)
-      response
+      http.request(request)
     end
     private :request
   end

data/lib/amazon-drs/error.rb

@@ -10,6 +10,19 @@ module AmazonDrs
       @error = json['error'] if json['error']
       @error_description = json['error_description'] if json['error_description']
     end
+
+    def inspect
+      resp = 'ERROR'
+      resp += " #{@error}" if instance_variable_defined?(:@error) && @error
+      resp += ': '
+      resp += @message if instance_variable_defined?(:@message) && @message
+      resp += @error_description if instance_variable_defined?(:@error_description) && @error_description
+      resp
+    end
+
+    def to_s
+      inspect
+    end
   end
 end
 

data/lib/amazon-drs/version.rb

@@ -1,3 +1,3 @@
 module AmazonDrs
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: amazon-drs
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".jrubyrc"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: amazon-drs is for Amazon Dash Replenishment Service