addresses 1.0.11 → 2.0

data/spec/factories/addresses.rb

@@ -1,9 +1,9 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :address, class: Addresses::Address do
-    number "Number"
-    complement nil
+    number { '1559' }
+    complement { 'Sala 66' }
     association :zipcode
   end
 end

data/spec/factories/cities.rb

@@ -1,8 +1,8 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :city, class: Addresses::City do
-    name "City name"
+    name { 'Natal' }
     association :state
   end
 end

data/spec/factories/countries.rb

@@ -1,8 +1,8 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :country, class: Addresses::Country do
-    name "Country name"
-    acronym "Country acronym"
+    name { 'Brasil' }
+    acronym { 'BR' }
   end
 end

data/spec/factories/neighborhoods.rb

@@ -1,8 +1,8 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :neighborhood, class: Addresses::Neighborhood do
-    name "Neighborhood name"
+    name { 'Tirol' }
     association :city
   end
 end

data/spec/factories/states.rb

@@ -1,9 +1,9 @@
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :state, class: Addresses::State do
-    name "State name"
-    acronym "State acronym"
+    name { 'Rio Grande do Norte' }
+    acronym { 'RN' }
     association :country
   end
 end

data/spec/factories/zipcodes.rb

@@ -1,8 +1,8 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :zipcode, class: Addresses::Zipcode do
-    street "Street name"
+    street { 'Av. Senador Salgado Filho' }
     association :city
     association :neighborhood
-    number "12345678"
+    number { "59015900" }
   end
 end

data/spec/models/addresses/address_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::Address, type: :model do
   describe 'validation' do
@@ -16,7 +16,7 @@ RSpec.describe Addresses::Address, type: :model do
     let!(:address) { create(:address) }
     let!(:address1) { create(:address, zipcode: zipcode) }
 
-    it { expect(address.to_s).to eq("Street name, Number, Neighborhood name - City name/State acronym") }
-    it { expect(address1.to_s).to eq("Street name, Number - City name/State acronym") }
+    it { expect(address.to_s).to eq("Av. Senador Salgado Filho, 1559, Tirol - Natal/RN") }
+    it { expect(address1.to_s).to eq("Av. Senador Salgado Filho, 1559 - Natal/RN") }
   end
 end

data/spec/models/addresses/city_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::City, :type => :model do
   describe 'association' do

data/spec/models/addresses/country_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::Country, :type => :model do
   describe 'association' do

data/spec/models/addresses/neighborhood_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::Neighborhood, :type => :model do
   describe 'association' do

data/spec/models/addresses/state_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::State, :type => :model do
   describe 'association' do

data/spec/models/addresses/zipcode_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::Zipcode, type: :model do
   describe 'validation' do
@@ -13,33 +13,4 @@ RSpec.describe Addresses::Zipcode, type: :model do
     it { is_expected.to belong_to(:neighborhood) }
     it { is_expected.to have_many(:addresses) }
   end
-
-  describe '.find_or_create_by_service', :vcr do
-    context 'when the zipcode exists in database' do
-      let!(:zipcode) { create :zipcode }
-      let!(:searched_zipcode) { Addresses::Zipcode.find_or_create_by_service(zipcode.number) }
-
-      it { expect(searched_zipcode).to eq(zipcode) }
-    end
-
-    context 'when the zipcode not exists in database' do
-      context 'but the zipcode was found in web service' do
-        let!(:searched_zipcode) { Addresses::Zipcode.find_or_create_by_service('05012010') }
-
-        it { expect(searched_zipcode).to be_a_instance_of(Addresses::Zipcode) }
-        it { expect(searched_zipcode.number).to eq('05012010') }
-        it { expect(searched_zipcode.street).to eq('Rua Ministro Gastão Mesquita') }
-      end
-
-      context 'and the zipcode was not found in web service' do
-        let!(:searched_zipcode) { Addresses::Zipcode.find_or_create_by_service('99999999') }
-        it { expect(searched_zipcode).to be_nil }
-      end
-    end
-  end
-
-  describe '#to_s' do
-    let!(:zipcode) { create :zipcode }
-    it { expect(zipcode.to_s).to eq("Street name, Neighborhood name. City name - State acronym") }
-  end
 end

data/spec/{spec_helper.rb → rails_helper.rb}

@@ -9,10 +9,10 @@ end
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
 require 'rspec/rails'
-require 'factory_girl_rails'
 require 'shoulda/matchers'
-
 require 'webmock/rspec'
+require 'factory_bot_rails'
+
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
   c.hook_into :webmock
@@ -28,9 +28,8 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.order = "random"
-
   config.include(Shoulda::Matchers::ActiveModel, type: :model)
   config.include(Shoulda::Matchers::ActiveRecord, type: :model)
 end

data/spec/requests/cities_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::CitiesController, type: :request do
   let!(:state) { create :state }

data/spec/requests/neighborhoods_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::NeighborhoodsController, type: :request do
   let!(:state) { create :state }

data/spec/requests/zipcodes_spec.rb

@@ -1,7 +1,8 @@
-require 'spec_helper'
+require 'rails_helper'
 
 RSpec.describe Addresses::ZipcodesController, type: :request do
-  let!(:state) { create :state }
+  let!(:country) { create :country }
+  let!(:state) { create :state, country: country }
   let!(:city) { create :city, state: state }
   let!(:neighborhood) { create :neighborhood, city: city }
   let!(:zipcode) { create :zipcode, city: city, neighborhood: neighborhood, number: '05012010' }
@@ -14,9 +15,14 @@ RSpec.describe Addresses::ZipcodesController, type: :request do
       expect(response.status).to be(200)
       expect(json["id"]).to eq(zipcode.id)
       expect(json["street"]).to eq(zipcode.street)
-      expect(json["city_id"]).to eq(city.id)
-      expect(json["state_id"]).to eq(state.id)
-      expect(json["neighborhood_id"]).to eq(neighborhood.id)
+      expect(json["neighborhood"]['id']).to eq(neighborhood.id)
+      expect(json["neighborhood"]['name']).to eq(neighborhood.name)
+      expect(json["city"]['id']).to eq(city.id)
+      expect(json["city"]['name']).to eq(city.name)
+      expect(json["state"]['id']).to eq(state.id)
+      expect(json["state"]['name']).to eq(state.name)
+      expect(json["country"]['id']).to eq(country.id)
+      expect(json["country"]['name']).to eq(country.name)
       expect(json["number"]).to eq('05012010')
     end
   end

data/spec/routing/cities_routing_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 RSpec.describe Addresses::CitiesController, type: :routing do
   routes { Addresses::Engine.routes }

data/spec/routing/neighborhoods_routing_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 RSpec.describe Addresses::NeighborhoodsController, type: :routing do
   routes { Addresses::Engine.routes }

data/spec/routing/zipcodes_routing_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 RSpec.describe Addresses::ZipcodesController, type: :routing do
   routes { Addresses::Engine.routes }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: addresses
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: '2.0'
 platform: ruby
 authors:
 - Wilbert Ribeiro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,56 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.8.2
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 5.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 5.1.1
 description: Create Country, State, City, Neighborhood and a polymorphic model called
   Address that can be related as addessable.
 email:
@@ -77,23 +63,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
-- app/assets/javascripts/addresses/application.js
-- app/assets/stylesheets/addresses/application.css
 - app/controllers/addresses/application_controller.rb
 - app/controllers/addresses/cities_controller.rb
 - app/controllers/addresses/neighborhoods_controller.rb
 - app/controllers/addresses/states_controller.rb
 - app/controllers/addresses/zipcodes_controller.rb
-- app/helpers/addresses/application_helper.rb
 - app/models/addresses/address.rb
 - app/models/addresses/city.rb
 - app/models/addresses/country.rb
 - app/models/addresses/neighborhood.rb
 - app/models/addresses/state.rb
 - app/models/addresses/zipcode.rb
-- app/services/zipcode_service.rb
 - config/routes.rb
 - db/migrate/20140327141509_create_addresses_countries.rb
 - db/migrate/20140327163801_create_addresses_states.rb
@@ -102,14 +83,15 @@ files:
 - db/migrate/20140328120418_create_addresses_addresses.rb
 - db/migrate/20160920172944_create_addresses_zipcodes.rb
 - db/migrate/20160920174406_remove_zipcode_attributes_from_addresses.rb
+- db/migrate/20191008052817_add_indexes.rb
 - lib/addresses.rb
 - lib/addresses/engine.rb
 - lib/tasks/addresses_tasks.rake
-- lib/tasks/natal_city.rake
-- lib/tasks/populate_cities.rake
-- lib/tasks/populate_countries.rake
-- lib/tasks/populate_neighborhoods.rake
-- lib/tasks/populate_states.rake
+- lib/tasks/populate/br/cities.rake
+- lib/tasks/populate/br/countries.rake
+- lib/tasks/populate/br/neighborhoods.rake
+- lib/tasks/populate/br/states.rake
+- lib/tasks/populate/br/zipcodes.rake
 - spec/controllers/addresses/cities_controller_spec.rb
 - spec/controllers/addresses/neighborhoods_controller_spec.rb
 - spec/controllers/addresses/states_controller_spec.rb
@@ -144,16 +126,19 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/locales/pt-BR.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20190614190716_create_addresses_countries.addresses.rb
-- spec/dummy/db/migrate/20190614190958_create_addresses_countries.addresses.rb
-- spec/dummy/db/migrate/20190614190959_create_addresses_states.addresses.rb
-- spec/dummy/db/migrate/20190614190960_create_addresses_cities.addresses.rb
-- spec/dummy/db/migrate/20190614190961_create_addresses_neighborhoods.addresses.rb
-- spec/dummy/db/migrate/20190614190962_create_addresses_addresses.addresses.rb
-- spec/dummy/db/migrate/20190614190963_create_addresses_zipcodes.addresses.rb
-- spec/dummy/db/migrate/20190614190964_remove_zipcode_attributes_from_addresses.addresses.rb
+- spec/dummy/db/development.sqlite3
+- spec/dummy/db/migrate/20191008054118_create_addresses_countries.addresses.rb
+- spec/dummy/db/migrate/20191008054119_create_addresses_states.addresses.rb
+- spec/dummy/db/migrate/20191008054120_create_addresses_cities.addresses.rb
+- spec/dummy/db/migrate/20191008054121_create_addresses_neighborhoods.addresses.rb
+- spec/dummy/db/migrate/20191008054122_create_addresses_addresses.addresses.rb
+- spec/dummy/db/migrate/20191008054123_create_addresses_zipcodes.addresses.rb
+- spec/dummy/db/migrate/20191008054124_remove_zipcode_attributes_from_addresses.addresses.rb
+- spec/dummy/db/migrate/20191008054125_add_indexes.addresses.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -178,20 +163,20 @@ files:
 - spec/fixtures/vcr_cassettes/ZipcodeService/_find/when_pass_a_valid_zipcode/1_1_1_6.yml
 - spec/fixtures/vcr_cassettes/ZipcodeService/_find/when_pass_a_valid_zipcode/1_1_1_7.yml
 - spec/fixtures/vcr_cassettes/ZipcodeService/_find/when_server_is_not_avaialable/1_1_3_1.yml
+- spec/fixtures/zipcodes/br/ceps.txt
 - spec/models/addresses/address_spec.rb
 - spec/models/addresses/city_spec.rb
 - spec/models/addresses/country_spec.rb
 - spec/models/addresses/neighborhood_spec.rb
 - spec/models/addresses/state_spec.rb
 - spec/models/addresses/zipcode_spec.rb
+- spec/rails_helper.rb
 - spec/requests/cities_spec.rb
 - spec/requests/neighborhoods_spec.rb
 - spec/requests/zipcodes_spec.rb
 - spec/routing/cities_routing_spec.rb
 - spec/routing/neighborhoods_routing_spec.rb
 - spec/routing/zipcodes_routing_spec.rb
-- spec/services/zipcode_service_spec.rb
-- spec/spec_helper.rb
 homepage: http://www.github.com/wilbert/addresses
 licenses:
 - MIT
@@ -211,12 +196,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: This engine allows create default addresses models for any usage.
 test_files:
-- spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/assets/javascripts/application.js
@@ -250,15 +234,18 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/db/migrate/20190614190959_create_addresses_states.addresses.rb
-- spec/dummy/db/migrate/20190614190960_create_addresses_cities.addresses.rb
-- spec/dummy/db/migrate/20190614190963_create_addresses_zipcodes.addresses.rb
-- spec/dummy/db/migrate/20190614190964_remove_zipcode_attributes_from_addresses.addresses.rb
-- spec/dummy/db/migrate/20190614190961_create_addresses_neighborhoods.addresses.rb
-- spec/dummy/db/migrate/20190614190716_create_addresses_countries.addresses.rb
-- spec/dummy/db/migrate/20190614190958_create_addresses_countries.addresses.rb
-- spec/dummy/db/migrate/20190614190962_create_addresses_addresses.addresses.rb
+- spec/dummy/db/migrate/20191008054121_create_addresses_neighborhoods.addresses.rb
+- spec/dummy/db/migrate/20191008054124_remove_zipcode_attributes_from_addresses.addresses.rb
+- spec/dummy/db/migrate/20191008054119_create_addresses_states.addresses.rb
+- spec/dummy/db/migrate/20191008054120_create_addresses_cities.addresses.rb
+- spec/dummy/db/migrate/20191008054123_create_addresses_zipcodes.addresses.rb
+- spec/dummy/db/migrate/20191008054125_add_indexes.addresses.rb
+- spec/dummy/db/migrate/20191008054118_create_addresses_countries.addresses.rb
+- spec/dummy/db/migrate/20191008054122_create_addresses_addresses.addresses.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/Gemfile
+- spec/dummy/log/test.log
+- spec/dummy/log/development.log
 - spec/dummy/Gemfile.lock
 - spec/dummy/README.rdoc
 - spec/models/addresses/country_spec.rb
@@ -290,6 +277,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/ZipcodeService/_find/when_pass_a_valid_zipcode/1_1_1_7.yml
 - spec/fixtures/vcr_cassettes/ZipcodeService/_find/when_pass_a_valid_zipcode/1_1_1_5.yml
 - spec/fixtures/vcr_cassettes/ZipcodeService/_find/when_pass_a_valid_zipcode/1_1_1_4.yml
+- spec/fixtures/zipcodes/br/ceps.txt
 - spec/routing/cities_routing_spec.rb
 - spec/routing/zipcodes_routing_spec.rb
 - spec/routing/neighborhoods_routing_spec.rb
@@ -297,4 +285,4 @@ test_files:
 - spec/controllers/addresses/cities_controller_spec.rb
 - spec/controllers/addresses/zipcodes_controller_spec.rb
 - spec/controllers/addresses/states_controller_spec.rb
-- spec/services/zipcode_service_spec.rb
+- spec/rails_helper.rb