cep_facil 0.1.1 → 0.1.2

data/Gemfile

@@ -1,2 +1,7 @@
+if RUBY_VERSION =~ /1.9/
+  Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
+end
+
 source "http://rubygems.org"
 gemspec

data/README.md

@@ -15,11 +15,18 @@ gem "cep_facil"
 Or via RubyGems, directly:
 
   `gem install cep_facil`
-  
+
+CepFacil works only in Ruby 1.9.2 by default. If you need it to work with 1.8.7 you must do the following:
+
+In the `Gemfile`
+
+```ruby
+gem "cep_facil", :git => "git://github.com/rodrigoalvesvieira/cep_facil.git", :branch => "1.8.7"
+```
 
 Usage
 -----
-  
+
 ### Fetching an address by zip code
 
 ```ruby
@@ -74,11 +81,18 @@ Author
 
 * Rodrigo Vieira - rodrigovieira1994@gmail.com - http://www.rodrigoalvesvieira.com
 
+Contributors
+------------
+
+* Adriano Bacha - abacha@gmail.com
+
 Thanks
 -------
 
 Huge thanks and cheers to CépFácil (http://cepfacil.com.br) of course. Thanks for the great service that you provide!
 
+Also, thanks to the [Contributors] of this project.
+
 Licence
 -------
 
@@ -86,7 +100,7 @@ Copyright (c) 2012 Rodrigo Vieira. http://www.rodrigoalvesvieira.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
-"Software"), to use, copy and modify copies of the Software, subject 
+"Software"), to use, copy and modify copies of the Software, subject
 to the following conditions:
 
 The above copyright notice and this permission notice shall be
@@ -98,4 +112,6 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+[Contributors]: #ontributors

data/cep_facil.gemspec

@@ -5,8 +5,8 @@ require "cep_facil/version"
 Gem::Specification.new do |s|
   s.name        = "cep_facil"
   s.version     = CepFacil::VERSION
-  s.authors     = ["Rodrigo Vieira"]
-  s.email       = ["rodrigo@atela.com.br"]
+  s.authors     = ["Rodrigo Alves Vieira"]
+  s.email       = ["rodrigovieira1994@gmail.com"]
   s.homepage    = "https://github.com/rodrigoalvesvieira/cep_facil"
   s.summary     = %q{Wrapper para o serviço cepfacil.com.br}
   s.description = %q{Wrapper Ruby para o serviço cepfacil.com.br}

data/lib/cep_facil/version.rb

@@ -1,3 +1,3 @@
 module CepFacil
-  VERSION = "0.1.1" #:nodoc:
+  VERSION = "0.1.2" #:nodoc:
 end

data/lib/cep_facil.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require "cgi"
 require "cep_facil/version"
 require "net/http"
 
@@ -29,7 +30,16 @@ module CepFacil
   # Some applications store Brazilian zip codes (CEPs) in formats like "22222222", or "22222-222"
   # or even as an integer. This method accept these three possible formats so you don´t need to format it yourself.
   
-  def get_address(zip_code, token)
+  def get_address(zip_code, token, dictionary = {})
+    dictionary = {
+      "tipo" => :type,
+      "cidade" => :city,
+      "bairro" => :neighborhood,
+      "cep" => :cep,
+      "descricao" => :description,
+      "uf" => :state
+    }.merge(dictionary)
+
     zip_code = zip_code.to_s
     
     if zip_code.match(/^[0-9]{5}[-]?[0-9]{3}/)
@@ -43,26 +53,7 @@ module CepFacil
     call = Net::HTTP::Get.new(@uri.request_uri)
     
     response = http.request(call)
-    response.body
-    
-    pattern = /^([a-z]+)\=/
-    result = response.body.split("&")
-    
-    type = result[2].gsub!(pattern, "")
-    state = result[3].gsub!(pattern, "")
-    city = result[4].gsub!(pattern, "")
-    neighborhood = result[5].gsub!(pattern, "")
-    description = result[6].gsub!(pattern, "")
-    
-    address = {
-      cep: zip_code,
-      type: type,
-      state: state,
-      city: city,
-      neighborhood: neighborhood,
-      description: description
-    }
-  
+    address = Hash[* CGI::parse(response.body).map {|key, value| [dictionary[key],value[0]]}.flatten]
   end
   
   # Receives and address hash and returns its extense version

data/spec/cep_facil_spec.rb

@@ -5,51 +5,51 @@ describe CepFacil do
   before(:each) do
     @token = "0E2ACA03-FC7F-4E87-9046-A8C46637BA9D"
   end
- 
+
   it "has a version" do
     CepFacil::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
-  
+
   it "can fetch an address from a CEP" do
     cep = "53417-540"
-    
+
     address = CepFacil.get_address cep, @token
     address.should_not be_nil
 
     address[:type].should eql("Rua")
-    address[:city].should eql("Paulista")    
+    address[:city].should eql("Paulista")
   end
-  
+
   it "works with non formatted zip codes (CEPs)" do
     cep = "53417540"
     address = CepFacil.get_address cep, @token
     address.should_not be_nil
   end
-  
+
   it "works even with zip codes (CEPs) stored as integers" do
     cep = 53417540
     address = CepFacil.get_address cep, @token
     address.should_not be_nil
   end
-  
+
   it "can get all 6 attributes (cep, type, state, city, neighborhood, description) from a given CEP" do
     cep = "52060-010"
     address = CepFacil.get_address cep, @token
-    
+
     address[:cep].should eql("52060010")
     address[:type].should eql("Rua")
     address[:state].should eql("PE")
     address[:city].should eql("Recife")
     address[:neighborhood].should eql("Parnamirim")
     address[:description].should include("Tude de Melo")
-    
+
     address[:cep].should_not be_nil
     address[:type].should_not be_nil
     address[:state].should_not be_nil
     address[:city].should_not be_nil
     address[:neighborhood].should_not be_nil
     address[:description].should_not be_nil
-    
+
     address.should have_key(:cep)
     address.should have_key(:type)
     address.should have_key(:state)
@@ -57,7 +57,7 @@ describe CepFacil do
     address.should have_key(:neighborhood)
     address.should have_key(:description)
   end
-  
+
   it "can return a string with the full address" do
     cep = "53417-540"
     address = CepFacil.get_address cep, @token
@@ -66,22 +66,28 @@ describe CepFacil do
     full_version.should eql("Rua Panelas, Artur Lundgren II, Paulista-PE, Brasil.")
   end
 
-=begin  
-  it "has a working alternative usage" do
-    include CepFacil
-    a = RSpec::Core::ExampleGroup.new
-    a.extend(CepFacil)
-    
-    cep = "50050-000"
-    address = get_address cep, @token
-    full_version = full address
-    
-    address.should_not be_nil
-    full_version.should_not be_nil
-    
-    full_version.should eql("Rua da Aurora, Boa Vista, Recife-PE, Brasil.")
+  it "handles correct encoding" do
+    cep = "79005-340"
+    address = CepFacil.get_address cep, @token
+    address[:neighborhood].should eql("Amambaí")
+    address[:description].should eql("Coronel Camisão")
+  end
+
+  it "support a different dictionary" do
+    cep = "79005-340"
+    dictionary = {
+      "tipo" => :type,
+      "cidade" => :city,
+      "bairro" => :district,
+      "cep" => :zipcode,
+      "descricao" => :street,
+      "uf" => :uf
+    }
+    address = CepFacil.get_address cep, @token, dictionary
+    address[:zipcode].should eql("79005340")
+    address[:uf].should eql("MS")
+    address[:district].should eql("Amambaí")
   end
-=end
 
 end
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: cep_facil
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
-- Rodrigo Vieira
+- Rodrigo Alves Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70140278475580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *70140278475580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Wrapper Ruby para o serviço cepfacil.com.br
 email:
-- rodrigo@atela.com.br
+- rodrigovieira1994@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -58,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cep_facil
-rubygems_version: 1.8.13
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Wrapper para o serviço cepfacil.com.br