recurring_select 3.0.1 → 4.0.0.rc1

data/app/assets/javascripts/utils.js

@@ -0,0 +1,70 @@
+function css(el, styles) {
+  for (let rule in styles) {
+    el.style[rule] = styles[rule]
+  }
+}
+
+function trigger(el, eventName) {
+  el.dispatchEvent(new CustomEvent(eventName))
+}
+
+function isPlainObject(obj) {
+  return obj && obj.toString() === "[object Object]"
+}
+
+const eventHandlerRefsExpando = '__recurring_select_events'
+
+function on(el, events, sel, handler) {
+  let eventHandler = sel
+  if (handler) {
+    eventHandler = (e) => {
+      if (e.target.matches(sel)) {
+        if (handler.call(this, e) === false) {
+          e.preventDefault()
+          e.stopPropagation()
+        }
+      }
+    }
+  }
+
+  el[eventHandlerRefsExpando] = el[eventHandlerRefsExpando] || []
+
+  events.trim().split(/ +/).forEach(type => {
+    el[eventHandlerRefsExpando].push([ type, eventHandler ])
+    el.addEventListener(type, eventHandler)
+  })
+}
+
+function off(el, events) {
+  const types = events.trim().split(/ +/)
+
+  el[eventHandlerRefsExpando] = (el[eventHandlerRefsExpando] || [])
+    .filter(([t, h], i) => {
+      if (types.includes(t)) {
+        el.removeEventListener(t, h)
+        return false
+      }
+      return true
+    })
+}
+
+function serialize(params, prefix) {
+  const query = Object.keys(params).map((key) => {
+    const value  = params[key];
+
+    if (params.constructor === Array)
+      key = `${prefix}[]`;
+    else if (params.constructor === Object)
+      key = (prefix ? `${prefix}[${key}]` : key);
+
+    if (value === null)
+      return `${key}=`
+
+    if (typeof value === 'object')
+      return serialize(value, key);
+    else
+      return `${key}=${encodeURIComponent(value)}`;
+  });
+
+  return [].concat.apply([], query).join('&');
+}

data/app/assets/stylesheets/recurring_select.scss

@@ -2,7 +2,9 @@
 
 /* -------- resets ---------------*/
 
-.rs_dialog_holder { font-size:14px; color:black;
+.rs_dialog_holder {
+  font-size:14px;
+  color:black;
   a {color:black;}
   input[type=button] {
     font: small/normal Arial,sans-serif;
@@ -28,10 +30,29 @@ select {
   option.bold {font-weight:bold; color:red;}
 }
 
-.rs_dialog_holder { position:fixed; left:0px; right:0px; top:0px; bottom:0px; padding-left:50%; background-color:rgba(255,255,255,0.2); z-index:50;
-  .rs_dialog { background-color:#f6f6f6; border:1px solid #acacac; @include shadows(1px, 3px, 8px, rgba(0,0,0,0.25)); @include rounded_corners(7px);
-              display:inline-block; min-width:200px; margin-left:-125px; overflow:hidden; position:relative;
-    .rs_dialog_content { padding:10px;
+.rs_dialog_holder {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  left:0px;
+  right:0px;
+  top:0px;
+  bottom:0px;
+  background-color:rgba(255,255,255,0.2);
+  z-index:50;
+
+  .rs_dialog {
+    background-color:#f6f6f6;
+    border:1px solid #acacac;
+    @include shadows(1px, 3px, 8px, rgba(0,0,0,0.25));
+    @include rounded_corners(7px);
+    min-width:200px;
+    overflow:hidden;
+
+    .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:image-url("recurring_select/cancel.png"); background-position:center; background-repeat:no-repeat;}
       }
@@ -42,7 +63,8 @@ select {
 
       a { -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; }
 
-      .freq_option_section { display:none;
+      .freq_option_section {
+        display:none;
         label { font-weight: bold; }
         .rs_interval {width:30px; text-align:center; display: inline-block;}
 
@@ -77,7 +99,10 @@ select {
       }
 
 
-      .rs_summary { padding:0px; margin-top:15px; border-top:1px solid #ccc;
+      .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: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;}
@@ -85,8 +110,11 @@ select {
         label {font-weight:normal;}
       }
 
-      .controls { padding:10px 0px 5px 0px; min-width:170px; text-align:center;
-        input[type=button] { margin:0px 5px; width:70px;
+      .controls {
+        padding:10px 0px 5px 0px;
+        min-width:170px;
+        text-align:center;
+        input[type=button] { margin:0px 5px;
           &.rs_save {color:#333; }
           &.rs_cancel {color:#666;}
           &.disabled {color:#aaa; }

data/lib/helpers/recurring_select_helper.rb

@@ -6,6 +6,12 @@ module RecurringSelectHelper
       RecurringSelectTag.new(object, method, self, default_schedules, options, html_options).render
     end
   end
+  
+  module FormTagHelper
+    def select_recurring_tag(name, default_schedules = nil, options = {}, html_options = {})
+      RecurringSelectTag.new(nil, name, self, default_schedules, options, html_options).render
+    end
+  end
 
   module FormBuilder
     def select_recurring(method, default_schedules = nil, options = {}, html_options = {})
@@ -65,7 +71,7 @@ module RecurringSelectHelper
       ar = [rule.to_s, rule.to_hash.to_json]
 
       if custom
-        ar[0] << "*"
+        ar[0] += "*"
         ar << {"data-custom" => true}
       end
 
@@ -90,20 +96,15 @@ module RecurringSelectHelper
     end
   end
 
-  class RecurringSelectTag < ActionView::Helpers::Tags::Base
+  class RecurringSelectTag < ActionView::Helpers::Tags::Select
     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)
-      @template_object = template_object
-      add_default_name_and_id(@html_options)
-
-      super(object, method, template_object, options)
+      html_options = recurring_select_html_options(html_options)
+
+      super(object, method, template_object, @default_schedules, options, html_options)
     end
 
     def render

data/lib/recurring_select/engine.rb

@@ -6,6 +6,7 @@ module RecurringSelect
 
     initializer "recurring_select.extending_form_builder" do |app|
       ActionView::Helpers::FormHelper.send(:include, RecurringSelectHelper::FormHelper)
+      ActionView::Helpers::FormTagHelper.send(:include, RecurringSelectHelper::FormTagHelper)
       ActionView::Helpers::FormOptionsHelper.send(:include, RecurringSelectHelper::FormOptionsHelper)
       ActionView::Helpers::FormBuilder.send(:include, RecurringSelectHelper::FormBuilder)
     end

data/lib/recurring_select/version.rb

@@ -1,3 +1,3 @@
 module RecurringSelect
-  VERSION = "3.0.1"
+  VERSION = "4.0.0.rc1"
 end

data/lib/recurring_select.rb

@@ -59,7 +59,7 @@ module RecurringSelect
     # this is soooooo ugly
     if params[:validations][:day_of_week]
       params[:validations][:day_of_week] ||= {}
-      if params[:validations][:day_of_week].length > 0 and not params[:validations][:day_of_week].keys.first =~ /\d/
+      if params[:validations][:day_of_week].length > 0 and not params[:validations][:day_of_week].keys.first.to_s =~ /\d/
         params[:validations][:day_of_week].symbolize_keys!
       else
         originals = params[:validations][:day_of_week].dup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recurring_select
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Jobber
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,28 +19,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +47,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,10 +124,12 @@ files:
 - Rakefile
 - app/assets/images/recurring_select/cancel.png
 - app/assets/images/recurring_select/throbber_13x13.gif
-- app/assets/javascripts/jquery-mobile-rs.js.coffee
-- 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/javascripts/defaults.js
+- app/assets/javascripts/jquery-mobile-rs.js
+- app/assets/javascripts/recurring_select.js
+- app/assets/javascripts/recurring_select/fr.js
+- app/assets/javascripts/recurring_select_dialog.js.erb
+- app/assets/javascripts/utils.js
 - app/assets/stylesheets/jquery-mobile-rs.scss
 - app/assets/stylesheets/recurring_select.scss
 - app/assets/stylesheets/utilities.scss
@@ -168,7 +142,7 @@ files:
 - lib/recurring_select.rb
 - lib/recurring_select/engine.rb
 - lib/recurring_select/version.rb
-homepage: http://github.com/getjobber/recurring_select
+homepage: http://github.com/gregschmit/recurring_select
 licenses:
 - MIT
 metadata: {}
@@ -183,11 +157,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A select helper which gives you magical powers to generate ice_cube rules.

data/app/assets/javascripts/jquery-mobile-rs.js.coffee

@@ -1,15 +0,0 @@
-#= require recurring_select
-#= require_self
-
-$ ->
-  $(document).on "recurring_select:cancel recurring_select:save", ".recurring_select", ->
-    $(this).selectmenu('refresh')
-
-  $(document).on "recurring_select:dialog_opened", ".rs_dialog_holder", ->
-    $(this).find("select").attr("data-theme", $('.recurring_select').data("theme")).attr("data-mini", true).selectmenu()
-    $(this).find("input[type=text]").textinput()
-
-    $(this).on "recurring_select:dialog_positioned", ".rs_dialog", ->
-      $(this).css
-        "top" : $(window).scrollTop()+"px"
-

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

@@ -1,105 +0,0 @@
-#= require recurring_select_dialog
-#= require_self
-
-$ = jQuery
-$ ->
-  $(document).on "focus", ".recurring_select", ->
-    $(this).recurring_select('set_initial_values')
-
-  $(document).on "change", ".recurring_select", ->
-    $(this).recurring_select('changed')
-
-methods =
-  set_initial_values: ->
-    @data 'initial-value-hash', @val()
-    @data 'initial-value-str', $(@find("option").get()[@.prop("selectedIndex")]).text()
-
-  changed: ->
-    if @val() == "custom"
-      methods.open_custom.apply(@)
-    else
-      methods.set_initial_values.apply(@)
-
-  open_custom: ->
-    @data "recurring-select-active", true
-    new RecurringSelectDialog(@)
-    @blur()
-
-  save: (new_rule) ->
-    @find("option[data-custom]").remove()
-    new_json_val = JSON.stringify(new_rule.hash)
-
-    # TODO: check for matching name, and replace that value if found
-
-    if $.inArray(new_json_val, @find("option").map -> $(@).val()) == -1
-      methods.insert_option.apply @, [new_rule.str, new_json_val]
-
-    @val new_json_val
-    methods.set_initial_values.apply @
-    @.trigger "recurring_select:save"
-
-  current_rule: ->
-    str:  @data("initial-value-str")
-    hash: $.parseJSON(@data("initial-value-hash"))
-
-  cancel: ->
-    @val @data("initial-value-hash")
-    @data "recurring-select-active", false
-    @.trigger "recurring_select:cancel"
-
-
-  insert_option: (new_rule_str, new_rule_json) ->
-    separator = @find("option:disabled")
-    if separator.length == 0
-      separator = @find("option")
-    separator = separator.last()
-
-    new_option = $(document.createElement("option"))
-    new_option.attr "data-custom", true
-
-    if new_rule_str.substr(new_rule_str.length - 1) != "*"
-      new_rule_str+="*"
-
-    new_option.text new_rule_str
-    new_option.val new_rule_json
-    new_option.insertBefore separator
-
-  methods: ->
-    methods
-
-$.fn.recurring_select = (method) ->
-  if method of methods
-    return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ) );
-  else
-    $.error( "Method #{method} does not exist on jQuery.recurring_select" );
-
-$.fn.recurring_select.options = {
-  monthly: {
-    show_week: [true, true, true, true, false, false]
-  }
-}
-
-$.fn.recurring_select.texts = {
-  locale_iso_code: "en"
-  repeat: "Repeat"
-  last_day: "Last Day"
-  frequency: "Frequency"
-  daily: "Daily"
-  weekly: "Weekly"
-  monthly: "Monthly"
-  yearly: "Yearly"
-  every: "Every"
-  days: "day(s)"
-  weeks_on: "week(s) on"
-  months: "month(s)"
-  years: "year(s)"
-  day_of_month: "Day of month"
-  day_of_week: "Day of week"
-  cancel: "Cancel"
-  ok: "OK"
-  summary: "Summary"
-  first_day_of_week: 0
-  days_first_letter: ["S", "M", "T", "W", "T", "F", "S" ]
-  order: ["1st", "2nd", "3rd", "4th", "5th", "Last"]
-  show_week: [true, true, true, true, false, false]
-}