recurring_select 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4cabe7a01dcefc8682a70850814515545fdbc4ef
-  data.tar.gz: 191681842a5ef0c281e045f6854bad2145620327
+SHA256:
+  metadata.gz: d2a0200c05a91d2e53f9893103e3ee5259a0bd0917efaf373e0fff2ced38caa6
+  data.tar.gz: e950b6d4f120e420885e68c7d69192d3e65c241d9c90d139a44691f676ad41a8
 SHA512:
-  metadata.gz: d1a272091bdb190e6824469338e4635c5904ad8def50196484eb421269be435ddc2b53fdf1a0dc5f3eacaa081f092943983632f35cc36955ff5f45ae0ff8d0a5
-  data.tar.gz: ddb128c7a89adbbd6974e7e3d52282de0fb49dea9e5e5b1117333f071b512b2ac089a773632f6760ff750144a78eabb6bb5238e0f731b3860abbd0cb52cc1b37
+  metadata.gz: e2714208952ec80d4cecaf50f579a26ea06b7a1025803ace7486f31c7a307e57e965eb766b28ddfa478195c4557b9f8871a19c6b98125549df4825befc54082b
+  data.tar.gz: 679630c691151c92b59e98fcf08697f8f2ca5fccb6556e7737f9581aa319ce67ce02ceb9b948c3b86b8d9a8d3b37173b1eb15314e2e2bb5792c71cde4b0b1fc5

data/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.
 

data/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", ->

data/app/assets/javascripts/recurring_select.js.coffee

@@ -1,5 +1,5 @@
-//= require recurring_select_dialog
-//= require_self
+#= require recurring_select_dialog
+#= require_self
 
 $ = jQuery
 $ ->

data/app/assets/javascripts/recurring_select/fr.js.coffee

@@ -16,7 +16,6 @@ $.fn.recurring_select.texts = {
   day_of_month: "Jour du mois"
   day_of_week: "Jour de la semaine"
   ok: "OK"
-  cancel: "Annuler"
   summary: "Résumé"
   first_day_of_week: 1
   days_first_letter: ["D", "L", "M", "M", "J", "V", "S" ]

data/{app → lib}/helpers/recurring_select_helper.rb

@@ -2,14 +2,8 @@ require "ice_cube"
 
 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 @@ module RecurringSelectHelper
     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

data/lib/recurring_select.rb

@@ -25,8 +25,7 @@ module RecurringSelect
 
     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

data/lib/recurring_select/engine.rb

@@ -1,16 +1,18 @@
+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

data/lib/recurring_select/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: recurring_select
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jobber
 - Forrest Zeisler
 - Nathan Youngman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -158,12 +158,12 @@ files:
 - app/assets/stylesheets/jquery-mobile-rs.scss
 - app/assets/stylesheets/recurring_select.scss
 - app/assets/stylesheets/utilities.scss
-- app/helpers/recurring_select_helper.rb
-- app/middleware/recurring_select_middleware.rb
 - config/locales/en.yml
 - config/locales/fr.yml
 - config/locales/nl.yml
 - config/routes.rb
+- lib/helpers/recurring_select_helper.rb
+- lib/middleware/recurring_select_middleware.rb
 - lib/recurring_select.rb
 - lib/recurring_select/engine.rb
 - lib/recurring_select/version.rb
@@ -171,7 +171,7 @@ homepage: http://github.com/getjobber/recurring_select
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,9 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: A select helper which gives you magical powers to generate ice_cube rules.
 test_files: []