ruby-jet 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5190b45ea661721139ce27889e32faf90a8849ec
-  data.tar.gz: fbf8feb37324ec7e2a2cd328cc12cd32bc8cdd61
+  metadata.gz: ffd0b98c1113276596df5721354d63e19984bd9d
+  data.tar.gz: ace62bd2d6dadbee4b05ec2c45473a0efb1c5159
 SHA512:
-  metadata.gz: c720821aa867dc50127be31fd02898bbbbb9a5f6b17547cd5853204c743d0475f98052202d52fc1c08d8256521659f9cd7d63950d2f5b6e157c9d4961bbc7238
-  data.tar.gz: d46c4d94597545aad8314813b0ac93d27c007813382567867fa7de689ddac6cd03ab37d0810fc9c09d6eb8e88c1093f9a459b71b3010439f618c60288ad5e8bb
+  metadata.gz: 69ee0a26c38782a3f41840567e781a3006f3df4e80345c87ed3924a0a9876a82f54096a1179b25b098a1e8a4e2b7109c02d8f75777c89ce827d59ed812060534
+  data.tar.gz: 28ae7db1a3ec791e56a74c32416ef02c02fe6253ef654e873be156d2ac64a887d2571b882af298b7f54c899803e319b0aa0af67277733d7af2db752ca6b6bfc0

data/lib/jet/client/files.rb

@@ -1,5 +1,5 @@
 require 'rest-client'
-require 'json'
+require 'oj'
 require 'zlib'
 require 'stringio'
 
@@ -20,14 +20,14 @@ class Jet::Client::Files
     gz.close
     gzipped_body = io.string
     response = RestClient.put(url, gzipped_body, headers)
-    JSON.parse(response.body) if response.code == 200
+    @client.decode_json(response.body) if response.code == 200
   end
 
   def uploaded_files(url, file_type, file_name)
     headers = @client.token
     body = { url: url, file_type: file_type, file_name: file_name }
-    response = RestClient.post("#{Jet::Client::API_URL}/files/uploaded", body.to_json, headers)
-    JSON.parse(response.body) if response.code == 200
+    response = RestClient.post("#{Jet::Client::API_URL}/files/uploaded", @client.encode_json(body), headers)
+    @client.decode_json(response.body) if response.code == 200
   end
 
   def jet_file_id(file_id)

data/lib/jet/client/orders.rb

@@ -1,5 +1,4 @@
 require 'rest-client'
-require 'json'
 
 class Jet::Client::Orders
 

data/lib/jet/client/products.rb

@@ -1,5 +1,4 @@
 require 'rest-client'
-require 'json'
 
 class Jet::Client::Products
   def initialize(client)
@@ -38,4 +37,3 @@ class Jet::Client::Products
     @client.rest_get_with_token('/merchant-skus', params)
   end
 end
-

data/lib/jet/client/returns.rb

@@ -1,5 +1,4 @@
 require 'rest-client'
-require 'json'
 
 class Jet::Client::Returns
 
@@ -27,10 +26,6 @@ class Jet::Client::Returns
     @client.rest_get_with_token("/returns/state/#{return_id}")
   end
 
-  def acknowledge_return(return_id, body = {})
-    @client.rest_put_with_token("/returns/#{return_id}/acknowledge", body)
-  end
-
   def complete_return(return_id, body = {})
     @client.rest_put_with_token("/returns/#{return_id}/complete", body)
   end

data/lib/jet/client/taxonomy.rb

@@ -1,5 +1,4 @@
 require 'rest-client'
-require 'json'
 
 class Jet::Client::Taxonomy
   def initialize(client)

data/lib/jet/client.rb

@@ -1,5 +1,5 @@
 require 'rest-client'
-require 'json'
+require 'oj'
 
 class Jet::Client
   API_URL = 'https://merchant-api.jet.com/api'
@@ -10,14 +10,22 @@ class Jet::Client
     @merchant_id = config[:merchant_id]
   end
 
+  def encode_json(data)
+    Oj.dump(data, mode: :compat)
+  end
+
+  def decode_json(json)
+    Oj.load(json)
+  end
+
   def token
     if not (@id_token and @token_type and @expires_on > Time.now)
       body = {
         user: @api_user,
         pass: @secret
       }
-      response = RestClient.post("#{API_URL}/token", body.to_json)
-      parsed_response = JSON.parse(response.body)
+      response = RestClient.post("#{API_URL}/token", encode_json(body))
+      parsed_response = decode_json(response.body)
       @id_token = parsed_response['id_token']
       @token_type = parsed_response['token_type']
       @expires_on = Time.parse(parsed_response['expires_on'])
@@ -30,13 +38,13 @@ class Jet::Client
     headers = token
     headers.merge!({ params: query_params }) unless query_params.empty?
     response = RestClient.get("#{API_URL}#{path}", headers)
-    JSON.parse(response.body) if response.code == 200
+    decode_json(response.body) if response.code == 200
   end
 
   def rest_put_with_token(path, body = {})
     headers = token
     response = RestClient.put("#{API_URL}#{path}", body.to_json, headers)
-    JSON.parse(response.body) if response.code == 200
+    decode_json(response.body) if response.code == 200
   end
 
   def orders

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jet
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jason Wells
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.15'
 description: Jet API service calls implemented in Ruby
 email:
 - flipstock@gmail.com