padrino-helpers 0.10.6 → 0.10.7

data/lib/padrino-helpers.rb

@@ -2,6 +2,7 @@ require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'cgi'
 require 'i18n'
 require 'enumerator'
+require 'active_support/time_with_zone'               # next extension depends on this
 require 'active_support/core_ext/string/conversions'  # to_date
 require 'active_support/core_ext/float/rounding'      # round
 require 'active_support/option_merger'                # with_options
@@ -37,7 +38,7 @@ module Padrino
       #
       # @example Register the helper module
       #   require 'padrino-helpers'
-      #   class Padrino::Appliocation
+      #   class Padrino::Application
       #     register Padrino::Helpers
       #   end
       #

data/lib/padrino-helpers/form_helpers.rb

@@ -244,11 +244,11 @@ module Padrino
       def error_message_on(object, field, options={})
         object = object.is_a?(Symbol) ? instance_variable_get("@#{object}") : object
         error  = object.errors[field] rescue nil
-        if error
+        # Array(error).first is necessary because some ORMs give us an array others directly a value
+        if error = Array(error)[0]
           options.reverse_merge!(:tag => :span, :class => :error)
           tag   = options.delete(:tag)
-          # Array(error).first is necessary because some orm give us an array others directly a value
-          error = [options.delete(:prepend), Array(error).first, options.delete(:append)].compact.join(" ")
+          error = [options.delete(:prepend), error, options.delete(:append)].compact.join(" ")
           content_tag(tag, error, options)
         else
           ''
@@ -703,7 +703,7 @@ module Padrino
         # Returns the options tags for a select based on the given option items
         #
         def options_for_select(option_items, selected_value=nil)
-          return '' if option_items.blank?
+          return [] if option_items.blank?
           option_items.map do |caption, value|
             value ||= caption
             content_tag(:option, caption, :value => value, :selected => option_is_selected?(value, caption, selected_value))

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

@@ -0,0 +1,103 @@
+ro:
+  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: 2
+
+    # 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: "lei"
+        # 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: "jumătate de minut"
+      less_than_x_seconds:
+        one:   "mai puțin de o secundă"
+        other: "mai puțin de %{count} secunde"
+      x_seconds:
+        one:   "o secundă"
+        other: "%{count} secunde"
+      less_than_x_minutes:
+        one:   "mai puțin de un minut"
+        other: "mai puțin de %{count} minute"
+      x_minutes:
+        one:   "un minut"
+        other: "%{count} minute"
+      about_x_hours:
+        one:   "aproximativ o oră"
+        other: "aproximativ %{count} ore"
+      x_days:
+        one:   "o zi"
+        other: "%{count} zile"
+      about_x_months:
+        one:   "aproximativ o lună"
+        other: "aproximativ %{count} luni"
+      x_months:
+        one:   "o lună"
+        other: "%{count} luni"
+      about_x_years:
+        one:   "aproximativ un an"
+        other: "aproximativ %{count} ani"
+      over_x_years:
+        one:   "peste un an"
+        other: "peste %{count} ani"
+      almost_x_years:
+        one:   "aproape un an"
+        other: "aproape %{count} ani"
+  models:
+    errors:
+      template:
+        header:
+          one:    "Nu s-a putut salva %{model}, a avut loc o eroare."
+          other:  "Nu s-a putut salva %{model}, au avut loc %{count} erori."
+        body: "Există probleme cu următoarele câmpuri:"

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

@@ -0,0 +1,103 @@
+sv:
+  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: 2
+
+    # 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: "kr"
+        # 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: "en halv minut"
+      less_than_x_seconds:
+        one:   "mindre än 1 sekund"
+        other: "mindre än %{count} sekunder"
+      x_seconds:
+        one:   "1 sekund"
+        other: "%{count} sekunder"
+      less_than_x_minutes:
+        one:   "mindre än en minut"
+        other: "mindre än %{count} minuter"
+      x_minutes:
+        one:   "1 minut"
+        other: "%{count} minuter"
+      about_x_hours:
+        one:   "cirka 1 timme"
+        other: "cirka %{count} timmar"
+      x_days:
+        one:   "1 dag"
+        other: "%{count} dagar"
+      about_x_months:
+        one:   "cirka 1 månad"
+        other: "cirka %{count} månader"
+      x_months:
+        one:   "1 månad"
+        other: "%{count} månader"
+      about_x_years:
+        one:   "cirka 1 år"
+        other: "cirka %{count} år"
+      over_x_years:
+        one:   "över 1 år"
+        other: "över %{count} år"
+      almost_x_years:
+        one:   "nästan 1 år"
+        other: "nästan %{count} år"
+  models:
+    errors:
+      template:
+        header:
+          one:    "1 fel hindrade denna %{model} från att sparas"
+          other:  "%{count} fel hindrade denna %{model} från att sparas"
+        body: "Följande fält innehåller fel:"

data/lib/padrino-helpers/output_helpers/slim_handler.rb

@@ -31,9 +31,9 @@ module Padrino
         #   @handler.capture_from_template(&block) => "...html..."
         #
         def capture_from_template(*args, &block)
-          self.output_buffer, _buf_was = "", self.output_buffer
+          self.output_buffer, _buf_was = '', self.output_buffer
           block.call(*args)
-          ret = eval("@_out_buf", block.binding)
+          ret = eval('@_out_buf', block.binding)
           self.output_buffer = _buf_was
           ret
         end

data/lib/padrino-helpers/tag_helpers.rb

@@ -214,7 +214,7 @@ module Padrino
           if v.is_a?(Hash)
             nested_values(k, v)
           elsif BOOLEAN_ATTRIBUTES.include?(k)
-            k.to_s
+            %(#{k}="#{k}")
           else
             %(#{k}="#{escape_value(v)}")
           end

data/test/fixtures/markup_app/views/capture_concat.slim

@@ -1,13 +1,13 @@
--@content = captured_content do
+- @content = captured_content do
   span Captured Line 1
   span Captured Line 2
 
-==@content
+== @content
 
-==determine_block_is_template('slim') do
+- determine_block_is_template('slim') do
   span This is slim
   span This is slim
 
-==concat_in_p('Concat Line 3')
+== concat_in_p('Concat Line 3')
 
-==ruby_not_template_block
+== ruby_not_template_block

data/test/fixtures/markup_app/views/link_to.slim

@@ -1,4 +1,4 @@
-= link_to "Test 1 No Block", '/test1', :class => 'test', :id => 'test1'
+== link_to "Test 1 No Block", '/test1', :class => 'test', :id => 'test1'
 
-- link_to("/test2", :class => 'test', :id => 'test2') do
+== link_to("/test2", :class => 'test', :id => 'test2') do
   span Test 2 With Block

data/test/test_asset_tag_helpers.rb

@@ -81,6 +81,12 @@ describe "AssetTagHelpers" do
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
       assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
+
+    should "display link block element in slim" do
+      visit '/slim/link_to'
+      assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
+    end
   end
 
   context 'for #mail_to method' do

data/test/test_form_helpers.rb

@@ -177,6 +177,12 @@ describe "FormHelpers" do
       actual_html = error_message_on(:user, :fake, :prepend => "foo", :append => "bar")
       assert actual_html.blank?
     end
+
+    should "display no message when error isn't present in an Array" do
+      @user = mock_model("User", :errors => { :a => [], :b => "2" }, :blank? => false)
+      actual_html = error_message_on(:user, :a, :prepend => "foo", :append => "bar")
+      assert actual_html.blank?
+    end
   end
 
   context 'for #label_tag method' do

data/test/test_output_helpers.rb

@@ -100,8 +100,7 @@ describe "OutputHelpers" do
     should_eventually "work for slim templates" do
       visit '/slim/capture_concat'
       assert_have_selector 'p', :content => "The slim block passed in is a template", :class => 'is_template'
-      # TODO Get SLIM template detection working (fix block_is_erb? method)
-      # assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
+      assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
     end
   end
 

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: padrino-helpers
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.10.7
   prerelease: 
-  version: 0.10.6
 platform: ruby
-authors: 
+authors:
 - Padrino Team
 - Nathan Esquenazi
 - Davide D'Agostino
@@ -12,40 +12,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: padrino-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.6
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.6"
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :runtime
-  version_requirements: *id002
-description: Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+description: Tag helpers, asset helpers, form helpers, form builders and many more
+  helpers for padrino
 email: padrinorb@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .yardopts
@@ -72,7 +80,9 @@ files:
 - lib/padrino-helpers/locale/no.yml
 - lib/padrino-helpers/locale/pl.yml
 - lib/padrino-helpers/locale/pt_br.yml
+- lib/padrino-helpers/locale/ro.yml
 - lib/padrino-helpers/locale/ru.yml
+- lib/padrino-helpers/locale/sv.yml
 - lib/padrino-helpers/locale/tr.yml
 - lib/padrino-helpers/locale/uk.yml
 - lib/padrino-helpers/locale/zh_cn.yml
@@ -147,32 +157,30 @@ files:
 - test/test_tag_helpers.rb
 homepage: http://www.padrinorb.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: padrino-helpers
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Helpers for padrino
-test_files: 
+test_files:
 - test/fixtures/markup_app/app.rb
 - test/fixtures/markup_app/views/capture_concat.erb
 - test/fixtures/markup_app/views/capture_concat.haml
@@ -231,3 +239,4 @@ test_files:
 - test/test_output_helpers.rb
 - test/test_render_helpers.rb
 - test/test_tag_helpers.rb
+has_rdoc: