Merge pull request gregschmit#147 from GetJobber/bump-version-for-3.0

Bump version for 3.0

Author: jessevanherk

.gitignore

@@ -1,5 +1,6 @@
 *.gem
 spec/gemfiles/Gemfile*.lock
+Gemfile.lock
 
 .bundle/
 tmp/*

Gemfile.lock

@@ -2,14 +2,8 @@
 
 module RecurringSelectHelper
   module FormHelper
-    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
-    elsif Rails::VERSION::MAJOR == 3
-      def select_recurring(object, method, default_schedules = nil, options = {}, html_options = {})
-        InstanceTag.new(object, method, self, options.delete(:object)).to_recurring_select_tag(default_schedules, options, html_options)
-      end
+    def select_recurring(object, method, default_schedules = nil, options = {}, html_options = {})
+      RecurringSelectTag.new(object, method, self, default_schedules, options, html_options).render
     end
   end
 
@@ -96,51 +90,24 @@ def recurring_select_html_options(html_options)
     end
   end
 
-  if Rails::VERSION::STRING.to_f >= 4.0
-    # === Rails 4
-    class RecurringSelectTag < ActionView::Helpers::Tags::Base
-      include RecurringSelectHelper::FormOptionsHelper
-      include SelectHTMLOptions
-
-      def initialize(object, method, template_object, default_schedules = nil, options = {}, html_options = {})
-        @default_schedules = default_schedules
-        @choices = @choices.to_a if @choices.is_a?(Range)
-        @method_name = method.to_s
-        @object_name = object.to_s
-        @html_options = recurring_select_html_options(html_options)
-        add_default_name_and_id(@html_options)
-
-        super(object, method, template_object, options)
-      end
+  class RecurringSelectTag < ActionView::Helpers::Tags::Base
+    include RecurringSelectHelper::FormOptionsHelper
+    include SelectHTMLOptions
 
-      def render
-        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
+    def initialize(object, method, template_object, default_schedules = nil, options = {}, html_options = {})
+      @default_schedules = default_schedules
+      @choices = @choices.to_a if @choices.is_a?(Range)
+      @method_name = method.to_s
+      @object_name = object.to_s
+      @html_options = recurring_select_html_options(html_options)
+      add_default_name_and_id(@html_options)
+
+      super(object, method, template_object, options)
     end
 
-  else
-    # === Rails 3
-    class InstanceTag < ActionView::Helpers::InstanceTag
-      include RecurringSelectHelper::FormOptionsHelper
-      include SelectHTMLOptions
-
-      def to_recurring_select_tag(default_schedules, options, html_options)
-        html_options = recurring_select_html_options(html_options)
-        add_default_name_and_id(html_options)
-        value = value(object)
-        options = add_options(
-          recurring_options_for_select(value, default_schedules, options),
-          options, value
-        )
-        content_tag("select", options, html_options)
-      end
+    def render
+      option_tags = add_options(recurring_options_for_select(value, @default_schedules, @options), @options, value)
+      select_content_tag(option_tags, @options, @html_options)
     end
   end
-
-
 end

lib/helpers/recurring_select_helper.rb

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

lib/recurring_select/version.rb

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", ">= 3.2"
+  s.add_dependency "rails", ">= 5.2"
   s.add_dependency "jquery-rails", ">= 3.0"
   s.add_dependency "ice_cube", ">= 0.11"
   s.add_dependency "sass-rails", ">= 4.0"