us_geo 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68802aa8e92d01352ec2107646d28307fcc14fb2c4fe2a103654d40b1ec1328c
-  data.tar.gz: 50f856f724b528654ef89a561aa0e7bf0cd9ac4f17a3a270ac92d6a41bc23927
+  metadata.gz: dceb63343a54560e873aa526e7be7e3990936674596c7983eb579a9921bea7bf
+  data.tar.gz: d2ccf2fd72f5363d77c29e6f39f288f2b9d9b569ea75dddd1ae5030615381994
 SHA512:
-  metadata.gz: 4d721fcf6721324a42d7271bec405b6f0656631a3662482ddfcd9b000747040efbd7f6b6c46395607b0d752df96870328e2bf6d803b15048b55d768274e00f5b
-  data.tar.gz: 6aacb9847c137272d88fc212fa1ee4deb9c118d577d3bcd75f373c87d3d4c7b03b2e02a6d3bee3d125cdb3e1c35e6b78cac906fb44b095ec74786be8abb49649
+  metadata.gz: df0c5cf5216e6eb926d6ffda006c003d7661790c4c3c10ee41c00a63342bc6ce2fb3e15fe081f5465c144c1fd06d28131d55af7b8273e1d89ec09d5f5cd5c4a9
+  data.tar.gz: 24e36f6a2af2c4b73853d8ab17a557c16faa04e8bf6e058f166defe1ac5dbfdd90cfe2ff7d8b828b9d8e8f34cbcfe51a3123d16e3004ba36239048bba45e012e

data/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.2.0
+
+### Added
+
+- Added places with `U6` FIPS classification. This adds more places in rural areas where not all settlements were previously included in the data set because they were not classified as places by the Census Bureau. These are places that are not incorporated and do not have many businesses or services, but are still recognized places where people live. These places do not have any demographic data associated with them since they are not included in the Census population estimates.
+
+### Changed
+
+- Updated data set with 2023 population estimates from the Census Bureau.
+
+## 2.1.1
+
+### Fixed
+
+- Made `belongs_to` associations on models optional so that you don't need to import the full data set in order to have valid records.
+
 ## 2.1.0
 
 ### Changed

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/db/migrate/20251029215800_add_locale_name_to_zctas.rb

@@ -0,0 +1,6 @@
+class AddLocaleNameToZctas < ActiveRecord::Migration[5.0]
+  def change
+    add_column :us_geo_zctas, :usps_locality, :string, limit: 30, null: true
+    add_column :us_geo_zctas, :usps_state_code, :string, limit: 2, null: true
+  end
+end

data/explorer_app/Gemfile

@@ -4,13 +4,13 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec path: "../"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.4", ">= 7.0.4.3"
+gem "rails", "~> 8.1.2", ">= 8.1.2"
 
 # Use sqlite3 as the database for Active Record
-gem "sqlite3", "~> 1.4"
+gem "sqlite3", "~> 2.9"
 
 # Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
+gem "puma", "~> 7.1"
 
 # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
 # gem "kredis"

data/explorer_app/app/helpers/application_helper.rb

@@ -42,7 +42,7 @@ module ApplicationHelper
   end
 
   def overlap_percentage(entity, other_entity, association)
-    return nil unless entity && other_entity && entity.total_area > 0
+    return nil unless entity && other_entity && entity.total_area.to_f > 0
 
     belongs_to = other_entity.class.base_class.to_s.demodulize.underscore
     overlap = entity.send(association).detect { |r| r.send(belongs_to) == other_entity }

data/lib/tasks/us_geo/us_geo.rake

@@ -24,24 +24,28 @@ namespace :us_geo do
     }
 
     klasses.each do |name, klass|
-      desc "Import data for #{klass}"
+      desc <<~DOC
+        Import data for #{klass}. Set US_GEO_BASE_DATA_URI to override the data source location.
+      DOC
       task name => :environment do
         t = Time.now
 
-        klass.load!
-        puts "Loaded #{klass.count} rows into #{klass.table_name} in #{(Time.now - t).round(1)}s"
+        imported_count, removed_count = klass.load!
+        puts "Loaded #{imported_count} rows into #{klass.table_name} in #{(Time.now - t).round(1)}s"
 
-        removed_count = klass.removed.count
         if removed_count > 0
           puts "  #{removed_count} previously imported records in #{klass.table_name} no longer exist in the current data source"
         end
       end
+    end
 
-      desc "Import data for all USGeo models"
-      task all: :environment do
-        klasses.each_key do |name|
-          Rake::Task["us_geo:import:#{name}"].invoke
-        end
+    desc <<~DOC
+      Import data for all USGeo models". Set US_GEO_BASE_DATA_URI to override the data source location.
+      The default data location is https://raw.githubusercontent.com/bdurand/us_geo/master/data/2020_dist
+    DOC
+    task all: :environment do
+      klasses.each_key do |name|
+        Rake::Task["us_geo:import:#{name}"].invoke
       end
     end
 

data/lib/us_geo/base_record.rb

@@ -37,11 +37,19 @@ module USGeo
       end
 
       # Mark the status of any records not updated in the block as being no longer imported.
+      #
+      # @return [Array<Integer>] Count of the number of records imported and the number of records removed
       def import!(&block)
         start_time = Time.at(Time.now.to_i.floor)
+
         yield
-        raise LoadError.new("No data found") unless where("updated_at >= ?", start_time).exists?
-        where("updated_at < ?", start_time).imported.update_all(status: STATUS_REMOVED)
+
+        imported_count = where("updated_at >= ?", start_time).count
+        raise LoadError.new("No data found") if imported_count == 0
+
+        removed_count = where("updated_at < ?", start_time).imported.update_all(status: STATUS_REMOVED)
+
+        [imported_count, removed_count]
       end
 
       def data_uri(path)
@@ -60,7 +68,7 @@ module USGeo
         require "csv"
 
         file = if location.include?(":")
-          URI.parse(location).open(read_timeout: 5, open_timeout: 5)
+          URI.parse(location).open(read_timeout: 10, open_timeout: 5)
         else
           File.open(location)
         end

data/lib/us_geo/county.rb

@@ -12,7 +12,7 @@ module USGeo
 
     belongs_to :core_based_statistical_area, foreign_key: :cbsa_geoid, optional: true, inverse_of: :counties
     belongs_to :metropolitan_division, foreign_key: :metropolitan_division_geoid, optional: true, inverse_of: :counties
-    belongs_to :state, foreign_key: :state_code, inverse_of: :counties
+    belongs_to :state, foreign_key: :state_code, optional: true, inverse_of: :counties
 
     has_many :subdivisions, -> { not_removed }, foreign_key: :county_geoid, inverse_of: :county, class_name: "USGeo::CountySubdivision"
 

data/lib/us_geo/county_subdivision.rb

@@ -8,7 +8,7 @@ module USGeo
 
     self.primary_key = "geoid"
 
-    belongs_to :county, foreign_key: :county_geoid, inverse_of: :subdivisions
+    belongs_to :county, foreign_key: :county_geoid, optional: true, inverse_of: :subdivisions
 
     has_many :zcta_county_subdivisions, -> { not_removed }, foreign_key: :county_subdivision_geoid, inverse_of: :county_subdivision, dependent: :destroy
     has_many :zctas, -> { not_removed }, through: :zcta_county_subdivisions

data/lib/us_geo/division.rb

@@ -6,7 +6,7 @@ module USGeo
     include Population
     include Area
 
-    belongs_to :region, inverse_of: :divisions
+    belongs_to :region, optional: true, inverse_of: :divisions
     has_many :states, -> { not_removed }, inverse_of: :division
 
     validates :name, presence: true, length: {maximum: 30}, uniqueness: true

data/lib/us_geo/place.rb

@@ -26,7 +26,7 @@ module USGeo
 
     # !@method primary_county
     #   @return [County] County that contains most of the place.
-    belongs_to :primary_county, foreign_key: :primary_county_geoid, class_name: "USGeo::County"
+    belongs_to :primary_county, foreign_key: :primary_county_geoid, optional: true, class_name: "USGeo::County"
 
     # !@method urban_area
     #   @return [UrbanArea] Urban area that the place is a part of.
@@ -34,7 +34,7 @@ module USGeo
 
     # !@method state
     #   @return [State] State that the place is in.
-    belongs_to :state, foreign_key: :state_code, inverse_of: :places
+    belongs_to :state, foreign_key: :state_code, optional: true, inverse_of: :places
 
     validates :geoid, length: {is: 7}
     validates :state_code, length: {is: 2}

data/lib/us_geo/state.rb

@@ -13,8 +13,8 @@ module USGeo
     self.primary_key = "code"
     self.inheritance_column = :_type_disabled
 
-    belongs_to :region, optional: -> { territory? }, inverse_of: :states
-    belongs_to :division, optional: -> { territory? }, inverse_of: :states
+    belongs_to :region, optional: true, inverse_of: :states
+    belongs_to :division, optional: true, inverse_of: :states
 
     has_many :counties, -> { not_removed }, foreign_key: :state_code, inverse_of: :state
     has_many :places, -> { not_removed }, foreign_key: :state_code, inverse_of: :state

data/lib/us_geo/urban_area.rb

@@ -19,7 +19,7 @@ module USGeo
 
     # !@method primary_county
     #   @return [USGeo::County] Primary county that contains most of the urban area.
-    belongs_to :primary_county, foreign_key: :primary_county_geoid, class_name: "USGeo::County"
+    belongs_to :primary_county, foreign_key: :primary_county_geoid, optional: true, class_name: "USGeo::County"
 
     # !@method urban_area_county_subdivisions
     #   @return [ActiveRecord::Relation<USGeo::UrbanAreaCountySubdivision>] County subdivision to urban area mapping.

data/lib/us_geo/zcta.rb

@@ -22,7 +22,6 @@ module USGeo
     #   This scope will search for ZCTA's via the ZCTAMappings table. This is useful
     #   when you have a retired ZIP code and want to find the current ZCTA for that ZIP code.
     #
-    #   @param zipcode [String] ZIP code to search for.
     #   @return [ActiveRecord::Relation] ZCTA's matching the given ZIP code.
     scope :for_zipcode, ->(zipcode) { left_outer_joins(:zcta_mappings).where(ZctaMapping.table_name => {zipcode: zipcode}).or(left_outer_joins(:zcta_mappings).where(zipcode: zipcode)).distinct }
 
@@ -36,7 +35,7 @@ module USGeo
 
     # @!method primary_county
     #   @return [USGeo::County] County that contains most of the ZCTA's land area.
-    belongs_to :primary_county, foreign_key: :primary_county_geoid, class_name: "USGeo::County"
+    belongs_to :primary_county, foreign_key: :primary_county_geoid, optional: true, class_name: "USGeo::County"
 
     # @!method zcta_urban_areas
     #   @return [ActiveRecord::Relation] ZCTA to urban area mappings.
@@ -48,7 +47,7 @@ module USGeo
 
     # @!method primary_urban_area
     #   @return [USGeo::UrbanArea] Urban area that contains most of the ZCTA's land area.
-    belongs_to :primary_urban_area, foreign_key: :primary_urban_area_geoid, class_name: "USGeo::UrbanArea"
+    belongs_to :primary_urban_area, foreign_key: :primary_urban_area_geoid, optional: true, class_name: "USGeo::UrbanArea"
 
     # @!method zcta_county_subdivisions
     #   @return [ActiveRecord::Relation] ZCTA to county subdivision mappings.
@@ -60,7 +59,7 @@ module USGeo
 
     # @!method primary_county_subdivision
     #   @return [USGeo::CountySubdivision] County subdivision that contains most of the ZCTA's land area.
-    belongs_to :primary_county_subdivision, foreign_key: :primary_county_subdivision_geoid, class_name: "USGeo::CountySubdivision"
+    belongs_to :primary_county_subdivision, foreign_key: :primary_county_subdivision_geoid, optional: true, class_name: "USGeo::CountySubdivision"
 
     # @!method zcta_places
     #   @return [ActiveRecord::Relation] ZCTA to place mappings.
@@ -72,7 +71,7 @@ module USGeo
 
     # @!method primary_place
     #   @return [USGeo::Place] Place that contains most of the ZCTA's land area.
-    belongs_to :primary_place, foreign_key: :primary_place_geoid, class_name: "USGeo::Place"
+    belongs_to :primary_place, foreign_key: :primary_place_geoid, optional: true, class_name: "USGeo::Place"
 
     # @!method zcta_mappings
     #   @return [ActiveRecord::Relation] 2010 ZCTA to current ZCTA mappings.

data/us_geo.gemspec

@@ -8,10 +8,17 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/bdurand/us_geo"
   spec.license = "MIT"
 
+  spec.metadata = {
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => spec.homepage,
+    "changelog_uri" => "#{spec.homepage}/blob/main/CHANGELOG.md"
+  }
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   ignore_files = %w[
     .
+    AGENTS.md
     Appraisals
     Gemfile
     Gemfile.lock
@@ -29,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", ">= 5.2"
+  spec.add_dependency "csv"
 
   spec.add_development_dependency "bundler"
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: us_geo
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Brian Durand
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - bbdurand@gmail.com
 executables: []
@@ -84,6 +96,7 @@ files:
 - db/migrate/20230417000600_add_additional_time_zone_name_to_counties.rb
 - db/migrate/20230426000100_add_index_on_zctas_geoids.rb
 - db/migrate/20230620000100_fix_short_names.rb
+- db/migrate/20251029215800_add_locale_name_to_zctas.rb
 - db/schema.rb
 - explorer_app/.gitattributes
 - explorer_app/.gitignore
@@ -203,8 +216,10 @@ files:
 homepage: https://github.com/bdurand/us_geo
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  homepage_uri: https://github.com/bdurand/us_geo
+  source_code_uri: https://github.com/bdurand/us_geo
+  changelog_uri: https://github.com/bdurand/us_geo/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -219,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Collection of geographic data for the United States for use with ActiveRecord
 test_files: []