padrino-helpers 0.9.10 → 0.9.11

data/Rakefile

@@ -1,52 +1,5 @@
-require 'rubygems'
-require 'rake'
-
-require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "padrino-helpers"
-    gem.summary = "Helpers for padrino"
-    gem.description = "Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino"
-    gem.email = "padrinorb@gmail.com"
-    gem.homepage = "http://github.com/padrino/padrino-framework/tree/master/padrino-helpers"
-    gem.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-    gem.rubyforge_project = 'padrino-helpers'
-    gem.version = Padrino.version
-    gem.add_runtime_dependency     "padrino-core",  "= #{Padrino.version}"
-    gem.add_development_dependency "haml",          ">= 2.2.1"
-    gem.add_development_dependency "shoulda",       ">= 2.10.3"
-    gem.add_development_dependency "mocha",         ">= 0.9.7"
-    gem.add_development_dependency "rack-test",     ">= 0.5.0"
-    gem.add_development_dependency "webrat",        ">= 0.5.1"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new { |r| r.doc_task = :none }
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+# coding:utf-8
+RAKE_ROOT = __FILE__
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |rcov|
-    rcov.libs << 'test'
-    rcov.pattern = 'test/**/test_*.rb'
-    rcov.verbose = true
-    rcov.rcov_opts << ['--exclude /Gems/1.8/gems/,/tmp/,padrino-admin,padrino-cache,padrino-core,padrino-gen,padrino-mailer']
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install relevance-rcov"
-  end
-end
-
-task :default => :test
+require 'rubygems'
+require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/lib/padrino-helpers.rb

@@ -1,9 +1,8 @@
-require 'padrino-core/support_lite'
-require 'active_support/core_ext/float/rounding'
-require 'active_support/option_merger'
+require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'cgi'
+require 'i18n'
 
-Dir[File.dirname(__FILE__) + '/padrino-helpers/**/*.rb'].each {|file| require file }
+FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
 
 # Load our locales
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
@@ -28,16 +27,19 @@ module Padrino
     #
     # for Padrino::Application
     #
-    def self.registered(app)
-      app.set :default_builder, 'StandardFormBuilder'
-      app.helpers Padrino::Helpers::OutputHelpers
-      app.helpers Padrino::Helpers::TagHelpers
-      app.helpers Padrino::Helpers::AssetTagHelpers
-      app.helpers Padrino::Helpers::FormHelpers
-      app.helpers Padrino::Helpers::FormatHelpers
-      app.helpers Padrino::Helpers::RenderHelpers
-      app.helpers Padrino::Helpers::NumberHelpers
-      app.helpers Padrino::Helpers::TranslationHelpers
+    class << self
+      def registered(app)
+        app.set :default_builder, 'StandardFormBuilder'
+        app.helpers Padrino::Helpers::OutputHelpers
+        app.helpers Padrino::Helpers::TagHelpers
+        app.helpers Padrino::Helpers::AssetTagHelpers
+        app.helpers Padrino::Helpers::FormHelpers
+        app.helpers Padrino::Helpers::FormatHelpers
+        app.helpers Padrino::Helpers::RenderHelpers
+        app.helpers Padrino::Helpers::NumberHelpers
+        app.helpers Padrino::Helpers::TranslationHelpers
+      end
+      alias :included :registered
     end
   end # Helpers
 end # Padrino

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -20,19 +20,19 @@ module Padrino
       #
       # ==== Examples
       #
-      #   link_to 'click me', '/dashboard', :class => 'linky'
-      #   link_to 'click me', '/dashboard', :if => @foo.present?
-      #   link_to 'click me', '/dashboard', :unless => @foo.empty?
-      #   link_to 'click me', '/dashboard', :unless => :current
-      #   link_to('/dashboard', :class => 'blocky') do ... end
+      #   link_to('click me', '/dashboard', :class => 'linky')
+      #   link_to('click me', '/dashboard', :remote => true)
+      #   link_to('click me', '/dashboard', :method => :delete)
+      #   link_to('click me', :class => 'blocky') do ... end
       #
       # Note that you can pass :+if+ or :+unless+ conditions, but if you provide :current as
       # condition padrino return true/false if the request.path_info match the given url
       #
       def link_to(*args, &block)
         options = args.extract_options!
+        options = parse_js_attributes(options) # parses remote, method and confirm options
         anchor  = "##{CGI.escape options.delete(:anchor).to_s}" if options[:anchor]
-        options["data-remote"] = "true" if options.delete(:remote)
+
         if block_given?
           url = args[0] ? args[0] + anchor.to_s : anchor || 'javascript:void(0);'
           options.reverse_merge!(:href => url)
@@ -246,7 +246,7 @@ module Padrino
         # Returns the timestamp mtime for an asset
         #
         def asset_timestamp(file_path)
-          return nil if file_path =~ /\?/
+          return nil if file_path =~ /\?/ || (self.class.respond_to?(:asset_stamp) && !self.class.asset_stamp)
           public_path = Padrino.root("public", file_path) if Padrino.respond_to?(:root)
           stamp = Time.now.to_i unless public_path && File.exist?(public_path)
           stamp ||= File.mtime(public_path).to_i
@@ -254,7 +254,7 @@ module Padrino
         end
 
         ##
-        # Parse link_to options for give correct conditions
+        # Parses link_to options for given correct conditions
         #
         def parse_conditions(url, options)
           if options.has_key?(:if)
@@ -266,6 +266,23 @@ module Padrino
             true
           end
         end
+
+        ##
+        # Parses link_to options for given js declarations (remote, method, confirm)
+        # Not destructive on options; returns updated options
+        #
+        def parse_js_attributes(options)
+          options = options.dup
+          options["data-remote"] = "true" if options.delete(:remote)
+          if link_confirm = options.delete(:confirm)
+            options["data-confirm"] = link_confirm
+          end
+          if link_method = options.delete(:method)
+            options["data-method"] = link_method
+            options["rel"] = "nofollow"
+          end
+          options
+        end
     end # AssetTagHelpers
   end # Helpers
-end # Padrino
+end # Padrino

data/lib/padrino-helpers/form_helpers.rb

@@ -39,10 +39,11 @@ module Padrino
       #
       def form_tag(url, options={}, &block)
         desired_method = options[:method]
-        options.delete(:method) if options[:method].to_s !~ /get|post/i
+        data_method = options.delete(:method) if options[:method].to_s !~ /get|post/i
         options.reverse_merge!(:method => 'post', :action => url)
         options[:enctype] = "multipart/form-data" if options.delete(:multipart)
         options["data-remote"] = "true" if options.delete(:remote)
+        options["data-method"] = data_method if data_method
         inner_form_html = hidden_form_method_field(desired_method) + capture_html(&block)
         concat_content content_tag('form', inner_form_html, options)
       end
@@ -130,7 +131,7 @@ module Padrino
             error_messages = objects.map { |object|
               object_name = options[:object_name].to_s.underscore.gsub('_', ' ')
               object.errors.map { |f, msg|
-                field = I18n.t(f, :default => object_name.humanize, :scope => [:models, object_name, :attributes])
+                field = I18n.t(f, :default => f.to_s.humanize, :scope => [:models, object_name, :attributes])
                 content_tag(:li, "%s %s" % [field, msg])
               }
             }.join
@@ -190,7 +191,7 @@ module Padrino
       #   label_tag :username, :class => 'long-label' do ... end
       #
       def label_tag(name, options={}, &block)
-        options.reverse_merge!(:caption => "#{name.to_s.titleize}: ", :for => name)
+        options.reverse_merge!(:caption => "#{name.to_s.humanize}: ", :for => name)
         caption_text = options.delete(:caption)
         caption_text << "* " if options.delete(:required)
         if block_given? # label with inner content

data/lib/padrino-helpers/format_helpers.rb

@@ -227,24 +227,15 @@ module Padrino
         distance_of_time_in_words(from_time, Time.now, include_seconds)
       end
 
-      ##
-      # Remove unsafe chars from our javascript
-      #
-      def escape_javascript(html_content)
-        return '' unless html_content
-        javascript_mapping = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n' }
-        javascript_mapping.merge("\r" => '\n', '"' => '\\"', "'" => "\\'")
-        escaped_string = html_content.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { javascript_mapping[$1] }
-        escaped_string
-      end
-
       ##
       # Used in xxxx.js.erb files to escape html so that it can be passed to javascript from Padrino
       #
       #   js_escape_html("<h1>Hey</h1>")
       #
       def js_escape_html(html_content)
-        %Q["#{escape_javascript(html_content)}"]
+        return '' unless html_content
+        javascript_mapping = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
+        html_content.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { javascript_mapping[$1] }
       end
     end # FormatHelpers
   end # Helpers

data/lib/padrino-helpers/locale/cz.yml

@@ -0,0 +1,103 @@
+en:
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: ","
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: " "
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+
+    # Used in number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%n %u"
+        unit: "Kč"
+        # These three are to override number.format and are optional
+        # separator: ","
+        # delimiter: " "
+        precision: 2
+
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "půl minutou"
+      less_than_x_seconds:
+        one:   "asi před sekundou"
+        other: "asi před {{count}} sekundami"
+      x_seconds:
+        one:   "sekundou"
+        other: "{{count}} sekundami"
+      less_than_x_minutes:
+        one:   "před necelou minutou"
+        other: "před ani ne {{count}} minutami"
+      x_minutes:
+        one:   "minutou"
+        other: "{{count}} minutami"
+      about_x_hours:
+        one:   "asi hodinou"
+        other: "asi {{count}} hodinami"
+      x_days:
+        one:   "24 hodinami"
+        other: "{{count}} dny"
+      about_x_months:
+        one:   "asi měsícem"
+        other: "asi {{count}} měsíci"
+      x_months:
+        one:   "měsícem"
+        other: "{{count}} měsíci"
+      about_x_years:
+        one:   "asi rokem"
+        other: "asi {{count}} roky"
+      over_x_years:
+        one:   "více než před rokem"
+        other: "více než {{count}} roky"
+      almost_x_years:
+        one:   "skoro rokem"
+        other: "almost {{count}} roků"
+  models:
+    errors:
+      template:
+        header:
+          one:    "Při ukládání {{model}} došlo k chybě a nebylo jej možné uložit"
+          other:  "Při ukládání {{model}} došlo ke {{count}} chybám a nebylo možné jej uložit"
+        body: "Následující pole obsahují chybně vyplněné údaje:"

data/lib/padrino-helpers/locale/da.yml

@@ -44,37 +44,37 @@ da:
       half_a_minute: "et halvt minut"
       less_than_x_seconds:
         one:  "mindre end et sekund"
-        other: "mindre end {{count}} sekunder"
+        other: "mindre end %{count} sekunder"
       x_seconds:
         one:  "et sekund"
-        other: "{{count}} sekunder"
+        other: "%{count} sekunder"
       less_than_x_minutes:
         one:  "mindre end et minut"
-        other: "mindre end {{count}} minutter"
+        other: "mindre end %{count} minutter"
       x_minutes:
         one:  "et minut"
-        other: "{{count}} minutter"
+        other: "%{count} minutter"
       about_x_hours:
         one:  "cirka en time"
-        other: "cirka {{count}} timer"
+        other: "cirka %{count} timer"
       x_days:
         one:  "en dag"
-        other: "{{count}} dage"
+        other: "%{count} dage"
       about_x_months:
         one:  "cirka en måned"
-        other: "cirka {{count}} måneder"
+        other: "cirka %{count} måneder"
       x_months:
         one:  "en måned"
-        other: "{{count}} måneder"
+        other: "%{count} måneder"
       about_x_years:
         one:  "cirka et år"
-        other: "cirka {{count}} år"
+        other: "cirka %{count} år"
       over_x_years:
         one:  "mere end et år"
-        other: "mere end {{count}} år"
+        other: "mere end %{count} år"
       almost_x_years:
         one:   "næsten et år"
-        other: "næsten {{count}} years"
+        other: "næsten %{count} years"
     prompts:
       second: "Sekund"
       minute: "Minut"
@@ -86,6 +86,6 @@ da:
     errors:
       template:
         header:
-          one:    "En fejl forhindrede {{model}} i at blive gemt"
-          other:  "{{count}} fejl forhindrede denne {{model}} i at blive gemt"
+          one:    "En fejl forhindrede %{model} i at blive gemt"
+          other:  "%{count} fejl forhindrede denne %{model} i at blive gemt"
         body: "Der var problemer med følgende felter:"

data/lib/padrino-helpers/locale/de.yml

@@ -40,39 +40,39 @@ de:
       less_than_x_seconds:
         zero: 'weniger als 1 Sekunde'
         one: 'weniger als 1 Sekunde'
-        other: 'weniger als {{count}} Sekunden'
+        other: 'weniger als %{count} Sekunden'
       x_seconds:
         one: '1 Sekunde'
-        other: '{{count}} Sekunden'
+        other: '%{count} Sekunden'
       less_than_x_minutes:
         zero: 'weniger als 1 Minute'
-        one: 'weniger als eine Minute'
-        other: 'weniger als {{count}} Minuten'
+        one: 'weniger als 1 Minute'
+        other: 'weniger als %{count} Minuten'
       x_minutes:
         one: '1 Minute'
-        other: '{{count}} Minuten'
+        other: '%{count} Minuten'
       about_x_hours:
         one: 'etwa 1 Stunde'
-        other: 'etwa {{count}} Stunden'
+        other: 'etwa %{count} Stunden'
       x_days:
         one: '1 Tag'
-        other: '{{count}} Tage'
+        other: '%{count} Tage'
       about_x_months:
         one: 'etwa 1 Monat'
-        other: 'etwa {{count}} Monate'
+        other: 'etwa %{count} Monate'
       x_months:
         one: '1 Monat'
-        other: '{{count}} Monate'
+        other: '%{count} Monate'
       about_x_years:
         one: 'etwa 1 Jahr'
-        other: 'etwa {{count}} Jahre'
+        other: 'etwa %{count} Jahre'
       over_x_years:
         one: 'mehr als 1 Jahr'
-        other: 'mehr als {{count}} Jahre'
+        other: 'mehr als %{count} Jahre'
   models:
     errors:
       template:
         header:
-          one:    "1 Fehler verhindert, dass Objekt {{model}} gesichert werden kann"
-          other:  "{{count}} Fehler verhindern, dass Objekt {{model}} gesichert werden kann"
-        body: "Es existieren Probleme mit den follgenden Feldern:"
+          one:    "1 Fehler verhindert, dass Objekt %{model} gesichert werden kann"
+          other:  "%{count} Fehler verhindern, dass Objekt %{model} gesichert werden kann"
+        body: "Es existieren Probleme mit den folgenden Feldern:"

data/lib/padrino-helpers/locale/en.yml

@@ -63,41 +63,41 @@ en:
       half_a_minute: "half a minute"
       less_than_x_seconds:
         one:   "less than 1 second"
-        other: "less than {{count}} seconds"
+        other: "less than %{count} seconds"
       x_seconds:
         one:   "1 second"
-        other: "{{count}} seconds"
+        other: "%{count} seconds"
       less_than_x_minutes:
         one:   "less than a minute"
-        other: "less than {{count}} minutes"
+        other: "less than %{count} minutes"
       x_minutes:
         one:   "1 minute"
-        other: "{{count}} minutes"
+        other: "%{count} minutes"
       about_x_hours:
         one:   "about 1 hour"
-        other: "about {{count}} hours"
+        other: "about %{count} hours"
       x_days:
         one:   "1 day"
-        other: "{{count}} days"
+        other: "%{count} days"
       about_x_months:
         one:   "about 1 month"
-        other: "about {{count}} months"
+        other: "about %{count} months"
       x_months:
         one:   "1 month"
-        other: "{{count}} months"
+        other: "%{count} months"
       about_x_years:
         one:   "about 1 year"
-        other: "about {{count}} years"
+        other: "about %{count} years"
       over_x_years:
         one:   "over 1 year"
-        other: "over {{count}} years"
+        other: "over %{count} years"
       almost_x_years:
         one:   "almost 1 year"
-        other: "almost {{count}} years"
+        other: "almost %{count} years"
   models:
     errors:
       template:
         header:
-          one:    "1 error prohibited this {{model}} from being saved"
-          other:  "{{count}} errors prohibited this {{model}} from being saved"
+          one:    "1 error prohibited this %{model} from being saved"
+          other:  "%{count} errors prohibited this %{model} from being saved"
         body: "There were problems with the following fields:"