mr_common 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4a4a712e4796b70a13f856f55a3d840119ade02c2c2b94f8e3f5c11758a65d
-  data.tar.gz: 4b260c79d0dc81f9efbde8c4ff168802db0ca042680bedeaed2e7c96558d656f
+  metadata.gz: cb005c3dea79627be3524d98f143154af85c90fdeb4013dcce4f8e391b68ca39
+  data.tar.gz: ee4ee1651df5e88554ca34c7e43c5426fff69d77fe32cc65f8c74607cd51ff0e
 SHA512:
-  metadata.gz: 5cb3d5d4e13c135c87c9534dcc3f9592f5ab87215a42950b42b0dca67fac9d324e159ce4a96135910ff9ddb9998a12a89206cd76cc481210b433c2f3155eaec5
-  data.tar.gz: 6d6c5275d16e58342b4be91603628c61f8b385a7d1642a67096196863727ae0e789f67451b2f9f5ded12658a005bb80f35d00465968d79ba13869934b3726d9e
+  metadata.gz: 12f522e9b24e11d31b97f8ada700461fd997e568ab84c4f8e9a9d9d89d7e2f5f74c5d302ac15d95b0ba6e3d089d87b26ff9d19c261b95acf2dad949e9524c9a6
+  data.tar.gz: c2d7a1b9c9e8e8b7c8b5503ce16c0ce17dbc343ad6e7dcbaeb6cbe96079b46a8486d4e1aad581f74f72e96bff9ea3f73c813bfe6e87d346e8e8e73c5f7e68f97

data/app/assets/stylesheets/mr_common/_forms.scss

@@ -52,6 +52,7 @@ input[type=time],
 textarea {
   display: block;
   border-radius: 2px;
+  background-color: $default-bg;
   border: 1px solid $primary;
   padding: 0.4rem 0.8rem;
   width: 100%;
@@ -79,6 +80,7 @@ select {
   border-radius: 2px;
   border: 1px solid $primary;
   padding: 0.4rem 2rem 0.3rem 0.8rem;
+  background-color: $default-bg;
   background-image: $down-chevron;
   background-position: center;
   background-position-x: calc(100% - 0.5rem);

data/app/assets/stylesheets/mr_common/_layout.scss

@@ -3,6 +3,7 @@ html {
   margin: 0;
   padding: 0;
   width: 100%;
+  background-color: $default-bg;
 }
 
 body {
@@ -11,6 +12,7 @@ body {
   margin: 0;
   position: relative;
   width: 100%;
+  background-color: $default-bg;
 }
 
 body::after {

data/app/assets/stylesheets/mr_common/_variables.scss

@@ -1,4 +1,5 @@
 // Colors
+$default-bg: white;
 $primary: purple;
 $primary-dark: mix($primary, black, 50%);
 $primary-light: mix($primary, white, 50%);

data/app/models/mr_common/reminder.rb

@@ -4,12 +4,6 @@ require_dependency "mr_common/application_record"
 
 module MrCommon
   class Reminder < ApplicationRecord
-    class << self
-      def time_zone_options
-        ActiveSupport::TimeZone::MAPPING.values.sort
-      end
-    end
-
     validates :start_time, presence: true
     validates :end_time, presence: true
     validates :location, presence: true
@@ -17,7 +11,7 @@ module MrCommon
     validates :slug, presence: true, uniqueness: true
     validates :start_time, presence: true
     validates :all_day, inclusion: [true, false]
-    validates :time_zone, presence: true, inclusion: Reminder.time_zone_options, if: -> { time_zone.present? }
+    validates :time_zone, presence: true, inclusion: MrCommon::Timezone.time_zone_options, if: -> { time_zone.present? }
 
     before_validation :parameterize_slug
 

data/app/models/mr_common/timezone.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module MrCommon
+  class Timezone
+    class << self
+      def time_zone_options
+        filtered_time_zones.collect(&:name)
+      end
+
+      def time_zone_select_options
+        filtered_time_zones.collect do |tz|
+          ["(UTC#{tz_utc_offset(tz)}) #{tz_friendly_name(tz)}", tz.name]
+        end
+      end
+
+      private
+        def all_time_zones
+          @timezones ||= TZInfo::Timezone.all.sort_by { |tz| tz.current_period.utc_total_offset }
+        end
+
+        # Include only timezones that have a translation available
+        def filtered_time_zones
+          @filtered_timezones ||= all_time_zones.collect do |tz|
+            next unless tz_friendly_name(tz)
+            tz
+          end.compact
+        end
+
+        def tz_friendly_name(tz)
+          I18n.t(tz.name, scope: :timezones, default: false)
+        end
+
+        def tz_utc_offset(tz)
+          ActiveSupport::TimeZone.seconds_to_utc_offset(tz.current_period.utc_total_offset)
+        end
+    end
+  end
+end

data/app/views/mr_common/reminders/reminders/_form.html.erb

@@ -33,7 +33,7 @@
 
     <%= f.form_group :time_zone, required: true do %>
       <%= f.label :time_zone %>
-      <%= f.select :time_zone, MrCommon::Reminder.time_zone_options, include_blank: true %>
+      <%= f.select :time_zone, MrCommon::Timezone.time_zone_select_options, include_blank: true %>
       <%= f.errors :time_zone %>
     <% end %>
 
@@ -69,4 +69,4 @@
       <% end %>
     </div>
   </div>
-<% end %>
+<% end %>

data/config/locales/en.yml

@@ -0,0 +1,78 @@
+en:
+  timezones:
+    "Etc/GMT+12": "International Date Line West"
+    "Pacific/Midway": "Midway Island, Samoa"
+    "Pacific/Honolulu": "Hawaii"
+    "America/Juneau": "Alaska"
+    "America/Los_Angeles": "Pacific Time (US and Canada); Tijuana"
+    "America/Phoenix": "Arizona"
+    "America/Chihuahua": "Chihuahua, La Paz, Mazatlan"
+    "America/Denver": "Mountain Time (US and Canada)"
+    "America/Belize": "Central America"
+    "America/Chicago": "Central Time (US and Canada)"
+    "America/Mexico_City": "Guadalajara, Mexico City, Monterrey"
+    "America/Regina": "Saskatchewan"
+    "America/Bogota": "Bogota, Lima, Quito"
+    "America/New_York": "Eastern Time (US and Canada)"
+    "America/Indiana/Indianapolis": "Indiana (East)"
+    "America/Glace_Bay": "Atlantic Time (Canada)"
+    "America/Caracas": "Caracas, La Paz"
+    "America/St_Johns": "Newfoundland and Labrador"
+    "America/Argentina/Buenos_Aires": "Buenos Aires, Georgetown"
+    "America/Godthab": "Greenland"
+    "America/Santiago": "Santiago"
+    "America/Sao_Paulo": "Brasilia"
+    "Etc/GMT+2": "Mid-Atlantic"
+    "Atlantic/Azores": "Azores"
+    "Atlantic/Cape_Verde": "Cape Verde Islands"
+    "Atlantic/Canary": "Canary Islands"
+    "Etc/UTC": "Dublin, Edinburgh, Lisbon, London"
+    "Europe/Amsterdam": "Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna"
+    "Europe/Belgrade": "Belgrade, Bratislava, Budapest, Ljubljana, Prague"
+    "Europe/Brussels": "Brussels, Copenhagen, Madrid, Paris"
+    "Africa/Casablanca": "Casablanca, Monrovia"
+    "Europe/Sarajevo": "Sarajevo, Skopje, Warsaw, Zagreb"
+    "Africa/Algiers": "West Central Africa"
+    "Europe/Athens": "Athens, Istanbul, Minsk"
+    "Europe/Bucharest": "Bucharest"
+    "Africa/Cairo": "Cairo"
+    "Africa/Harare": "Harare, Pretoria"
+    "Europe/Helsinki": "Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius"
+    "Asia/Jerusalem": "Jerusalem"
+    "Asia/Baghdad": "Baghdad"
+    "Europe/Moscow": "Moscow, St. Petersburg, Volgograd"
+    "Asia/Kuwait": "Kuwait, Riyadh"
+    "Africa/Nairobi": "Nairobi"
+    "Asia/Tehran": "Tehran"
+    "Asia/Dubai": "Abu Dhabi, Muscat"
+    "Asia/Baku": "Baku, Tbilisi, Yerevan"
+    "Asia/Kabul": "Kabul"
+    "Asia/Yekaterinburg": "Ekaterinburg"
+    "Asia/Karachi": "Islamabad, Karachi, Tashkent"
+    "Asia/Kolkata": "Chennai, Kolkata, Mumbai, New Delhi"
+    "Asia/Colombo": "Sri Jayawardenepura"
+    "Asia/Almaty": "Almaty, Novosibirsk"
+    "Asia/Kathmandu": "Kathmandu"
+    "Asia/Dhaka": "Astana, Dhaka"
+    "Asia/Rangoon": "Yangon Rangoon"
+    "Asia/Bangkok": "Bangkok, Hanoi, Jakarta"
+    "Asia/Krasnoyarsk": "Krasnoyarsk"
+    "Asia/Shanghai": "Beijing, Chongqing, Hong Kong SAR, Urumqi"
+    "Asia/Irkutsk": "Irkutsk, Ulaanbaatar"
+    "Asia/Kuala_Lumpur": "Kuala Lumpur, Singapore"
+    "Australia/Perth": "Perth"
+    "Asia/Taipei": "Taipei"
+    "Asia/Tokyo": "Osaka, Sapporo, Tokyo"
+    "Asia/Seoul": "Seoul"
+    "Asia/Yakutsk": "Yakutsk"
+    "Australia/Darwin": "Darwin"
+    "Australia/Brisbane": "Brisbane"
+    "Pacific/Guam": "Guam, Port Moresby"
+    "Asia/Vladivostok": "Vladivostok"
+    "Australia/Adelaide": "Adelaide"
+    "Australia/Sydney": "Canberra, Melbourne, Sydney"
+    "Australia/Hobart": "Hobart"
+    "Asia/Magadan": "Magadan, Solomon Islands, New Caledonia"
+    "Pacific/Fiji": "Fiji Islands, Kamchatka, Marshall Islands"
+    "Pacific/Auckland": "Auckland, Wellington"
+    "Pacific/Tongatapu": "Nuku'alofa"

data/lib/mr_common/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MrCommon
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/dummy/config/database.yml

@@ -17,6 +17,7 @@
 default: &default
   adapter: postgresql
   encoding: unicode
+  host: localhost
   # For details on connection pooling, see Rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>

data/spec/dummy/db/schema.rb

@@ -30,16 +30,16 @@ ActiveRecord::Schema.define(version: 2019_01_24_160301) do
   end
 
   create_table "mr_common_reminders", force: :cascade do |t|
-    t.datetime "start_time"
-    t.datetime "end_time"
+    t.datetime "start_time", null: false
+    t.datetime "end_time", null: false
     t.string "location", default: "", null: false
     t.string "summary", default: "", null: false
     t.text "description", default: "", null: false
     t.string "slug", default: "", null: false
     t.boolean "all_day", default: false, null: false
+    t.string "time_zone", default: "Etc/UTC", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "time_zone"
     t.boolean "include_in_confirmation_mailer", default: false, null: false
     t.index ["slug"], name: "index_reminders_on_slug", unique: true
   end

data/spec/models/reminder_spec.rb

@@ -75,10 +75,10 @@ module MrCommon
     end
 
     describe ".time_zone_options" do
-      it "is an alias to ActiveSupport::TimeZone::MAPPING.values.sort" do
-        expected = ActiveSupport::TimeZone::MAPPING.values.sort
-        actual = MrCommon::Reminder.time_zone_options
-        expect(actual).to eq expected
+      it "is a subset of TZInfo::Timezone.all names" do
+        expected = TZInfo::Timezone.all.collect(&:name)
+        actual = MrCommon::Timezone.time_zone_options
+        expect(actual - expected).to be_empty
       end
     end
   end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mr_common
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Corey Smedstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: carmen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: carmen
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.2
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2018.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2018.9
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -208,6 +222,7 @@ files:
 - app/models/mr_common/pattern.rb
 - app/models/mr_common/registration.rb
 - app/models/mr_common/reminder.rb
+- app/models/mr_common/timezone.rb
 - app/views/layouts/mr_common/_flash.html.erb
 - app/views/layouts/mr_common/_footer.html.erb
 - app/views/layouts/mr_common/_navigation.html.erb
@@ -230,6 +245,7 @@ files:
 - app/views/mr_common/reminders/reminders/index.html.erb
 - app/views/mr_common/reminders/reminders/new.html.erb
 - app/views/mr_common/reminders/reminders/show.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20190110202347_create_reminders.rb
 - db/migrate/20190122185500_create_registrations.rb