cobro_digital 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c78fb34d01c8ee0797661f4987b3d8e91ffefb4
-  data.tar.gz: abc54aede5e6e7b0e2dbbad45e69e64f81153ebb
+  metadata.gz: 02ddf257503cd550fc4b8a1583475c5f56a3c363
+  data.tar.gz: f577d7d9b881a5282c20a507598eff02af683002
 SHA512:
-  metadata.gz: a582e44a64e0205301673380574e074e6aa2269fcfb36383fc54e3585fc9564719fe32806362bb11ab4768ae08e9c390a3aa8ee076d7a5a11fd197a0af9f24da
-  data.tar.gz: 6d88a47bd0d4171ba64252114e528255e18b96b9b79a5b203555a1dbcc8aa04a8c0249412935778ba6be744342952dc29cd67676c5dcecd165e2e5eb499add65
+  metadata.gz: '098cd90720c214cff2cb970244a1c859854bcc778fa0c33235bfcc06c2536a82dfdb0ccd9f484890e4a5c05c9c8e3450da96587c249b4c915404d6660501ab82'
+  data.tar.gz: 204eb5352e5a3d52128b52a47c44e5d81f6000d18d29364f94c764b641c199cf70fee732a25f177a09d1eb104ace611c33411434105f11c5389037c474e2852d

data/cobro_digital.gemspec

@@ -27,14 +27,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec"
+  # spec.add_development_dependency "rspec"
 
-  spec.add_runtime_dependency(%q<savon>, ["= 2.4.0"])
+  spec.add_runtime_dependency 'savon', '~> 2.4'
 
-  spec.add_dependency(%q<nokogiri>, ["~> 1.6"])
-  spec.add_dependency(%q<wasabi>, ["~> 3.2.3"])
-  spec.add_dependency(%q<akami>, ["~> 1.1"])
-  spec.add_dependency(%q<nori>, ["~> 2.3.0"])
+  spec.add_dependency 'nokogiri', '~> 1.6'
+  spec.add_dependency 'wasabi', '~> 3.2'
+  spec.add_dependency 'akami', '~> 1.1'
+  spec.add_dependency 'nori', '~> 2.3'
 end

data/lib/cobro_digital/meta.rb

@@ -1,7 +1,7 @@
 module CobroDigital
   class Meta < CobroDigital::Operador
 
-    META_WS = 'meta'
+    META_WS = 'meta'.freeze
 
     # md5(microtime(true)*rand())
     # { 'handshake'=>Digest::MD5.hexdigest(Time.now.to_f.to_s),
@@ -38,10 +38,58 @@ module CobroDigital
 		# 	'5' => { 'metodo_webservice' => 'inhabilitar_boleta',
     #            'handshake' => Digest::MD5.hexdigest(Time.now.to_f.to_s),
     #            'nro_boleta' => '65' } }
-    def self.meta(params)
-      CobroDigital::Meta.new( :http_method => CobroDigital::Https::POST,
-                              :webservice  => META_WS,
-                              :render      => params )
+
+    def self.transaction(desde, hasta, filtros = {})
+      filter = {
+        ::CobroDigital::Transaccion::FILTRO_TIPO => ::CobroDigital::Transaccion::FILTRO_TIPO_INGRESO
+      }
+
+      filter.merge!(filtros) unless filtros.empty?
+
+      CobroDigital::Transaccion.consultar(
+        desde,
+        hasta,
+        filter
+      )
+    end
+
+    def self.render(objs)
+      querys = {}
+      objs.each_with_index do |obj, i|
+        querys[i] = obj.render.merge(metodo_webservice: obj.webservice)
+      end
+      querys
+    end
+
+    def self.meta(objs)
+      CobroDigital::Meta.new(
+        :http_method => CobroDigital::Https::POST,
+        :webservice  => META_WS,
+        :render      => render(objs)
+      )
+    end
+
+    def parse_response
+      output = response.body[:webservice_cobrodigital_response][:output]
+      parsed_response = JSON.parse(output)
+
+      datos = parsed_response['datos'].map do |data|
+        parsed_data = JSON.parse(data)
+
+        local_data = if parsed_data['datos'].present?
+                       JSON.parse(parsed_data['datos'].first) rescue []
+                     else
+                       []
+                     end
+
+        { resultado: (parsed_data['ejecucion_correcta'] == '1'),
+          log: parsed_data['log'],
+          datos: local_data }
+      end
+
+      { resultado: (parsed_response['ejecucion_correcta'] == '1'),
+        log: parsed_response['log'],
+        datos: datos }
     end
 
   end

data/lib/cobro_digital/operador.rb

@@ -1,21 +1,22 @@
 module CobroDigital
   class Operador
 
-    attr_accessor :http_method, :webservice, :render, :response
+    attr_accessor :http_method, :webservice, :render, :response, :client
 
     def initialize(attrs={})
       @http_method = attrs[:http_method]
       @webservice  = attrs[:webservice]
       @render      = attrs[:render]
+      @client      = nil
     end
 
     def request
       { :metodo_webservice => @webservice }.merge(render)
     end
 
-    def call(id_comercio, sid, opt={})
-      client = CobroDigital::Client.new(opt.merge(:id_comercio => id_comercio, :sid => sid, :http_method => http_method))
-      @response = client.call(request)
+    def call(id_comercio, sid, opt = {})
+      @client = CobroDigital::Client.new(opt.merge(:id_comercio => id_comercio, :sid => sid, :http_method => http_method))
+      @response = @client.call(request)
     end
 
     def parse_response

data/lib/cobro_digital/transaccion.rb

@@ -15,13 +15,21 @@ module CobroDigital
     FILTRO_TIPO_TARJETA_CREDITO   = 'tarjeta_credito'   # Solo aquellas cobranzas abonadas con tarjeta de crédito.
     FILTRO_TIPO_DEBITO_AUTOMATICO = 'debito_automatico' # Está relacionado a los débitos realizados por CBU.
 
+    def self.render(desde, hasta, filtros = {})
+      {
+        :desde   => desde.strftime('%Y%m%d'),
+        :hasta   => hasta.strftime('%Y%m%d'),
+        :filtros => filtros
+      }
+    end
+
     # { 'desde'=>'20160932', 'hasta'=>'20161001' }
-    def self.consultar(desde, hasta, filtros={})
-      CobroDigital::Transaccion.new( :http_method => CobroDigital::Https::GET,
-                                     :webservice  => CONSULTAR_TRANSACCIONES_WS,
-                                     :render      => { :desde   => desde.strftime('%Y%m%d'),
-                                                       :hasta   => hasta.strftime('%Y%m%d'),
-                                                       :filtros => filtros } )
+    def self.consultar(desde, hasta, filtros = {})
+      CobroDigital::Transaccion.new(
+        :http_method => CobroDigital::Https::GET,
+        :webservice  => CONSULTAR_TRANSACCIONES_WS,
+        :render      => render(desde, hasta, filtros)
+      )
     end
 
     def parse_response

data/lib/cobro_digital/version.rb

@@ -1,3 +1,3 @@
 module CobroDigital
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/cobro_digital.rb

@@ -24,7 +24,7 @@ module CobroDigital
 
   class Client
 
-    attr_accessor :id_comercio, :sid, :client_to_use, :http_method, :pagadores, :boletas, :transacciones, :micrositios, :requests
+    attr_accessor :id_comercio, :sid, :client_to_use, :http_method, :pagadores, :boletas, :transacciones, :micrositios, :requests, :request_xml
 
     def initialize(attrs={})
       @id_comercio    = attrs[:id_comercio]
@@ -35,10 +35,14 @@ module CobroDigital
       @boletas        = []
       @transacciones  = []
       @micrositios    = []
+      @request_xml    = nil
     end
 
     def soap_client(params)
-      client = Savon.client( wsdl: CobroDigital::WSDL, log_level: :debug, pretty_print_xml: true)
+      client = Savon.client(wsdl: CobroDigital::WSDL, log_level: :debug, pretty_print_xml: true)
+      operation = client.operation(:webservice_cobrodigital)
+      request = operation.build(message: { 'parametros_de_entrada' => params.to_json })
+      @request_xml = request.pretty
       client.call(:webservice_cobrodigital, message: { 'parametros_de_entrada' => params.to_json })
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobro_digital
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - g.edera
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,34 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: akami
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
 description: Adaptador para el Web Service de CobroDigital
 email:
 - gab.edera@gmail.com
@@ -168,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Adaptador CobroDigital