correios-cep 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6164e71254f2ef59c989f89d5defcaef1413ef
-  data.tar.gz: a9110b7b615e02f922d341289823a6a99e5331da
+  metadata.gz: b4205b263bcf608493677f1f0f6ce7a9cbf4fea6
+  data.tar.gz: b39d686fef4ff806416993478d88885a05fe694a
 SHA512:
-  metadata.gz: 2819ca06ab734c9b34c0fc9c9f9fd2a7016e5229c04e035a1079f9bf483993ff67c6e9a987c7e300b707f6a0b67ff746259178d9e7e47711b9509760fd3577c0
-  data.tar.gz: 8dc08cbc5b87127c7159415640a1548b47a78253f99a0c457e81188545cc31bfb56b74a13ed237b975a24e9a54e398acb60ccdf0241658bb007006fb2dab0217
+  metadata.gz: 102b1121be45c66e6963b59ab0490cefd5a7431c8509f98f9285cfc34cee7db68b49dee7efa15c97dfa4a855dc5919da27c9b4be21f00bc6dccc59f382f18f46
+  data.tar.gz: c9ea444975185a81518c5a71b5fcfd787d6c6c53d69c13645482e45c34aa2c4eb036d490d9ae940fef9996ff960b26af4276b5439ff34e6024c98de0cbe65812

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## Version 0.4.0
+- Improvement: Replace Nokogiri by Ox. Issue #3.
+
 ## Version 0.3.3
 - Fix: Downgrade LogMe gem version to 0.0.8, because 0.0.9 does not support Ruby 1.9.2.
 

data/correios-cep.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new('>= 1.9.2')
 
   spec.add_dependency 'log-me',   '= 0.0.8'
-  spec.add_dependency 'nokogiri', '~> 1.6'
+  spec.add_dependency "ox", "~> 2.2"
 
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec',   '~> 3.2'
-  spec.add_development_dependency 'vcr',     '~> 2.9'
-  spec.add_development_dependency 'webmock', '~> 1.21'
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec",   "~> 3.2"
+  spec.add_development_dependency "vcr",     "~> 2.9"
+  spec.add_development_dependency "webmock", "~> 1.15"
 end

data/lib/correios/cep/parser.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+require 'ox'
 
 module Correios
   module CEP
@@ -14,21 +14,33 @@ module Correios
       }.freeze
 
       def address(xml)
-        result = Nokogiri::XML(xml).xpath('//return')
-        return if result.nil? || result.empty?
+        doc = Ox.parse(xml)
+        return_node = find_node(doc.nodes, 'return')
+        return if return_node.nil?
 
         address = {}
-        result.children.each do |element|
-          address[ADDRESS_MAP[element.name]] = element.text if ADDRESS_MAP[element.name]
+        return_node.nodes.each do |element|
+          address[ADDRESS_MAP[element.name]] = text_for(element) if ADDRESS_MAP[element.name]
         end
 
-        join_complements! address
+        join_complements(address)
         address
       end
 
       private
 
-      def join_complements!(address)
+      def find_node(nodes, name)
+        node = nodes.first
+        return node if node.nil? || node.name == name
+
+        find_node(node.nodes, name)
+      end
+
+      def text_for(element)
+        element.text.to_s.force_encoding(Encoding::UTF_8)
+      end
+
+      def join_complements(address)
         address[:complement] += " #{address.delete(:complement2)}"
         address[:complement].strip!
       end

data/lib/correios/cep/version.rb

@@ -1,5 +1,5 @@
 module Correios
   module CEP
-    VERSION = '0.3.3'
+    VERSION = '0.4.0'
   end
 end

data/spec/correios/cep/parser_spec.rb

@@ -3,39 +3,98 @@ require 'spec_helper'
 
 describe Correios::CEP::Parser do
   describe '#address' do
+    let(:expected_address) do
+      {
+        address: 'Rua Fernando Amorim',
+        neighborhood: 'Cavaleiro',
+        city: 'Jaboatão dos Guararapes',
+        state: 'PE',
+        zipcode: '54250610',
+        complement: ''
+      }
+    end
+
     context 'when address is found' do
-      let(:xml) do
-        "<?xml version='1.0' encoding='UTF-8'?>" +
-        "<S:Envelope>" +
-          "<S:Body>" +
-            "<ns2:consultaCEPResponse xmlns:ns2=\"http://cliente.bean.master.sigep.bsb.correios.com.br/\">" +
-              "<return>" +
-                "<bairro>Cavaleiro</bairro>" +
-                "<cep>54250610</cep>" +
-                "<cidade>Jaboatão dos Guararapes</cidade>" +
-                "<complemento>de 1500 até o fim</complemento>" +
-                "<complemento2>(zona mista)</complemento2>" +
-                "<end>Rua Fernando Amorim</end>" +
-                "<id>0</id>" +
-                "<uf>PE</uf>" +
-              "</return>" +
-            "</ns2:consultaCEPResponse>" +
-          "</S:Body>" +
-        "</S:Envelope>"
+      context 'and does not have complement' do
+        let(:xml) do
+          "<?xml version='1.0' encoding='UTF-8'?>" +
+          "<S:Envelope>" +
+            "<S:Body>" +
+              "<ns2:consultaCEPResponse xmlns:ns2=\"http://cliente.bean.master.sigep.bsb.correios.com.br/\">" +
+                "<return>" +
+                  "<bairro>Cavaleiro</bairro>" +
+                  "<cep>54250610</cep>" +
+                  "<cidade>Jaboatão dos Guararapes</cidade>" +
+                  "<complemento></complemento>" +
+                  "<complemento2></complemento2>" +
+                  "<end>Rua Fernando Amorim</end>" +
+                  "<id>0</id>" +
+                  "<uf>PE</uf>" +
+                "</return>" +
+              "</ns2:consultaCEPResponse>" +
+            "</S:Body>" +
+          "</S:Envelope>"
+        end
+
+        it 'returns address' do
+          expect(subject.address(xml)).to eq expected_address
+        end
       end
-      let(:expected_address) do
-        {
-          address: 'Rua Fernando Amorim',
-          neighborhood: 'Cavaleiro',
-          city: 'Jaboatão dos Guararapes',
-          state: 'PE',
-          zipcode: '54250610',
-          complement: 'de 1500 até o fim (zona mista)'
-        }
+
+      context 'and has one complement' do
+        let(:xml) do
+          "<?xml version='1.0' encoding='UTF-8'?>" +
+          "<S:Envelope>" +
+            "<S:Body>" +
+              "<ns2:consultaCEPResponse xmlns:ns2=\"http://cliente.bean.master.sigep.bsb.correios.com.br/\">" +
+                "<return>" +
+                  "<bairro>Cavaleiro</bairro>" +
+                  "<cep>54250610</cep>" +
+                  "<cidade>Jaboatão dos Guararapes</cidade>" +
+                  "<complemento>de 1500 até o fim</complemento>" +
+                  "<complemento2></complemento2>" +
+                  "<end>Rua Fernando Amorim</end>" +
+                  "<id>0</id>" +
+                  "<uf>PE</uf>" +
+                "</return>" +
+              "</ns2:consultaCEPResponse>" +
+            "</S:Body>" +
+          "</S:Envelope>"
+        end
+
+        it 'returns address' do
+          expected_address[:complement] = 'de 1500 até o fim'
+
+          expect(subject.address(xml)).to eq expected_address
+        end
       end
 
-      it 'returns address' do
-        expect(subject.address(xml)).to eq expected_address
+      context 'and has two complements' do
+        let(:xml) do
+          "<?xml version='1.0' encoding='UTF-8'?>" +
+          "<S:Envelope>" +
+            "<S:Body>" +
+              "<ns2:consultaCEPResponse xmlns:ns2=\"http://cliente.bean.master.sigep.bsb.correios.com.br/\">" +
+                "<return>" +
+                  "<bairro>Cavaleiro</bairro>" +
+                  "<cep>54250610</cep>" +
+                  "<cidade>Jaboatão dos Guararapes</cidade>" +
+                  "<complemento>de 1500 até o fim</complemento>" +
+                  "<complemento2>(zona mista)</complemento2>" +
+                  "<end>Rua Fernando Amorim</end>" +
+                  "<id>0</id>" +
+                  "<uf>PE</uf>" +
+                "</return>" +
+              "</ns2:consultaCEPResponse>" +
+            "</S:Body>" +
+          "</S:Envelope>"
+        end
+
+        it 'returns address' do
+          expected_address[:complement] = 'de 1500 até o fim (zona mista)'
+
+          expect(subject.address(xml)).to eq expected_address
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: correios-cep
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Prodis a.k.a. Fernando Hamasaki de Amorim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log-me
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.15'
 description: Correios CEP gem gets updated Brazilian address from a zipcode, directly
   from Correios database. No HTML parsers.
 email: