Merge pull request gregschmit#141 from GetJobber/upgrade_rails_6

jessevanherk · web-flow · commit 742dc12f4fb3 · 2020-08-31T10:58:44.000-06:00
Upgrade rails 6

- add support for rails 6 - move helper and middleware to lib/ as mentioned in rails/issues/336363
- fix sprockets and autoload errors through the project
- update specs for newer style
- update Travis CI yml
- update dummy app - remove redundant files and add post route to display params instead of routes error screen
- make Gemfile clean (includes only gemspec)
-  move some files under /lib since they're logically part of the gem rather than the app, and make them easier to autoload.
diff --git a/.travis.yml b/.travis.yml
@@ -1,38 +1,63 @@
-sudo: false
 language: ruby
 script: bundle exec rspec spec
+
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.5
   - 2.2.0
   - 2.3.7
+  - 2.4.9
+  - 2.5.3
+  - 2.6.5
   - jruby-19mode
+
 gemfile:
   - spec/gemfiles/Gemfile.rails-4.0.x
   - spec/gemfiles/Gemfile.rails-4.1.x
   - spec/gemfiles/Gemfile.rails-4.2.x
   - spec/gemfiles/Gemfile.rails-5.0.x
-matrix:
+  - spec/gemfiles/Gemfile.rails-6.0.x
+
+jobs:
   exclude:
-    - rvm: 1.9.3
-      gemfile: spec/gemfiles/rails-4.0.x.gemfile
-    - rvm: 1.9.3
-      gemfile: spec/gemfiles/rails-5.0.x.gemfile
-    - rvm: 1.9.3
-      gemfile: spec/gemfiles/rails-4.1.x.gemfile
-    - rvm: 1.9.3
-      gemfile: spec/gemfiles/rails-5.0.x.gemfile
-    - rvm: 1.9.3
-      gemfile: spec/gemfiles/rails-4.2.x.gemfile
     - rvm: 2.0.0
-      gemfile: spec/gemfiles/rails-5.0.x.gemfile
+      gemfile: spec/gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.0.0
+      gemfile: spec/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.1.5
+      gemfile: spec/gemfiles/Gemfile.rails-5.0.x
     - rvm: 2.1.5
-      gemfile: spec/gemfiles/rails-5.0.x.gemfile
-    - rvm: 2.2.2
-      gemfile: spec/gemfiles/rails-5.0.x.gemfile
+      gemfile: spec/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.2.0
+      gemfile: spec/gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.2.0
+      gemfile: spec/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.3.7
+      gemfile: spec/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.4.9
+      gemfile: spec/gemfiles/Gemfile.rails-4.0.x
+    - rvm: 2.4.9
+      gemfile: spec/gemfiles/Gemfile.rails-4.1.x
+    - rvm: 2.4.9
+      gemfile: spec/gemfiles/Gemfile.rails-6.0.x
+    - rvm: 2.5.3
+      gemfile: spec/gemfiles/Gemfile.rails-4.0.x
+    - rvm: 2.5.3
+      gemfile: spec/gemfiles/Gemfile.rails-4.1.x
+    - rvm: 2.6.5
+      gemfile: spec/gemfiles/Gemfile.rails-4.0.x
+    - rvm: 2.6.5
+      gemfile: spec/gemfiles/Gemfile.rails-4.1.x
+    - rvm: jruby-19mode
+      gemfile: spec/gemfiles/Gemfile.rails-4.0.x
+    - rvm: jruby-19mode
+      gemfile: spec/gemfiles/Gemfile.rails-4.1.x
     - rvm: jruby-19mode
-      gemfile: spec/gemfiles/Gemfile.rails-3.2.x
-  fast_finish: true
+      gemfile: spec/gemfiles/Gemfile.rails-4.2.x
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,2 @@
 source 'https://rubygems.org'
 gemspec
-
-gem 'pg', platform: :ruby
-gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-
-gem 'jquery-rails'
-
-gem 'rails', '~> 4.0.12'
-gem 'sass-rails', '~> 4.0.5'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    recurring_select (2.1.0)
+    recurring_select (3.0.0)
       coffee-rails (>= 3.1)
       ice_cube (>= 0.11)
       jquery-rails (>= 3.0)
@@ -51,7 +51,7 @@ GEM
     hike (1.2.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    ice_cube (0.16.2)
+    ice_cube (0.16.3)
     jquery-rails (3.1.5)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -60,7 +60,6 @@ GEM
     mime-types (2.6.2)
     minitest (4.7.5)
     multi_json (1.15.0)
-    pg (0.17.1)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -122,16 +121,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcpostgresql-adapter
   bundler (>= 1.3.5)
-  jquery-rails
-  pg
-  rails (~> 4.0.12)
   rake (>= 0.9.6)
   recurring_select!
   rspec (>= 2.14)
   rspec-rails (>= 2.14)
-  sass-rails (~> 4.0.5)
 
 BUNDLED WITH
-   1.16.2
+   1.17.2
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Recurring Select
 
-[![Build Status](https://travis-ci.org/GetJobber/recurring_select.png?branch=master)](https://travis-ci.org/GetJobber/recurring_select) [![Code Climate](https://codeclimate.com/github/GetJobber/recurring_select.png)](https://codeclimate.com/github/GetJobber/recurring_select)
+[![Build Status](https://travis-ci.org/GetJobber/recurring_select.svg?branch=master)](https://travis-ci.org/GetJobber/recurring_select) [![Code Climate](https://codeclimate.com/github/GetJobber/recurring_select.png)](https://codeclimate.com/github/GetJobber/recurring_select)
 
 This gem adds selectors and helpers for working with recurring schedules in a Rails app. It uses [ice_cube](https://github.com/seejohnrun/ice_cube) recurring scheduling gem.
 
diff --git a/app/assets/javascripts/jquery-mobile-rs.js.coffee b/app/assets/javascripts/jquery-mobile-rs.js.coffee
@@ -1,5 +1,5 @@
-//= require recurring_select
-//= require_self
+#= require recurring_select
+#= require_self
 
 $ ->
   $(document).on "recurring_select:cancel recurring_select:save", ".recurring_select", ->
diff --git a/app/assets/javascripts/recurring_select.js.coffee b/app/assets/javascripts/recurring_select.js.coffee
@@ -1,5 +1,5 @@
-//= require recurring_select_dialog
-//= require_self
+#= require recurring_select_dialog
+#= require_self
 
 $ = jQuery
 $ ->
diff --git a/lib/helpers/recurring_select_helper.rb b/lib/helpers/recurring_select_helper.rb
diff --git a/lib/middleware/recurring_select_middleware.rb b/lib/middleware/recurring_select_middleware.rb
diff --git a/lib/recurring_select.rb b/lib/recurring_select.rb
@@ -25,8 +25,7 @@ def self.is_valid_rule?(possible_rule)
 
     if possible_rule.is_a?(String)
       begin
-        JSON.parse(possible_rule)
-        return true
+        return JSON.parse(possible_rule).is_a?(Hash)
       rescue JSON::ParserError
         return false
       end
diff --git a/lib/recurring_select/engine.rb b/lib/recurring_select/engine.rb
@@ -1,16 +1,19 @@
+require "helpers/recurring_select_helper"
+require "middleware/recurring_select_middleware"
+
 module RecurringSelect
   class Engine < Rails::Engine
-    
+
     initializer "recurring_select.extending_form_builder" do |app|
     # config.to_prepare do
       ActionView::Helpers::FormHelper.send(:include, RecurringSelectHelper::FormHelper)
       ActionView::Helpers::FormOptionsHelper.send(:include, RecurringSelectHelper::FormOptionsHelper)
       ActionView::Helpers::FormBuilder.send(:include, RecurringSelectHelper::FormBuilder)
     end
-    
+
     initializer "recurring_select.connecting_middleware" do |app|
-      app.middleware.use RecurringSelectMiddleware # insert_after ActionDispatch::ParamsParser, 
+      app.middleware.use RecurringSelectMiddleware # insert_after ActionDispatch::ParamsParser,
     end
-    
+
   end
 end
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
@@ -0,0 +1,2 @@
+//= link application.css
+//= link application.js
diff --git a/spec/dummy/app/assets/javascripts/sample.js b/spec/dummy/app/assets/javascripts/sample.js
diff --git a/spec/dummy/app/assets/stylesheets/application.scss b/spec/dummy/app/assets/stylesheets/application.scss
@@ -7,5 +7,5 @@
 */
 
 
-body {background-color:#ccc;}
-form { margin:100px; padding:50px; border:1px solid #ccc; background-color:#fff;}
+body {background-color:#ccc;padding:100px;}
+form, section {padding:50px;background-color:#fff;}
diff --git a/spec/dummy/app/controllers/sample_controller.rb b/spec/dummy/app/controllers/sample_controller.rb
@@ -3,4 +3,7 @@ class SampleController < ApplicationController
   def index
   end
 
+  def result
+    render 'result', locals: { fake_model: params[:fake_model] }
+  end
 end
diff --git a/spec/dummy/app/helpers/application_helper.rb b/spec/dummy/app/helpers/application_helper.rb
diff --git a/spec/dummy/app/helpers/sample_helper.rb b/spec/dummy/app/helpers/sample_helper.rb
diff --git a/spec/dummy/app/views/sample/index.html.erb b/spec/dummy/app/views/sample/index.html.erb
@@ -1,4 +1,4 @@
-<%= form_for FakeModel.new, :url => root_url do |f| %>
+<%= form_for FakeModel.new, :url => result_url do |f| %>
 
   <p>
     <%= f.label :recurring_rules, "no defaults and not set" %><br/>
diff --git a/spec/dummy/app/views/sample/result.html.erb b/spec/dummy/app/views/sample/result.html.erb
@@ -0,0 +1,4 @@
+<section>
+  <h1>Fake Model Params</h1>
+  <%= fake_model %>
+</section>
diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb
@@ -27,4 +27,5 @@
 
   # Expands the lines which load the assets
   config.assets.debug = true
+  config.eager_load = false
 end
diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb
@@ -57,4 +57,5 @@
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+  config.eager_load = true
 end
diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
@@ -33,4 +33,5 @@
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+  config.eager_load = false
 end
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
@@ -1,3 +1,4 @@
 Dummy::Application.routes.draw do
+  post '/result', to: 'sample#result', as: :result
   root to: 'sample#index'
 end
diff --git a/spec/gemfiles/Gemfile.rails-5.0.x b/spec/gemfiles/Gemfile.rails-5.0.x
@@ -4,5 +4,7 @@ gemspec :path => "./../.."
 gem 'pg', platform: :ruby
 gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
 
+gem "jquery-rails"
+
 gem "rails", "~> 5.2"
-gem "sass-rails", "~> 5.0"
+gem "sass-rails", "~> 5.0"
diff --git a/spec/gemfiles/Gemfile.rails-6.0.x b/spec/gemfiles/Gemfile.rails-6.0.x
@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem 'pg', platform: :ruby
+gem 'activerecord-jdbcpostgresql-adapter', "~> 60.0", platform: :jruby
+
+gem "jquery-rails"
+
+gem "rails", "~> 6.0"
+gem "sass-rails", "~> 6.0"
diff --git a/spec/lib/helpers/recurring_select_helper_spec.rb b/spec/lib/helpers/recurring_select_helper_spec.rb
@@ -9,7 +9,7 @@ class FromTester
   describe "#recurring_options_for_select" do
     it "should use the correct options (basic)" do
       subject = FromTester.new
-      subject.should_receive(:options_for_select).with(
+      expect(subject).to receive(:options_for_select).with(
         [
           ['- not recurring -', 'null'],
           ['Set schedule...', 'custom']
@@ -20,7 +20,7 @@ class FromTester
 
     it "should use the correct options (no defaults but custom rule)" do
       subject = FromTester.new
-      subject.should_receive(:options_for_select).with(
+      expect(subject).to receive(:options_for_select).with(
         [
           ["Weekly", IceCube::Rule.weekly.to_hash.to_json],
           ['or', {:disabled => true}],
@@ -32,7 +32,7 @@ class FromTester
 
     it "should use the correct options (defaults with no rule)" do
       subject = FromTester.new
-      subject.should_receive(:options_for_select).with(
+      expect(subject).to receive(:options_for_select).with(
         [
           ["Weekly", IceCube::Rule.weekly.to_hash.to_json],
           ["Monthly", IceCube::Rule.monthly.to_hash.to_json],
@@ -45,7 +45,7 @@ class FromTester
 
     it "should use the correct options (non-recurring rule with defaults)" do
       subject = FromTester.new
-      subject.should_receive(:options_for_select).with(
+      expect(subject).to receive(:options_for_select).with(
         [
           ["- not recurring -", 'null'],
           ["different", 1],
diff --git a/spec/lib/recurring_select_spec.rb b/spec/lib/recurring_select_spec.rb
@@ -2,48 +2,48 @@
 
 describe RecurringSelect do
   it "should be a module" do
-    RecurringSelect.should be_kind_of Module
+    expect(RecurringSelect).to be_kind_of Module
   end
 
   describe "#is_valid_rule?" do
     it "should identify invalid rules" do
-      RecurringSelect.should_not be_is_valid_rule(nil)
-      RecurringSelect.should_not be_is_valid_rule("")
-      RecurringSelect.should_not be_is_valid_rule(false)
-      RecurringSelect.should_not be_is_valid_rule("null")
-      RecurringSelect.should_not be_is_valid_rule("0")
-      RecurringSelect.should_not be_is_valid_rule("custom")
-      RecurringSelect.should_not be_is_valid_rule([1, 2])
+      expect(RecurringSelect.is_valid_rule?(nil)).to be false
+      expect(RecurringSelect.is_valid_rule?("")).to be false
+      expect(RecurringSelect.is_valid_rule?(false)).to be false
+      expect(RecurringSelect.is_valid_rule?("null")).to be false
+      expect(RecurringSelect.is_valid_rule?("0")).to be false
+      expect(RecurringSelect.is_valid_rule?("custom")).to be false
+      expect(RecurringSelect.is_valid_rule?([1, 2])).to be false
     end
 
     it "should identify valid rules" do
-      RecurringSelect.should be_is_valid_rule(IceCube::Rule.weekly)
-      RecurringSelect.should be_is_valid_rule(IceCube::Rule.weekly.to_hash)
-      RecurringSelect.should be_is_valid_rule(IceCube::Rule.weekly.to_hash.to_json)
+      expect(RecurringSelect.is_valid_rule?(IceCube::Rule.weekly)).to be true
+      expect(RecurringSelect.is_valid_rule?(IceCube::Rule.weekly.to_hash)).to be true
+      expect(RecurringSelect.is_valid_rule?(IceCube::Rule.weekly.to_hash.to_json)).to be true
     end
   end
 
   describe "#filter_params" do
     it "Monthly with day_of_week" do
-      RecurringSelect.filter_params({
-        :validations=>{"day_of_week"=>{"wednesday"=>["1", "3"]}},
-        :rule_type=>"IceCube::MonthlyRule",
-        :interval=>1
-      }).should == {
-        :validations=>{:day_of_week =>{:wednesday =>[1, 3]}},
-        :rule_type=>"IceCube::MonthlyRule",
-        :interval=>1
-      }
+      expect(RecurringSelect.filter_params({
+        :validations => { "day_of_week" => { "wednesday" => %w[1 3] } },
+        :rule_type => "IceCube::MonthlyRule",
+        :interval => 1
+      })).to eq({
+        :validations => { :day_of_week => { :wednesday => [1, 3] } },
+        :rule_type => "IceCube::MonthlyRule",
+        :interval => 1
+      })
 
-      RecurringSelect.filter_params({
-        :validations=>{"day_of_week"=>{"2"=>["1", "3"]}},
-        :rule_type=>"IceCube::MonthlyRule",
-        :interval=>1
-      }).should == {
-        :validations=>{:day_of_week =>{2 =>[1, 3]}},
-        :rule_type=>"IceCube::MonthlyRule",
-        :interval=>1
-      }
+      expect(RecurringSelect.filter_params({
+        :validations => { "day_of_week" => { "2" => %w[1 3] } },
+        :rule_type => "IceCube::MonthlyRule",
+        :interval => 1
+      })).to eq({
+        :validations => { :day_of_week => { 2 => [1, 3] } },
+        :rule_type => "IceCube::MonthlyRule",
+        :interval => 1
+      })
     end
   end
 
