Rename Region to Subregion

README.md

@@ -27,9 +27,9 @@ Note: If you get a security warning in Chrome, Click "Advanced" and then "Procee
 
 Contributing new spots is easy! Make sure you're signed into your [Github account](https://github.com/join) and edit the [seeds file](https://github.com/swrobel/meta-surf-forecast/edit/master/db/seeds.rb):
 
-1. Create a new region if necessary. For example, the LA region is created like so:
+1. Create a new Region if necessary. For example, Los Angeles is created like so:
     ```ruby
-    LA = Region.find_or_create_by(name: 'Los Angeles')
+    LA = Subregion.find_or_create_by(name: 'Los Angeles')
     ```
 1. Get the Spitcast spot id, slug (unique text id) & lat/lon data using [their spot list API](http://api.spitcast.com/api/spot/nearby?longitude=-122.005261&latitude=37.02188) (you'll need to replace the lat/lon in the URL with yours, which you can get from the [Google Geocoder](https://google-developers.appspot.com/maps/documentation/utils/geocoder/)). The slug is `spot_id_char` in their API.
 1. Go to the MagicSeaweed page for the spot you want to add. Their spot id is the number at the end of the url, and the slug is the text after the slash and before `-Surf-Report`, ex: for `http://magicseaweed.com/Pipeline-Backdoor-Surf-Report/616/` the slug is `Pipeline-Backdoor` and the id is `616`.
@@ -49,7 +49,7 @@ Use the following as a template. Delete the lines for `surfline_id`, `msw_id`, e
     msw_slug: 'County-Line-Yerba-Buena-Beach',
     spitcast_id: 207,
     spitcast_slug: 'county-line-malibu-ca',
-    region: LA,
+    subregion: LA,
   },
 ```
 

app/controllers/regions_controller.rb → app/controllers/subregions_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class RegionsController < ApplicationController
-  before_action :set_region
+class SubregionsController < ApplicationController
+  before_action :set_subregion
 
   def show
     @forecasts = Spot.connection.select_all <<-SQL
@@ -57,7 +57,7 @@ def show
         JOIN spots s ON sub.spot_id = s.id
         WHERE sub.timestamp > now() at time zone 'utc'
           AND sub.timestamp <= (SELECT max(timestamp) FROM spitcasts)
-          AND s.region_id = #{@region.id}
+          AND s.subregion_id = #{@subregion.id}
         GROUP BY id
                 ,name
                 ,lat
@@ -98,7 +98,7 @@ def show
 
 private
 
-  def set_region
-    @region = Region.find(params[:id])
+  def set_subregion
+    @subregion = Subregion.find(params[:id])
   end
 end

app/models/spot.rb

@@ -8,7 +8,7 @@ class Spot < ApplicationRecord
   has_many :surfline_lolas
   has_many :msws
   has_many :spitcasts
-  belongs_to :region
+  belongs_to :subregion
 
   default_scope -> { order(:name) }
   scope :optimized, -> { includes(:msws, :surfline_nearshores, :surfline_lolas, :spitcasts) }

app/models/region.rb → app/models/subregion.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Region < ApplicationRecord
+class Subregion < ApplicationRecord
   extend FriendlyId
   friendly_id :name, use: %i[slugged finders]
 

app/views/regions/show.html.slim → app/views/subregions/show.html.slim

@@ -2,8 +2,8 @@ nav.navbar.navbar-light.sticky-top
   .row.font-weight-light
     span.margin-left Region:
     select.margin-left onchange='window.location = this.value'
-      - Region.all.each do |region|
-        option value=region_path(region) selected=('selected' if region == @region) =region.name
+      - Subregion.all.each do |subregion|
+        option value=subregion_path(subregion) selected=('selected' if subregion == @subregion) =subregion.name
 div
   - @forecasts.each do |data, forecast|
     h2.font-weight-light.margin-left.spot-header

config/environments/development.rb

@@ -38,7 +38,7 @@
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = ENV['RAILS_SERVE_STATIC_FILES'].blank?
+  config.assets.debug = true
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.
@@ -61,7 +61,6 @@
 
   # Suppress static asset requests from server logs
   config.assets.quiet = true
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   config.middleware.insert_before ActionDispatch::ShowExceptions, Rack::Toolbar,
                                   snippet: '<script id="__bs_script__">

config/routes.rb

@@ -6,7 +6,7 @@
   end
 
   resources :spots, only: :show
-  resources :regions, only: :show
+  resources :subregions, only: :show
 
-  root to: redirect('/regions/los-angeles')
+  root to: redirect('/subregions/los-angeles')
 end

db/migrate/20170906230307_rename_regions_to_subregions.rb

@@ -0,0 +1,7 @@
+class RenameRegionsToSubregions < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :regions, :subregions
+
+    rename_column :spots, :region_id, :subregion_id
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170618230016) do
+ActiveRecord::Schema.define(version: 20170906230307) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -49,14 +49,6 @@
     t.index ["spot_id", "timestamp"], name: "index_msws_on_spot_id_and_timestamp"
   end
 
-  create_table "regions", force: :cascade do |t|
-    t.string "name"
-    t.string "slug"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["slug"], name: "index_regions_on_slug", unique: true
-  end
-
   create_table "spitcasts", id: :serial, force: :cascade do |t|
     t.integer "spot_id"
     t.datetime "timestamp"
@@ -79,13 +71,21 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "slug"
-    t.bigint "region_id"
+    t.bigint "subregion_id"
     t.string "msw_slug"
     t.string "spitcast_slug"
     t.string "surfline_slug"
     t.index ["msw_id", "surfline_id", "spitcast_id"], name: "index_spots_on_msw_id_and_surfline_id_and_spitcast_id", unique: true
-    t.index ["region_id"], name: "index_spots_on_region_id"
     t.index ["slug"], name: "index_spots_on_slug", unique: true
+    t.index ["subregion_id"], name: "index_spots_on_subregion_id"
+  end
+
+  create_table "subregions", force: :cascade do |t|
+    t.string "name"
+    t.string "slug"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["slug"], name: "index_subregions_on_slug", unique: true
   end
 
   create_table "surfline_lolas", id: :serial, force: :cascade do |t|
@@ -142,7 +142,7 @@
   add_foreign_key "msws", "spots"
   add_foreign_key "spitcasts", "api_requests"
   add_foreign_key "spitcasts", "spots"
-  add_foreign_key "spots", "regions"
+  add_foreign_key "spots", "subregions"
   add_foreign_key "surfline_lolas", "api_requests"
   add_foreign_key "surfline_lolas", "spots"
   add_foreign_key "surfline_nearshores", "api_requests"

db/seeds.rb

@@ -5,9 +5,9 @@
   dept.url = 'http://www.publichealth.lacounty.gov/phcommon/public/eh/water_quality/beach_grades.cfm'
 end
 
-LA = Region.find_or_create_by(name: 'Los Angeles')
-SC = Region.find_or_create_by(name: 'Santa Cruz')
-SF = Region.find_or_create_by(name: 'San Francisco')
+LA = Subregion.find_or_create_by(name: 'Los Angeles')
+SC = Subregion.find_or_create_by(name: 'Santa Cruz')
+SF = Subregion.find_or_create_by(name: 'San Francisco')
 
 spots = [
   {
@@ -19,7 +19,7 @@
     msw_slug: 'County-Line-Yerba-Buena-Beach',
     spitcast_id: 207,
     spitcast_slug: 'county-line-malibu-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Leo Carillo',
@@ -28,15 +28,15 @@
     surfline_id: 4953,
     msw_id: 2642,
     msw_slug: 'Leo-Carrillo',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Zeros',
     lat: 34.041956,
     lon: -118.91593,
     msw_id: 2643,
     msw_slug: 'Zero-Nicholas-Canyon-County-Beach',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Zuma Beach',
@@ -47,7 +47,7 @@
     msw_slug: 'Zuma-Beach-County-Park',
     spitcast_id: 206,
     spitcast_slug: 'zuma-beach-malibu-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Point Dume',
@@ -56,7 +56,7 @@
     surfline_id: 4947,
     msw_id: 2610,
     msw_slug: 'Point-Dume',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Malibu',
@@ -67,7 +67,7 @@
     msw_slug: 'Malibu-First-Point',
     spitcast_id: 205,
     spitcast_slug: 'malibu-malibu-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Topanga',
@@ -78,7 +78,7 @@
     msw_slug: 'Topanga-State-Beach',
     spitcast_id: 388,
     spitcast_slug: 'topanga-malibu-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Sunset Blvd',
@@ -89,7 +89,7 @@
     msw_slug: 'Sunset-Blvd',
     spitcast_id: 387,
     spitcast_slug: 'sunset-pacific-palisades-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Venice Breakwater',
@@ -100,7 +100,7 @@
     msw_slug: 'Venice-Beach',
     spitcast_id: 204,
     spitcast_slug: 'venice-venice-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'El Porto',
@@ -111,7 +111,7 @@
     msw_slug: 'El-Porto-Beach',
     spitcast_id: 402,
     spitcast_slug: 'el-porto-manhattan-beach-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Manhattan Beach',
@@ -122,7 +122,7 @@
     msw_slug: 'Manhattan-Beach',
     spitcast_id: 203,
     spitcast_slug: 'manhattan-beach-manhattan-beach-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Hermosa Beach',
@@ -133,7 +133,7 @@
     msw_slug: 'Hermosa-Beach',
     spitcast_id: 202,
     spitcast_slug: 'hermosa-hermosa-beach-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Redondo Breakwall',
@@ -142,7 +142,7 @@
     surfline_id: 4912,
     msw_id: 4208,
     msw_slug: 'Redondo-Beach-Breakwater',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Torrance Beach/Haggertys',
@@ -153,7 +153,7 @@
     msw_slug: 'Torrance-Beach-Haggertys',
     spitcast_id: 200,
     spitcast_slug: 'torrance-beach-redondo-beach-ca',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Palos Verdes Cove',
@@ -162,7 +162,7 @@
     surfline_id: 4936,
     msw_id: 4207,
     msw_slug: 'Palos-Verdes-Cove',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Lunada Bay',
@@ -171,7 +171,7 @@
     surfline_id: 4935,
     msw_id: 283,
     msw_slug: 'Lunada-Bay',
-    region: LA,
+    subregion: LA,
   },
   {
     name: 'Ocean Beach',
@@ -182,7 +182,7 @@
     msw_slug: 'Ocean-Beach',
     spitcast_id: 117,
     spitcast_slug: 'south-ocean-beach-san-francisco-ca',
-    region: SF,
+    subregion: SF,
   },
   {
     name: 'Pleasure Point',
@@ -193,7 +193,7 @@
     msw_slug: 'Pleasure-Point',
     spitcast_id: 1,
     spitcast_slug: 'pleasure-point-santa-cruz-ca',
-    region: SC,
+    subregion: SC,
   },
 ]
 
@@ -202,7 +202,7 @@
   spot.name = spot_data[:name]
   spot.lat = spot_data[:lat]
   spot.lon = spot_data[:lon]
-  spot.region = spot_data[:region]
+  spot.subregion = spot_data[:subregion]
   spot.msw_slug = spot_data[:msw_slug]
   spot.spitcast_slug = spot_data[:spitcast_slug]
   spot.save!