parcel_api 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a13b9916fa74c4f67fecb998d3e1dea4f2e1a80
-  data.tar.gz: 77a34e2f09f3652004658cb8d3d46481711a0804
+  metadata.gz: 7b4a64cee7c8d3f2bc58d3a657b75404bd4dfc18
+  data.tar.gz: b901efeb4b0573f25cfd1f7c5418281181976094
 SHA512:
-  metadata.gz: 80523cc33e155600914746946f7f07750785405a9e227d8c5fc47b099b79b7d9b8f7ec955980b4b8587b7c1b0df4fb4aaae02f3d651c507bda748eeb4c9aad60
-  data.tar.gz: d67c9e91c76821fcc008876348ab5424affc0e9040c0f37e650a79428836e2277a23f56082c3497cc3696d1c755b57b990e8ec5a186ad05cfd3b05e985247e5c
+  metadata.gz: b5c5b3d71b090caca863daa02e080480ec4d3da7b25eaedf4230bfe078142a31178e30dfc442971330c006a18eceaba30dea6928df6e3474e502902727c88177
+  data.tar.gz: a188ba9475063f663fec6d6fa46a58dc25e3ace41ba7f1243919132b1592053c4d923ef10da7e2249007dd508001a8167927af1eaaa79ec9d2316d04ebd04dfb

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
+  - 2.4.3
+  - 2.3.7
+  - 2.2.10
 addons:
   code_climate:
     repo_token: 71a1f8fa6b8f4bd0e13542f237fd8f060d4dab088c71e5f980ed6247197d1820

data/Gemfile.lock

@@ -77,7 +77,7 @@ GEM
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    yard (0.8.7.6)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -91,7 +91,7 @@ DEPENDENCIES
   rspec (~> 3.2)
   vcr (~> 2.9)
   webmock (~> 1.21)
-  yard (~> 0.8)
+  yard (~> 0.9)
 
 BUNDLED WITH
-   1.14.6
+   1.16.0

data/lib/parcel_api/label.rb

@@ -6,10 +6,12 @@ module ParcelApi
   class Label
     LABEL_URL = '/ParcelLabel/2.0/labels'
 
+    attr_accessor :connection, :labels, :label_request, :label_response
+
     # Creates a new ParcelApi::Label instance.
 
-    def initialize(connection=nil)
-      @connection ||= connection || ParcelApi::Client.connection
+    def initialize(connection = nil)
+      self.connection ||= connection || ParcelApi::Client.connection
     end
 
     # Create a label with the specified options
@@ -17,10 +19,7 @@ module ParcelApi
     # @return Single or array of label objects
 
     def create(label_options)
-      domestic_url = File.join(LABEL_URL, 'domestic')
-      response = @connection.post domestic_url, body: label_options.to_json.to_ascii, headers: { 'Content-Type' => 'application/json' }
-      labels = response.parsed['labels'].map {|label| OpenStruct.new(label)}
-      labels.first if labels.count == 1
+      create_label File.join(LABEL_URL, 'domestic'), label_options
     end
 
     # Create an international label with the specified options
@@ -28,10 +27,7 @@ module ParcelApi
     # @return Single or array of label objects
 
     def international_create(label_options)
-      international_url = File.join(LABEL_URL, 'international')
-      response = @connection.post international_url, body: label_options.to_json.to_ascii, headers: { 'Content-Type' => 'application/json' }
-      labels = response.parsed['labels'].map {|label| OpenStruct.new(label)}
-      labels.first if labels.count == 1
+      create_label File.join(LABEL_URL, 'international', label_options)
     end
 
     # Get label details
@@ -40,7 +36,7 @@ module ParcelApi
 
     def details(label_id)
       details_url = File.join(LABEL_URL, "#{label_id}.json")
-      response = @connection.get details_url
+      response = connection.get details_url
       details = response.parsed.tap {|d| d.delete('success')}
       OpenStruct.new(details)
     end
@@ -51,10 +47,21 @@ module ParcelApi
 
     def download(label_id)
       download_url = File.join(LABEL_URL, "#{label_id}.pdf")
-      response = @connection.get download_url
+      response = connection.get download_url
       StringIO.new(response.body)
     end
 
+    private
+
+    def create_label(url, label_options)
+      self.label_request = {
+        body: label_options.to_json.to_ascii,
+        headers: { 'Content-Type' => 'application/json' }
+      }
+      self.label_response = connection.post(url, label_request)
+      self.label_response.parsed['labels'].map {|label| OpenStruct.new(label)}.first
+    end
+
   end
 
 end

data/lib/parcel_api/version.rb

@@ -1,3 +1,3 @@
 module ParcelApi
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/parcel_api.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'webmock', '~> 1.21'
   spec.add_development_dependency 'vcr', '~> 2.9'
-  spec.add_development_dependency 'yard', '~> 0.8'
+  spec.add_development_dependency 'yard', '~> 0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parcel_api
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Robert Coleman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: 
 email:
 - github@robert.net.nz
@@ -254,4 +254,3 @@ signing_key:
 specification_version: 4
 summary: Ruby client for NZ Post's Parcel APIs
 test_files: []
-has_rdoc: