padrino-helpers 0.9.14 → 0.9.15

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -285,4 +285,4 @@ module Padrino
         end
     end # AssetTagHelpers
   end # Helpers
-end # Padrino
+end # Padrino

data/lib/padrino-helpers/form_builder/abstract_form_builder.rb

@@ -123,11 +123,7 @@ module Padrino
           # Add a :invalid css class to the field if it contain an error
           def field_error(field, options)
             error = @object.errors[field] rescue nil
-            if error
-              [options[:class], :invalid].flatten.compact.join(" ")
-            else
-              options[:class]
-            end
+            error.blank? ? options[:class] : [options[:class], :invalid].flatten.compact.join(" ")
           end
 
           # Returns the name for the given field

data/lib/padrino-helpers/form_helpers.rb

@@ -193,7 +193,7 @@ module Padrino
       def label_tag(name, options={}, &block)
         options.reverse_merge!(:caption => "#{name.to_s.humanize}: ", :for => name)
         caption_text = options.delete(:caption)
-        caption_text << "* " if options.delete(:required)
+        caption_text << "<span class='required'>*</span> " if options.delete(:required)
         if block_given? # label with inner content
           label_content = caption_text + capture_html(&block)
           concat_content(content_tag(:label, label_content, options))
@@ -357,7 +357,7 @@ module Padrino
         return '' if option_items.blank?
         option_items.collect do |caption, value|
           value ||= caption
-          content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /#{value}|#{caption}/)
+          content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /^(#{value}|#{caption})$/)
         end
       end
 

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

@@ -63,41 +63,41 @@ cz:
       half_a_minute: "půl minutou"
       less_than_x_seconds:
         one:   "asi před sekundou"
-        other: "asi před {{count}} sekundami"
+        other: "asi před %{count} sekundami"
       x_seconds:
         one:   "sekundou"
-        other: "{{count}} sekundami"
+        other: "%{count} sekundami"
       less_than_x_minutes:
         one:   "před necelou minutou"
-        other: "před ani ne {{count}} minutami"
+        other: "před ani ne %{count} minutami"
       x_minutes:
         one:   "minutou"
-        other: "{{count}} minutami"
+        other: "%{count} minutami"
       about_x_hours:
         one:   "asi hodinou"
-        other: "asi {{count}} hodinami"
+        other: "asi %{count} hodinami"
       x_days:
         one:   "24 hodinami"
-        other: "{{count}} dny"
+        other: "%{count} dny"
       about_x_months:
         one:   "asi měsícem"
-        other: "asi {{count}} měsíci"
+        other: "asi %{count} měsíci"
       x_months:
         one:   "měsícem"
-        other: "{{count}} měsíci"
+        other: "%{count} měsíci"
       about_x_years:
         one:   "asi rokem"
-        other: "asi {{count}} roky"
+        other: "asi %{count} roky"
       over_x_years:
         one:   "více než před rokem"
-        other: "více než {{count}} roky"
+        other: "více než %{count} roky"
       almost_x_years:
         one:   "skoro rokem"
-        other: "almost {{count}} roků"
+        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"
+          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/nl.yml

@@ -0,0 +1,78 @@
+nl:
+  number:
+    format:
+      precision: 2
+      separator: ','
+      delimiter: '.'
+    currency:
+      format:
+        unit: '€'
+        format: '%u %n'
+        separator:
+        delimiter:
+        precision:
+    percentage:
+      format:
+        delimiter: ""
+    precision:
+      format:
+        delimiter: ""
+    human:
+      format:
+        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"
+
+  datetime:
+    distance_in_words:
+      half_a_minute: 'een halve minuut'
+      less_than_x_seconds:
+        zero: 'minder dan 1 seconde'
+        one: 'minder dan 1 seconde'
+        other: 'minder dan %{count} seconden'
+      x_seconds:
+        one: '1 seconde'
+        other: '%{count} seconden'
+      less_than_x_minutes:
+        zero: 'minder dan 1 minuut'
+        one: 'minder dan 1 minuut'
+        other: 'minder dan %{count} minuten'
+      x_minutes:
+        one: '1 minuut'
+        other: '%{count} minuten'
+      about_x_hours:
+        one: 'ongeveer 1 uur'
+        other: 'ongeveer %{count} uur'
+      x_days:
+        one: '1 dag'
+        other: '%{count} dagen'
+      about_x_months:
+        one: 'ongeveer 1 dag'
+        other: 'ongeveer %{count} dagen'
+      x_months:
+        one: '1 maand'
+        other: '%{count} maanden'
+      about_x_years:
+        one: 'ongeveer 1 jaar'
+        other: 'ongeveer %{count} jaar'
+      over_x_years:
+        one: 'meer dan 1 jaar'
+        other: 'meer dan %{count} jaar'
+  models:
+    errors:
+      template:
+        header:
+          one: "1 fout verhindert het opslaan van dit %{model} object"
+          other:  "%{count} fouten verhinderen het opslaan van dit %{model} object"
+        body: "Controleer alstublieft de volgende velden:"

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

@@ -0,0 +1,95 @@
+pl:
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      separator: ","
+      delimiter: " "
+      precision: 2
+
+    # Used in number_to_currency()
+    currency:
+      format:
+        format: "%n %u"
+        unit: "PLN"
+        separator: ","
+        delimiter: " "
+        precision: 2
+
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        delimiter: ""
+
+    # Used in number_to_precision()
+    precision:
+      format:
+        delimiter: ""
+
+    # Used in number_to_human_size()
+    human:
+      format:
+        delimiter: ""
+        precision: 1
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "bajt"
+            other: "bajty"
+          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ół minuty"
+      less_than_x_seconds:
+        one:   "mniej niż sekundę"
+        few:   "mniej niż %{count} sekundy"
+        other: "mniej niż %{count} sekund"
+      x_seconds:
+        one:   "sekundę"
+        few:   "%{count} sekundy"
+        other: "%{count} sekund"
+      less_than_x_minutes:
+        one:   "mniej niż minutę"
+        few:   "mniej niż %{count} minuty"
+        other: "mniej niż %{count} minut"
+      x_minutes:
+        one:   "minutę"
+        few:   "%{count} minuty"
+        other: "%{count} minut"
+      about_x_hours:
+        one:   "około godziny"
+        other: "około %{count} godzin"
+      x_days:
+        one:   "1 dzień"
+        other: "%{count} dni"
+      about_x_months:
+        one:   "około miesiąca"
+        other: "około %{count} miesięcy"
+      x_months:
+        one:   "1 miesiąc"
+        few:   "%{count} miesiące"
+        other: "%{count} miesięcy"
+      about_x_years:
+        one:   "około roku"
+        other: "około %{count} lat"
+      almost_x_years:
+        one:   "prawie rok"
+        few:   "prawie %{count} lata"
+        other: "prawie %{count} lat"
+      over_x_years:
+        one:   "ponad rok"
+        few:   "ponad %{count} lata"
+        other: "ponad %{count} lat"
+  models:
+    errors:
+      template:
+        header:
+          one:    "%{model} nie został zachowany z powodu jednego błędu"
+          other:  "%{model} nie został zachowany z powodu %{count} błędów"
+        body: "Błędy dotyczą następujących pól:"

data/padrino-helpers.gemspec

@@ -1,22 +1,20 @@
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
-require 'rubygems'
-require 'bundler'
 
 Gem::Specification.new do |s|
-  s.name = %q{padrino-helpers}
-  s.rubyforge_project = %q{padrino-helpers}
+  s.name = "padrino-helpers"
+  s.rubyforge_project = "padrino-helpers"
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.email = %q{padrinorb@gmail.com}
-  s.summary = %q{Helpers for padrino}
-  s.homepage = %q{http://github.com/padrino/padrino-framework/tree/master/padrino-helpers}
-  s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
+  s.email = "padrinorb@gmail.com"
+  s.summary = "Helpers for padrino"
+  s.homepage = "http://www.padrinorb.com"
+  s.description = "Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino"
   s.required_rubygems_version = ">= 1.3.6"
   s.version = Padrino.version
   s.date = Time.now.strftime("%Y-%m-%d")
   s.extra_rdoc_files = Dir["*.rdoc"]
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-helpers.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_path = 'lib'
-  s.add_runtime_dependency(%q<padrino-core>, ["= #{Padrino.version}"])
-  s.add_bundler_dependencies :helpers, :development
+  s.require_path = "lib"
+  s.add_dependency("padrino-core", Padrino.version)
+  s.add_dependency("i18n", ">=0.4.1")
 end

data/test/test_asset_tag_helpers.rb

@@ -131,7 +131,7 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     end
     should "display image tag relative link with options" do
       time = stop_time_for_test
-      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") { 
+      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") {
         image_tag('relative/pic.gif', :class => 'photo') }
     end
     should "display image tag uri link with options" do
@@ -140,7 +140,7 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     end
     should "display image tag relative link with incorrect spacing" do
       time = stop_time_for_test
-      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") { 
+      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") {
         image_tag(' relative/ pic.gif  ', :class => 'photo') }
     end
     should "not use a timestamp if stamp setting is false" do
@@ -265,4 +265,4 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       assert_has_tag('link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title') { feed_tag :rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title" }
     end
   end
-end
+end

data/test/test_form_builder.rb

@@ -10,7 +10,7 @@ class TestFormBuilder < Test::Unit::TestCase
 
   def setup
     role_types = [stub(:name => 'Admin', :id => 1), stub(:name => 'Moderate', :id => 2),  stub(:name => 'Limited', :id => 3)]
-    @user = stub(:errors => {:a => "must be present", :b => "must be valid"}, :class => 'User', :first_name => "Joe", :session_id => 54)
+    @user = stub(:errors => {:a => "must be present", :b => "must be valid", :email => "Must be valid", :first_name => []}, :class => 'User', :first_name => "Joe", :email => '', :session_id => 54)
     @user.stubs(:role_types => role_types, :role => "1")
     @user_none = stub(:errors => {}, :class => 'User')
   end
@@ -38,12 +38,12 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('form', :action => '/register', :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'text', :name => 'outer-user_account[username]') { actual_html }
     end
-    
+
     should "display correct form html with remote option" do
       actual_html = form_for(@user, '/update', :remote => true) { "Demo" }
       assert_has_tag('form', :action => '/update', :method => 'post', "data-remote" => 'true') { actual_html }
     end
-    
+
     should "display correct form html with remote option and method put" do
       actual_html = form_for(@user, '/update', :remote => true, :method => 'put') { "Demo" }
       assert_has_tag('form', :method => 'post', "data-method" => 'put', "data-remote" => 'true') { actual_html }
@@ -94,6 +94,16 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
       assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
     end
+
+    should "have a class of 'invalid' for fields with errors" do
+      actual_html = form_for(@user, '/register') {|f| f.text_field(:email) }
+      assert_has_tag(:input, :type => 'text', :name => 'user[email]', :id => 'user_email', :class => 'invalid') {actual_html }
+    end
+
+    should "not have a class of 'invalid' for fields with no errors" do
+      actual_html = form_for(@user, '/register') {|f| f.text_field(:first_name) }
+      assert_has_no_tag(:input, :type => 'text', :name => 'user[first_name]', :id => 'user_first_name', :class => 'invalid') {actual_html }
+    end
   end
 
   context 'for #fields_for method' do
@@ -655,4 +665,4 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png?#{@stamp}"
     end
   end
-end
+end

data/test/test_form_helpers.rb

@@ -19,13 +19,13 @@ class TestFormHelpers < Test::Unit::TestCase
       actual_html = form_tag('/register', :class => 'test') { text_field_tag(:username) }
       assert_has_tag('form input', :type => 'text', :name => "username") { actual_html }
     end
-    
+
     should "display correct form with remote" do
       actual_html = form_tag('/update', :class => 'put-form', :remote => true) { "Demo" }
       assert_has_tag(:form, :class => "put-form", "data-remote" => 'true') { actual_html }
       assert_has_no_tag(:form, "data-method" => 'post') { actual_html }
     end
-    
+
     should "display correct form with remote and method is put" do
       actual_html = form_tag('/update', :method => 'put', :remote => true) { "Demo" }
       assert_has_tag(:form, "data-remote" => 'true', "data-method" => 'put') { actual_html }
@@ -132,6 +132,12 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_has_tag(:label, :for => 'username', :class => 'long-label', :content => "Nickname") { actual_html }
     end
 
+    should "display label tag in ruby with required" do
+      actual_html = label_tag(:username, :caption => "Nickname", :required => true)
+      assert_has_tag(:label, :for => 'username', :content => 'Nickname') { actual_html }
+      assert_has_tag('label[for=username] span.required', :content => "*") { actual_html }
+    end
+
     should "display label tag in erb for simple form" do
       visit '/erb/form_tag'
       assert_have_selector 'form.simple-form label', :count => 4
@@ -346,6 +352,14 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
     end
 
+    should "display options selected only for exact match" do
+      options = [['One', '1'], ['1', '10'], ['Two', "-1"]]
+      actual_html = select_tag(:range, :options => options, :selected => '-1')
+      assert_has_tag(:select, :name => 'range') { actual_html }
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'Two', :value => '-1', :selected => 'selected') { actual_html }
+    end
+
     should "display select tag in erb" do
       visit '/erb/form_tag'
       assert_have_selector 'form.simple-form select', :count => 1, :name => 'color'
@@ -432,5 +446,4 @@ class TestFormHelpers < Test::Unit::TestCase
       assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png?#{@stamp}"
     end
   end
-
-end
+end

data/test/test_format_helpers.rb

@@ -192,4 +192,4 @@ class TestFormatHelpers < Test::Unit::TestCase
       assert_equal "<data-confirm=\\\"are you sure\\\">", js_escape_html("<data-confirm=\"are you sure\">")
     end
   end
-end
+end

data/test/test_output_helpers.rb

@@ -60,4 +60,4 @@ class TestOutputHelpers < Test::Unit::TestCase
       assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
     end
   end
-end
+end

data/test/test_render_helpers.rb

@@ -46,5 +46,4 @@ class TestRenderHelpers < Test::Unit::TestCase
       assert_have_selector 'p', :content => "Extra is bar"
     end
   end
-
-end
+end

data/test/test_tag_helpers.rb

@@ -77,4 +77,4 @@ class TestTagHelpers < Test::Unit::TestCase
       assert_has_tag('input[type=checkbox]', :disabled => 'disabled') { actual_html }
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: false
   segments: 
   - 0
   - 9
-  - 14
-  version: 0.9.14
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,26 +18,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -07:00
+date: 2010-08-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: padrino-core
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 37
         segments: 
         - 0
         - 9
-        - 14
-        version: 0.9.14
+        - 15
+        version: 0.9.15
   type: :runtime
-  name: padrino-core
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,105 +52,7 @@ dependencies:
         - 1
         version: 0.4.1
   type: :runtime
-  name: i18n
-  prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  name: rake
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  name: mocha
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
-  type: :development
-  name: rack-test
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
-        version: 0.5.1
-  type: :development
-  name: webrat
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 2
-        - 22
-        version: 2.2.22
-  type: :development
-  name: haml
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 2
-        - 10
-        - 3
-        version: 2.10.3
-  type: :development
-  name: shoulda
-  prerelease: false
-  version_requirements: *id008
 description: Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino
 email: padrinorb@gmail.com
 executables: []
@@ -176,6 +80,8 @@ files:
 - lib/padrino-helpers/locale/es.yml
 - lib/padrino-helpers/locale/fr.yml
 - lib/padrino-helpers/locale/it.yml
+- lib/padrino-helpers/locale/nl.yml
+- lib/padrino-helpers/locale/pl.yml
 - lib/padrino-helpers/locale/pt_br.yml
 - lib/padrino-helpers/locale/ru.yml
 - lib/padrino-helpers/locale/tr.yml
@@ -221,7 +127,7 @@ files:
 - test/test_render_helpers.rb
 - test/test_tag_helpers.rb
 has_rdoc: true
-homepage: http://github.com/padrino/padrino-framework/tree/master/padrino-helpers
+homepage: http://www.padrinorb.com
 licenses: []
 
 post_install_message: