ruby-jet 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 695f74da722f871f86fbd0282ebbabd8e9ca9049
-  data.tar.gz: 23ae1f65f0a2114798a7f4cdf78c8e947f7710c3
+  metadata.gz: e962bc47649ce4576b0c1bbafbbe8f93e14170a8
+  data.tar.gz: 291f440df4fd0fda198a0a1737ee3f2838413fc4
 SHA512:
-  metadata.gz: 9fff8594f18d872fda70f48543ae8de6e4f6e6ac1241c3258c259848d5ba7d7a8581fadd24afe1e1e5b06f3141f78b18b528fd9c95a7d143ca3dfee8bcd9cba2
-  data.tar.gz: 7a2e3ad139cb4c5f26f8d8a72b519e3d205cefaac6d38364be382557d48b2d4acdb04d569ee8a8dc14fdc5d3d73f4aec0700d92b96c52d15161771391e254d5c
+  metadata.gz: 2d24f34ed23fe4926b1fa0b1f8a938c817e873b158c04b39ad549ce38e86f4df9430d68fa4c7edcbc7261b993077fefdd5586c73032ec9ae3cbb87387822a676
+  data.tar.gz: a09bf17cc7c06dfdf52ba4e5f2a9da165c2771dca5d6c9283d8a4cae9ea61e1e7af46d9c5d9b79e8493e3b991c9a46827269ceac0b0761af084813e0d262b0a8

data/lib/jet/client.rb

@@ -2,7 +2,6 @@ require 'rest-client'
 require 'json'
 
 class Jet::Client
-
   API_URL = 'https://merchant-api.jet.com/api'
 
   def initialize(config = {})
@@ -11,7 +10,7 @@ class Jet::Client
     @merchant_id = config[:merchant_id]
   end
 
-  def get_token
+  def token
     if not (@id_token and @token_type and @expires_on > Time.now)
       body = {
         user: @api_user,
@@ -24,7 +23,7 @@ class Jet::Client
       @expires_on = Time.parse(parsed_response['expires_on'])
     end
 
-    {Authorization: "#{@token_type} #{@id_token}"}
+    { Authorization: "#{@token_type} #{@id_token}" }
   end
 
   def orders

data/lib/jet/client/orders.rb

@@ -16,63 +16,39 @@ class Jet::Client::Orders
   end
 
   def get_orders(status = :ready)
-    headers = @client.get_token
+    headers = @client.token
     query_status = STATUSES[status]
     response = RestClient.get("#{Jet::Client::API_URL}/orders/#{query_status}", headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def get_order(order_url)
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.get("#{Jet::Client::API_URL}#{order_url}", headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def get_order_by_id(order_id)
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.get("#{Jet::Client::API_URL}/orders/withoutShipmentDetail/#{order_id}", headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def acknowledge_order(order_id, body = {})
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.put("#{Jet::Client::API_URL}/orders/#{order_id}/acknowledge", body.to_json, headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def ship_order(order_id, body = {})
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.put("#{Jet::Client::API_URL}/orders/#{order_id}/shipped", body.to_json, headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def get_directed_cancel
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.get("#{Jet::Client::API_URL}/orders/directedCancel", headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 end

data/lib/jet/client/returns.rb

@@ -15,53 +15,33 @@ class Jet::Client::Returns
   end
 
   def get_returns(status = :created)
-    headers = @client.get_token
+    headers = @client.token
     query_status = STATUSES[status]
     response = RestClient.get("#{Jet::Client::API_URL}/returns/#{query_status}", headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def get_return(return_url)
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.get("#{Jet::Client::API_URL}#{return_url}", headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def get_return_by_id(return_id)
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.get("#{Jet::Client::API_URL}/returns/state/#{return_id}", headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def acknowledge_return(return_id, body = {})
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.put("#{Jet::Client::API_URL}/returns/#{return_id}/acknowledge", body.to_json, headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 
   def complete_return(return_id, body = {})
-    headers = @client.get_token
+    headers = @client.token
     response = RestClient.put("#{Jet::Client::API_URL}/returns/#{return_id}/complete", body.to_json, headers)
-    if response.code == 200
-      JSON.parse(response.body)
-    else
-      nil
-    end
+    JSON.parse(response.body) if response.code == 200
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-jet
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Jason Wells