recurring_select 1.2.1.rc2 → 1.2.1.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb330f53dbb9e927ef6e926b82ed842e6f5fa405
-  data.tar.gz: 110685ad736abe16f880e317dcb80fa92eaa1385
+  metadata.gz: 9812313e5f81141d2f0350d36ead49d4bbc0fd7b
+  data.tar.gz: e938685e8b6e8ba0760665a66c46ebbb1974c863
 SHA512:
-  metadata.gz: 33c79b15c93c3dfe966f8c5fc01eeeb715fbb1529460ac5935aa69f72d8d7b8f4207464580de1450bf7b9f07076c654a7ff0d1fc5f746e3678aa49a1e49708d0
-  data.tar.gz: 9aec0d6cb1a1fc90755b11cf9df882a7e1c30ce9f8c30437b64678f030168798afacf1a103efd24c3ba3b0a3b273cecc6479f93285696d4f65396a5e10148dc6
+  metadata.gz: 027fd4813b29ec2e514102a26a63825895c86a27af6990780ee169c7acbe2df53584c1ac636494e0e30977edf3a5f004a47fb65083b6a08472907a57294bac3d
+  data.tar.gz: db6869e807c21b95ec7e9cdae8a84f88f77cd455575f8095b0d6bbaffa5be8b6eb79ffbb46e9bfd954b1113815a31892821848451b66e19d04a3e257648deef4

data/app/helpers/recurring_select_helper.rb

@@ -1,6 +1,4 @@
 require "ice_cube"
-require_relative "utilities/form_options_ext"
-require_relative "utilities/tag_ext"
 
 module RecurringSelectHelper
   module FormHelper
@@ -24,4 +22,121 @@ module RecurringSelectHelper
       @template.select_recurring(@object_name, method, default_schedules, options.merge(:object => @object), html_options)
     end
   end
+
+  module FormOptionsHelper
+    def recurring_options_for_select(currently_selected_rule = nil, default_schedules = nil, options = {})
+
+      options_array = []
+      blank_option_label = options[:blank_label] || I18n.t("recurring_select.not_recurring")
+      blank_option = [blank_option_label, "null"]
+      separator = [I18n.t("recurring_select.or"), {:disabled => true}]
+
+      if default_schedules.blank?
+        if currently_selected_rule.present?
+          options_array << blank_option if options[:allow_blank]
+          options_array << ice_cube_rule_to_option(currently_selected_rule)
+          options_array << separator
+          options_array << [I18n.t("recurring_select.change_schedule"), "custom"]
+        else
+          options_array << blank_option
+          options_array << [I18n.t("recurring_select.set_schedule"), "custom"]
+        end
+      else
+        options_array << blank_option if options[:allow_blank]
+
+        options_array += default_schedules.collect{|dc|
+          ice_cube_rule_to_option(dc)
+        }
+
+        if currently_selected_rule.present? and !current_rule_in_defaults?(currently_selected_rule, default_schedules)
+          options_array << ice_cube_rule_to_option(currently_selected_rule, true)
+          custom_label = [I18n.t("recurring_select.new_custom_schedule"), "custom"]
+        else
+          custom_label = [I18n.t("recurring_select.custom_schedule"), "custom"]
+        end
+
+        options_array << separator
+        options_array << custom_label
+      end
+
+      options_for_select(options_array, currently_selected_rule.to_json)
+    end
+
+    private
+
+    def ice_cube_rule_to_option(supplied_rule, custom = false)
+      return supplied_rule unless RecurringSelect.is_valid_rule?(supplied_rule)
+
+      rule = RecurringSelect.dirty_hash_to_rule(supplied_rule)
+      ar = [rule.to_s, rule.to_hash.to_json]
+
+      if custom
+        ar[0] << "*"
+        ar << {"data-custom" => true}
+      end
+
+      ar
+    end
+
+    def current_rule_in_defaults?(currently_selected_rule, default_schedules)
+      default_schedules.any?{|option|
+        option == currently_selected_rule or
+          (option.is_a?(Array) and option[1] == currently_selected_rule)
+      }
+    end
+  end
+
+  module SelectHTMLOptions
+    private
+
+    def recurring_select_html_options(html_options)
+      html_options = html_options.stringify_keys
+      html_options["class"] = (html_options["class"].to_s.split + ["recurring_select"]).join(" ")
+      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
+
+      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
+    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
+    end
+  end
+
+
 end

data/lib/recurring_select/version.rb

@@ -1,3 +1,3 @@
 module RecurringSelect
-  VERSION = "1.2.1.rc2"
+  VERSION = "1.2.1.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recurring_select
 version: !ruby/object:Gem::Version
-  version: 1.2.1.rc2
+  version: 1.2.1.rc3
 platform: ruby
 authors:
 - Jobber
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -170,8 +170,6 @@ files:
 - app/assets/stylesheets/recurring_select.css.scss.erb
 - app/assets/stylesheets/utilities.scss
 - app/helpers/recurring_select_helper.rb
-- app/helpers/utilities/form_options_ext.rb
-- app/helpers/utilities/tag_ext.rb
 - app/middleware/recurring_select_middleware.rb
 - config/locales/en.yml
 - config/locales/fr.yml

data/app/helpers/utilities/form_options_ext.rb

@@ -1,64 +0,0 @@
-module RecurringSelectHelper
-  module FormOptionsHelper
-    def recurring_options_for_select(currently_selected_rule = nil, default_schedules = nil, options = {})
-
-      options_array = []
-      blank_option_label = options[:blank_label] || I18n.t("recurring_select.not_recurring")
-      blank_option = [blank_option_label, "null"]
-      separator = [I18n.t("recurring_select.or"), {:disabled => true}]
-
-      if default_schedules.blank?
-        if not currently_selected_rule.blank?
-          options_array << blank_option if options[:allow_blank]
-          options_array << ice_cube_rule_to_option(currently_selected_rule)
-          options_array << separator
-          options_array << [I18n.t("recurring_select.change_schedule"), "custom"]
-        else
-          options_array << blank_option
-          options_array << [I18n.t("recurring_select.set_schedule"), "custom"]
-        end
-      else
-        options_array << blank_option if options[:allow_blank]
-
-        options_array += default_schedules.collect{|dc|
-          ice_cube_rule_to_option(dc)
-        }
-
-        if not currently_selected_rule.blank? and not current_rule_in_defaults?(currently_selected_rule, default_schedules)
-          options_array << ice_cube_rule_to_option(currently_selected_rule, true)
-          custom_label = [I18n.t("recurring_select.new_custom_schedule"), "custom"]
-        else
-          custom_label = [I18n.t("recurring_select.custom_schedule"), "custom"]
-        end
-
-        options_array << separator
-        options_array << custom_label
-      end
-
-      options_for_select(options_array, currently_selected_rule.to_json)
-    end
-
-    private
-
-    def ice_cube_rule_to_option(supplied_rule, custom = false)
-      return supplied_rule unless RecurringSelect.is_valid_rule?(supplied_rule)
-
-      rule = RecurringSelect.dirty_hash_to_rule(supplied_rule)
-      ar = [rule.to_s, rule.to_hash.to_json]
-
-      if custom
-        ar[0] << "*"
-        ar << {"data-custom" => true}
-      end
-
-      ar
-    end
-
-    def current_rule_in_defaults?(currently_selected_rule, default_schedules)
-      default_schedules.any?{|option|
-        option == currently_selected_rule or
-          (option.is_a?(Array) and option[1] == currently_selected_rule)
-      }
-    end
-  end
-end

data/app/helpers/utilities/tag_ext.rb

@@ -1,53 +0,0 @@
-module RecurringSelectHelper
-  module SelectHTMLOptions
-    private
-
-    def recurring_select_html_options(html_options)
-      html_options = html_options.stringify_keys
-      html_options["class"] = (html_options["class"].to_s.split + ["recurring_select"]).join(" ")
-      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
-
-      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
-    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
-    end
-  end
-end