Merge pull request gregschmit#122 from GetJobber/JOB-9744/upgrade-to-rails-5

Update so we can use this on rails 5

Author: chris-hut

.ruby-version

@@ -1 +1 @@
-2.1.3
+2.3.7

.travis.yml

@@ -6,19 +6,31 @@ rvm:
   - 2.0.0
   - 2.1.5
   - 2.2.0
+  - 2.3.7
   - 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:
   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
+    - rvm: 2.1.5
+      gemfile: spec/gemfiles/rails-5.0.x.gemfile
+    - rvm: 2.2.2
+      gemfile: spec/gemfiles/rails-5.0.x.gemfile
     - rvm: jruby-19mode
       gemfile: spec/gemfiles/Gemfile.rails-3.2.x
   fast_finish: true

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    recurring_select (2.0.0)
+    recurring_select (2.1.0)
       coffee-rails (>= 3.1)
       ice_cube (>= 0.11)
       jquery-rails (>= 3.0)
@@ -37,19 +37,19 @@ GEM
       tzinfo (~> 0.3.37)
     arel (4.0.2)
     builder (3.1.4)
-    coffee-rails (4.1.0)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.12.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     hike (1.2.3)
     i18n (0.7.0)
-    ice_cube (0.13.0)
+    ice_cube (0.16.2)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -130,3 +130,6 @@ DEPENDENCIES
   rspec (>= 2.14)
   rspec-rails (>= 2.14)
   sass-rails (~> 4.0.5)
+
+BUNDLED WITH
+   1.16.2

app/helpers/recurring_select_helper.rb

@@ -2,7 +2,7 @@
 
 module RecurringSelectHelper
   module FormHelper
-    if Rails::VERSION::MAJOR == 4
+    if Rails::VERSION::MAJOR >= 4
       def select_recurring(object, method, default_schedules = nil, options = {}, html_options = {})
         RecurringSelectTag.new(object, method, self, default_schedules, options, html_options).render
       end
@@ -114,7 +114,11 @@ def initialize(object, method, template_object, default_schedules = nil, options
       end
 
       def render
-        option_tags = add_options(recurring_options_for_select(value(object), @default_schedules, @options), @options, value(object))
+        if Rails::VERSION::STRING >= '5.2'
+          option_tags = add_options(recurring_options_for_select(value, @default_schedules, @options), @options, value)
+        else
+          option_tags = add_options(recurring_options_for_select(value(object), @default_schedules, @options), @options, value(object))
+        end
         select_content_tag(option_tags, @options, @html_options)
       end
     end

lib/recurring_select/version.rb

@@ -1,3 +1,3 @@
 module RecurringSelect
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

spec/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem 'pg', platform: :ruby
+gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+
+gem "rails", "~> 5.2"
+gem "sass-rails", "~> 5.0"