date_select_separator 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ab84d2fb59f486d297f43e41708344c9295ea2
-  data.tar.gz: 66d4f721a709680f38d2b66d6224784a048b3ea6
+  metadata.gz: eb54a4895e0f3b1d091b1aa1dc57762773c570bc
+  data.tar.gz: 3390de920b13d01948d61f20658ffc27565db450
 SHA512:
-  metadata.gz: fd35ea8972fa63ae06de839012099ca8a6e57d87ede9b85531945ba1c63cb4db8a50835fbd1edbdeb6dc81029165165adc2af6bf1f513bd92f8d87bdb6364669
-  data.tar.gz: f9508b1981cc5162d82977f01639300085b648b64d5f024e1162784816f392dc63c97154a43ed83df55f14e27fe3244c7e637912f31967e855b5bee119ac72fc
+  metadata.gz: 54e1647eee9b17b5d4089ed9cdae47cd546cad2826eacedda0d788452834b47ad1242494e579a4e1c2ad37e7776e3f6b3f3996bd1f0be5b9a64b335ae0e5fae3
+  data.tar.gz: cb19585216815a897cfa1c47d950403d275467fcbbcb018fed4b8eac797d74eb89ff7f495ccb041f17d5f6542d46dd3f6b69cef54339ceee25dc3e0abb731ac9

data/README.md

@@ -1,6 +1,9 @@
 # DateSelectSeparator
 
-Add separators to data_select on Rails.
+Add separators to data_select and datetime_select on Ruby on Rails.
+
+![](https://dl.dropboxusercontent.com/u/177616/images/github/date_select_separator/1.png)
+![](https://dl.dropboxusercontent.com/u/177616/images/github/date_select_separator/2.png)
 
 ## Installation
 
@@ -14,7 +17,7 @@ And then execute:
 
 ## Usage
 
-Add these lines in your locale file like [config/locales/ja.yml](https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/ja.yml):
+Add translations to your locale file like below.
 
     ja:
       datetime:
@@ -26,20 +29,20 @@ Add these lines in your locale file like [config/locales/ja.yml](https://github.
           minute: 分
           second: 秒
 
-And then use ```use_separators: true```:
+Add `use_separators: true` option to data_select or datetime_select.
 
     # Add a separator after each select_tags
     <%= f.date_select :birthday, use_month_numbers: true, use_separators: true %>
     <%= f.datetime_select :birthday, use_month_numbers: true, time_separator: '', use_separators: true %>
-    
+
     # Add a separator to each option_tags except month. Month is used a value like ja.data.month_names
-    <%= f.date_select :birthday, use_separators: {inline: true} %>
-    <%= f.datetime_select :birthday, time_separator: '', use_separators: {inline: true} %>
-    
+    <%= f.date_select :birthday, use_separators: { inline: true } %>
+    <%= f.datetime_select :birthday, time_separator: '', use_separators: { inline: true } %>
+
     # Options: html_tag, class_prefix etc
-    <%= f.date_select :birthday, use_month_numbers: true, use_separators: {html_tag: :div, class_prefix: 'foo'} %>
-    <%= f.date_select :birthday, use_month_numbers: true, use_separators: {year: 'yy', month: 'mm', day: 'dd'} %>
-
+    <%= f.date_select :birthday, use_month_numbers: true, use_separators: { html_tag: :div, class_prefix: 'foo' } %>
+    <%= f.date_select :birthday, use_month_numbers: true, use_separators: { year: 'yy', month: 'mm', day: 'dd' } %>
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1 +1,28 @@
-require "bundler/gem_tasks"
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'DateSelectSeparator'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+task default: :test

data/lib/date_select_separator/action_view_extension.rb

@@ -0,0 +1,86 @@
+module DateSelectSeparator
+  module ActionViewExtension
+    extend ActiveSupport::Concern
+
+    included do
+      def select_month_with_separator
+        separators = @options[:use_separators]
+        select_tag = select_month_without_separator
+
+        if use_separators?(:month, separators) && !inline_separator?(separators)
+          select_tag << separator_tag(:month, separators)
+        end
+
+        select_tag
+      end
+      alias_method_chain :select_month, :separator
+
+      private
+      def use_separators?(type, separators)
+        discard_type = "discard_#{type}".to_sym
+        !@options[:use_hidden] && !@options[discard_type] && separators
+      end
+
+      def inline_separator?(separators)
+        separators.is_a?(Hash) && separators[:inline]
+      end
+
+      def separator_text(type, separators)
+        if separators.is_a?(Hash) && separators[type]
+          separators[type]
+        else
+          key = 'datetime.separators.' + type.to_s
+          I18n.translate(key, locale: @options[:locale])
+        end
+      end
+
+      def separator_tag(type, separators)
+        default_options = { html_tag: :span, class_prefix: 'separator' }
+        options = separators.is_a?(Hash) ? default_options.merge!(separators) : default_options
+        text = separator_text(type, separators)
+        class_name = options[:class_prefix] + "_#{type}"
+        content_tag(options[:html_tag], text, class: class_name) + "\n"
+      end
+
+      def build_options_and_select_with_separator(type, selected, options = {})
+        separators = @options[:use_separators]
+
+        unless use_separators?(type, separators)
+          return build_options_and_select_without_separator(type, selected, options)
+        end
+
+        if inline_separator?(separators)
+          options.merge!(separator: separator_text(type, separators))
+          build_select(type, build_options_with_separator(selected, options))
+        else
+          build_select(type, build_options(selected, options)) + separator_tag(type, separators)
+        end
+      end
+      alias_method_chain :build_options_and_select, :separator
+
+      def build_options_with_separator(selected, options = {})
+        options = {
+          leading_zeros: true, ampm: false, use_two_digit_numbers: false, separator: false
+        }.merge!(options)
+
+        start         = options.delete(:start) || 0
+        stop          = options.delete(:end) || 59
+        step          = options.delete(:step) || 1
+        leading_zeros = options.delete(:leading_zeros)
+
+        select_options = []
+        start.step(stop, step) do |i|
+          value = leading_zeros ? sprintf("%02d", i) : i
+          tag_options = { value: value }
+          tag_options[:selected] = "selected" if selected == i
+          text = options[:use_two_digit_numbers] ? sprintf("%02d", i) : value
+          text = options[:ampm] ? AMPM_TRANSLATION[i] : text
+          text = options[:separator] ? text.to_s + options[:separator] : text
+          select_options << content_tag(:option, text, tag_options)
+        end
+
+        (select_options.join("\n") + "\n").html_safe
+      end
+    end
+  end
+end

data/lib/date_select_separator/railtie.rb

@@ -0,0 +1,9 @@
+module DateSelectSeparator
+  class Railtie < ::Rails::Railtie
+    initializer 'date_select_separator' do |app|
+      ActiveSupport.on_load(:action_view) do
+        ::ActionView::Helpers::DateTimeSelector.send :include, DateSelectSeparator::ActionViewExtension
+      end
+    end
+  end
+end

data/lib/date_select_separator/version.rb

@@ -1,3 +1,3 @@
 module DateSelectSeparator
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/date_select_separator.rb

@@ -1,93 +1,5 @@
-require "date_select_separator/version"
-
-module ActionView
-  module Helpers
-    class DateTimeSelector
-      def select_month_with_separator
-        separators = @options[:use_separators]
-        select_tag = select_month_without_separator
-
-        if @options[:use_hidden].blank? && @options[:discard_month].blank? && separators.present?
-          select_tag << separator_tag(:month, separators)
-        end
-
-        select_tag
-      end
-      alias_method_chain :select_month, :separator
-
-      def build_options_and_select_with_separator(type, selected, options = {})
-        separators = @options[:use_separators]
-
-        if separators.present?
-          if use_inline_separator?(separators)
-            options.merge!({:use_separator => separator_name(type, separators)})
-            build_select(type, build_options_with_separator(selected, options))
-          else
-            build_select(type, build_options(selected, options)) + separator_tag(type, separators)
-          end
-        else
-          build_options_and_select_without_separator(type, selected, options)
-        end
-      end
-      alias_method_chain :build_options_and_select, :separator
-
-      private
-        def use_inline_separator?(separators)
-          (separators.class == Hash && separators[:inline] == true)
-        end
-
-        def translated_separator_name(type)
-          key = 'datetime.separators.' + type.to_s
-          I18n.translate(key, :locale => @options[:locale])
-        end
-
-        def separator_name(type, separators)
-          if separators.class == Hash && separators[type].present?
-            separators[type]
-          else
-            key = 'datetime.separators.' + type.to_s
-            I18n.translate(key, :locale => @options[:locale])
-          end
-        end
-
-        def separator_tag(type, separators)
-          return '' if use_inline_separator?(separators)
-
-          default_options = {:html_tag => :span, :class_prefix => 'separator'}
-          options = (separators.class == Hash) ? default_options.merge!(separators) : default_options
-
-          if options
-            name = separator_name(type, separators)
-            class_name = options[:class_prefix] + "_#{type}"
-            content_tag(options[:html_tag], name, :class => class_name) + "\n"
-          else
-            ''
-          end
-        end
-
-        def build_options_with_separator(selected, options = {})
-          options = {
-            leading_zeros: true, ampm: false, use_two_digit_numbers: false, use_separator: false
-          }.merge!(options)
-
-          start         = options.delete(:start) || 0
-          stop          = options.delete(:end) || 59
-          step          = options.delete(:step) || 1
-          leading_zeros = options.delete(:leading_zeros)
-
-          select_options = []
-          start.step(stop, step) do |i|
-            value = leading_zeros ? sprintf("%02d", i) : i
-            tag_options = { :value => value }
-            tag_options[:selected] = "selected" if selected == i
-            text = options[:use_two_digit_numbers] ? sprintf("%02d", i) : value
-            text = options[:ampm] ? AMPM_TRANSLATION[i] : text
-            text = options[:use_separator] ? text.to_s + options[:use_separator] : text
-            select_options << content_tag(:option, text, tag_options)
-          end
-
-          (select_options.join("\n") + "\n").html_safe
-        end
-    end
-  end
+module DateSelectSeparator
 end
+
+require 'date_select_separator/action_view_extension'
+require 'date_select_separator/railtie'