Merge pull request #86 from digitaltom/rails_5.2

initial port to rails 5
digitaltom · Aug 11, 2019 · 11c3bb7 · 11c3bb7
2 parents 418e134 + 00359e7
commit 11c3bb7
Show file tree

Hide file tree

Showing 23 changed files with 145 additions and 114 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,18 +2,18 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2'
+gem 'rails', '~> 5.2'
 # angular-rails-templates currently only works with sprocket-rails 2
-gem 'sprockets-rails', '~> 3.2.1'
+gem 'sprockets-rails'
 
 gem 'angular-rails-templates'
 gem 'angular_rails_csrf'
 gem 'haml'
 
 source 'https://rails-assets.org' do
-  gem 'rails-assets-angular', '1.4.5'
-  gem 'rails-assets-angular-route', '1.4.5'
-  gem 'rails-assets-lazysizes', '4.1.8'
+  gem 'rails-assets-angular'
+  gem 'rails-assets-angular-route'
+  gem 'rails-assets-lazysizes'
 end
 
 gem 'uglifier', '>= 1.3.0'
@@ -22,7 +22,6 @@ gem 'uglifier', '>= 1.3.0'
 
 # Use Puma as the app server
 gem 'puma'
-gem 'quiet_assets'
 
 # file upload + qrcode
 gem 'config-parser'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,39 +2,46 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actionmailer (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
+    actioncable (5.2.3)
+      actionpack (= 5.2.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.11.1)
-      actionview (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.11.1)
-      activesupport (= 4.2.11.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.11.1)
-      activesupport (= 4.2.11.1)
-      builder (~> 3.1)
-    activerecord (4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      arel (~> 6.0)
-    activesupport (4.2.11.1)
-      i18n (~> 0.7)
+    activejob (5.2.3)
+      activesupport (= 5.2.3)
+      globalid (>= 0.3.6)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activerecord (5.2.3)
+      activemodel (= 5.2.3)
+      activesupport (= 5.2.3)
+      arel (>= 9.0)
+    activestorage (5.2.3)
+      actionpack (= 5.2.3)
+      activerecord (= 5.2.3)
+      marcel (~> 0.3.1)
+    activesupport (5.2.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
@@ -45,7 +52,7 @@ GEM
     angular_rails_csrf (3.2.0)
       railties (>= 3, < 6)
     ansi (1.5.0)
-    arel (6.0.4)
+    arel (9.0.0)
     ast (2.4.0)
     awesome_print (1.8.0)
     builder (3.2.3)
@@ -65,25 +72,29 @@ GEM
       rake (< 13.0)
     concurrent-ruby (1.1.5)
     config-parser (0.3.0)
-    coveralls (0.8.23)
-      json (>= 1.8, < 3)
-      simplecov (~> 0.16.1)
-      term-ansicolor (~> 1.3)
-      thor (>= 0.19.4, < 2.0)
-      tins (~> 1.6)
+    coveralls (0.7.1)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crass (1.0.4)
     diff-lcs (1.3)
-    docile (1.3.1)
-    erubis (2.7.0)
+    docile (1.3.2)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    erubi (1.8.0)
     eventmachine (1.0.9)
     execjs (2.7.0)
     ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    haml (5.1.1)
+    haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    i18n (0.9.5)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
     json (2.2.0)
@@ -92,9 +103,18 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mimemagic (0.3.3)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
+    multi_json (1.13.1)
+    netrc (0.11.0)
     nio4r (2.4.0)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
@@ -107,48 +127,50 @@ GEM
     public_suffix (3.1.1)
     puma (4.1.0)
       nio4r (~> 2.0)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
-    rack (1.6.11)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.11.1)
-      actionmailer (= 4.2.11.1)
-      actionpack (= 4.2.11.1)
-      actionview (= 4.2.11.1)
-      activejob (= 4.2.11.1)
-      activemodel (= 4.2.11.1)
-      activerecord (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.11.1)
-      sprockets-rails
-    rails-assets-angular (1.4.5)
-    rails-assets-angular-route (1.4.5)
-      rails-assets-angular (= 1.4.5)
-    rails-assets-lazysizes (4.1.8)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.3)
+      actioncable (= 5.2.3)
+      actionmailer (= 5.2.3)
+      actionpack (= 5.2.3)
+      actionview (= 5.2.3)
+      activejob (= 5.2.3)
+      activemodel (= 5.2.3)
+      activerecord (= 5.2.3)
+      activestorage (= 5.2.3)
+      activesupport (= 5.2.3)
+      bundler (>= 1.3.0)
+      railties (= 5.2.3)
+      sprockets-rails (>= 2.0.0)
+    rails-assets-angular (1.7.5)
+    rails-assets-angular-route (1.7.5)
+      rails-assets-angular (= 1.7.5)
+    rails-assets-lazysizes (5.1.1)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.11.1)
-      actionpack (= 4.2.11.1)
-      activesupport (= 4.2.11.1)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
     regexp_parser (1.6.0)
-    rspec-core (3.8.0)
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-rails (3.8.2)
@@ -159,23 +181,23 @@ GEM
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.0.1)
+    rubocop-rails (2.2.1)
       rack (>= 1.1)
-      rubocop (>= 0.70.0)
+      rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
     rubyzip (1.2.3)
     selenium-webdriver (3.142.3)
       childprocess (>= 0.5, < 2.0)
       rubyzip (~> 1.2, >= 1.2.2)
-    simplecov (0.16.1)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -199,16 +221,22 @@ GEM
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.9)
-    tins (1.20.2)
+    tins (1.21.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
     webdrivers (4.1.2)
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (>= 3.0, < 4.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -227,17 +255,16 @@ DEPENDENCIES
   haml
   pi_piper
   puma
-  quiet_assets
-  rails (~> 4.2)
-  rails-assets-angular (= 1.4.5)!
-  rails-assets-angular-route (= 1.4.5)!
-  rails-assets-lazysizes (= 4.1.8)!
+  rails (~> 5.2)
+  rails-assets-angular!
+  rails-assets-angular-route!
+  rails-assets-lazysizes!
   rspec-rails
   rubocop
   rubocop-rails
   simplecov
   simplecov-console
-  sprockets-rails (~> 3.2.1)
+  sprockets-rails
   uglifier (>= 1.3.0)
   webdrivers
 

diff --git a/public/images/shoot_animation.gif → app/assets/images/shoot_animation.gif b/public/images/shoot_animation.gif → app/assets/images/shoot_animation.gif
diff --git a/public/images/shoot_animation2.gif → app/assets/images/shoot_animation2.gif b/public/images/shoot_animation2.gif → app/assets/images/shoot_animation2.gif
diff --git a/public/images/shoot_animation3.gif → app/assets/images/shoot_animation3.gif b/public/images/shoot_animation3.gif → app/assets/images/shoot_animation3.gif
diff --git a/public/images/shoot_animation4.gif → app/assets/images/shoot_animation4.gif b/public/images/shoot_animation4.gif → app/assets/images/shoot_animation4.gif
diff --git a/app/assets/images/shoot_still.png b/app/assets/images/shoot_still.png
diff --git a/public/images/shoot_still_sw.png → app/assets/images/shoot_still_sw.png b/public/images/shoot_still_sw.png → app/assets/images/shoot_still_sw.png
diff --git a/app/assets/templates/picture_set.html.haml b/app/assets/templates/picture_set.html.haml
@@ -2,24 +2,24 @@
   %img{'ng-src'=>'/{{picture_set.path}}/{{picture_set.animation}}'}
 
 #button-start
-  %a.btn.btn-default.btn-lg{ 'ng-href' => "#/" }
+  %a.btn.btn-default.btn-lg{ 'ng-href' => "#!/" }
     %span
       = image_tag 'take_picture.png', {:class => 'shoot_img_btn'}
     %b Start
-  %a.btn.btn-default.btn-lg{ 'ng-show' => 'send_by_email', 'ng-href' => "#/picture_set/{{picture_set.date}}/email" }
+  %a.btn.btn-default.btn-lg{ 'ng-show' => 'send_by_email', 'ng-href' => "#!/picture_set/{{picture_set.date}}/email" }
     %b Send by email
-  %a.btn.btn-default.btn-lg{ 'ng-href' => "#/picture_set/{{picture_set.date}}/gallery" }
+  %a.btn.btn-default.btn-lg{ 'ng-href' => "#!/picture_set/{{picture_set.date}}/gallery" }
     %b Single pictures
-  %a.btn.btn-default.btn-lg{ 'ng-href' => "#/slideshow/{{picture_set.date}}" }
+  %a.btn.btn-default.btn-lg{ 'ng-href' => "#!/slideshow/{{picture_set.date}}" }
     %b Slideshow
 
 
 #button-next
-  %a.btn.btn-default.btn-lg{ 'ng-href' => "#/picture_set/{{picture_set.next.date}}" }
+  %a.btn.btn-default.btn-lg{ 'ng-href' => "#!/picture_set/{{picture_set.next.date}}" }
     %b > Next
 
 #button-last
-  %a.btn.btn-default.btn-lg{ 'ng-href' => "#/picture_set/{{picture_set.last.date}}" }
+  %a.btn.btn-default.btn-lg{ 'ng-href' => "#!/picture_set/{{picture_set.last.date}}" }
     %b Last <
 
 #button-delete{ 'ng-hide' => 'rw' }

diff --git a/app/assets/templates/picture_set_email.html.haml b/app/assets/templates/picture_set_email.html.haml
@@ -16,5 +16,5 @@
       %img.img-responsive.center-block{'ng-src'=>'/{{picture_set.path}}/{{picture_set.animation}}'}
 
   .row.text-center
-    %a.btn.btn-default.btn-lg{ 'ng-href' => "#/picture_set/{{picture_set.date}}" }
+    %a.btn.btn-default.btn-lg{ 'ng-href' => "#!/picture_set/{{picture_set.date}}" }
       %b Back
diff --git a/app/assets/templates/picture_set_gallery.html.haml b/app/assets/templates/picture_set_gallery.html.haml
@@ -7,7 +7,7 @@
       %a.thumbnail{ 'ng-href' => "{{picture_set.path}}/{{picture_set.combined}}" }
         %img.img-responsive{ style: 'width:400px;', 'ng-src' => "{{picture_set.path}}/{{picture_set.combined}}", alt: "" }
   .row.text-center
-    %a.btn.btn-default.btn-lg{ 'ng-href' => "#/picture_set/{{picture_set.date}}" }
+    %a.btn.btn-default.btn-lg{ 'ng-href' => "#!/picture_set/{{picture_set.date}}" }
       %b Back
-    %a.btn.btn-default.btn-lg{ 'ng-show' => 'send_by_email', 'ng-href' => "#/picture_set/{{picture_set.date}}/email" }
+    %a.btn.btn-default.btn-lg{ 'ng-show' => 'send_by_email', 'ng-href' => "#!/picture_set/{{picture_set.date}}/email" }
       %b Send per email
diff --git a/app/assets/templates/picture_sets.html.haml b/app/assets/templates/picture_sets.html.haml
@@ -7,7 +7,7 @@
       Click here to take a picture
 
   %span{ 'ng-repeat' => 'picture_set in picture_sets'}
-    %a{href: '#/picture_set/{{picture_set.date}}'}
+    %a{href: '#!/picture_set/{{picture_set.date}}'.html_safe}
       %img.gallery-img.lazyload{'data-src' => '{{picture_set.path}}/{{picture_set.animation}}'}
 
   %h3