friendly_shipping 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba3ffaa5a9a2dc26efe1c741f3579bb00af900b1
-  data.tar.gz: d59fb16b95c9851917d508bf08c4c2e5eafac026
+  metadata.gz: c51440567e32656dd9c373764b43ed8915c7bed5
+  data.tar.gz: ac745c9dd9e1c087ec387c429f761633c15783bc
 SHA512:
-  metadata.gz: 8ee545c4c8af459aa943bb97c17b5d58f71f063d7c048e2d72f8f3ece48047c65959d5f7eb94638ac8ed24b5d28012d8ae85a979446d8c8920d73349c5ebaeee
-  data.tar.gz: 9009c54b6022b8d8b644e0032bb712d7ababcf7b13a5f726a5a5398b8c6e0b5454fd5d633eb5091ed4014277bdf0f1b3c2055547ca5c9ead9b0e1783b65cfcf9
+  metadata.gz: d8b986a76ea28d2ba06f7d6ad3bfea61748e0d291d95f59b9d1ea826cd6bc0d94b16b5cefe7fd2d9d03f0cbf32762b6a7fc9145d4d06054b3d0bceff2125b723
+  data.tar.gz: faee889795cd2d7588771e9938e1660eec64e3c72e65994dac6e348b4a5aff1eef514d0f1d5ae44a39f0bf2ff47057d1c6a7f68efde8a20ce431b9d50739540f

data/lib/friendly_shipping/bad_request.rb

@@ -0,0 +1,23 @@
+require 'json'
+
+module FriendlyShipping
+  class BadRequest < StandardError
+    attr_reader :rest_error, :response
+
+    def initialize(rest_error)
+      @rest_error = rest_error
+      @response = rest_error.response
+      super parse_json_errors || rest_error
+    end
+
+    private
+
+    def parse_json_errors
+      parsed_body = JSON.parse(response.body)
+      messages = parsed_body.fetch('errors')&.map { |e| e.fetch('message') }
+      messages&.join(', ')
+    rescue JSON::ParserError, KeyError => _error
+      nil
+    end
+  end
+end

data/lib/friendly_shipping/rest_client.rb

@@ -0,0 +1,53 @@
+require 'dry/monads/result'
+require 'friendly_shipping/bad_request'
+require 'rest-client'
+
+module FriendlyShipping
+  class RestClient
+    extend Dry::Monads::Result::Mixin
+    class <<self
+      def get(path, headers)
+        Success(
+          ::RestClient.get(
+            path,
+            headers
+          )
+        )
+      rescue ::RestClient::Exception => error
+        Failure(error)
+      end
+
+      def post(path, payload, headers)
+        Success(
+          ::RestClient.post(
+            path,
+            payload,
+            headers
+          )
+        )
+      rescue ::RestClient::Exception => error
+        if error.http_code == 400
+          Failure(BadRequest.new(error))
+        else
+          Failure(error)
+        end
+      end
+
+      def put(path, payload, headers)
+        Success(
+          ::RestClient.put(
+            path,
+            payload,
+            headers
+          )
+        )
+      rescue ::RestClient::Exception => error
+        if error.http_code == 400
+          Failure(BadRequest.new(error))
+        else
+          Failure(error)
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/services/ship_engine.rb

@@ -1,15 +1,14 @@
+
 require 'dry/monads/result'
-require 'rest-client'
+require 'friendly_shipping/rest_client'
 require 'friendly_shipping/services/ship_engine/parse_carrier_response'
 require 'friendly_shipping/services/ship_engine/serialize_label_shipment'
 require 'friendly_shipping/services/ship_engine/parse_label_response'
-require 'friendly_shipping/services/ship_engine/bad_request'
+require 'friendly_shipping/services/ship_engine/parse_void_response'
 
 module FriendlyShipping
   module Services
     class ShipEngine
-      include Dry::Monads::Result::Mixin
-
       API_BASE = "https://api.shipengine.com/v1/"
       API_PATHS = {
         carriers: "carriers",
@@ -22,57 +21,37 @@ module FriendlyShipping
       end
 
       def carriers
-        path = API_PATHS[:carriers]
-        get(path).fmap do |response|
+        path = API_BASE + API_PATHS[:carriers]
+        FriendlyShipping::RestClient.get(path, request_headers).fmap do |response|
           ParseCarrierResponse.new(response: response).call
         end
       end
 
       def labels(shipment)
         payload = SerializeLabelShipment.new(shipment: shipment).call.merge(test_label: test).to_json
-        path = API_PATHS[:labels]
-        post(path, payload).fmap do |response|
+        path = API_BASE + API_PATHS[:labels]
+        FriendlyShipping::RestClient.post(path, payload, request_headers).fmap do |response|
           ParseLabelResponse.new(response: response).call
         end
       end
 
-      private
-
-      def get(path)
-        Success(
-          RestClient.get(
-            API_BASE + path,
-            request_headers
-          )
-        )
-      rescue RestClient::ExceptionWithResponse => error
-        Failure(error)
-      end
-
-      def post(path, payload)
-        Success(
-          RestClient.post(
-            API_BASE + path,
-            payload,
-            request_headers
-          )
-        )
-      rescue RestClient::ExceptionWithResponse => error
-        if error.to_s == '400 Bad Request'
-          Failure(BadRequest.new(error))
-        else
-          Failure(error)
+      def void(label)
+        path = "#{API_BASE}labels/#{label.id}/void"
+        FriendlyShipping::RestClient.put(path, '', request_headers).bind do |response|
+          ParseVoidResponse.new(response: response).call
         end
       end
 
+      private
+
+      attr_reader :token, :test
+
       def request_headers
         {
           content_type: :json,
           "api-key": token
         }
       end
-
-      attr_reader :token, :test
     end
   end
 end

data/lib/friendly_shipping/services/ship_engine/parse_void_response.rb

@@ -0,0 +1,23 @@
+require 'friendly_shipping/bad_request'
+
+module FriendlyShipping
+  module Services
+    class ShipEngine
+      class ParseVoidResponse
+        include Dry::Monads::Result::Mixin
+
+        attr_reader :response
+
+        def initialize(response:)
+          @response = response
+        end
+
+        def call
+          parsed_json = JSON.parse(response.body)
+          approved, message = parsed_json["approved"], parsed_json["message"]
+          approved ? Success(message) : Failure(message)
+        end
+      end
+    end
+  end
+end

data/lib/friendly_shipping/version.rb

@@ -1,3 +1,3 @@
 module FriendlyShipping
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: physical
@@ -128,12 +128,14 @@ files:
 - bin/setup
 - friendly_shipping.gemspec
 - lib/friendly_shipping.rb
+- lib/friendly_shipping/bad_request.rb
 - lib/friendly_shipping/carrier.rb
 - lib/friendly_shipping/label.rb
+- lib/friendly_shipping/rest_client.rb
 - lib/friendly_shipping/services/ship_engine.rb
-- lib/friendly_shipping/services/ship_engine/bad_request.rb
 - lib/friendly_shipping/services/ship_engine/parse_carrier_response.rb
 - lib/friendly_shipping/services/ship_engine/parse_label_response.rb
+- lib/friendly_shipping/services/ship_engine/parse_void_response.rb
 - lib/friendly_shipping/services/ship_engine/serialize_label_shipment.rb
 - lib/friendly_shipping/shipping_method.rb
 - lib/friendly_shipping/version.rb

data/lib/friendly_shipping/services/ship_engine/bad_request.rb

@@ -1,27 +0,0 @@
-require 'json'
-
-module FriendlyShipping
-  module Services
-    class ShipEngine
-      class BadRequest < StandardError
-        attr_reader :rest_error, :response
-
-        def initialize(rest_error)
-          @rest_error = rest_error
-          @response = rest_error.response
-          super parse_json_errors || rest_error
-        end
-
-        private
-
-        def parse_json_errors
-          parsed_body = JSON.parse(response.body)
-          messages = parsed_body.fetch('errors')&.map { |e| e.fetch('message') }
-          messages&.join(', ')
-        rescue JSON::ParserError, KeyError => _error
-          nil
-        end
-      end
-    end
-  end
-end