middleman-core 3.1.0.rc.2 → 3.1.0.rc.3

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/lib/padrino-helpers/locale/pt_br.yml

@@ -17,8 +17,8 @@ pt_br:
         format: "%u%n"
         unit: "R$"
         # These three are to override number.format and are optional
-        separator: "."
-        delimiter: ","
+        separator: ","
+        delimiter: "."
         precision: 2
 
     # Used in number_to_percentage()

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/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/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/lib/padrino-helpers/output_helpers.rb

@@ -26,6 +26,8 @@ module Padrino
       ##
       # Captures the html from a block of template code for any available handler.
       #
+      # Be aware that trusting the html is up to the caller.
+      #
       # @param [Object] *args
       #   Objects yield to the captured block
       # @param [Proc] &block
@@ -37,15 +39,21 @@ module Padrino
       #   capture_html(&block) => "...html..."
       #   capture_html(object_for_block, &block) => "...html..."
       #
+      # @example
+      #   ActiveSupport::SafeBuffer.new + capture_html { "<foo>" }
+      #   # => "&lt;foo&gt;"
+      #   ActiveSupport::SafeBuffer.safe_concat + capture_html { "<foo>" }
+      #   # => "<foo>"
+      #
       # @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
@@ -53,7 +61,9 @@ module Padrino
       ##
       # Outputs the given text to the templates buffer directly.
       #
-      # @param [String] text
+      # The output might be subject to escaping, if it is not marked as safe.
+      #
+      # @param [String,SafeBuffer] text
       #   Text to concatenate to the buffer.
       #
       # @example
@@ -70,6 +80,21 @@ module Padrino
       end
       alias :concat :concat_content
 
+      ##
+      # Outputs the given text to the templates buffer directly,
+      # assuming that it is safe.
+      #
+      # @param [String] text
+      #   Text to concatenate to the buffer.
+      #
+      # @example
+      #   concat_safe_content("This will be output to the template buffer")
+      #
+      # @api semipublic
+      def concat_safe_content(text="")
+        concat_content text.html_safe
+      end
+
       ##
       # Returns true if the block is from a supported template type; false otherwise.
       # Used to determine if html should be returned or concatenated to the view.
@@ -146,7 +171,7 @@ module Padrino
       def yield_content(key, *args)
         blocks = content_blocks[key.to_sym]
         return nil if blocks.empty?
-        blocks.map { |content| capture_html(*args, &content) }.join
+        mark_safe(blocks.map { |content| capture_html(*args, &content) }.join)
       end
 
       protected
@@ -170,6 +195,21 @@ module Padrino
         def find_proper_handler
           OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.engines.include?(current_engine) && h.is_type? }
         end
+
+        ##
+        # Marks a String or a collection of Strings as safe. `nil` is accepted
+        # but ignored.
+        #
+        # @param [String, Array<String>] the values to be marked safe.
+        #
+        # @return [ActiveSupport::SafeBuffer, Array<ActiveSupport::SafeBuffer>]
+        def mark_safe(value)
+          if value.respond_to? :map!
+            value.map!{|v| v.html_safe if v }
+          else
+            value.html_safe if value
+          end
+        end
     end # OutputHelpers
   end # Helpers
 end # Padrino

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/lib/padrino-helpers/output_helpers/erb_handler.rb

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

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/lib/padrino-helpers/output_helpers/slim_handler.rb

@@ -1,5 +1,4 @@
 # Make slim works with sinatra/padrino
-Slim::Engine.set_default_options(:buffer => '@_out_buf', :generator => Temple::Generators::StringBuffer) if defined?(Slim)
 
 module Padrino
   module Helpers
@@ -31,11 +30,11 @@ module Padrino
         #   @handler.capture_from_template(&block) => "...html..."
         #
         def capture_from_template(*args, &block)
-          self.output_buffer, _buf_was = '', self.output_buffer
-          block.call(*args)
-          ret = eval('@_out_buf', block.binding)
+          self.output_buffer, _buf_was = ActiveSupport::SafeBuffer.new, self.output_buffer
+          captured_block = block.call(*args)
+          ret = eval("@_out_buf", block.binding)
           self.output_buffer = _buf_was
-          ret
+          [ ret, captured_block ]
         end
 
         ##
@@ -73,9 +72,9 @@ module Padrino
           def output_buffer=(val)
             template.instance_variable_set(:@_out_buf, val)
           end
-        end # SlimHandler
+      end # SlimHandler
 
-        OutputHelpers.register(SlimHandler)
+      OutputHelpers.register(SlimHandler)
     end # OutputHelpers
   end # Helpers
 end # Padrino

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/lib/padrino-helpers/render_helpers.rb

@@ -46,12 +46,12 @@ module Padrino
             counter += 1
             options[:locals].merge!(object_name => member, "#{object_name}_counter".to_sym => counter)
             render(explicit_engine, template_path, options.dup)
-          }.join("\n")
+          }.join("\n").html_safe
         else
           if member = options.delete(:object)
             options[:locals].merge!(object_name => member)
           end
-          render(explicit_engine, template_path, options.dup)
+          render(explicit_engine, template_path, options.dup).html_safe
         end
       end
       alias :render_partial :partial

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/lib/padrino-helpers/tag_helpers.rb

@@ -13,6 +13,12 @@ module Padrino
         '"' => """
       }
 
+      ##
+      # Cached Regexp for escaping values to avoid rebuilding one
+      # on every escape operation.
+      #
+      ESCAPE_REGEXP = Regexp.union(*ESCAPE_VALUES.keys)
+
       BOOLEAN_ATTRIBUTES = [
         :autoplay,
         :autofocus,
@@ -42,6 +48,12 @@ module Padrino
         :confirm
       ]
 
+      ##
+      # A html_safe newline string to avoid allocating a new on each
+      # concatenation.
+      #
+      NEWLINE = "\n".html_safe.freeze
+
       ##
       # Creates an HTML tag with given name, content, and options
       #
@@ -104,14 +116,30 @@ module Padrino
           content = capture_html(&block)
         end
 
-        content = content.join("\n") if content.respond_to?(:join)
-
         options    = parse_data_options(name, options)
         attributes = tag_attributes(options)
-        output = "<#{name}#{attributes}>#{content}</#{name}>"
+        output = ActiveSupport::SafeBuffer.new
+        output.safe_concat "<#{name}#{attributes}>"
+        if content.respond_to?(:each) && !content.is_a?(String)
+          content.each { |c| output.concat c; output.safe_concat NEWLINE }
+        else
+          output.concat content
+        end
+        output.safe_concat "</#{name}>"
+
         block_is_template?(block) ? concat_content(output) : output
       end
 
+      ##
+      # Like #content_tag, but assumes its input to be safe and doesn't
+      # escape. It also returns safe html.
+      #
+      # @see #content_tag
+      #
+      def safe_content_tag(name, content = nil, options = nil, &block)
+        mark_safe(content_tag(name, mark_safe(content), options, &block))
+      end
+
       ##
       # Creates an HTML input field with the given type and options
       #
@@ -185,7 +213,7 @@ module Padrino
       #
       # @example
       #   tag :hr, :class => 'dotted'
-      #   # => <hr class="dotted">
+      #   # => <hr class="dotted" />
       #
       #   tag :input, :name => 'username', :type => :text
       #   # => <input name="username" type="text" />
@@ -200,7 +228,7 @@ module Padrino
       def tag(name, options = nil, open = false)
         options    = parse_data_options(name, options)
         attributes = tag_attributes(options)
-        "<#{name}#{attributes}#{open ? '>' : ' />'}"
+        "<#{name}#{attributes}#{open ? '>' : ' />'}".html_safe
       end
 
       private
@@ -226,7 +254,7 @@ module Padrino
       # Escape tag values to their HTML/XML entities.
       ##
       def escape_value(string)
-        string.to_s.gsub(Regexp.union(*ESCAPE_VALUES.keys)) { |c| ESCAPE_VALUES[c] }
+        string.to_s.gsub(ESCAPE_REGEXP) { |c| ESCAPE_VALUES[c] }
       end
 
       ##

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/fixtures/markup_app/app.rb

@@ -2,12 +2,19 @@ require 'sinatra/base'
 require 'haml'
 require 'erubis'
 require 'slim'
+require 'padrino-core/application/rendering/extensions/erubis'
+require 'padrino-core/application/rendering/extensions/haml'
+require 'padrino-core/application/rendering/extensions/slim'
 
 class MarkupDemo < Sinatra::Base
   register Padrino::Helpers
 
   configure do
     set :root, File.dirname(__FILE__)
+    set :erb, :engine_class => Padrino::Erubis::SafeBufferTemplate
+    set :haml, :escape_html => true
+    set :slim, :generator => Temple::Generators::RailsOutputBuffer,
+               :buffer => "out_buf"
   end
 
   get '/:engine/:file' do
@@ -23,19 +30,19 @@ class MarkupDemo < Sinatra::Base
 
     def captured_content(&block)
       content_html = capture_html(&block)
-      "<p>#{content_html}</p>"
+      "<p>#{content_html}</p>".html_safe
     end
 
     def concat_in_p(content_html)
-      concat_content "<p>#{content_html}</p>"
+      concat_safe_content "<p>#{content_html}</p>"
     end
 
-    def determine_block_is_template(name, &block)
-      concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
+    def concat_if_block_is_template(name, &block)
+      concat_safe_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
     end
 
-    def ruby_not_template_block
-      determine_block_is_template('ruby') do
+    def concat_ruby_not_template_block
+      concat_if_block_is_template('ruby') do
         content_tag(:span, "This not a template block")
       end
     end

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/fixtures/markup_app/views/capture_concat.erb

@@ -6,9 +6,9 @@
 
 <% concat_in_p('Concat Line 3') %>
 
-<% determine_block_is_template('erb') do %>
+<% concat_if_block_is_template('erb') do %>
   <span>This is erb</span>
   <span>This is erb</span>
 <% end %>
 
-<% ruby_not_template_block %>
+<% concat_ruby_not_template_block %>

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/fixtures/markup_app/views/capture_concat.haml

@@ -5,8 +5,8 @@
 
 - concat_in_p('Concat Line 3')
 
-- determine_block_is_template('haml') do
+- concat_if_block_is_template('haml') do
   %span This is haml
   %span This is haml
 
-- ruby_not_template_block
+- concat_ruby_not_template_block

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/fixtures/markup_app/views/capture_concat.slim

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