Commit d723a6c

@@ -7,6 +7,6 @@ class Gym < ActiveRecord::Base
   private
 
   def assign_location
-    self.latitude, self.longitude = Location.from(address, city, state, country)
+    self.latitude, self.longitude = Location.from(address, city, region, country)
   end
 end

@@ -1,6 +1,6 @@
 class Location
-  def self.from(address, city, state, country)
-    results = Geocoder.search("#{address}, #{city}, #{state}, #{country}")
+  def self.from(address, city, region, country)
+    results = Geocoder.search("#{address}, #{city}, #{region}, #{country}")
     results.any? ? results.first.coordinates : [nil, nil]
   end
 end

@@ -4,8 +4,9 @@ class CreateGyms < ActiveRecord::Migration
       t.string :name, null: false
       t.string :address
       t.string :city
-      t.string :state
+      t.string :region
       t.string :country
+      t.string :postal_code
       t.decimal :latitude, precision: 10, scale: 6
       t.decimal :longitude, precision: 10, scale: 6
       t.timestamps null: false

@@ -42,15 +42,16 @@ ActiveRecord::Schema.define(version: 20160430041813) do
   end
 
   create_table "gyms", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
-    t.string   "name",                                null: false
+    t.string   "name",                                 null: false
     t.string   "address"
     t.string   "city"
-    t.string   "state"
+    t.string   "region"
     t.string   "country"
-    t.decimal  "latitude",   precision: 10, scale: 6
-    t.decimal  "longitude",  precision: 10, scale: 6
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
+    t.string   "postal_code"
+    t.decimal  "latitude",    precision: 10, scale: 6
+    t.decimal  "longitude",   precision: 10, scale: 6
+    t.datetime "created_at",                           null: false
+    t.datetime "updated_at",                           null: false
   end
 
   create_table "profiles", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|

@@ -20,7 +20,7 @@ describe Gym do
       subject.assign_attributes(
         address: '123 street sw',
         city: 'edmonton',
-        state: 'alberta',
+        region: 'alberta',
         country: 'canada',
       )
       subject.save!

@@ -57,7 +57,8 @@ FactoryGirl.define do
     name { FFaker::Internet.user_name }
     address { FFaker::Address.street_address }
     city { FFaker::AddressCA.city }
-    state { FFaker::AddressCA.city }
+    region { FFaker::AddressCA.province }
+    postal_code { FFaker::AddressCA.postal_code }
     country { FFaker::Address.country }
   end
 end