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/form_builder/abstract_form_builder.rb

@@ -24,9 +24,9 @@ module Padrino
         end
 
         # f.label :username, :caption => "Nickname"
-        def label(field, options={})
+        def label(field, options={}, &block)
           options.reverse_merge!(:caption => "#{field_human_name(field)}: ")
-          @template.label_tag(field_id(field), options)
+          @template.label_tag(field_id(field), options, &block)
         end
 
         # f.hidden_field :session_id, :value => "45"
@@ -95,12 +95,38 @@ module Padrino
           @template.select_tag field_name(field), options
         end
 
+        # f.check_box_group :color, :options => ['red', 'green', 'blue'], :selected => ['red', 'blue']
+        # f.check_box_group :color, :collection => @colors, :fields => [:name, :id]
+        def check_box_group(field, options={})
+          selected_values = Array(options[:selected] || field_value(field))
+          if options[:collection]
+            fields = options[:fields] || [:name, :id]
+            # don't use map!, it will break some orms
+            selected_values = selected_values.map{ |v| (v.respond_to?(fields[0]) ? v.send(fields[1]) : v).to_s }
+          end
+          labeled_group( field, options ) do |variant|
+            @template.check_box_tag( field_name(field)+'[]', :value => variant[1], :id => variant[2], :checked => selected_values.include?(variant[1]) )
+          end
+        end
+
+        # f.radio_button_group :color, :options => ['red', 'green']
+        # f.radio_button_group :color, :collection => @colors, :fields => [:name, :id], :selected => @colors.first
+        def radio_button_group(field, options={})
+          fields = options[:fields] || [:name, :id]
+          selected_value = options[:selected] || field_value(field)
+          selected_value = selected_value.send(fields[1])  if selected_value.respond_to?(fields[0])
+          labeled_group( field, options ) do |variant|
+            @template.radio_button_tag( field_name(field), :value => variant[1], :id => variant[2], :checked => variant[1] == selected_value.to_s )
+          end
+        end
+
         # f.check_box :remember_me, :value => 'true', :uncheck_value => '0'
         def check_box(field, options={})
+          html = ActiveSupport::SafeBuffer.new
           unchecked_value = options.delete(:uncheck_value) || '0'
           options.reverse_merge!(:id => field_id(field), :value => '1')
           options.reverse_merge!(:checked => true) if values_matches_field?(field, options[:value])
-          html  = @template.hidden_field_tag(options[:name] || field_name(field), :value => unchecked_value, :id => nil)
+          html << @template.hidden_field_tag(options[:name] || field_name(field), :value => unchecked_value, :id => nil)
           html << @template.check_box_tag(field_name(field), options)
         end
 
@@ -140,7 +166,11 @@ module Padrino
           result = nested_objects.each_with_index.map do |child_instance, index|
             nested_options[:index] = include_index ? index : nil
             @template.fields_for(child_instance,  { :nested => nested_options }, &block)
-          end.join("\n")
+          end.join("\n").html_safe
+        end
+
+        def csrf_token_field
+          @template.csrf_token_field
         end
 
         protected
@@ -171,17 +201,8 @@ module Padrino
           # field_name(:number) => "user[telephone_attributes][number]"
           # field_name(:street) => "user[addresses_attributes][0][street]"
           def field_name(field=nil)
-            result = []
-            if root_form?
-              result << object_model_name
-            elsif nested_form?
-              parent_form = @options[:nested][:parent]
-              attributes_name = "#{@options[:nested][:association]}_attributes"
-              nested_index = @options[:nested][:index]
-              fragment = [parent_form.field_name, "[#{attributes_name}", "]"]
-              fragment.insert(2, "][#{nested_index}") if nested_index
-              result << fragment
-            end
+            result = field_result
+            result << field_name_fragment if nested_form?
             result << "[#{field}]" unless field.blank?
             result.flatten.join
           end
@@ -192,17 +213,8 @@ module Padrino
           # field_name(:number) => "user_telephone_attributes_number"
           # field_name(:street) => "user_addresses_attributes_0_street"
           def field_id(field=nil, value=nil)
-            result = []
-            if root_form?
-              result << object_model_name
-            elsif nested_form?
-              parent_form = @options[:nested][:parent]
-              attributes_name = "#{@options[:nested][:association]}_attributes"
-              nested_index = @options[:nested][:index]
-              fragment = [parent_form.field_id, "_#{attributes_name}"]
-              fragment.push("_#{nested_index}") if nested_index
-              result << fragment
-            end
+            result = field_result
+            result << field_id_fragment if nested_form?
             result << "_#{field}" unless field.blank?
             result << "_#{value}" unless value.blank?
             result.flatten.join
@@ -245,6 +257,52 @@ module Padrino
           def root_form?
             !nested_form?
           end
+
+          # Builds a group of labels for radios or checkboxes
+          def labeled_group(field, options={})
+            options.reverse_merge!(:id => field_id(field), :selected => field_value(field))
+            options.merge!(:class => field_error(field, options))
+            variants = case
+            when options[:options]
+              options[:options].map{ |caption, value| [caption.to_s, (value||caption).to_s] }
+            when options[:collection]
+              fields = options[:fields] || [:name, :id]
+              options[:collection].map{ |variant| [variant.send(fields.first).to_s, variant.send(fields.last).to_s] }
+            else
+              []
+            end
+            variants.inject(''.html_safe) do |html, variant|
+              variant[2] = "#{field_id(field)}_#{variant[1]}"
+              html << @template.label_tag("#{field_name(field)}[]", :for => variant[2], :caption => "#{yield(variant)} #{variant[0]}")
+            end
+          end
+
+        private
+        def field_result
+          result = []
+          result << object_model_name if root_form?
+          result
+        end
+
+        def field_name_fragment
+          fragment = [result_options[:parent_form].field_name, "[#{result_options[:attributes_name]}", "]"]
+          fragment.insert(2, "][#{result_options[:nested_index]}") if result_options[:nested_index]
+          fragment
+        end
+
+        def field_id_fragment
+          fragment = [result_options[:parent_form].field_id, "_#{result_options[:attributes_name]}"]
+          fragment.push("_#{result_options[:nested_index]}") if result_options[:nested_index]
+          fragment
+        end
+
+        def result_options
+          {
+            :parent_form  => @options[:nested][:parent],
+            :nested_index => @options[:nested][:index],
+            :attributes_name => "#{@options[:nested][:association]}_attributes"
+          }
+        end
       end # AbstractFormBuilder
     end # FormBuilder
   end # Helpers

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

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Padrino
   module Helpers
     ##
@@ -28,8 +30,9 @@ module Padrino
       #
       # @api public
       def form_for(object, url, settings={}, &block)
-        form_html = capture_html(builder_instance(object, settings), &block)
-        form_tag(url, settings) { form_html }
+        instance = builder_instance(object, settings)
+        html = capture_html(instance, &block)
+        form_tag(url, settings) { html }
       end
 
       ##
@@ -54,7 +57,7 @@ module Padrino
         instance = builder_instance(object, settings)
         fields_html = capture_html(instance, &block)
         fields_html << instance.hidden_field(:id) if instance.send(:nested_object_id)
-        concat_content fields_html
+        concat_safe_content fields_html
       end
 
       ##
@@ -79,8 +82,9 @@ module Padrino
         options.reverse_merge!(:method => 'post', :action => url)
         options[:enctype] = 'multipart/form-data' if options.delete(:multipart)
         options['accept-charset'] ||= 'UTF-8'
-        inner_form_html  = hidden_form_method_field(desired_method)
-        inner_form_html += capture_html(&block)
+        inner_form_html = hidden_form_method_field(desired_method)
+        inner_form_html << csrf_token_field
+        inner_form_html << mark_safe(capture_html(&block))
         concat_content content_tag(:form, inner_form_html, options)
       end
 
@@ -100,7 +104,7 @@ module Padrino
       #
       # @api semipublic
       def hidden_form_method_field(desired_method)
-        return '' if desired_method.blank? || desired_method.to_s =~ /get|post/i
+        return ActiveSupport::SafeBuffer.new if desired_method.blank? || desired_method.to_s =~ /get|post/i
         hidden_field_tag(:_method, :value => desired_method)
       end
 
@@ -125,8 +129,8 @@ module Padrino
       def field_set_tag(*args, &block)
         options = args.extract_options!
         legend_text = args[0].is_a?(String) ? args.first : nil
-        legend_html = legend_text.blank? ? '' : content_tag(:legend, legend_text)
-        field_set_content = legend_html + capture_html(&block)
+        legend_html = legend_text.blank? ? ActiveSupport::SafeBuffer.new : content_tag(:legend, legend_text)
+        field_set_content = legend_html + mark_safe(capture_html(&block))
         concat_content content_tag(:fieldset, field_set_content, options)
       end
 
@@ -167,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 = {}
@@ -199,10 +203,10 @@ module Padrino
               }
             }.join
 
-            contents = ''
+            contents = ActiveSupport::SafeBuffer.new
             contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
             contents << content_tag(:p, message) unless message.blank?
-            contents << content_tag(:ul, error_messages)
+            contents << safe_content_tag(:ul, error_messages)
 
             content_tag(:div, contents, html)
           end
@@ -244,7 +248,14 @@ 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
-        # Array(error).first is necessary because some ORMs give us an array others directly a value
+        error = if defined?(Ohm::Model) && object.is_a?(Ohm::Model)
+          I18n.t("ohm.errors.messages.#{error[0]}", :default => error[0].to_s)
+        else
+          # Array(error).first is necessary because some ORMs 
+          # give us an array others directly a value
+          Array(error)[0]
+        end
+
         if error = Array(error)[0]
           options.reverse_merge!(:tag => :span, :class => :error)
           tag   = options.delete(:tag)
@@ -276,10 +287,11 @@ module Padrino
       # @api public
       def label_tag(name, options={}, &block)
         options.reverse_merge!(:caption => "#{name.to_s.humanize}: ", :for => name)
-        caption_text = options.delete(:caption)
-        caption_text << "<span class='required'>*</span> " if options.delete(:required)
+        caption_text = options.delete(:caption).html_safe
+        caption_text.safe_concat "<span class='required'>*</span> " if options.delete(:required)
+
         if block_given? # label with inner content
-          label_content = caption_text + capture_html(&block)
+          label_content = caption_text.concat capture_html(&block)
           concat_content(content_tag(:label, label_content, options))
         else # regular label
           content_tag(:label, caption_text, options)
@@ -409,10 +421,10 @@ module Padrino
       #   # => <input name="age" min="18" max="120" step="1" type="number">
       #
       # @api public
-      def number_field_tag(name, options={})        
+      def number_field_tag(name, options={})
         input_tag(:number, options.reverse_merge(:name => name))
       end
-      
+
       ##
       # Creates a telephone field input with the given name and options
       #
@@ -452,7 +464,7 @@ module Padrino
       def email_field_tag(name, options={})
         input_tag(:email, options.reverse_merge(:name => name))
       end
-      
+
       ##
       # Creates a search field input with the given name and options
       #
@@ -573,6 +585,7 @@ module Padrino
       #
       # @api public
       def file_field_tag(name, options={})
+        name = "#{name}[]" if options[:multiple]
         options.reverse_merge!(:name => name)
         input_tag(:file, options)
       end
@@ -630,7 +643,7 @@ module Padrino
         end
         select_options_html = select_options_html.unshift(blank_option(prompt)) if select_options_html.is_a?(Array)
         options.merge!(:name => "#{options[:name]}[]") if options[:multiple]
-        content_tag(:select, select_options_html, options)
+        safe_content_tag(:select, select_options_html, options)
       end
 
       ##
@@ -689,6 +702,68 @@ module Padrino
         input_tag(:image, options)
       end
 
+      # Constructs a hidden field containing a CSRF token.
+      #
+      # @param [String] token
+      #   The token to use. Will be read from the session by default.
+      #
+      # @return [String] The hidden field with CSRF token as value.
+      #
+      # @example
+      #   csrf_token_field
+      #
+      # @api public
+      def csrf_token_field(token = nil)
+        if defined? session
+          token ||= (session[:csrf] ||= SecureRandom.hex(32))
+        end
+
+        hidden_field_tag :authenticity_token, :value => token
+      end
+
+      ##
+      # Creates a form containing a single button that submits to the url.
+      #
+      # @overload button_to(name, url, options={})
+      #   @param [String]  caption  The text caption.
+      #   @param [String]  url      The url href.
+      #   @param [Hash]    options  The html options.
+      # @overload button_to(name, options={}, &block)
+      #   @param [String]  url      The url href.
+      #   @param [Hash]    options  The html options.
+      #   @param [Proc]    block    The button content.
+      #
+      # @option options [Boolean] :multipart
+      #   If true, this form will support multipart encoding.
+      # @option options [String] :remote
+      #   Instructs ujs handler to handle the submit as ajax.
+      # @option options [Symbol] :method
+      #   Instructs ujs handler to use different http method (i.e :post, :delete).
+      #
+      # @return [String] Form and button html with specified +options+.
+      #
+      # @example
+      #   button_to 'Delete', url(:accounts_destroy, :id => account), :method => :delete, :class => :form
+      #   # Generates:
+      #   # <form class="form" action="/admin/accounts/destroy/2" method="post">
+      #   #   <input type="hidden" value="delete" name="_method" />
+      #   #   <input type="submit" value="Delete" />
+      #   # </form>
+      #
+      # @api public
+      def button_to(*args, &block)
+        name, url = args[0], args[1]
+        options   = args.extract_options!
+        options['data-remote'] = 'true' if options.delete(:remote)
+        if block_given?
+          form_tag(url, options, &block)
+        else
+          form_tag(url, options) do
+            submit_tag(name)
+          end
+        end
+      end
+
       protected
 
         ##

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module Padrino
   module Helpers
     ###
@@ -18,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
@@ -40,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
 
       ##
@@ -82,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
 
       ##
@@ -373,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"'])/) { javascript_mapping[$1] }
+        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/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/lib/padrino-helpers/locale/fr.yml

@@ -27,25 +27,25 @@ fr:
         format: "%n %u"
         units:
           byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
+            one:   "Octet"
+            other: "Octets"
+          kb: "Ko"
+          mb: "Mo"
+          gb: "Go"
+          tb: "To"
 
   datetime:
     distance_in_words:
       half_a_minute: "une demi minute"
       less_than_x_seconds:
-        one:   "infèrieur à une seconde"
-        other: "infèrieur à %{count} secondes"
+        one:   "inférieur à une seconde"
+        other: "inférieur à %{count} secondes"
       x_seconds:
         one:   "1 seconde"
         other: "%{count} secondes"
       less_than_x_minutes:
-        one:   "infèrieur à 1 minute"
-        other: "infèrieur à %{count} minutes"
+        one:   "inférieur à 1 minute"
+        other: "inférieur à %{count} minutes"
       x_minutes:
         one:   "1 minute"
         other: "%{count} minutes"
@@ -68,8 +68,8 @@ fr:
         one:   "plus d'un an"
         other: "plus de %{count} ans"
       almost_x_years:
-        one:   "près d'un ans"
-        other: "près de %{count} years"
+        one:   "près d'un an"
+        other: "près de %{count} ans"
   models:
     errors:
       template: