nfe-paulistana 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    nfe-paulistana (0.5.0)
-      nokogiri
-      savon (= 0.9.9)
+    nfe-paulistana (1.0.0)
+      nokogiri (= 1.5.9)
+      savon (~> 2.3.0)
       signer
 
 GEM
@@ -12,15 +12,16 @@ GEM
     akami (1.2.0)
       gyoku (>= 0.4.0)
       nokogiri (>= 1.4.0)
-    builder (3.0.4)
+    builder (3.2.2)
     diff-lcs (1.1.3)
-    gyoku (1.0.0)
+    gyoku (1.1.0)
       builder (>= 2.1.2)
-    httpi (0.9.7)
+    httpi (2.1.0)
       rack
+      rubyntlm (~> 0.3.2)
     nokogiri (1.5.9)
-    nori (1.1.5)
-    rack (1.4.5)
+    nori (2.3.0)
+    rack (1.5.2)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)
@@ -29,18 +30,20 @@ GEM
     rspec-expectations (2.10.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.10.1)
-    savon (0.9.9)
-      akami (~> 1.0)
+    rubyntlm (0.3.4)
+    savon (2.3.0)
+      akami (~> 1.2.0)
       builder (>= 2.1.2)
-      gyoku (>= 0.4.0)
-      httpi (~> 0.9)
-      nokogiri (>= 1.4.0)
-      nori (~> 1.1)
-      wasabi (~> 2.1)
+      gyoku (~> 1.1.0)
+      httpi (~> 2.1.0)
+      nokogiri (>= 1.4.0, < 1.6)
+      nori (~> 2.3.0)
+      wasabi (~> 3.2.0)
     signer (1.1.1)
       nokogiri (>= 1.5.1)
-    wasabi (2.3.0)
-      nokogiri (>= 1.4.0)
+    wasabi (3.2.0)
+      httpi (~> 2.0)
+      nokogiri (>= 1.4.0, < 1.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -4,7 +4,7 @@ Nota Fiscal Paulistana
 Instanciando o Gateway
 --------------------
 
-      gateway = NfePaulistana::Gateway.new(cert_path: "path/to/certificate.p12", cert_pass: "password")
+      gateway = NfePaulistana::Gateway.new(ssl_cert_p12_path: "path/to/certificate.p12", ssl_cert_path: "path/to/certificate.pem", ssl_key_path: "path/to/key.pem", ssl_cert_pass: "password")
 
 Metodos
 ------------

data/lib/nfe-paulistana.rb

@@ -9,27 +9,21 @@ require "savon"
 
 module NfePaulistana
   WSDL = 'https://nfe.prefeitura.sp.gov.br/ws/lotenfe.asmx?wsdl'
-  Savon.configure do |config|
-    config.soap_version = 2
-  end
-  Savon.env_namespace = :soap
 
   def self.enviar(data = {})
     certificado = OpenSSL::PKCS12.new(File.read(data[:cert_path]), data[:cert_pass]) 
     client = get_client(certificado)
 
     begin
-      response = client.request(:envio_rps) do |soap|
-        soap.input = [ 
+      response = client.call(:envio_rps, message: {
+        input: [ 
             "EnvioRPSRequest", 
               {"xmlns" => "http://www.prefeitura.sp.gov.br/nfe"}
-        ]
-
-        soap.body = XmlBuilder.new.xml_for(:envio_rps, data, certificado)
-
-        soap.version = 2
-      end
-      Response.new(xml: response.to_hash[:envio_rps_response][:retorno_xml], method: :envio_rps_response)
+        ],
+        body: XmlBuilder.new.xml_for(:envio_rps, data, certificado),
+        version: 2
+      })
+      Response.new(xml: response.hash[:envio_rps_response][:retorno_xml], method: :envio_rps_response)
     rescue Savon::Error => error
     end
   end
@@ -37,19 +31,7 @@ module NfePaulistana
   private
 
   def get_client(certificado)
-    client = Savon::Client.new do |wsdl, http|
-      wsdl.document = WSDL
-      # http.auth.ssl.cert_key_file = "/Users/patricknegri/Desenvolvimento/Certificado-Iugu-Chave.pem"
-      # http.auth.ssl.cert_file = "/Users/patricknegri/Desenvolvimento/Certificado-Iugu.pem"
-      http.auth.ssl.cert_key = certificado.key
-      http.auth.ssl.cert = certificado.certificate
-      http.auth.ssl.verify_mode = :peer
-
-      # http.ssl_client_auth( :cert => @certificado, :key => @certificado.key, :verify_mode => OpenSSL::SSL::VERIFY_NONE )
-      # http.auth.ssl.cert = @certificado
-      # http.auth.ssl.key = @certificado.key
-      # http.auth.ssl.verify_mode = :none
-    end
+    Savon.client(soap_version: 2, env_namespace: :soap, ssl_verify_mode: :peer, ssl_cert_file: certificado.certificate, ssl_cert_key_file: certificado.key, wsdl: WSDL)
   end
 
 end

data/lib/nfe-paulistana/gateway.rb

@@ -2,10 +2,6 @@ require 'savon'
 
 module NfePaulistana
   class Gateway
-    Savon.configure do |config|
-      config.soap_version = 2
-    end
-    Savon.env_namespace = :soap
 
     METHODS = {
       envio_rps: "EnvioRPSRequest",
@@ -22,9 +18,11 @@ module NfePaulistana
 
     def initialize(options = {})
       @options = {
-        cert_path: "", 
-        cert_pass: "",
-        wdsl: 'https://nfe.prefeitura.sp.gov.br/ws/lotenfe.asmx?wsdl'
+        ssl_cert_p12_path: "",
+        ssl_cert_path: "", 
+        ssl_key_path: "", 
+        ssl_cert_pass: "",
+        wsdl: 'https://nfe.prefeitura.sp.gov.br/ws/lotenfe.asmx?wsdl'
       }.merge(options)
     end
 
@@ -71,32 +69,20 @@ module NfePaulistana
     private
 
     def certificate
-      OpenSSL::PKCS12.new(File.read(@options[:cert_path]), @options[:cert_pass])
+      OpenSSL::PKCS12.new(File.read(@options[:ssl_cert_p12_path]), @options[:ssl_cert_pass])
     end
 
     def request(method, data = {})
       certificado = certificate
-      client = get_client(certificado)
-      response = client.request(method) do |soap|
-        soap.input = [ 
-            METHODS[method], 
-              {"xmlns" => "http://www.prefeitura.sp.gov.br/nfe"}
-        ]
-        soap.body = XmlBuilder.new.xml_for(method, data, certificado)
-        soap.version = 2
-      end
+      client = get_client
+      response = client.call(method, message: XmlBuilder.new.xml_for(method, data, certificado))
       method_response = (method.to_s + "_response").to_sym
-      Response.new(xml: response.to_hash[method_response][:retorno_xml], method: method)
+      Response.new(xml: response.hash[:envelope][:body][method_response][:retorno_xml], method: method)
     rescue Savon::Error => error
     end
 
-    def get_client(certificado)
-      Savon::Client.new do |wsdl, http|
-        wsdl.document = @options[:wdsl]
-        http.auth.ssl.cert_key = certificado.key
-        http.auth.ssl.cert = certificado.certificate
-        http.auth.ssl.verify_mode = :peer
-      end
+    def get_client
+      Savon.client(soap_version: 2, env_namespace: :soap, ssl_verify_mode: :peer, ssl_cert_file: @options[:ssl_cert_path], ssl_cert_key_file: @options[:ssl_key_path], ssl_cert_key_password: @options[:ssl_cert_pass], wsdl: @options[:wsdl], env_namespace: :soap, namespace_identifier: nil)
     end
   end
 end

data/lib/nfe-paulistana/version.rb

@@ -1,3 +1,3 @@
 module NfePaulistana
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/nfe-paulistana.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_dependency "nokogiri"
-  s.add_dependency "savon", "0.9.9"
+  s.add_dependency "nokogiri", "1.5.9"
+  s.add_dependency "savon", "~> 2.3.0"
   s.add_dependency "signer"
   s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nfe-paulistana
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: signer
   requirement: !ruby/object:Gem::Requirement