formize 0.0.14 → 0.0.17

data/lib/formize/helpers.rb

@@ -1,8 +1,29 @@
 module Formize
+  DATE_FORMAT_TOKENS = {
+    'dd' => '%d',
+    'oo' => '%j',
+    'D'  => '%a',
+    'DD' => '%A',
+    'mm' => '%m',
+    'M'  => '%b',
+    'MM' => '%B',
+    'y'  => '%y',
+    'yy' => '%Y'
+  }.freeze
+  TIME_FORMAT_TOKENS = {
+    'hh' => '%H',
+    'mm' => '%M',
+    'ss' => '%S',
+    'tt' => '%p',
+    'TT' => '%P'
+  }.freeze
+                                                
+
   # @private
   module Helpers
     autoload :AssetTagHelper, 'formize/helpers/asset_tag_helper'
     autoload :TagHelper, 'formize/helpers/tag_helper'
     autoload :FormHelper, 'formize/helpers/form_helper'
+    autoload :FormTagHelper, 'formize/helpers/form_tag_helper'
   end
 end

data/lib/formize/helpers/asset_tag_helper.rb

@@ -19,16 +19,21 @@ module Formize
       # @option options [TrueClass, FalseClass] :skip_stylesheet
       #   Skip the inclusion of default stylesheet: formize.css
       # 
-      # @option options [TrueClass, FalseClass] :with_formize
-      #   Include main javascript formize.js
+      # @option options [TrueClass, FalseClass] :monolithic
+      #   If +true+ includes a monolithic javascript formize.js else include
+      #   choosen specific javascripts with little weight.
       # 
-      # @deprecated
+      # @deprecated Will be removed when rails <= 3.0 support won't be effective in 
+      #   versions >= 0.1.0
       def formize_include_tag(options={})
         options[:locale] ||= ::I18n.locale
         html  = ""
-        html << javascript_include_tag('jquery.ui.formize') if options[:special_ui]
-        html << javascript_include_tag('locales/jquery.ui.datepicker-' + locale.to_s)
-        html << javascript_include_tag('formize') if options[:with_formize]
+        if options[:monolithic]
+          html << javascript_include_tag('formize')
+        else
+          html << javascript_include_tag('jquery.ui.formize')
+          html << javascript_include_tag('locales/jquery.ui.datepicker-' + locale.to_s)
+        end
         unless options[:skip_stylesheet]
           html << stylesheet_link_tag('jquery-ui')
           html << stylesheet_link_tag('formize') 
@@ -36,7 +41,6 @@ module Formize
         return html.html_safe
       end
 
-
     end
   end
 end

data/lib/formize/helpers/form_helper.rb

@@ -88,18 +88,7 @@ module Formize
           localized_value = I18n.localize(localized_value, :format=>format)
         end
         format = I18n.translate('date.formats.'+format.to_s) 
-        conv = {
-          'dd' => '%d',
-          'oo' => '%j',
-          'D'  => '%a',
-          'DD' => '%A',
-          'mm' => '%m',
-          'M'  => '%b',
-          'MM' => '%B',
-          'y'  => '%y',
-          'yy' => '%Y'
-        }
-        conv.each{|js, rb| format.gsub!(rb, js)}
+        Formize::DATE_FORMAT_TOKENS.each{|js, rb| format.gsub!(rb, js)}
         html  = ""
         html << hidden_field(object_name, method)
         html << tag(:input, :type=>:text, "data-datepicker"=>"#{object_name}_#{method}", "data-date-format"=>format, :value=>localized_value, "data-locale"=>::I18n.locale, :size=>options.delete(:size)||10)
@@ -107,14 +96,12 @@ module Formize
       end
 
       
-      # Returns a text field for selecting a Date with hour 
-      # with a hidden field containing the well formatted datetime
+      # Returns a text field with a default placeholder for timestamp
       def datetime_field(object_name, method, options = {})
-        object = instance_variable_get("@#{object_name}")
-        html  = ""
-        html << hidden_field(object_name, method)
-        html << tag(:input, :type=>:text, "data-datepicker"=>"#{object_name}_#{method}", :size=>options.delete(:size)||10)
-        return html
+        default = {}
+        default[:placeholder] = I18n.translate!('time.placeholder') rescue nil
+        default[:size] ||= 24
+        return text_field(object_name, method, default.merge(options))
       end
 
       

data/lib/formize/helpers/form_tag_helper.rb

@@ -0,0 +1,31 @@
+module Formize
+  module Helpers
+    module FormTagHelper
+
+
+      def date_field_tag(name, value=nil, options={})
+        format = options[:format]||:default
+        raise ArgumentError.new("Option :format must be a Symbol referencing a translation 'date.formats.<format>'")unless format.is_a?(Symbol)
+        unless (localized_value = value).nil?
+          localized_value = I18n.localize(localized_value, :format=>format)
+        end
+        format = I18n.translate('date.formats.'+format.to_s)
+        Formize::DATE_FORMAT_TOKENS.each{|js, rb| format.gsub!(rb, js)}        
+        html  = ""
+        html << hidden_field_tag(name, value.to_s(:db))
+        html << tag(:input, :type=>:text, "data-datepicker"=>name, "data-date-format"=>format, :value=>localized_value, "data-locale"=>::I18n.locale, :size=>options.delete(:size)||10)
+        return html.html_safe
+      end
+
+      # Returns a text field with a default placeholder for timestamp
+      def datetime_field_tag(name, value=nil, options={})
+        default = {}
+        default[:placeholder] = I18n.translate!('time.placeholder') rescue nil
+        default[:size] ||= 24
+        return text_field_tag(name, value, default.merge(options))
+      end
+
+
+    end
+  end
+end

data/lib/formize/railtie.rb

@@ -8,6 +8,7 @@ module Formize
         include Formize::Helpers::AssetTagHelper
         include Formize::Helpers::TagHelper
         include Formize::Helpers::FormHelper
+        include Formize::Helpers::FormTagHelper
       end
       ActiveSupport.on_load(:action_controller) do
         include Formize::ActionController

data/lib/generators/formize/install/install_generator.rb

@@ -4,7 +4,7 @@ module Formize
 
   class InstallGenerator < ::Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
-    class_option :no_ui, :type => :boolean, :default => false, :desc => "Do not include special jQuery-UI JavaScripts"
+    # class_option :no_ui, :type => :boolean, :default => false, :desc => "Do not include special jQuery-UI JavaScripts"
     class_option :no_locales, :type => :boolean, :default => false, :desc => "Do not include locales for jQuery-UI date picker"
     class_option :no_stylesheet, :type => :boolean, :default => false, :desc => "Do not include stylesheet of jQuery-UI"
 
@@ -12,12 +12,12 @@ module Formize
       def copy_assets
         copy_file '../../../../assets/javascripts/formize.js',  'public/javascripts/formize.js'
 
-        unless options[:no_ui]
-          copy_file '../../../../assets/javascripts/jquery.ui.formize.js',  'public/javascripts/jquery.ui.formize.js'
-        end
+        # unless options[:no_ui]
+        copy_file '../../../../assets/javascripts/jquery.ui.formize.js',  'public/javascripts/jquery.ui.formize.js'
+        # end
 
         unless options[:no_locales]
-          for locale in Dir.glob(File.expand_path('../../../../assets/javascripts/locales/*.js', __FILE__))
+          for locale in Dir.glob(File.expand_path('../../../../assets/javascripts/locales/*datepicker*.js', __FILE__))
             file = locale.split(/[\\\/]+/)[-1]
             copy_file "../../../../assets/javascripts/locales/#{file}",  "public/javascripts/locales/#{file}"
           end

data/lib/tasks/formize.rake

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+require 'active_support'
+require 'action_pack'
+require 'action_view'
+require 'action_controller'
+require 'action_dispatch'
+
+# $LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+
+require 'formize'
+
+namespace :formize do
+  desc "Generate formize.js"
+  task :compile do
+    Formize.compile!
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formize
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17846020 !ruby/object:Gem::Requirement
+  requirement: &19944640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *17846020
+  version_requirements: *19944640
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &17844600 !ruby/object:Gem::Requirement
+  requirement: &19942320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17844600
+  version_requirements: *19942320
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &17843480 !ruby/object:Gem::Requirement
+  requirement: &19940700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17843480
+  version_requirements: *19940700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17841520 !ruby/object:Gem::Requirement
+  requirement: &19939820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *17841520
+  version_requirements: *19939820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &17839740 !ruby/object:Gem::Requirement
+  requirement: &19939180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17839740
+  version_requirements: *19939180
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17826960 !ruby/object:Gem::Requirement
+  requirement: &19938520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 2.4.2
   type: :development
   prerelease: false
-  version_requirements: *17826960
+  version_requirements: *19938520
 description: Like simple_form or formtastic, it aims to handle easily forms but taking
   in account AJAX and HTML5 on depending fields mainly.
 email: brice.texier@ekylibre.org
@@ -104,6 +104,7 @@ files:
 - lib/assets/images/ui-icons_cd0a0a_256x240.png
 - lib/assets/javascripts/formize.js
 - lib/assets/javascripts/jquery.ui.formize.js
+- lib/assets/javascripts/jquery.ui.timepicker.js
 - lib/assets/javascripts/locales/jquery.ui.datepicker-af.js
 - lib/assets/javascripts/locales/jquery.ui.datepicker-ar.js
 - lib/assets/javascripts/locales/jquery.ui.datepicker-az.js
@@ -158,6 +159,20 @@ files:
 - lib/assets/javascripts/locales/jquery.ui.datepicker-zh-CN.js
 - lib/assets/javascripts/locales/jquery.ui.datepicker-zh-HK.js
 - lib/assets/javascripts/locales/jquery.ui.datepicker-zh-TW.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-cs.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-de.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-el.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-es.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-et.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-fr.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-hu.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-id.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-it.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-lt.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-nl.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-ru.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-tr.js
+- lib/assets/javascripts/locales/jquery.ui.timepicker-vi.js
 - lib/assets/stylesheets/formize.css
 - lib/assets/stylesheets/jquery-ui.css
 - lib/formize.rb
@@ -172,11 +187,13 @@ files:
 - lib/formize/helpers.rb
 - lib/formize/helpers/asset_tag_helper.rb
 - lib/formize/helpers/form_helper.rb
+- lib/formize/helpers/form_tag_helper.rb
 - lib/formize/helpers/tag_helper.rb
 - lib/formize/railtie.rb
 - lib/generators/formize/install/USAGE
 - lib/generators/formize/install/install_generator.rb
 - lib/generators/formize/install/templates/initializer.rb
+- lib/tasks/formize.rake
 homepage: http://github.com/burisu/formize
 licenses:
 - MIT
@@ -190,6 +207,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4502632806187008995
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: