oca-epak 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeede2d0da740bfb15092074d0d39c538874d439
-  data.tar.gz: 8e3a86749633428e59c54752f7cc7063758f0171
+  metadata.gz: 63d16a3f53e35acefdb9f763c3d343ab7b56dc9b
+  data.tar.gz: 8e0ec175cc444b726e8594cde4eae24b954a0d53
 SHA512:
-  metadata.gz: 425848307e4ac16a2fdfaf92578ad2b7f687c038262bb9756a4c3db5655e79fc69df0d98b24bef88c87ba755689e45aec03e7d900c2e1d04ae610c3fba85f73d
-  data.tar.gz: c042b2dd09704baf5853924121ececcc4d01cda14375cb009a57eb677d838337a94cbf487880ba21caa4fea3c624a4326dfe27a2c52b7c9828a4f52a61ca886e
+  metadata.gz: 8f673dfb5d956e2bba94cb5967b655428c484d5e29302153e3896e954461c758ce7df8ff2a2b8d9fb2c826a8e8b3ef7cee8207cd1d97312264b26d737c44929e
+  data.tar.gz: e4feaf827f85af4f73412ae736c0d555fbb8096c8f77e1ada9d1d2de009c92db9f9ab8f71b0e1e434336638c4633aae333244fb3f11cb806a45a1f60fb427a4f

data/lib/oca-epak.rb

@@ -1,7 +1,9 @@
 require 'savon'
 require 'erb'
 require 'ostruct'
-require 'oca-epak/client'
+require 'oca-epak/base_client'
+require 'oca-epak/epak/client'
+require 'oca-epak/oep/client'
 require 'oca-epak/pickup_data'
 require 'oca-epak/errors/generic_error'
 require 'oca-epak/errors/bad_request'

data/lib/oca-epak/base_client.rb

@@ -0,0 +1,33 @@
+module Oca
+  class BaseClient
+    attr_reader :client
+    attr_accessor :username, :password
+
+    BASE_WSDL_URL = 'http://webservice.oca.com.ar'.freeze
+
+    def initialize(username, password)
+      @username = username
+      @password = password
+    end
+
+    protected
+
+      def parse_result(response, method)
+        method_response = "#{method}_response".to_sym
+        method_result = "#{method}_result".to_sym
+        if body = response.body[method_response]
+          body[method_result]
+        end
+      end
+
+      def parse_results_table(response, method)
+        if result = parse_result(response, method)
+          if result[:diffgram][:new_data_set]
+            result[:diffgram][:new_data_set][:table]
+          else
+            raise Oca::Errors::BadRequest.new("Oca WS responded with:\n#{response.body}")
+          end
+        end
+      end
+  end
+end

data/lib/oca-epak/{client.rb → epak/client.rb}

@@ -1,15 +1,10 @@
 module Oca
   module Epak
-    class Client
-      attr_reader :client
-      attr_accessor :username, :password
-
-      WSDL = 'http://webservice.oca.com.ar/epak_tracking/Oep_TrackEPak.asmx?wsdl'.freeze
-
+    class Client < BaseClient
       def initialize(username, password)
-        @client = Savon.client(wsdl: WSDL)
-        @username = username
-        @password = password
+        super
+        wsdl_url = "#{BASE_WSDL_URL}/epak_tracking/Oep_TrackEPak.asmx?wsdl"
+        @client = Savon.client(wsdl: wsdl_url)
       end
 
       # Checks if the user has input valid credentials
@@ -33,7 +28,7 @@ module Oca
                    qty: "1", total: "123", cuit: cuit, op: op }
           get_shipping_rates(opts)
           true
-        rescue Oca::Epak::GenericError => e
+        rescue Oca::Errors::GenericError => e
           false
         end
       end
@@ -45,7 +40,7 @@ module Oca
       # @param [Hash] opts
       # @option [Oca::Epak::PickupData] :pickup_data Pickup Data object
       # @option [Boolean] :confirm_pickup Confirm Pickup? Defaults to false
-      # @option [Integer] :days_to_pickup Days OCA should wait before pickup, default: 1 (?) #TODO Confirm
+      # @option [Integer] :days_to_pickup Days OCA should wait before pickup, default: 1
       # @option [Integer] :pickup_range Range to be used when picking it up, default: 1
       # @return [Hash, nil]
       def create_pickup_order(opts = {})
@@ -60,7 +55,7 @@ module Oca
                     "DiasHastaRetiro" => days_to_pickup,
                     "idFranjaHoraria" => pickup_range }
         response = client.call(:ingreso_or, message: message)
-        parse_results_table(response, :ingreso_or)
+        parse_result(response, :ingreso_or)
       end
 
       # Get rates and delivery estimate for a shipment
@@ -130,26 +125,6 @@ module Oca
           body[:get_provincias_result][:provincias][:provincia]
         end
       end
-
-      private
-
-        def parse_result(response, method)
-          method_response = "#{method}_response".to_sym
-          method_result = "#{method}_result".to_sym
-          if body = response.body[method_response]
-            body[method_result]
-          end
-        end
-
-        def parse_results_table(response, method)
-          if result = parse_result(response, method)
-            if result[:diffgram][:new_data_set]
-              result[:diffgram][:new_data_set][:table]
-            else
-              raise Oca::Epak::BadRequest.new("Oca WS responded with:\n#{response.body}")
-            end
-          end
-        end
     end
   end
 end

data/lib/oca-epak/errors/bad_request.rb

@@ -1,5 +1,5 @@
 module Oca
-  module Epak
+  module Errors
     class BadRequest < GenericError
     end
   end

data/lib/oca-epak/errors/generic_error.rb

@@ -1,5 +1,5 @@
 module Oca
-  module Epak
+  module Errors
     class GenericError < StandardError
     end
   end

data/lib/oca-epak/oep/client.rb

@@ -0,0 +1,25 @@
+module Oca
+  module Oep
+    class Client < BaseClient
+      def initialize(username, password)
+        super
+        wsdl_url = "#{BASE_WSDL_URL}/oep_tracking/Oep_Track.asmx?wsdl"
+        @client = Savon.client(wsdl: wsdl_url)
+      end
+
+      # Returns the HTML for a label
+      #
+      # @param opts
+      # @option id_orden_retiro [Integer]
+      # @option nro_envio [String]
+      # @return [String] HTML
+      def get_html_de_etiquetas_por_orden_or_numero_envio(opts = {})
+        method = :get_html_de_etiquetas_por_orden_or_numero_envio
+        opts = { "idOrdenRetiro" => opts[:id_orden_retiro],
+                 "nroEnvio" => opts[:nro_envio] }
+        response = client.call(method, message: opts)
+        parse_result(response, method)
+      end
+    end
+  end
+end

data/lib/oca-epak/version.rb

@@ -1,5 +1,5 @@
 module Oca
   module Epak
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oca-epak
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Mauro Otonelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -104,9 +104,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/oca-epak.rb
-- lib/oca-epak/client.rb
+- lib/oca-epak/base_client.rb
+- lib/oca-epak/epak/client.rb
 - lib/oca-epak/errors/bad_request.rb
 - lib/oca-epak/errors/generic_error.rb
+- lib/oca-epak/oep/client.rb
 - lib/oca-epak/pickup_data.rb
 - lib/oca-epak/version.rb
 homepage: https://github.com/ombulabs/oca-epak