padrino-helpers 0.11.0 → 0.11.1

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -5,8 +5,8 @@ module Padrino
     #
     module AssetTagHelpers
       FRAGMENT_HASH = "#".html_safe.freeze
-       # assets that require an appended extension
-      APPEND_ASSET_EXTENSIONS = ["js", "css"]
+      APPEND_ASSET_EXTENSIONS = ["js", "css"]  # assets that require an appended extension
+      ABSOLUTE_URL_PATTERN = %r{^(https?://)} # absolute url regex
 
       ##
       # Creates a div to display the flash of given type if it exists
@@ -32,7 +32,7 @@ module Padrino
         bootstrap = options.delete(:bootstrap) if options[:bootstrap]
         args.inject(''.html_safe) do |html,kind|
           flash_text = flash[kind]
-          next if flash_text.blank?
+          next html if flash_text.blank?
           flash_text << safe_content_tag(:button, "&times;", {:type => :button, :class => :close, :'data-dismiss' => :alert}) if bootstrap
           html << safe_content_tag(:div, flash_text, options.reverse_merge(:class => kind))
         end
@@ -323,7 +323,7 @@ module Padrino
       # @api semipublic
       def asset_path(kind, source)
         source = asset_normalize_extension(kind, URI.escape(source.to_s))
-        return source if source =~ %r{^(/|https?://)} # absolute source
+        return source if source =~ ABSOLUTE_URL_PATTERN || source =~ /^\// # absolute source
         source = File.join(asset_folder_name(kind), source)
         timestamp = asset_timestamp(source)
         result_path = uri_root_path(source)
@@ -384,7 +384,7 @@ module Padrino
       #
       def asset_normalize_extension(kind, source)
         ignore_extension = !APPEND_ASSET_EXTENSIONS.include?(kind.to_s)
-        source << ".#{kind}" unless ignore_extension or source =~ /\.#{kind}/
+        source << ".#{kind}" unless ignore_extension || source =~ /\.#{kind}/ || source =~ ABSOLUTE_URL_PATTERN
         source
       end
 

data/lib/padrino-helpers/breadcrumb_helpers.rb

@@ -37,7 +37,7 @@ module Padrino
       #
       # @api public
       def set_home(url, caption)
-        self.home = { :url => url, :caption => caption.to_s.humanize, :name => :home }
+        self.home = { :url => url, :caption => caption.to_s.humanize.html_safe, :name => :home }
         reset
       end
 
@@ -85,7 +85,7 @@ module Padrino
       #
       # @api public
       def add(name, url, caption)
-        items << { :name => name, :url => url.to_s, :caption => caption.to_s.humanize }
+        items << { :name => name, :url => url.to_s, :caption => caption.to_s.humanize.html_safe }
       end
 
       alias :<< :add

data/lib/padrino-helpers/form_helpers.rb

@@ -31,7 +31,8 @@ module Padrino
       # @api public
       def form_for(object, url, settings={}, &block)
         instance = builder_instance(object, settings)
-        form_tag(url, settings) { capture_html(instance, &block) }
+        html = capture_html(instance, &block)
+        form_tag(url, settings) { html }
       end
 
       ##
@@ -170,7 +171,7 @@ module Padrino
         objects = objects.map { |object_name|
           object_name.is_a?(Symbol) ? instance_variable_get("@#{object_name}") : object_name
         }.compact
-        count   = objects.inject(0) { |sum, object| sum + object.errors.size }
+        count   = objects.inject(0) { |sum, object| sum + object.errors.count }
 
         unless count.zero?
           html = {}

data/lib/padrino-helpers/format_helpers.rb

@@ -19,7 +19,7 @@ module Padrino
       #
       # @api public
       def escape_html(text)
-        Rack::Utils.escape_html(text)
+        Rack::Utils.escape_html(text).html_safe
       end
       alias h escape_html
       alias sanitize_html escape_html
@@ -41,8 +41,8 @@ module Padrino
       #
       # @api public
       def h!(text, blank_text = ' ')
-        return blank_text if text.nil? || text.empty?
-        h text
+        return blank_text.html_safe if text.nil? || text.empty?
+        h(text)
       end
 
       ##
@@ -83,12 +83,13 @@ module Padrino
       def simple_format(text, options={})
         t = options.delete(:tag) || :p
         start_tag = tag(t, options, true)
-        text = text.to_s.dup
+        text = escape_html(text.to_s.dup)
         text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
         text.gsub!(/\n\n+/, "</#{t}>\n\n#{start_tag}")  # 2+ newline  -> paragraph
         text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
         text.insert 0, start_tag
         text << "</#{t}>"
+        text.html_safe
       end
 
       ##
@@ -374,7 +375,9 @@ module Padrino
       def js_escape_html(html_content)
         return '' unless html_content
         javascript_mapping = { '\\' => '\\\\', '</' => '<\/', "\r\n" => '\n', "\n" => '\n', "\r" => '\n', '"' => '\\"', "'" => "\\'" }
-        html_content.gsub(/(\\|<\/|\r\n|[\n\r"'])/){|m| javascript_mapping[m]}
+        escaped_content = html_content.gsub(/(\\|<\/|\r\n|[\n\r"'])/){ |m| javascript_mapping[m] }
+        escaped_content = escaped_content.html_safe if html_content.html_safe?
+        escaped_content
       end
       alias :escape_javascript :js_escape_html
     end # FormatHelpers

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

@@ -14,8 +14,8 @@ zh_cn:
     currency:
       format:
         # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
-        format: "%u %n"
-        unit: "元"
+        format: "%u%n"
+        unit: "RMB"
         # These three are to override number.format and are optional
         separator: "."
         delimiter: ","
@@ -50,12 +50,12 @@ zh_cn:
         format: "%n %u"
         units:
           byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
+            one:   "字节"
+            other: "字节"
+          kb: "K"
+          mb: "兆"
+          gb: "G"
+          tb: "T"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
@@ -92,13 +92,12 @@ zh_cn:
         one:   "一年多"
         other: "%{count} 年多"
       almost_x_years:
-        one:   "接近一年"
-        other: "接近 %{count} 年"
+        one:   "已经一年"
+        other: "已经 %{count} 年"
   models:
     errors:
       template:
         header:
-          one:   "有1 个错误发生使得「%{model}」无法被储存。 "
-          other: "有%{count} 个错误发生使得「%{model}」无法被储存。 "
-        body: "以下栏位发生问题："
-
+          one:    "%{model} 保存时产生错误"
+          other:  "%{model} 保存时产生了 %{count} 个错误"
+        body: "下列字段产生错误："

data/lib/padrino-helpers/output_helpers.rb

@@ -48,12 +48,12 @@ module Padrino
       # @api semipublic
       def capture_html(*args, &block)
         handler = find_proper_handler
-        captured_html = ""
+        captured_block, captured_html = nil, ""
         if handler && handler.is_type? && handler.block_is_type?(block)
-          captured_html = handler.capture_from_template(*args, &block)
+          captured_html, captured_block = handler.capture_from_template(*args, &block)
         end
         # invoking the block directly if there was no template
-        captured_html = block_given? && block.call(*args) if captured_html.blank?
+        captured_html = block_given? && ( captured_block || block.call(*args) )  if captured_html.blank?
         captured_html
       end
       alias :capture :capture_html

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

@@ -29,10 +29,10 @@ module Padrino
         #
         def capture_from_template(*args, &block)
           self.output_buffer, _buf_was = ActiveSupport::SafeBuffer.new, self.output_buffer
-          block.call(*args)
+          captured_block = block.call(*args)
           ret = eval("@_out_buf", block.binding)
           self.output_buffer = _buf_was
-          ret
+          [ ret, captured_block ]
         end
 
         ##

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

@@ -31,10 +31,10 @@ module Padrino
         #
         def capture_from_template(*args, &block)
           self.output_buffer, _buf_was = ActiveSupport::SafeBuffer.new, self.output_buffer
-          block.call(*args)
+          captured_block = block.call(*args)
           ret = eval("@_out_buf", block.binding)
           self.output_buffer = _buf_was
-          ret
+          [ ret, captured_block ]
         end
 
         ##

data/test/fixtures/render_app/app.rb

@@ -31,6 +31,10 @@ class RenderDemo < Padrino::Application
     render :explicit_engine
   end
 
+  get '/double_capture_:ext' do
+    render "double_capture_#{params[:ext]}"
+  end
+
   # partial with object
   get '/partial/object' do
     partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }

data/test/fixtures/render_app/views/double_capture_erb.erb

@@ -0,0 +1,3 @@
+<% form_for( :object, '/' ) do |f| %>
+  <%= $number_of_captures += 1 %>
+<% end %>

data/test/fixtures/render_app/views/double_capture_haml.haml

@@ -0,0 +1,2 @@
+- form_for :object, '/' do |f|
+  = $number_of_captures += 1

data/test/fixtures/render_app/views/double_capture_slim.slim

@@ -0,0 +1,2 @@
+- form_for :object, '/' do |f|
+  = $number_of_captures += 1

data/test/test_asset_tag_helpers.rb

@@ -23,7 +23,7 @@ describe "AssetTagHelpers" do
     should "display multiple flash tags with given attributes" do
       flash[:error] = 'wrong'
       flash[:success] = 'okey'
-      actual_html = flash_tag(:success, :error, :id => 'area')
+      actual_html = flash_tag(:success, :warning, :error, :id => 'area')
       assert_has_tag('div.success#area', :content => flash[:success]) { actual_html }
       assert_has_tag('div.error#area', :content => flash[:error]) { actual_html }
       assert_has_no_tag('div.notice') { actual_html }
@@ -294,6 +294,12 @@ describe "AssetTagHelpers" do
       assert_has_tag('script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
 
+    should "not append extension to absolute paths" do
+      time = stop_time_for_test
+      actual_html = javascript_include_tag('https://maps.googleapis.com/maps/api/js?key=value&sensor=false')
+      assert_has_tag('script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false") { actual_html }
+    end
+
     should "display javascript items" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')

data/test/test_format_helpers.rb

@@ -15,6 +15,7 @@ describe "FormatHelpers" do
   context 'for #simple_format method' do
     should "format simple text into html format" do
       actual_text = simple_format("Here is some basic text...\n...with a line break.")
+      assert_equal true, actual_text.html_safe?
       assert_equal "<p>Here is some basic text...\n<br />...with a line break.</p>", actual_text
     end
 
@@ -139,6 +140,11 @@ describe "FormatHelpers" do
     should "return text escaped if not empty" do
       assert_equal '&lt;h1&gt;hello&lt;&#x2F;h1&gt;', h!('<h1>hello</h1>')
     end
+    should "mark escaped text as safe" do
+      assert_equal false, '<h1>hello</h1>'.html_safe?
+      assert_equal true, h('<h1>hello</h1>').html_safe?
+      assert_equal true, h!("", "default").html_safe?
+    end
   end
 
   context 'for #time_ago_in_words method' do
@@ -227,5 +233,9 @@ describe "FormatHelpers" do
       assert_equal "<data-confirm=\\\"are you sure\\\">", js_escape_html("<data-confirm=\"are you sure\">")
       assert_equal "<data-confirm=\\\"are you sure\\\">", js_escape_html(ActiveSupport::SafeBuffer.new("<data-confirm=\"are you sure\">"))
     end
+    should "keep html_safe content html_safe" do
+      assert_equal false, js_escape_html('"hello"').html_safe?
+      assert_equal true, js_escape_html(ActiveSupport::SafeBuffer.new('"hello"')).html_safe?
+    end
   end
 end

data/test/test_render_helpers.rb

@@ -72,5 +72,23 @@ describe "RenderHelpers" do
       assert_have_selector 'p.slim span',  :content => "slim"
       assert_have_selector 'p.end',   :content => "haml"
     end
+
+    should "capture slim template once and only once" do
+      $number_of_captures = 0
+      visit '/double_capture_slim'
+      assert_equal 1,$number_of_captures
+    end
+
+    should "capture haml template once and only once" do
+      $number_of_captures = 0
+      visit '/double_capture_haml'
+      assert_equal 1,$number_of_captures
+    end
+
+    should "capture erb template once and only once" do
+      $number_of_captures = 0
+      visit '/double_capture_erb'
+      assert_equal 1,$number_of_captures
+    end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
+  prerelease: 
 platform: ruby
 authors:
 - Padrino Team
@@ -11,25 +12,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,6 +140,9 @@ files:
 - test/fixtures/render_app/views/current_engines/_erb.erb
 - test/fixtures/render_app/views/current_engines/_haml.haml
 - test/fixtures/render_app/views/current_engines/_slim.slim
+- test/fixtures/render_app/views/double_capture_erb.erb
+- test/fixtures/render_app/views/double_capture_haml.haml
+- test/fixtures/render_app/views/double_capture_slim.slim
 - test/fixtures/render_app/views/erb/test.erb
 - test/fixtures/render_app/views/explicit_engine.haml
 - test/fixtures/render_app/views/haml/test.haml
@@ -153,27 +161,31 @@ files:
 - test/test_tag_helpers.rb
 homepage: http://www.padrinorb.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3249284005023139295
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-helpers
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Helpers for padrino
 test_files:
 - test/fixtures/markup_app/app.rb
@@ -218,6 +230,9 @@ test_files:
 - test/fixtures/render_app/views/current_engines/_erb.erb
 - test/fixtures/render_app/views/current_engines/_haml.haml
 - test/fixtures/render_app/views/current_engines/_slim.slim
+- test/fixtures/render_app/views/double_capture_erb.erb
+- test/fixtures/render_app/views/double_capture_haml.haml
+- test/fixtures/render_app/views/double_capture_slim.slim
 - test/fixtures/render_app/views/erb/test.erb
 - test/fixtures/render_app/views/explicit_engine.haml
 - test/fixtures/render_app/views/haml/test.haml

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: f362f51264ab447da505f5bbaeb295b467cff819
-  data.tar.gz: c0a4370011a89876d15d3668a82e3451e5b9b6cb
-SHA512:
-  metadata.gz: c3b645ff7c6bbdafc844465cb6f78fcdea389ee27ccff8b6dabd2f7eb352ebb1f256f0cea9c67914a6d56ba74609c678a2703b7b7451558c73ef1822877a511f
-  data.tar.gz: fafd39ce16c2639cbde4537a6b6530b2580e1c59ae9c397298dd16d8416bc9a241e7eeff8c4a91f4548609f64339162ec28ad597398a1c6a93839f11c6706652