us_geo 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73084a715b73e960f52bf49b61e83d9bf68814a95a5ba9a6c702e721f9fe4c14
-  data.tar.gz: 3e525d12df7a407afdfd67116a1f54f8c17de9def115a433fb0678b215267eff
+  metadata.gz: 55d616e1859588fe10360c02f03f54425dd22131491d2dd3eed1562ed82a7db9
+  data.tar.gz: 42d5621571038484a7f54da077af404f1261da7d7b98de8b011a2daf3435dd4c
 SHA512:
-  metadata.gz: 4a2c90967678930d21c7c3560d785a4fb8551f71cf017f1e9a8ef975f637bb215b3ef90376140a67cdbd6740f1ae4206407f7da25ef027804d8b788a525c73b8
-  data.tar.gz: e1ec086a0af3dff1ad76af089caa510af3175f2b82f5afa6489752bd562dbb6662cc374cd6b55a0ec6392f3e289318c93387b2a6b9b0b684fe15e2422a2955e5
+  metadata.gz: 7f76c7eab9424153ea5872cdebd31baafd19987cefb13ad84f954d4f6822d4210267dbfd6b2b73a20e488d68c02dc947cc9bfcdd9c9dff156020a46efc2cf48b
+  data.tar.gz: e3ebb26c9f666a072bf1d727bbe86873332288d698cee70999f22434077a46ada1e92b28a361330c317d2cd7c7c82c9a2583f3c9e3ff75d6ae5dc5edd8cd604a

data/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.0.3
+
+### Added
+
+- Added methods to calculate housing density.
+
+## 2.0.2
+
+### Fixed
+
+- Migrations that update existing data are now compatible with Rails versions prior to 7.0.
+
 ## 2.0.1
 
 ### Added

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.3

data/db/migrate/20230414000700_add_short_name_to_core_based_statistical_areas.rb

@@ -6,10 +6,12 @@ class AddShortNameToCoreBasedStatisticalAreas < ActiveRecord::Migration[5.0]
 
     add_column :us_geo_core_based_statistical_areas, :short_name, :string, null: true
 
+    update_sql = "UPDATE us_geo_core_based_statistical_areas SET short_name = ? WHERE geoid = ?"
+
     select_all("SELECT geoid, name FROM us_geo_core_based_statistical_areas").each do |row|
       city, state = row["name"].split(", ", 2)
       short_name = "#{city.split("-").first}, #{state.split("-").first}"
-      update("UPDATE us_geo_core_based_statistical_areas SET short_name = ? WHERE geoid = ?", nil, [short_name, row["geoid"]])
+      update ActiveRecord::Base.sanitize_sql([update_sql, short_name, row["geoid"]])
     end
 
     change_column_null :us_geo_core_based_statistical_areas, :short_name, false

data/db/migrate/20230414000750_add_short_name_to_combined_statistical_areas.rb

@@ -6,10 +6,12 @@ class AddShortNameToCombinedStatisticalAreas < ActiveRecord::Migration[5.0]
 
     add_column :us_geo_combined_statistical_areas, :short_name, :string, null: true
 
+    update_sql = "UPDATE us_geo_combined_statistical_areas SET short_name = ? WHERE geoid = ?"
+
     select_all("SELECT geoid, name FROM us_geo_combined_statistical_areas").each do |row|
       city, state = row["name"].split(", ", 2)
       short_name = "#{city.split("-").first}, #{state.split("-").first}"
-      update("UPDATE us_geo_combined_statistical_areas SET short_name = ? WHERE geoid = ?", nil, [short_name, row["geoid"]])
+      update ActiveRecord::Base.sanitize_sql([update_sql, short_name, row["geoid"]])
     end
 
     change_column_null :us_geo_combined_statistical_areas, :short_name, false

data/db/migrate/20230417000200_add_unique_name_index_to_county_subdivisions.rb

@@ -13,8 +13,10 @@ class AddUniqueNameIndexToCountySubdivisions < ActiveRecord::Migration[5.0]
         AND t1.name = t2.name
     SQL
 
+    update_sql = "UPDATE us_geo_county_subdivisions SET name = ? WHERE geoid = ?"
+
     select_all(duplicates_sql).each do |row|
-      update("UPDATE us_geo_county_subdivisions SET name = ? WHERE geoid = ?", nil, ["#{row["name"]} (duplicate)", row["geoid"]])
+      update ActiveRecord::Base.sanitize_sql([update_sql, "#{row["name"]} (duplicate)", row["geoid"]])
     end
 
     add_index :us_geo_county_subdivisions, [:name, :county_geoid], unique: true, name: "index_us_geo_county_subdivisions_on_unique_name"

data/explorer_app/app/helpers/application_helper.rb

@@ -25,8 +25,7 @@ module ApplicationHelper
     render "shared/demographics_cells", entity: entity, round_area: round_area
   end
 
-  def population_density(entity)
-    density = entity.population_density
+  def density(density)
     return nil unless density
 
     round = if density < 1

data/explorer_app/app/views/counties/show.html.erb

@@ -48,12 +48,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@county) %></td>
+      <td><%= density(@county.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@county.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@county.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@county.land_area, round: 0) %></td>

data/explorer_app/app/views/county_subdivisions/show.html.erb

@@ -48,12 +48,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@county_subdivision) %></td>
+      <td><%= density(@county_subdivision.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@county_subdivision.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@county_subdivision.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@county_subdivision.land_area, round: 0) %></td>

data/explorer_app/app/views/places/show.html.erb

@@ -56,12 +56,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@place) %></td>
+      <td><%= density(@place.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@place.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@place.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@place.land_area, round: 0) %></td>

data/explorer_app/app/views/shared/_demographics_cells.html.erb

@@ -1,5 +1,6 @@
 <%= content_tag(:td, (entity.population ? formatted_number(entity.population) : "-"), class: "text-end", data: {sort: entity.population.to_i}) %>
-<%= content_tag(:td, population_density(entity), class: "text-end", data: {sort: entity.population_density.to_f}) %>
+<%= content_tag(:td, density(entity.population_density), class: "text-end", data: {sort: entity.population_density.to_f}) %>
 <%= content_tag(:td, (entity.housing_units ? formatted_number(entity.housing_units) : "-"), class: "text-end", data: {sort: entity.housing_units.to_i}) %>
+<%= content_tag(:td, density(entity.housing_density), class: "text-end", data: {sort: entity.housing_density.to_f}) %>
 <%= content_tag(:td, (entity.land_area ? formatted_number(entity.land_area, round: round_area) : "-"), class: "text-end", data: {sort: entity.land_area.to_i}) %>
 <%= content_tag(:td, (entity.water_area ? formatted_number(entity.water_area, round: round_area) : "-"), class: "text-end", data: {sort: entity.water_area.to_i}) %>

data/explorer_app/app/views/shared/_demographics_headers.html.erb

@@ -1,5 +1,6 @@
 <th class="text-end">Population</th>
 <th class="text-end">Population Density</th>
 <th class="text-end">Housing Units</th>
+<th class="text-end">Housing Density</th>
 <th class="text-end">Land Area</th>
 <th class="text-end">Water Area</th>

data/explorer_app/app/views/zctas/show.html.erb

@@ -54,12 +54,16 @@
     </tr>
     <tr>
       <th>Population Density</th>
-      <td><%= population_density(@zcta) %></td>
+      <td><%= density(@zcta.population_density) %></td>
     </tr>
     <tr>
       <th>Housing Units</th>
       <td><%= formatted_number(@zcta.housing_units) %></td>
     </tr>
+    <tr>
+      <th>Housing Density</th>
+      <td><%= density(@zcta.housing_density) %></td>
+    </tr>
     <tr>
       <th>Land Area (mi<sup>2</sup>)</th>
       <td><%= formatted_number(@zcta.land_area, round: 0) %></td>

data/lib/us_geo/population.rb

@@ -22,5 +22,19 @@ module USGeo
     def population_density_km
       population.to_f / land_area_km if population && land_area.to_f > 0
     end
+
+    # Housing units per square mile.
+    #
+    # @return [Float, nil]
+    def housing_density
+      housing_units.to_f / land_area if housing_units && land_area.to_f > 0
+    end
+
+    # Housing units per square kilometer.
+    #
+    # @return [Float, nil]
+    def housing_density_km
+      housing_units.to_f / land_area_km if housing_units && land_area.to_f > 0
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: us_geo
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord