parcel_api 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fc1e342902c65e83dd9577c46d3d659cb219a0
-  data.tar.gz: dd0ba98998fbf3203ce2f414db245272579bc4b1
+  metadata.gz: 8a13b9916fa74c4f67fecb998d3e1dea4f2e1a80
+  data.tar.gz: 77a34e2f09f3652004658cb8d3d46481711a0804
 SHA512:
-  metadata.gz: 6eae4d4ac188da4222b7c92d54b2510a3c61ad0196aca47b328a8089ff60d5129bdb4e0180d9a260a85b5a5e5bba31a02e450f498b8c1ba0e57ec307cb04f9fe
-  data.tar.gz: f34704c0b9d44288d53e3fd6fefaeeb7070a0cca42183d18788ac0064328844b971d3764514f80eb7da1c3a3a2c9e40e8533de417839f52341c21c157fc14a0f
+  metadata.gz: 80523cc33e155600914746946f7f07750785405a9e227d8c5fc47b099b79b7d9b8f7ec955980b4b8587b7c1b0df4fb4aaae02f3d651c507bda748eeb4c9aad60
+  data.tar.gz: d67c9e91c76821fcc008876348ab5424affc0e9040c0f37e650a79428836e2277a23f56082c3497cc3696d1c755b57b990e8ec5a186ad05cfd3b05e985247e5c

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    parcel_api (1.1.1)
+    parcel_api (1.2.0)
       activesupport (~> 4.2)
       oauth2 (~> 1.0)
       recursive-open-struct (~> 0.6)
       redis (~> 3.2)
+      stringex (~> 2.7, >= 2.7.1)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
@@ -25,18 +25,17 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    faraday (0.9.2)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    i18n (0.7.0)
-    json (1.8.3)
+    i18n (0.8.4)
     jwt (1.5.6)
     method_source (0.8.2)
-    minitest (5.9.1)
+    minitest (5.10.2)
     multi_json (1.11.0)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -45,10 +44,10 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    rack (2.0.3)
     rake (10.4.2)
     recursive-open-struct (0.6.5)
-    redis (3.3.1)
+    redis (3.3.3)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -69,9 +68,10 @@ GEM
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
     slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    stringex (2.7.1)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     vcr (2.9.3)
     webmock (1.21.0)
@@ -94,4 +94,4 @@ DEPENDENCIES
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/lib/parcel_api/address.rb

@@ -21,7 +21,7 @@ module ParcelApi
 
     def search(query, count=10)
       return [] if query.length < 4
-      response = @connection.get DOMESTIC_URL, params: { q: query, count: count }
+      response = @connection.get DOMESTIC_URL, params: { q: query.to_ascii, count: count }
       addresses = response.parsed['addresses'].each do |a|
         a['address_id'] = Integer(a['address_id'])
         a['dpid'] = Integer(a['dpid']) if a['dpid']
@@ -67,7 +67,7 @@ module ParcelApi
     def international_search(query, count=5, country_code=nil)
       return [] if query.length < 4
 
-      response = @connection.get INTERNATIONAL_URL, params: { q: query, count: count, country_code: country_code }
+      response = @connection.get INTERNATIONAL_URL, params: { q: query.to_ascii, count: count, country_code: country_code }
       response.parsed['addresses'].map {|address| OpenStruct.new(address)}
     end
 

data/lib/parcel_api/client.rb

@@ -35,7 +35,7 @@ module ParcelApi
           access_token = OAuth2::AccessToken.from_hash client, JSON.parse(json)
         else
           access_token = client.password.get_token @username, @password
-          @redis.set(:parcel_api_access_token, access_token.to_hash.to_json, ex: access_token.expires_in.seconds - 6.hours)
+          @redis.set(:parcel_api_access_token, access_token.to_hash.to_json, ex: (access_token.expires_in.seconds - 1.hour))
           access_token
         end
       end

data/lib/parcel_api/label.rb

@@ -18,7 +18,7 @@ module ParcelApi
 
     def create(label_options)
       domestic_url = File.join(LABEL_URL, 'domestic')
-      response = @connection.post domestic_url, body: label_options.to_json, headers: { 'Content-Type' => 'application/json' }
+      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
     end
@@ -29,7 +29,7 @@ module ParcelApi
 
     def international_create(label_options)
       international_url = File.join(LABEL_URL, 'international')
-      response = @connection.post international_url, body: label_options.to_json, headers: { 'Content-Type' => 'application/json' }
+      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
     end

data/lib/parcel_api/notification.rb

@@ -18,7 +18,7 @@ module ParcelApi
     # @return Object of notification details
 
     def create(notification_options)
-      response = @connection.post PARCELNOTIFICATION_URL, body: notification_options.to_json, headers: { 'Content-Type' => 'application/json' }
+      response = @connection.post PARCELNOTIFICATION_URL, body: notification_options.to_json.to_ascii, headers: { 'Content-Type' => 'application/json' }
       RecursiveOpenStruct.new(response.parsed, recurse_over_arrays: true)
     end
 

data/lib/parcel_api/pickup.rb

@@ -17,7 +17,7 @@ module ParcelApi
     # @return Object of pickup details
 
     def create(pickup_options)
-      response = @connection.post PARCELPICKUP_URL, body: pickup_options.to_json, headers: { 'Content-Type' => 'application/json' }
+      response = @connection.post PARCELPICKUP_URL, body: pickup_options.to_json.to_ascii, headers: { 'Content-Type' => 'application/json' }
       RecursiveOpenStruct.new(response.parsed, recurse_over_arrays: true)
     end
 

data/lib/parcel_api/version.rb

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

data/lib/parcel_api.rb

@@ -1,4 +1,5 @@
 require 'recursive-open-struct'
+require 'stringex_lite'
 
 require 'parcel_api/version'
 require 'parcel_api/address'

data/parcel_api.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redis', '~> 3.2'
   spec.add_dependency 'activesupport', '~> 4.2'
   spec.add_dependency 'recursive-open-struct', '~> 0.6'
+  spec.add_dependency 'stringex', '~> 2.7', '>= 2.7.1'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parcel_api
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Robert Coleman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -80,6 +80,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for NZ Post's Parcel APIs