oca-epak 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b770b600437c06428ca3857ee228823915a249b5
-  data.tar.gz: 9cca002c4d209ad4824026486fa959730e9181ae
+  metadata.gz: 28d1b13cc67bd420e4bc7838c2bf4c122a8bf01d
+  data.tar.gz: a92563151e81a485126934f34d86dd85fe827900
 SHA512:
-  metadata.gz: 2b707fa3733af3a184bce13abbb4802c3147c8b95d4a0f2bceba5faadacab82dc2484864b142f36b0c2022c817aa811308575bd8560242cc28d84e4710d58768
-  data.tar.gz: 897ee612dcb938f5adf5e97374647b855afbe9b669820da0252fd85135a2e27074baff33cf409811cb7bfb53ad7df87aa659a3a64fab3fef62d06cbba9aa966d
+  metadata.gz: d7bd05bde365ba9cef7ab983ed152e8c318add7f5e54e947a4541acbfca8b1fb8ea3cf6a26703db5ccbb4f7544f9573f3d3e75233d12d410606606a9ca5b53ef
+  data.tar.gz: 2b6f084a2e742a46bc853f2bea23c89491f6d9aa78038f239dd57bdb149835b2d6c76553a75f5d45ae4df4470638ec8afa8c76b7f14cc0fc5bd5ab996294244f

data/lib/oca-epak.rb

@@ -2,6 +2,7 @@ require 'savon'
 require 'erb'
 require 'ostruct'
 require 'oca-epak/base_client'
+require 'oca-epak/logger'
 require 'oca-epak/epak/client'
 require 'oca-epak/oep/client'
 require 'oca-epak/pickup_data'

data/lib/oca-epak/base_client.rb

@@ -3,7 +3,8 @@ module Oca
     attr_reader :client
     attr_accessor :username, :password
 
-    BASE_WSDL_URL = 'http://webservice.oca.com.ar'.freeze
+    BASE_WSDL_URL = "http://webservice.oca.com.ar".freeze
+    FALSE_STRING = "false".freeze
 
     def initialize(username, password)
       @username = username

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

@@ -1,10 +1,15 @@
 module Oca
   module Epak
     class Client < BaseClient
+      ONE_STRING = "1".freeze
+      USER_STRING = "usr".freeze
+      PASSWORD_STRING = "psw".freeze
+      WSDL_URL = "#{BASE_WSDL_URL}/epak_tracking/Oep_TrackEPak.asmx?wsdl".freeze
+
       def initialize(username, password)
         super
-        wsdl_url = "#{BASE_WSDL_URL}/epak_tracking/Oep_TrackEPak.asmx?wsdl"
-        @client = Savon.client(wsdl: wsdl_url)
+        @opts = { wsdl: WSDL_URL }.merge(Oca::Logger.options)
+        @client = Savon.client(@opts)
       end
 
       # Checks if the user has input valid credentials
@@ -12,9 +17,9 @@ module Oca
       # @return [Boolean] Whether the credentials entered are valid or not
       def check_credentials
         method = :get_epack_user
-        opts = { "usr" => username, "psw" => password }
+        opts = { USER_STRING => username, PASSWORD_STRING => password }
         response = client.call(method, message: opts)
-        parse_results_table(response, method).first[:existe] == "1"
+        parse_results_table(response, method).first[:existe] == ONE_STRING
       end
 
       # Creates a Pickup Order, which lets OCA know you want to make a delivery.
@@ -28,12 +33,12 @@ module Oca
       # @option opts [Integer] :pickup_range Range to be used when picking it up, default: 1
       # @return [Hash, nil]
       def create_pickup_order(opts = {})
-        confirm_pickup = opts.fetch(:confirm_pickup, false)
-        days_to_pickup = opts.fetch(:days_to_pickup, "1")
-        pickup_range = opts.fetch(:pickup_range, "1")
+        confirm_pickup = opts.fetch(:confirm_pickup, FALSE_STRING)
+        days_to_pickup = opts.fetch(:days_to_pickup, ONE_STRING)
+        pickup_range = opts.fetch(:pickup_range, ONE_STRING)
         rendered_xml = opts[:pickup_data].to_xml
 
-        message = { "usr" => username, "psw" => password,
+        message = { USER_STRING => username, PASSWORD_STRING => password,
                     "xml_Datos" => rendered_xml,
                     "ConfirmarRetiro" => confirm_pickup.to_s,
                     "DiasHastaRetiro" => days_to_pickup,
@@ -83,7 +88,7 @@ module Oca
       # @return [Array, nil] Returns all operation codes available for the user
       def get_operation_codes
         method = :get_operativas_by_usuario
-        opts = { "usr" => username, "psw" => password }
+        opts = { USER_STRING => username, PASSWORD_STRING => password }
         response = client.call(method, message: opts)
         parse_results_table(response, method)
       end

data/lib/oca-epak/logger.rb

@@ -0,0 +1,34 @@
+module Oca
+  class Logger
+    attr_accessor :log, :pretty_print_xml, :log_level
+
+    # Receives a hash with keys `log`, `pretty_print_xml` and `log_level`.
+    # `log_level` can be :info, :debug, :warn, :error or :fatal
+    #
+    # @param opts [Hash]
+    # @option opts [Boolean] :log
+    # @option opts [Boolean] :pretty_print_xml
+    # @option opts [Symbol] :log_level
+    def initialize(opts = {})
+      @log = opts[:log] || false
+      @pretty_print_xml = opts[:pretty_print_xml] || false
+      @log_level = opts[:log_level] || :info
+    end
+
+    # Returns a hash with the logging options for Savon.
+    #
+    # @return [Hash]
+    def logger_options
+      { log: log, pretty_print_xml: pretty_print_xml, log_level: log_level }
+    end
+
+    def self.options=(opts = {})
+      @logger = Oca::Logger.new(opts)
+    end
+
+    def self.options
+      @logger ||= Oca::Logger.new
+      @logger.logger_options
+    end
+  end
+end

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

@@ -1,10 +1,12 @@
 module Oca
   module Oep
     class Client < BaseClient
+      WSDL_URL = "#{BASE_WSDL_URL}/oep_tracking/Oep_Track.asmx?wsdl".freeze
+
       def initialize(username, password)
         super
-        wsdl_url = "#{BASE_WSDL_URL}/oep_tracking/Oep_Track.asmx?wsdl"
-        @client = Savon.client(wsdl: wsdl_url)
+        @opts = { wsdl: WSDL_URL }.merge(Oca::Logger.options)
+        @client = Savon.client(@opts)
       end
 
       # Returns the HTML for a label
@@ -20,6 +22,27 @@ module Oca
         response = client.call(method, message: opts)
         parse_result(response, method)
       end
+
+      # Returns the PDF (Base64 encoded) String for a label
+      #
+      # @param [Hash] opts
+      # @option opts [Integer] :id_orden_retiro
+      # @option opts [String] :nro_envio
+      # @option opts [Boolean] :logistica_inversa
+      # @return [String] PDF data Base64 encoded
+      def get_pdf_de_etiquetas_por_orden_or_numero_envio(opts = {})
+        method = :get_pdf_de_etiquetas_por_orden_or_numero_envio
+        opts = {
+          "idOrdenRetiro" => opts[:id_orden_retiro],
+          "nroEnvio" => opts[:nro_envio],
+          "logisticaInversa" => opts.fetch(:logistica_inversa, FALSE_STRING).to_s
+        }
+        response = client.call(method, message: opts)
+        parse_result(response, method)
+      rescue Savon::SOAPFault => error
+        msg = "Oca WS responded with:\n#{error.http.code}\n#{error}"
+        raise Oca::Errors::BadRequest.new(msg)
+      end
     end
   end
 end

data/lib/oca-epak/pickup_data.rb

@@ -1,6 +1,8 @@
 module Oca
   module Epak
     class PickupData
+      PATH_TO_XML = File.expand_path("../retiro.xml.erb", __FILE__).freeze
+
       attr_accessor :account_number, :pickup, :shipments
 
       # Creates a Pickup Data object for creating a pickup order in OCA.
@@ -22,8 +24,7 @@ module Oca
       private
 
         def or_template
-          path_to_xml = File.expand_path("../retiro.xml.erb", __FILE__)
-          ERB.new(File.read(path_to_xml), nil, "-")
+          ERB.new(File.read(PATH_TO_XML), nil, "-")
         end
     end
   end

data/lib/oca-epak/version.rb

@@ -1,5 +1,5 @@
 module Oca
   module Epak
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oca-epak
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Mauro Otonelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.39.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,7 @@ files:
 - lib/oca-epak/epak/client.rb
 - lib/oca-epak/errors/bad_request.rb
 - lib/oca-epak/errors/generic_error.rb
+- lib/oca-epak/logger.rb
 - lib/oca-epak/oep/client.rb
 - lib/oca-epak/pickup_data.rb
 - lib/oca-epak/retiro.xml.erb
@@ -132,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: OCA E-Pak