Merge pull request #558 from RefugeRestrooms/develop

Deploy! Deploy!

.ruby-version

@@ -1 +1 @@
-2.3.7
+2.5.3

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.7-slim
+FROM ruby:2.5.3-slim
 ENV PHANTOM_JS=2.1.1
 
 # Add basic binaries

Gemfile

@@ -1,9 +1,9 @@
 source 'https://rubygems.org'
-ruby '2.3.7'
+ruby '2.5.3'
 
 gem 'rails', '5.2.1'
 
-gem 'activeadmin', '~> 1.3'
+gem 'activeadmin', '~> 1.4.1'
 gem 'bootsnap', require: false
 gem 'bootstrap-sass'
 gem 'bugsnag'
@@ -18,7 +18,8 @@ gem 'haml'
 gem 'high_voltage', '~> 3.0.0'
 gem 'http_accept_language'
 gem 'jbuilder', '~> 2.5'
-gem 'kaminari', '~> 0.17.0'
+gem 'kaminari', '~> 1.1.1'
+gem 'kaminari-grape', '~> 1.0'
 gem 'mail_form', '>= 1.7.0'
 gem 'pg'
 gem 'pg_search'
@@ -32,10 +33,6 @@ gem 'turbolinks'
 gem 'uglifier', '>= 1.3.0'
 gem 'webpacker', '~> 3.5'
 
-group :production do
-  gem 'rails_12factor'
-end
-
 group :development, :test do
   gem 'better_errors', '~> 2.4.0'
   gem 'binding_of_caller'
@@ -55,7 +52,7 @@ group :test do
   gem 'database_cleaner'
   gem 'poltergeist'
   gem 'simplecov', '~> 0.7.1', require: false
-  gem 'webmock', '~> 1.18.0'
+  gem 'webmock', '~> 3.2.1'
 end
 
 group :doc do

Gemfile.lock

@@ -24,7 +24,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activeadmin (1.3.1)
+    activeadmin (1.4.1)
       arbre (>= 1.1.1)
       coffee-rails
       formtastic (~> 3.1)
@@ -98,7 +98,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     countries (2.1.4)
       i18n_data (~> 0.8.0)
       money (~> 6.9)
@@ -166,10 +166,11 @@ GEM
     has_scope (0.7.2)
       actionpack (>= 4.1)
       activesupport (>= 4.1)
+    hashdiff (0.3.7)
     hashie (3.6.0)
     high_voltage (3.0.0)
     http_accept_language (2.1.1)
-    i18n (1.1.0)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     i18n-debug (1.1.1)
       i18n (< 2)
@@ -187,9 +188,21 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
+    kaminari-grape (1.0.1)
+      grape
+      kaminari-core (~> 1.0)
     kramdown (1.15.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -263,11 +276,6 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    rails_12factor (0.0.3)
-      rails_serve_static_assets
-      rails_stdout_logging
-    rails_serve_static_assets (0.0.5)
-    rails_stdout_logging (0.0.5)
     railties (5.2.1)
       actionpack (= 5.2.1)
       activesupport (= 5.2.1)
@@ -276,7 +284,7 @@ GEM
       thor (>= 0.19.0, < 2.0)
     rake (12.3.1)
     rakismet (1.5.4)
-    ransack (2.0.1)
+    ransack (2.1.0)
       actionpack (>= 5.0)
       activerecord (>= 5.0)
       activesupport (>= 5.0)
@@ -356,9 +364,10 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
     warden (1.2.7)
       rack (>= 1.0)
-    webmock (1.18.0)
+    webmock (3.2.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
     webpacker (3.5.5)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
@@ -373,7 +382,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeadmin (~> 1.3)
+  activeadmin (~> 1.4.1)
   better_errors (~> 2.4.0)
   binding_of_caller
   bootsnap
@@ -395,7 +404,8 @@ DEPENDENCIES
   http_accept_language
   i18n-debug
   jbuilder (~> 2.5)
-  kaminari (~> 0.17.0)
+  kaminari (~> 1.1.1)
+  kaminari-grape (~> 1.0)
   listen (>= 3.0.5, < 3.2)
   mail_form (>= 1.7.0)
   pg
@@ -406,7 +416,6 @@ DEPENDENCIES
   rack-cors
   rack-jsonp
   rails (= 5.2.1)
-  rails_12factor
   rakismet
   rspec-rails
   sass-rails
@@ -416,11 +425,11 @@ DEPENDENCIES
   turbolinks
   tzinfo-data
   uglifier (>= 1.3.0)
-  webmock (~> 1.18.0)
+  webmock (~> 3.2.1)
   webpacker (~> 3.5)
 
 RUBY VERSION
-   ruby 2.3.7p456
+   ruby 2.5.3p105
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

README.md

@@ -29,7 +29,7 @@ Please also read our [Code of Conduct](https://github.com/RefugeRestrooms/refuge
 
 ## Tech
 
-* Ruby Version - ruby-2.3.0
+* Ruby Version - ruby-2.5.3
 * Ruby on Rails
 * RSpec
 * Javascript

app/views/restrooms/_restroom.html.haml

@@ -24,9 +24,10 @@
     .itemDistance
       - if restroom.respond_to?(:distance)
         = restroom.distance.round(2)
-        miles /
+        = t("restroom.distance.miles")
+        \/
         = miles_to_kilometers(restroom.distance).round(2)
-        kilometers
+        = t("restroom.distance.kilometers")
     .itemIcons
       - if restroom.unisex?
         .unisexRestroom{:title => t("restroom.type.unisex")}

config/environments/production.rb

@@ -20,9 +20,8 @@
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  # config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
-  config.public_file_server.enabled = false
-
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass

config/locales/en/restroom.en.yml

@@ -20,6 +20,9 @@ en:
     guess_location: 'Guess current location'
     directions: 'Directions'
     directions_hint: '(e.g.: third floor in the back, by the dressing rooms...)'
+    distance:
+      miles: miles
+      kilometers: kilometers
     comments_hint: '(e.g.: you have to be a "paying customer", just act like you are browsing for a bit...)'
     comments: 'Comments'
     accessible: 'Accessible'

config/locales/es/restroom.es.yml

@@ -20,6 +20,9 @@ es:
     guess_location: 'Encontrar ubicación actual'
     directions: 'Direcciones'
     directions_hint: '(por ejemplo: tercer piso al fondo, al lado de los vestidores...)'
+    distance:
+      miles: millas
+      kilometers: kilómetros
     comments_hint: '(e.g.: baños son solo para "consumidores", hay que actuar como que estas por comprar algo...)'
     comments: 'Comentarios'
     accessible: 'Es accesible'

config/locales/fr/restroom.fr.yml

@@ -20,6 +20,9 @@ fr:
     guess_location: 'Trouver ma position actuelle'
     directions: 'Indications'
     directions_hint: "(ex: troisième étage au fond, à coté des cabines d'essayage...)"
+    distance:
+      miles: milles
+      kilometers: kilomètres
     comments_hint: '(ex: vous devez être un client, faites comme si vous cherchiez quelque chose...)'
     comments: 'Commentaires'
     accessible: 'Accessible'

config/locales/hi/restroom.hi.yml

@@ -20,6 +20,9 @@ hi:
     guess_location: 'वर्तमान स्थान का अनुमान'
     directions: 'दिशानिर्देश'
     directions_hint: 'उदाहरण: पीछे की तीसरी मंजिल, ड्रेसिंग रूम द्वारा ...)'
+    distance:
+      miles: मील
+      kilometers: किलोमीटर
     comments_hint: '(उदाहरण: आपको "भुगतान करने वाला ग्राहक" होना है, बस कार्य करें जैसे आप थोड़ी देर के लिए ब्राउज़ कर रहे हैं ...)'
     comments: 'टिप्पणियां'
     accessible: 'सुलभ'

config/locales/it/restroom.it.yml

@@ -20,6 +20,9 @@ it:
     guess_location: 'Deduci posizione attuale'
     directions: 'Indicazioni'
     directions_hint: '(es.: terzo piano sul retro, vicino agli spogliatoi...)'
+    distance:
+      miles: miglias
+      kilometers: chilometri
     comments_hint: "(es.: devi essere un \"cliente pagante\", devi solo comportarti come se stessi cercando un po'...)"
     comments: 'Commenti'
     accessible: 'Accessibile'

config/locales/pl/restroom.pl.yml

@@ -20,6 +20,9 @@ pl:
     guess_location: 'Obecna lokalizacja urządzenia'
     directions: 'Wskazówki'
     directions_hint: '(np.: na trzecim piętrze, obok baru, koło przebieralni...)'
+    distance:
+      miles: mi
+      kilometers: km
     comments_hint: '(np.: musisz coś kupić, udawaj że się rozglądasz z zamiarem zakupu...)'
     comments: 'Komentarze'
     accessible: 'Dostęp dla osób niepełnosprawnych'

config/locales/pt-BR/restroom.pt-BR.yml

@@ -20,6 +20,9 @@ pt-BR:
     guess_location: 'Adivinhar localização atual'
     directions: 'Instruções'
     directions_hint: '(por exemplo: terceiro andar nos fundos, perto dos vestiários...)'
+    distance:
+      miles: milhas
+      kilometers: quilômetros
     comments_hint: '(por exemplo: você tem que ser um "consumidor pagante", aja como se estivesse dando uma olhada...)'
     comments: 'Comentários'
     accessible: 'Acessível'

package.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "yarn": ">=1.0.2",
     "@rails/webpacker": "3.5",
-    "rails-erb-loader": "^5.4.2",
     "bootstrap": "^4.1.1",
     "jquery": "^3.3.1",
     "jquery-ujs": "^1.2.2",
-    "popper.js": "^1.14.3"
+    "popper.js": "^1.14.3",
+    "rails-erb-loader": "^5.4.2",
+    "yarn": ">=1.0.2"
   },
   "devDependencies": {
-    "webpack-dev-server": "2.11.2"
+    "webpack-dev-server": "^3.1.14"
   },
   "engines": {
     "yarn": ">=1.0.2"