addresses 2.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b98ad9854e13c11cf4da821241934c2393316f39637c8ab08929d98e696d0b94
-  data.tar.gz: 16af6871b87ddac66de2e0b38c9d122d2f790f2001f62b5d13acf62820adfae6
+  metadata.gz: 075ca513fc5ee9679a0b68dd5cfc5bf77bdd66df03c51007ea1ea8eeb16ec05c
+  data.tar.gz: 0f6a47c6941efdb2d4249fcd80af1fcd2e126b39363ba6fcf667ac004d6fa996
 SHA512:
-  metadata.gz: 4e3fb674b4957d2daff508d348848fc56adcd521c795be94c2f976f804b836e89308f9833622d66f4db32edc3eebb592948f8c0e626b67b4fc6cbc4bc1e1a87c
-  data.tar.gz: 828b6de238ac9c6728458cf04e4bd339cf1b64b4ee43ede0778c6c4001f7551ebf6b86bad605a7620e24020067bb9bbfc03fc9eb875c0216e51667b1275ad2df
+  metadata.gz: 695120a2a42383f2135985dd584f75038d75e2efc268434b988216d68eceaf80f7888c22ca64dfb8c610363ba1ca1ad7f5786432097947a02244e0a8309cb555
+  data.tar.gz: fae24ef00cdeb5679bc83f29b6df96e10973e5dcd2b0a1c94eb57c3751b5d2a2a7ea5fdd3868b544bfb389a5c32ffcda0c7f3635d83c338ca91b65b037f84cd2

data/app/controllers/addresses/cities_controller.rb

@@ -6,13 +6,11 @@ module Addresses
   class CitiesController < ApplicationController
     def index
       @cities = City.filter(params)
-
       render json: @cities
     end
 
     def show
       @city = City.find(params[:id])
-
       render json: @city
     end
   end

data/app/controllers/addresses/countries_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_dependency 'addresses/application_controller'
+
+module Addresses
+  class CountriesController < ApplicationController
+    def index
+      @countries = Country.all
+      render json: @countries
+    end
+
+    def show
+      @city = Country.find(params[:id])
+      render json: @city
+    end
+  end
+end

data/app/controllers/addresses/neighborhoods_controller.rb

@@ -5,11 +5,13 @@ require_dependency 'addresses/application_controller'
 module Addresses
   class NeighborhoodsController < ApplicationController
     def index
-      @city = City.find(params[:city_id])
-
-      @neighborhoods = @city.neighborhoods.order('name asc')
-
+      @neighborhoods = Neighborhood.where(city_id: params[:city_id])
       render json: @neighborhoods
     end
+
+    def show
+      @neighborhood = Neighborhood.find(params[:id])
+      render json: @neighborhood
+    end
   end
 end

data/app/controllers/addresses/regions_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_dependency 'addresses/application_controller'
+
+module Addresses
+  class RegionsController < ApplicationController
+    def index
+      @regions = Region.where(country_id: params[:country_id])
+      render json: @regions
+    end
+
+    def show
+      @region = Region.find(params[:id])
+      render json: @region
+    end
+  end
+end

data/app/controllers/addresses/states_controller.rb

@@ -5,8 +5,13 @@ require_dependency 'addresses/application_controller'
 module Addresses
   class StatesController < ApplicationController
     def index
-      @states = State.order('name asc')
+      @states = State.where(country_id: params[:country_id])
       render json: @states
     end
+
+    def show
+      @state = State.find(params[:id])
+      render json: @state
+    end
   end
 end

data/app/models/addresses/city.rb

@@ -2,11 +2,14 @@
 
 module Addresses
   class City < ActiveRecord::Base
-    validates :name, :state_id, presence: true
-
     belongs_to :state
 
+    default_scope { order('name asc') }
+
     has_many :neighborhoods
+    has_many :zipcodes
+
+    validates :name, :state_id, presence: true
 
     class << self
       def filter(params = {})
@@ -21,16 +24,15 @@ module Addresses
       end
 
       private
-
-      def query_word
-        adapter == 'postgresql' ? 'ilike' : 'like'
-      end
-
-      def adapter
-        ActiveRecord::Base.connection.instance_values["config"][:adapter]
-      rescue
-        nil
-      end
+        def query_word
+          adapter == 'postgresql' ? 'ilike' : 'like'
+        end
+
+        def adapter
+          ActiveRecord::Base.connection.instance_values['config'][:adapter]
+        rescue
+          nil
+        end
     end
   end
 end

data/app/models/addresses/country.rb

@@ -2,7 +2,14 @@
 
 module Addresses
   class Country < ActiveRecord::Base
-    validates :name, presence: true
+    default_scope { order('name asc') }
+
+    has_many :regions
     has_many :states
+    has_many :cities, through: :states
+    has_many :zipcodes, through: :cities
+    has_many :addresses, through: :zipcodes
+
+    validates :name, presence: true
   end
 end

data/app/models/addresses/neighborhood.rb

@@ -2,8 +2,12 @@
 
 module Addresses
   class Neighborhood < ActiveRecord::Base
-    validates :name, :city_id, presence: true
-
     belongs_to :city
+
+    default_scope { order('name asc') }
+
+    has_many :zipcodes
+
+    validates :name, :city_id, presence: true
   end
 end

data/app/models/addresses/region.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Addresses
+  class Region < ActiveRecord::Base
+    belongs_to :country
+
+    default_scope { order('name asc') }
+
+    has_many :states
+    has_many :cities, through: :states
+    has_many :neighborhoods, through: :cities
+    has_many :zipcodes, through: :cities
+
+    validates :name, :country_id, presence: true
+  end
+end

data/app/models/addresses/state.rb

@@ -2,10 +2,13 @@
 
 module Addresses
   class State < ActiveRecord::Base
-    validates :name, :country_id, presence: true
-
     belongs_to :country
 
+    default_scope { order('name asc') }
+
     has_many :cities
+    has_many :zipcodes, through: :cities
+
+    validates :name, :country_id, presence: true
   end
 end

data/config/routes.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 Addresses::Engine.routes.draw do
+  resources :countries, only: [:index, :show]
+  resources :regions, only: [:index, :show]
   resources :cities, only: [:index, :show]
-  resources :neighborhoods, only: [:index]
-  resources :states, only: [:index]
+  resources :neighborhoods, only: [:index, :show]
+  resources :states, only: [:index, :show]
 
   get 'zipcodes/:zipcode', to: 'zipcodes#show', constraints: { zipcode: /\d{8}/ }, as: :zipcode
 end

data/db/migrate/20191010233002_create_addresses_regions.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateAddressesRegions < ActiveRecord::Migration[6.0]
+  def change
+    create_table :addresses_regions do |t|
+      t.string :name
+      t.string :acronym
+      t.float :latitude
+      t.float :longitude
+      t.references :country, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20191010233144_add_indexes_to_regions.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddIndexesToRegions < ActiveRecord::Migration[6.0]
+  def change
+    add_index :addresses_regions, :name
+    add_index :addresses_regions, [:name, :country_id]
+  end
+end

data/db/migrate/20191010233512_add_capital_to_addresses_state.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCapitalToAddressesState < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_states, :capital_id, :int, index: true
+  end
+end

data/db/migrate/20191010233947_add_region_id_to_addresses_states.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRegionIdToAddressesStates < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :addresses_states, :region, index: true
+  end
+end

data/db/migrate/20191010234112_add_latitude_and_longitude_to_addresses_address.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddLatitudeAndLongitudeToAddressesAddress < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_addresses, :latitude, :float
+    add_index :addresses_addresses, :latitude
+    add_column :addresses_addresses, :longitude, :float
+    add_index :addresses_addresses, :longitude
+  end
+end

data/db/migrate/20191010235008_add_latitude_and_longitude_to_addresses_country.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddLatitudeAndLongitudeToAddressesCountry < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_countries, :latitude, :float
+    add_index :addresses_countries, :latitude
+    add_column :addresses_countries, :longitude, :float
+    add_index :addresses_countries, :longitude
+  end
+end

data/db/migrate/20191010235050_add_latitude_and_longitude_to_addresses_states.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddLatitudeAndLongitudeToAddressesStates < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_states, :latitude, :float
+    add_index :addresses_states, :latitude
+    add_column :addresses_states, :longitude, :float
+    add_index :addresses_states, :longitude
+  end
+end

data/db/migrate/20191010235112_add_latitude_and_longitude_to_addresses_cities.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddLatitudeAndLongitudeToAddressesCities < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_cities, :latitude, :float
+    add_index :addresses_cities, :latitude
+    add_column :addresses_cities, :longitude, :float
+    add_index :addresses_cities, :longitude
+  end
+end

data/db/migrate/20191010235129_add_latitude_and_longitude_to_addresses_neighborhoods.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddLatitudeAndLongitudeToAddressesNeighborhoods < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_neighborhoods, :latitude, :float
+    add_index :addresses_neighborhoods, :latitude
+    add_column :addresses_neighborhoods, :longitude, :float
+    add_index :addresses_neighborhoods, :longitude
+  end
+end

data/db/migrate/20191010235145_add_latitude_and_longitude_to_addresses_zipcodes.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddLatitudeAndLongitudeToAddressesZipcodes < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_zipcodes, :latitude, :float
+    add_index :addresses_zipcodes, :latitude
+    add_column :addresses_zipcodes, :longitude, :float
+    add_index :addresses_zipcodes, :longitude
+  end
+end

data/spec/controllers/addresses/states_controller_spec.rb

@@ -4,10 +4,11 @@ require 'rails_helper'
 RSpec.describe Addresses::StatesController, type: :controller do
   routes { Addresses::Engine.routes }
 
-  let!(:state) { create :state }
+  let!(:country) { create :country }
+  let!(:state) { create :state, country: country }
 
   describe "GET #index" do
-    before { get :index, params: { state_id: state.id, format: :json } }
+    before { get :index, params: { country_id: country.id, format: :json } }
 
     it { expect(response).to have_http_status(:success) }
     it { expect(assigns(:states)).to eq([state]) }

data/spec/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    addresses (2.0)
+    addresses (2.0.1)
       rails (~> 6.0.0)
 
 GEM
@@ -115,7 +115,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rake (13.0.0)
-    sprockets (3.7.2)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -130,7 +130,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    zeitwerk (2.1.10)
+    zeitwerk (2.2.0)
 
 PLATFORMS
   ruby

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,2 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css

data/spec/dummy/db/migrate/20191011003831_create_addresses_regions.addresses.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# This migration comes from addresses (originally 20191010233002)
+
+class CreateAddressesRegions < ActiveRecord::Migration[6.0]
+  def change
+    create_table :addresses_regions do |t|
+      t.string :name
+      t.string :acronym
+      t.float :latitude
+      t.float :longitude
+      t.references :country, index: true
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20191011003832_add_indexes_to_regions.addresses.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+# This migration comes from addresses (originally 20191010233144)
+
+class AddIndexesToRegions < ActiveRecord::Migration[6.0]
+  def change
+    add_index :addresses_regions, :name
+    add_index :addresses_regions, [:name, :contry_id]
+  end
+end

data/spec/dummy/db/migrate/20191011003833_add_capital_to_addresses_state.addresses.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# This migration comes from addresses (originally 20191010233512)
+
+class AddCapitalToAddressesState < ActiveRecord::Migration[6.0]
+  def change
+    add_column :addresses_states, :capital_id, :int, index: true
+  end
+end

data/spec/dummy/db/migrate/20191011003834_add_region_id_to_addresses_states.addresses.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# This migration comes from addresses (originally 20191010233947)
+
+class AddRegionIdToAddressesStates < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :addresses_states, :region, index: true
+  end
+end