recurring_select 1.2.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fab37d1e22d29ea0e11bf7cd8fa8029c0d82ffae
-  data.tar.gz: 91ffdeb1a1501631d6c59a722e8716921b15c980
+SHA256:
+  metadata.gz: d2a0200c05a91d2e53f9893103e3ee5259a0bd0917efaf373e0fff2ced38caa6
+  data.tar.gz: e950b6d4f120e420885e68c7d69192d3e65c241d9c90d139a44691f676ad41a8
 SHA512:
-  metadata.gz: a4a0c849ab6538a1b6ca9f23170b9796b73b7cfeca34b7d1785a417d536cf457d35752c716e81ea720d8e63a9e7946acff14494bf40c78efc084ac184d878f29
-  data.tar.gz: 810ed71fa996b7c149e0f3842daa4cda8c2f7ac5d055224ea862bb5f755a4d083107084131a75afb849ada57fa6a03b94dc746cf39922b4d7ab57145d8690a69
+  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.
 
@@ -101,6 +101,7 @@ For other languages include a JavaScript file like this:
 
 ```coffeescript
 $.fn.recurring_select.texts = {
+  locale_iso_code: "fr"
   repeat: "Repeat"
   frequency: "Frequency"
   daily: "Daily"

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
 $ ->
@@ -80,6 +80,7 @@ $.fn.recurring_select.options = {
 }
 
 $.fn.recurring_select.texts = {
+  locale_iso_code: "en"
   repeat: "Repeat"
   last_day: "Last Day"
   frequency: "Frequency"

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

@@ -1,4 +1,5 @@
 $.fn.recurring_select.texts = {
+  locale_iso_code: "fr"
   repeat: "Récurrence"
   last_day: "Dernier jour"
   frequency: "Fréquence"
@@ -15,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/assets/javascripts/recurring_select_dialog.js.coffee.erb

@@ -21,8 +21,8 @@ window.RecurringSelectDialog =
       @mainEventInit()
       @freqInit()
       @summaryInit()
-      @freq_select.focus()
       @outer_holder.trigger "recurring_select:dialog_opened"
+      @freq_select.focus()
 
     positionDialogVert: (initial_positioning) =>
       window_height = $(window).height()
@@ -43,7 +43,6 @@ window.RecurringSelectDialog =
         @inner_holder.css new_style_hash
         @inner_holder.trigger "recurring_select:dialog_positioned"
       else
-        @content.css {"width": @content.width()+"px"}
         @inner_holder.addClass "animated"
         @inner_holder.animate new_style_hash, 200, =>
           @inner_holder.removeClass "animated"
@@ -103,10 +102,15 @@ window.RecurringSelectDialog =
       interval_input.val(@current_rule.hash.interval)
       interval_input.on "change keyup", @intervalChanged
 
+      # clear selected days
+      section.find(".day_holder a").each (index, element) ->
+        $(element).removeClass("selected")
+
       # connect the day fields
       if @current_rule.hash.validations? && @current_rule.hash.validations.day?
         $(@current_rule.hash.validations.day).each (index, val) ->
           section.find(".day_holder a[data-value='"+val+"']").addClass("selected")
+
       section.off('click', '.day_holder a').on "click", ".day_holder a", @daysChanged
 
       section.show()
@@ -161,9 +165,9 @@ window.RecurringSelectDialog =
 
     summaryFetch: ->
       return if !(@current_rule.hash? && (rule_type = @current_rule.hash.rule_type)?)
-      @content.css {"width": @content.width()+"px"}
+      @current_rule.hash['week_start'] = $.fn.recurring_select.texts["first_day_of_week"]
       $.ajax
-        url: "/recurring_select/translate",
+        url: "<%= Rails.application.config.action_controller.relative_url_root %>/recurring_select/translate/#{$.fn.recurring_select.texts["locale_iso_code"]}",
         type: "POST",
         data: @current_rule.hash
         success: @summaryFetchSuccess
@@ -198,12 +202,14 @@ window.RecurringSelectDialog =
 
       for num, index in [1, 2, 3, 4, 5, -1]
         if show_row[index]
-          monthly_calendar.append "<span>#{row_labels[index]}</span>"
-          for day_of_week in [0..6]
-            day_link = $("<a>", {text: cell_str[day_of_week]})
+          monthly_calendar.append "<span>#{row_labels[num - 1]}</span>"
+          for day_of_week in [$.fn.recurring_select.texts["first_day_of_week"]...(7 + $.fn.recurring_select.texts["first_day_of_week"])]
+            day_of_week = day_of_week % 7
+            day_link = $("<a>", {text: cell_str[day_of_week] })
             day_link.attr("day", day_of_week)
             day_link.attr("instance", num)
             monthly_calendar.append day_link
+
       $.each @current_rule.hash.validations.day_of_week, (key, value) ->
         $.each value, (index, instance) ->
           section.find("a[day='#{key}'][instance='#{instance}']").addClass("selected")
@@ -252,7 +258,6 @@ window.RecurringSelectDialog =
       @current_rule.hash.interval = parseInt($(event.currentTarget).val())
       if @current_rule.hash.interval < 1 || isNaN(@current_rule.hash.interval)
         @current_rule.hash.interval = 1
-        # $(event.currentTarget).val(@current_rule.hash.interval)
       @summaryUpdate()
 
     daysChanged: (event) =>
@@ -301,9 +306,9 @@ window.RecurringSelectDialog =
         <div class='rs_dialog'>
           <div class='rs_dialog_content'>
             <h1>#{$.fn.recurring_select.texts["repeat"]} <a href='#' title='#{$.fn.recurring_select.texts["cancel"]}' Alt='#{$.fn.recurring_select.texts["cancel"]}'></a> </h1>
-            <p>
+            <p class='frequency-select-wrapper'>
               <label for='rs_frequency'>#{$.fn.recurring_select.texts["frequency"]}:</label>
-              <select id='rs_frequency' class='rs_frequency' name='rs_frequency'>
+              <select data-wrapper-class='ui-recurring-select' id='rs_frequency' class='rs_frequency' name='rs_frequency'>
                 <option value='Daily'>#{$.fn.recurring_select.texts["daily"]}</option>
                 <option value='Weekly'>#{$.fn.recurring_select.texts["weekly"]}</option>
                 <option value='Monthly'>#{$.fn.recurring_select.texts["monthly"]}</option>
@@ -314,14 +319,14 @@ window.RecurringSelectDialog =
             <div class='daily_options freq_option_section'>
               <p>
                 #{$.fn.recurring_select.texts["every"]}
-                <input type='text' name='rs_daily_interval' class='rs_daily_interval rs_interval' value='1' size='2' />
+                <input type='text' data-wrapper-class='ui-recurring-select' name='rs_daily_interval' class='rs_daily_interval rs_interval' value='1' size='2' />
                 #{$.fn.recurring_select.texts["days"]}
               </p>
             </div>
             <div class='weekly_options freq_option_section'>
               <p>
                 #{$.fn.recurring_select.texts["every"]}
-                <input type='text' name='rs_weekly_interval' class='rs_weekly_interval rs_interval' value='1' size='2' />
+                <input type='text' data-wrapper-class='ui-recurring-select' name='rs_weekly_interval' class='rs_weekly_interval rs_interval' value='1' size='2' />
                 #{$.fn.recurring_select.texts["weeks_on"]}:
               </p>
               <div class='day_holder'>
@@ -337,12 +342,12 @@ window.RecurringSelectDialog =
             <div class='monthly_options freq_option_section'>
               <p>
                 #{$.fn.recurring_select.texts["every"]}
-                <input type='text' name='rs_monthly_interval' class='rs_monthly_interval rs_interval' value='1' size='2' />
+                <input type='text' data-wrapper-class='ui-recurring-select' name='rs_monthly_interval' class='rs_monthly_interval rs_interval' value='1' size='2' />
                 #{$.fn.recurring_select.texts["months"]}:
               </p>
               <p class='monthly_rule_type'>
-                <span>#{$.fn.recurring_select.texts["day_of_month"]} <input type='radio' class='monthly_rule_type_day' name='monthly_rule_type' value='true' /></span>
-                <span>#{$.fn.recurring_select.texts["day_of_week"]} <input type='radio' class='monthly_rule_type_week' name='monthly_rule_type' value='true' /></span>
+                <span><label for='monthly_rule_type_day'>#{$.fn.recurring_select.texts["day_of_month"]}</label><input type='radio' class='monthly_rule_type_day' name='monthly_rule_type' id='monthly_rule_type_day' value='true' /></span>
+                <span><label for='monthly_rule_type_week'>#{$.fn.recurring_select.texts["day_of_week"]}</label><input type='radio' class='monthly_rule_type_week' name='monthly_rule_type' id='monthly_rule_type_week' value='true' /></span>
               </p>
               <p class='rs_calendar_day'></p>
               <p class='rs_calendar_week'></p>
@@ -350,7 +355,7 @@ window.RecurringSelectDialog =
             <div class='yearly_options freq_option_section'>
               <p>
                 #{$.fn.recurring_select.texts["every"]}
-                <input type='text' name='rs_yearly_interval' class='rs_yearly_interval rs_interval' value='1' size='2' />
+                <input type='text' data-wrapper-class='ui-recurring-select' name='rs_yearly_interval' class='rs_yearly_interval rs_interval' value='1' size='2' />
                 #{$.fn.recurring_select.texts["years"]}
               </p>
             </div>
@@ -358,8 +363,8 @@ window.RecurringSelectDialog =
               <span></span>
             </p>
             <div class='controls'>
-              <input type='button' class='rs_save' value='#{$.fn.recurring_select.texts["ok"]}' />
-              <input type='button' class='rs_cancel' value='#{$.fn.recurring_select.texts["cancel"]}' />
+              <input type='button' data-wrapper-class='ui-recurring-select' class='rs_save' value='#{$.fn.recurring_select.texts["ok"]}' />
+              <input type='button' data-wrapper-class='ui-recurring-select' class='rs_cancel' value='#{$.fn.recurring_select.texts["cancel"]}' />
             </div>
           </div>
         </div>

data/app/assets/stylesheets/{jquery-mobile-rs.css.scss.erb → jquery-mobile-rs.scss}

@@ -3,6 +3,20 @@
 *= require_self
 */
 
+/* Make the jQuery mobile wrapped input elements inline */
+div.ui-recurring-select {
+  display:inline-block;
+}
+
+.frequency-select-wrapper label{
+  display:inline;
+}
+
+/* Make the jQuery mobile wrapped labels and radios remain inline elements inline */
+p.monthly_rule_type label {
+  display:inline;
+}
+
 .rs_dialog_holder {padding-left:0px; background-color:#333; background-color:rgba(30,30,30,0.3); font-size:1em; position:absolute;
   .rs_dialog { position:absolute; left:10px; right:10px; margin:0px; display:block; z-index:51;
 

data/app/assets/stylesheets/{recurring_select.css.scss.erb → recurring_select.scss}

@@ -33,7 +33,7 @@ select {
               display:inline-block; min-width:200px; margin-left:-125px; overflow:hidden; position:relative;
     .rs_dialog_content { padding:10px;
       h1 { font-size:16px; padding:0px; margin:0 0 10px 0;
-        a {float:right; display:inline-block; height:16px; width:16px; background-image:url(<%=asset_path "recurring_select/cancel.png"%>); background-position:center; background-repeat:no-repeat;}
+        a {float:right; display:inline-block; height:16px; width:16px; background-image:image-url("recurring_select/cancel.png"); background-position:center; background-repeat:no-repeat;}
       }
 
       p { padding:5px 0; margin:0; line-height: 14px;
@@ -80,7 +80,7 @@ select {
       .rs_summary { padding:0px; margin-top:15px; border-top:1px solid #ccc;
         span {font-weight:bold; border-top:1px solid #fff; display:block; padding:10px 0 5px 0;}
         &.fetching {color:#999;
-          span {background-image:url(<%=asset_path "recurring_select/throbber_13x13.gif" %>); background-position:center; background-repeat:no-repeat; display:inline-block; height:13px; width:13px; margin-top:-4px; padding-right:5px;}
+          span {background-image:image-url("recurring_select/throbber_13x13.gif"); background-position:center; background-repeat:no-repeat; display:inline-block; height:13px; width:13px; margin-top:-4px; padding-right:5px;}
         }
         label {font-weight:normal;}
       }

data/config/locales/nl.yml

@@ -0,0 +1,8 @@
+nl:
+  recurring_select:
+    not_recurring: "- niet herhalen -"
+    change_schedule: "Rooster aanpassen..."
+    set_schedule: "Rooster instellen..."
+    new_custom_schedule: "Nieuw aangepast rooster..."
+    custom_schedule: "Aangepast rooster..."
+    or: of

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,47 +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
-        option_tags = add_options(recurring_options_for_select(value(object), @default_schedules, @options), @options, value(object))
-        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/{app → lib}/middleware/recurring_select_middleware.rb

@@ -7,7 +7,9 @@ class RecurringSelectMiddleware
   end
 
   def call(env)
-    if env["PATH_INFO"] =~ /^\/recurring_select\/translate/
+    regexp = /^\/recurring_select\/translate\/(.*)/
+    if env["PATH_INFO"] =~ regexp
+      I18n.locale = env["PATH_INFO"].scan(regexp).first.first
       request = Rack::Request.new(env)
       params = request.params
       params.symbolize_keys!

data/lib/recurring_select.rb

@@ -7,14 +7,15 @@ module RecurringSelect
     if params.is_a? IceCube::Rule
       params
     else
-      if params.is_a?(String)
-        params = JSON.parse(params)
+      params = JSON.parse(params, quirks_mode: true) if params.is_a?(String)
+      if params.nil?
+        nil
+      else
+        params = params.symbolize_keys
+        rules_hash = filter_params(params)
+        IceCube::Rule.from_hash(rules_hash)
       end
 
-      params = params.symbolize_keys
-      rules_hash = filter_params(params)
-
-      IceCube::Rule.from_hash(rules_hash)
     end
   end
 
@@ -24,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 = "1.2.4"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: recurring_select
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Jobber
 - Forrest Zeisler
 - Nathan Youngman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-17 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
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -155,14 +155,15 @@ files:
 - app/assets/javascripts/recurring_select.js.coffee
 - app/assets/javascripts/recurring_select/fr.js.coffee
 - app/assets/javascripts/recurring_select_dialog.js.coffee.erb
-- app/assets/stylesheets/jquery-mobile-rs.css.scss.erb
-- app/assets/stylesheets/recurring_select.css.scss.erb
+- 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
@@ -170,7 +171,7 @@ homepage: http://github.com/getjobber/recurring_select
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,9 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-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: []