various fixes

berk · Nov 4, 2017 · 4dbae3a · 4dbae3a
1 parent 79072de
commit 4dbae3a
Show file tree

Hide file tree

Showing 59 changed files with 2,299 additions and 219 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
-gem 'rails', '4.1.5'
+gem 'rails', '5.1.4'
+gem 'puma', '~> 3.7'
 
 # Declare your gem's dependencies in will_filter.gemspec.
 gemspec

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,149 +1,193 @@
 PATH
   remote: .
   specs:
-    will_filter (4.0.1)
+    will_filter (5.1.0)
       kaminari
       rails (>= 3.2.3)
       sass
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      mail (~> 2.5.4)
-    actionpack (4.1.5)
-      actionview (= 4.1.5)
-      activesupport (= 4.1.5)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.5)
-      activesupport (= 4.1.5)
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.5)
-      activesupport (= 4.1.5)
-      builder (~> 3.1)
-    activerecord (4.1.5)
-      activemodel (= 4.1.5)
-      activesupport (= 4.1.5)
-      arel (~> 5.0.0)
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    autoprefixer-rails (6.4.0.3)
+    arel (8.0.0)
+    autoprefixer-rails (7.1.6)
       execjs
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    builder (3.2.2)
-    coderay (1.1.1)
-    coffee-rails (4.2.1)
+    builder (3.2.3)
+    coderay (1.1.2)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    diff-lcs (1.3)
+    erubi (1.7.0)
     execjs (2.7.0)
-    i18n (0.7.0)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
+    ffi (1.9.18)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
+    jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (1.8.3)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (5.9.0)
-    polyglot (0.3.5)
-    pry (0.10.4)
+    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)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (0.1.4)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    pry (0.11.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.5)
-      actionmailer (= 4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      activemodel (= 4.1.5)
-      activerecord (= 4.1.5)
-      activesupport (= 4.1.5)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.5)
-      sprockets-rails (~> 2.0)
-    railties (4.1.5)
-      actionpack (= 4.1.5)
-      activesupport (= 4.1.5)
+      method_source (~> 0.9.0)
+    puma (3.10.0)
+    rack (2.0.3)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rr (1.2.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.2)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rake (12.2.1)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rr (1.2.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sass (3.4.22)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    sass (3.5.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    slop (3.6.0)
     spork (0.9.2)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.2.2)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (3.0.2)
+    uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     watchr (0.7)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -156,7 +200,8 @@ DEPENDENCIES
   jquery-ui-rails
   kaminari
   pry
-  rails (= 4.1.5)
+  puma (~> 3.7)
+  rails (= 5.1.4)
   rr
   rspec
   rspec-rails
@@ -168,4 +213,4 @@ DEPENDENCIES
   will_filter!
 
 BUNDLED WITH
-   1.11.2
+   1.15.3
diff --git a/app/controllers/will_filter/calendar_controller.rb b/app/controllers/will_filter/calendar_controller.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2016 Michael Berkovich, theiceberk@gmail.com
+# Copyright (c) 2017 Michael Berkovich, theiceberk@gmail.com
 #
 #  __    __  ____  _      _          _____  ____  _     ______    ___  ____
 # |  |__|  ||    || |    | |        |     ||    || |   |      |  /  _]|    \

diff --git a/app/controllers/will_filter/exporter_controller.rb b/app/controllers/will_filter/exporter_controller.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2016 Michael Berkovich, theiceberk@gmail.com
+# Copyright (c) 2017 Michael Berkovich, theiceberk@gmail.com
 #
 #  __    __  ____  _      _          _____  ____  _     ______    ___  ____
 # |  |__|  ||    || |    | |        |     ||    || |   |      |  /  _]|    \

diff --git a/app/controllers/will_filter/filter_controller.rb b/app/controllers/will_filter/filter_controller.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2016 Michael Berkovich, theiceberk@gmail.com
+# Copyright (c) 2017 Michael Berkovich, theiceberk@gmail.com
 #
 #  __    __  ____  _      _          _____  ____  _     ______    ___  ____
 # |  |__|  ||    || |    | |        |     ||    || |   |      |  /  _]|    \

diff --git a/app/models/will_filter/filter.rb b/app/models/will_filter/filter.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2016 Michael Berkovich, theiceberk@gmail.com
+# Copyright (c) 2017 Michael Berkovich, theiceberk@gmail.com
 #
 #  __    __  ____  _      _          _____  ____  _     ______    ___  ____
 # |  |__|  ||    || |    | |        |     ||    || |   |      |  /  _]|    \

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2016 Michael Berkovich, theiceberk@gmail.com
+# Copyright (c) 2017 Michael Berkovich, theiceberk@gmail.com
 #
 #  __    __  ____  _      _          _____  ____  _     ______    ___  ____
 # |  |__|  ||    || |    | |        |     ||    || |   |      |  /  _]|    \