date_picker 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddc92c926e371bc1891dec407dbb02be9d15faa
-  data.tar.gz: 9cfdcc14a3314a9c7f15cd8c5f32b919eebdd416
+  metadata.gz: ceb66dd09f6029e8ba9e12325bd213ea9125a7b1
+  data.tar.gz: 36cfdde89f119fe670daf3f9b22afc4dd066c027
 SHA512:
-  metadata.gz: f77608aa4e9833df606ebd73c613fd609edf2b0ff885ed1bf86a1bc79306bd9a44d94f1039a12b293dc5ea1a84c05dbd6c7d9147a44383e41b85985af2deb97e
-  data.tar.gz: c8559f3fe46b24e4ff1b8c6dbf5ffa035de67e92b159829c0712b957fd83c116299bfdd577c2093060100f2f33e40aacca3d8dc996a08184650042cb8e3b0b92
+  metadata.gz: 99eef5718cb5407114fb827b1f5414f58c972fb5dd48ee38a43467652afea98c5d20240acf3d10c8673ac2ca2a95d6a1617ab84291cdc41c68bd88ccb5627973
+  data.tar.gz: 46fae6e48d9c229ff5614552150870785aa0a79ebd0048727f7800e077d41b880bf3178e9fadb220238b2d0b3b0451eeae4d94ae75b9356ebfbe3000fdbe4e56

data/lib/date_picker.rb

@@ -1,5 +1,8 @@
 require 'date_picker/railtie' if defined? ::Rails::Railtie
-require 'date_picker/mappings'
+require 'date_picker/mappings/moment'
+require 'date_picker/mappings/jquery_ui'
+require 'date_picker/mappings/pickadate'
+require 'date_picker/mappings/flatpickr'
 require 'date_picker/form_tag_helper'
 require 'date_picker/form_helper'
 require 'i18n'

data/lib/date_picker/form_helper.rb

@@ -13,19 +13,19 @@ module DatePicker
     
     module FormBuilderMethods
       
-      def date_picker(attribute, options = {})
-        options[:id]||= DatePicker::FormHelper.field_id(self.object_name, attribute)
-        @template.date_picker_tag("#{self.object_name}[#{attribute}]", self.object.send(attribute), options)
+      def date_picker(attribute, options = {}, html_options = {})
+        html_options[:id]||= DatePicker::FormHelper.field_id(self.object_name, attribute)
+        @template.date_picker_tag("#{self.object_name}[#{attribute}]", self.object.send(attribute), options, html_options)
       end
       
-      def datetime_picker(attribute, options = {})
-        options[:id]||= DatePicker::FormHelper.field_id(self.object_name, attribute)
-        @template.datetime_picker_tag("#{self.object_name}[#{attribute}]", self.object.send(attribute), options)
+      def datetime_picker(attribute, options = {}, html_options = {})
+        html_options[:id]||= DatePicker::FormHelper.field_id(self.object_name, attribute)
+        @template.datetime_picker_tag("#{self.object_name}[#{attribute}]", self.object.send(attribute), options, html_options)
       end
       
-      def time_picker(attribute, options = {})
-        options[:id]||= DatePicker::FormHelper.field_id(self.object_name, attribute)
-        @template.time_picker_tag("#{self.object_name}[#{attribute}]", self.object.send(attribute), options)
+      def time_picker(attribute, options = {}, html_options = {})
+        html_options[:id]||= DatePicker::FormHelper.field_id(self.object_name, attribute)
+        @template.time_picker_tag("#{self.object_name}[#{attribute}]", self.object.send(attribute), options, html_options)
       end
       
     end

data/lib/date_picker/form_tag_helper.rb

@@ -1,27 +1,62 @@
 require 'erb'
+require 'tzinfo'
 module DatePicker
   module FormTagHelper
     
-    def date_picker_tag(name, value, options = {})
+    def date_picker_tag(name, value, options = {}, html_options = nil)
 
-      options[:type]||= :date
-      options[:time_zone]||= false
-      options[:data]||= {}
-      options[:id]||= "date_picker_" + Digest::SHA1.hexdigest(name.to_s)[8..16]
+      # Clean object and attribute names
+      object_name = name.gsub(/\[\w*\]$/, "")
+      attribute_name = name.gsub(/.*\[(\w*)\]$/, "\\1")
+      
+      # Setup Options      
+      option_names = [:time_zone, :format, :type, :default, :min, :max]
+      opts = options.clone
+      html_opts = html_options.clone
+      options||= {}
+      options = opts.slice(*option_names)
+      options = ({
+        type: :date,
+        time_zone: false,
+      }).merge(options)
+      html_options||= {}
+
+      # Merge html_options with options
+      html_options = {
+        # Use text-type as default instead of date, since Datepicker should not mix up with native html5 components
+        type: :text,
+        # Generate unique ID with UI
+        id: "date_picker_" + Digest::SHA1.hexdigest(name.to_s)[8..16],
+        name: name,
+        data: html_options[:data] || options[:data] || {}
+      }.merge(opts.except(*option_names)).merge(html_options)
       
+      # Get the type
       type = options[:type]
       
-      if value.blank?
+      # Set default values
+      if !options.key?(:default)
         case type
           when :date
-            value = Date.today
+            default = Date.current
           when :datetime
-            value = DateTime.now
+            default = DateTime.current
           when :time
-            value = Time.now
+            default = Time.current
         end
+      else
+        default = options[:default]
       end
       
+      # Override value from html_options
+      if html_options.key?(:value)
+        value = html_options[:value]
+      end
+      
+      # Set default value if blank
+      if value.blank?
+        value = default
+      end
       
       # Get Type format if not specified
       format = nil
@@ -31,6 +66,7 @@ module DatePicker
         format = DatePicker.config.formats[type]
       end
       
+      # Apply string format identifier or default format
       if format.blank? || !format.is_a?(String)
         case type
           when :date
@@ -47,129 +83,130 @@ module DatePicker
         format = format.to_s
       end
       
-      # Get formatted value
-      formatted_value = value.present? ? I18n.l(value, format: format.to_s) : nil
-      
+      # Get Style
       if options[:style].present?
         style = options[:style]
       elsif DatePicker.config.style.present?
         style = DatePicker.config.style
       else
-        style = :bootstrap
+        style = :none
       end
-      
       path = File.join(File.dirname(__FILE__), "styles", style.to_s)
-      
+
       # Require the selected style and retrieve as object
-      require path
-      obj = Object::const_get('DatePicker::Styles::' + style.to_s.classify).new
-      
+      if style && style != 'none' && File.exist?(path + '.rb')
+        require path
+        obj = Object::const_get('DatePicker::Styles::' + style.to_s.classify).new
+      end
       
+      # Merge with types and options from style template
       types = [:date]
-      if obj.respond_to?(:types)
+      if obj && obj.respond_to?(:types)
         types = obj.send(:types)
       end
       
-      input_options = options.except(:time_zone, :format, :input_tag, :type, :pattern)
-      
+      # Mobile Fallback
+      is_mobile = (request.headers["HTTP_USER_AGENT"].present? && request.headers["HTTP_USER_AGENT"] =~ /\b(Mobile|webOS|Android|iPhone|iPad|iPod|Windows Phone|Opera Mobi|Kindle|BackBerry|PlayBook)\b/i).present?
+      if is_mobile
+        case options[:type]
+        when :date
+          return date_field(object_name, attribute_name, html_options.merge({type: 'date', value: value.present? ? value : ''}))
+        when :datetime
+          return datetime_field(object_name, attribute_name, html_options.merge({type: 'datetime-local', value: value.present? ? value.strftime("%Y-%m-%dT%H:%M:%S") : ''}))
+        when :time
+          return time_field(object_name, attribute_name, html_options.merge({type: 'time', value: value.present? ? value.strftime("%H:%M") : ''}))
+        end
+      end
+
+      # Desktop Fallback
+      if !obj || !types.include?(options[:type])
+        # Presence of attribute name prevents auto-generating        
+        html_options.delete(:name)
+        # Choose the right form helper by type
+        case options[:type]
+        when :date
+          return date_select(object_name, attribute_name, {default: value}, html_options)
+        when :datetime
+          return datetime_select(object_name, attribute_name, {default: value}, html_options)
+        when :time
+          return time_select(object_name, attribute_name, {default: value}, html_options)
+        end
+      end
+
+      # Get options from implementation
       if obj.respond_to?(:options)
-        input_options = input_options.merge(obj.send(:options))
+        html_options = html_options.merge(obj.send(:options))
       end
       
+      # Get mapping from style
       if obj.mapping.present?
         mapping = obj.mapping
       end
-
+      
+      # Resolve mapping by identifier
       if obj.mapping.is_a? Symbol
         mapping = DatePicker::Mappings.send(obj.mapping)
       end
-      
-      input_options[:type] = :text
-      input_options[:value] = formatted_value
-      
-      input_tag = options[:tag] || :input
-      input_id = options[:id]
-      input_html = content_tag(input_tag, nil, input_options)
 
-      # Escape special chars
-      if mapping[:_].present?
-        format.gsub!(/(?<!%)([a-z]+)/i, mapping[:_].gsub(/\*/, "\\\\1"))
+      # Setup picker format
+      picker_format = format.clone
+
+      # Escape special chars in format
+      if mapping[:__].present?
+        replace = mapping[:__].gsub(/\*/, "\\\\1")
+        # Get strftime patterns
+        keys = mapping.keys.select{ |key| !mapping[key].blank? && !key.to_s.start_with?('__') }
+        # Get picker patterns
+        values = keys.map{ |key| mapping[key] }
+        # Escape any special characters of picker format not preceded by %
+        picker_format.gsub!(/(?<!%)(#{(values.map { |string| Regexp.escape(string) }).join('|')})/i, replace)
+        # Escape strftime patterns not preceded by %
+        picker_format.gsub!(/(?<!%)(#{(keys.map { |string| Regexp.escape(string) }).join('|')})/i, replace)
       end
       
+      # If time_zone option is specified, replace timezone identifier with mapping in format
       if options[:time_zone]
         # Time zone abbreviation name
-        format.gsub!("%Z", value.present? ? value.to_datetime.strftime("%Z") : "")
+        picker_format.gsub!("%Z", value.present? ? value.to_datetime.strftime("%Z") : "")
         # Time zone as hour and minute offset from UTC (e.g. +0900)
-        format.gsub!("%z", mapping[:z])
+        picker_format.gsub!("%z", mapping[:z])
       else
-        # Strip time zone and trim result
-        format.gsub!("%Z", "")
-        format.gsub!("%z", "")
-        format.strip!
+        # Otherwise strip time zone and trim result
+        picker_format.gsub!("%Z", "")
+        picker_format.gsub!("%z", "")
+        picker_format.strip!
       end
       
+      # Actually replace patterns
       mapping.each_pair do |k, v|
-        format.gsub!("%" + k.to_s, v)
+        picker_format.gsub!("%" + k.to_s, v)
       end
       
-      # Set up the data format pattern
+      # Setup data format pattern
       if type == :date
         data_format = "%Y-%m-%d"
       else
-        data_format = "%Y-%m-%d %H:%M:%S %z"
+        data_format = "%Y-%m-%d %H:%M:%S" + ((format.include?("%z") || format.include?("%z")) && options[:time_zone] ? ' %z' : '')
       end
       
+      # If time_zone option is specified, replace timezone identifier with mapping in data_format
       if options[:time_zone]
         # Time zone abbreviation name
         data_format.gsub!("%Z", value.present? ? value.to_datetime.strftime("%Z") : "")
         # Time zone as hour and minute offset from UTC (e.g. +0900)
         data_format.gsub!("%z", mapping[:z])
-      else
-        # Strip time zone and trim result
-        # Strip time zone and trim result
-        format.gsub!("%Z", "")
-        format.gsub!("%z", "")
-        format.strip!
       end
       
+      # Replace mappings in data_format
       mapping.each_pair do |k, v|
         data_format.gsub!("%" + k.to_s, v)
       end
-      
-      object_name = name.gsub(/\[\w*\]$/, "")
-      attribute_name = name.gsub(/.*\[(\w*)\]$/, "\\1")
-      
-      
-      is_mobile = (request.headers["HTTP_USER_AGENT"].present? && request.headers["HTTP_USER_AGENT"] =~ /\b(Mobile|webOS|Android|iPhone|iPad|iPod|Windows Phone|Opera Mobi|Kindle|BackBerry|PlayBook)\b/i).present?
-      
-      # Mobile fallback
-      if is_mobile
-        case options[:type]
-        when :date
-          return date_field(object_name, attribute_name, input_options.merge({type: 'date', value: value}))
-        when :datetime
-          return datetime_field(object_name, attribute_name, input_options.merge({type: 'datetime-local', value: value.strftime("%Y-%m-%dT%H:%M:%S")}))
-        when :time
-          return time_field(object_name, attribute_name, input_options.merge({type: 'time', value: value.strftime("%H:%M")}))
-        end
-      end
-      
-      # Desktop Fallback
-      if !types.include?(options[:type])
-        case options[:type]
-        when :date
-          return date_select(object_name, attribute_name, {default: value}, input_options)
-        when :datetime
-          return datetime_select(object_name, attribute_name, {default: value}, input_options)
-        when :time
-          return time_select(object_name, attribute_name, {default: value}, input_options)
-        end
-      end
-      
-      # Use type text on desktop
-      input_options[:type] = :text
-      
-      
+
+      # Get formatted value
+      formatted_value = value.present? ? I18n.l(value, format: format.to_s) : nil
+      html_options[:value] = formatted_value
+
+      # Get builder template reference
       tmpl = obj.template
       
       # i18n
@@ -181,8 +218,21 @@ module DatePicker
       day_names = I18n.t('date.day_names', default: Date::DAYNAMES)
       abbr_day_names = I18n.t('date.abbr_day_names', default: Date::ABBR_DAYNAMES)
       
-      time = value.present? ? type == :time ? value.localtime.utc.to_i * 1000 : value.to_time.utc.to_i * 1000 : 0
+      # Setup timestamp
+      time = value.present? ? value.to_time.utc.to_i * 1000 : 0
+      
+      # Setup timezone
+      tz = Time.zone
+      if value.present?
+        utc_offset = (value.is_a?(Date) ? value.to_datetime : value).utc_offset
+        tz = ActiveSupport::TimeZone.all.select {
+          |zone|
+          zone.tzinfo.current_period.offset.utc_total_offset === utc_offset
+        }.first
+      end
+      timezone = type === :time && utc_offset === 0 ? 'Etc/UTC' : ActiveSupport::TimeZone::MAPPING[tz.name]
       
+      # Setup Picker Options
       camelized_keys = 
         lambda do |h| 
           Hash === h ? 
@@ -194,40 +244,53 @@ module DatePicker
               end 
             ] : h 
         end
+        
+      picker_options = camelized_keys[html_options[:data]].to_json
       
-      json_options = camelized_keys[input_options[:data]].to_json
+      # Setup html input
+      input_tag = :input
+      input_id = html_options[:id]
+      input_html = content_tag(input_tag, nil, html_options)
       
-      vars = {
+      # Setup template variables
+      vars = options.merge({
         type: type,
         value: value,
         locale: locale,
-        format: format,
+        picker_format: picker_format,
         data_format: data_format,
         name: name,
         input_id: input_id,
-        input_options: input_options,
+        html_options: html_options,
         time: time,
+        time_zone: timezone,
         input_html: input_html, 
         month_names: month_names,
         abbr_month_names: abbr_month_names,
         day_names: day_names,
         abbr_day_names: abbr_day_names
-      }
+      })
       
+      # Actually render the picker
       result = ERB.new(tmpl).result(OpenStruct.new(vars).instance_eval { binding })
       
+      # Return picker html
       return result.html_safe
       
     end
     
-    def datetime_picker_tag(name, value, options = {})
-      options[:type]||= :datetime
-      date_picker_tag(name, value, options)
+    def datetime_picker_tag(name, value, options = {}, html_options = {})
+      options = options.clone.merge({
+        type: :datetime
+      })
+      date_picker_tag(name, value, options, html_options)
     end
     
-    def time_picker_tag(name, value, options = {})
-      options[:type]||= :time
-      datetime_picker_tag(name, value, options)
+    def time_picker_tag(name, value, options = {}, html_options = {})
+      options = options.clone.merge({
+        type: :time
+      })
+      date_picker_tag(name, value, options, html_options)
     end
     
   end

data/lib/date_picker/mappings/flatpickr.rb

@@ -0,0 +1,50 @@
+module DatePicker
+  module Mappings
+    def self.flatpickr
+      {
+        # Escape sequence
+        __: '\\\\\\\\*', 
+        # Year with century
+        Y: 'Y',
+        # Year without a century (00..99)
+        y: 'y',
+        # Day of month, blank-padded (1..31)
+        e: 'j',
+        # Day of the month (01..31)
+        d: 'd',
+        # Day of the year (001..366)
+        j: 'DDD',
+        # The abbreviated weekday name (“Sun”)
+        a: 'D',
+        # The full weekday name (“Sunday”)
+        A: 'l',
+        # Month of the year (01..12)
+        m: 'm',
+        # Month of the year no-padded (1..12)
+        '-m': 'n',
+        # The full month name (“January”)
+        B: 'F',
+        # The abbreviated month name (“Jan”)
+        b: 'M',
+        # Hour of the day, 24-hour clock (00..23)
+        H: 'H',
+        # Hour of the day, 12-hour clock (01..12)
+        I: 'h',
+        # Minute of the hour (00..59)
+        M: 'i',
+        # Second of the minute (00..60)
+        S: 'S',
+        # Meridian indicator (“AM” or “PM”)
+        p: 'K',
+        # Week number of the current year, starting with the first Sunday as the first day of the first week (00..53)
+        U: 'ww',
+        # Week number of the current year, starting with the first Monday as the first day of the first week (00..53)
+        W: 'WW',
+        # Day of the week (Sunday is 0, 0..6)
+        w: 'd',
+        # Time zone as hour and minute offset from UTC (e.g. +0900)
+        z: 'x'
+      }
+    end
+  end
+end