padrino-helpers 0.12.9 → 0.13.0.beta1

data/lib/padrino-helpers/form_helpers/options.rb

@@ -45,9 +45,7 @@ module Padrino
         #
         def option_is_selected?(value, caption, selected_values)
           Array(selected_values).any? do |selected|
-            value ?
-              value.to_s == selected.to_s :
-              caption.to_s == selected.to_s
+            [value.to_s, caption.to_s].include?(selected.to_s)
           end
         end
 
@@ -57,9 +55,9 @@ module Padrino
         def options_for_select(option_items, state = {})
           return [] if option_items.blank?
           option_items.map do |caption, value, attributes|
-            html_attributes = { :value => value || caption }.merge(attributes||{})
-            html_attributes[:selected] ||= option_is_selected?(html_attributes[:value], caption, state[:selected])
-            html_attributes[:disabled] ||= option_is_selected?(html_attributes[:value], caption, state[:disabled])
+            html_attributes = { :value => value ||= caption }.merge(attributes||{})
+            html_attributes[:selected] ||= option_is_selected?(value, caption, state[:selected])
+            html_attributes[:disabled] ||= option_is_selected?(value, caption, state[:disabled])
             content_tag(:option, caption, html_attributes)
           end
         end
@@ -92,7 +90,7 @@ module Padrino
             collection.map{ |item| [ item.send(fields.first), item.send(fields.last) ] }
           else
             options.delete(:options) || []
-          end
+          end        
         end
       end
     end

data/lib/padrino-helpers/output_helpers.rb

@@ -80,7 +80,7 @@ module Padrino
       #
       def concat_content(text="")
         if handler = find_proper_handler
-          handler.concat_to_template(text, binding)
+          handler.concat_to_template(text)
         else
           text
         end

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

@@ -46,7 +46,7 @@ module Padrino
         # @example
         #   @handler.concat_to_template("This will be output to the template buffer")
         #
-        def concat_to_template(text="", context=nil)
+        def concat_to_template(text="")
           text
         end
 

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

@@ -8,8 +8,7 @@ module Padrino
         ##
         # Outputs the given text to the templates buffer directly.
         #
-        def concat_to_template(text="", context=nil)
-          return text if context && context.eval("@__in_ruby_literal")
+        def concat_to_template(text="")
           output_buffer << text
           nil
         end

data/lib/padrino-helpers/render_helpers.rb

@@ -34,8 +34,8 @@ module Padrino
         options = { :locals => {}, :layout => false }.update(options)
         explicit_engine = options.delete(:engine)
 
-        path, _, name = template.to_s.rpartition(File::SEPARATOR)
-        template_path = path.empty? ? :"_#{name}" : :"#{path}#{File::SEPARATOR}_#{name}"
+        path,_,name = template.to_s.rpartition(File::SEPARATOR)
+        template_path = File.join(path,"_#{name}").to_sym
         item_name = name.partition('.').first.to_sym
 
         items, counter = if options[:collection].respond_to?(:inject)
@@ -58,27 +58,6 @@ module Padrino
         end
       end
       alias :render_partial :partial
-
-      def self.included(base)
-        unless base.instance_methods.include?(:render) || base.private_instance_methods.include?(:render)
-          base.class_eval do
-            fail "gem 'tilt' is required" unless defined?(::Tilt)
-
-            def render(engine, file=nil, options={}, locals=nil, &block)
-              locals ||= options[:locals] || {}
-              engine, file = file, engine if file.nil?
-              template_engine = engine ? ::Tilt[engine] : ::Tilt.default_mapping[file]
-              fail "Engine #{engine.inspect} is not registered with Tilt" unless template_engine
-              unless File.file?(file.to_s)
-                engine_extensions = ::Tilt.default_mapping.extensions_for(template_engine)
-                file = Dir.glob("#{file}.{#{engine_extensions.join(',')}}").first || fail("Template '#{file}' not found")
-              end
-              template = template_engine.new(file.to_s, options)
-              template.render(options[:scope] || self, locals, &block)
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/padrino-helpers/tag_helpers.rb

@@ -197,7 +197,7 @@ module Padrino
       #   # => <input type="text" name="username" required autofocus />
       #
       #   input_tag :number, :name => 'credit_card', :autocomplete => :off
-      #   # => <input type="number" autocomplete="off" />
+      #   # => <input type="number" name="credit_card" autocomplete="off" />  
       #
       def input_tag(type, options = {})
         tag(:input, { :type => type }.update(options))
@@ -235,19 +235,6 @@ module Padrino
         "<#{name}#{attributes}#{open ? '>' : ' />'}".html_safe
       end
 
-      ##
-      # Returns an escaped document link.
-      #
-      # @example
-      #   escape_link('http://example.com/spaced link')
-      #   # => 'http://example.com/spaced%20link'
-      #   escape_link('already%20partially escaped')
-      #   # => 'already%20partially%20escaped'
-      #
-      def escape_link(link)
-        link.gsub(' ', '%20')
-      end
-
       private
 
       ##

data/lib/padrino/rendering.rb

@@ -34,11 +34,6 @@ module Padrino
       /~$/ # This is for Gedit
     ] unless defined?(IGNORE_FILE_PATTERN)
 
-    ##
-    # Defines common content-type alias mappings.
-    #
-    CONTENT_TYPE_ALIASES = { :htm => :html }
-
     ##
     # Default options used in the resolve_template-method.
     #
@@ -98,30 +93,6 @@ module Padrino
         @layout = name
       end
 
-      ##
-      # Returns the cached template file to render for a given url,
-      # content_type and locale. Deprecated since 0.12.1
-      #
-      # @param [Array<template_path, content_type, locale>] render_options
-      #
-      def fetch_template_file(render_options)
-        logger.warn "##{__method__} is deprecated"
-        (@_cached_templates ||= {})[render_options]
-      end
-
-      ##
-      # Caches the template file for the given rendering options. Deprecated since 0.12.1
-      #
-      # @param [String] template_file
-      #   The path of the template file.
-      #
-      # @param [Array<template_path, content_type, locale>] render_options
-      #
-      def cache_template_file!(template_file, render_options)
-        logger.warn "##{__method__} is deprecated"
-        (@_cached_templates ||= {})[render_options] = template_file || []
-      end
-
       ##
       # Returns the cached layout path.
       #
@@ -226,7 +197,7 @@ module Padrino
         # This means that no engine was explicitly defined
         data, engine = resolve_template(engine, options) if data.nil?
 
-        ensure_rendering_engine(engine) || (options[:layout] ||= @layout || false)
+        ensure_rendering_engine(engine) || (options[:layout] ||= false)
 
         # Cleanup the template.
         @current_engine, engine_was = engine, @current_engine
@@ -239,20 +210,6 @@ module Padrino
         @_out_buf = buf_was
       end
 
-      ##
-      # Returns the located layout tuple to be used for the rendered template
-      # (if available). Deprecated since 0.12.1
-      #
-      # @example
-      #   resolve_layout
-      #   # => ["/layouts/custom", :erb]
-      #   # => [nil, nil]
-      #
-      def resolved_layout
-        logger.warn "##{__method__} is deprecated"
-        resolve_template(settings.fetch_layout_path, :raise_exceptions => false, :strict_format => true) || [nil, nil]
-      end
-
       ##
       # Returns the template path and engine that match content_type (if present),
       # I18n.locale.
@@ -350,14 +307,13 @@ module Padrino
       end
 
       def select_template(templates, template_path, content_type, _locale)
-        symbol = content_type_symbol(content_type)
-        simple_content_type = [:html, :plain].include?(symbol)
+        simple_content_type = [:html, :plain].include?(content_type)
         target_path, target_engine = path_and_engine(template_path)
 
-        templates.find{ |file,_| file.to_s == "#{target_path}.#{locale}.#{symbol}" } ||
+        templates.find{ |file,_| file.to_s == "#{target_path}.#{locale}.#{content_type}" } ||
         templates.find{ |file,_| file.to_s == "#{target_path}.#{locale}" && simple_content_type } ||
         templates.find{ |file,engine| engine == target_engine || File.extname(file.to_s) == ".#{target_engine}" } ||
-        templates.find{ |file,_| file.to_s == "#{target_path}.#{symbol}" } ||
+        templates.find{ |file,_| file.to_s == "#{target_path}.#{content_type}" } ||
         templates.find{ |file,_| file.to_s == "#{target_path}" && simple_content_type }
       end
 
@@ -379,14 +335,6 @@ module Padrino
         require 'padrino/rendering/erb_template'
         settings.set :erb, Padrino::Rendering.engine_configurations[:erb]
       end
-
-      def content_type_symbol(type)
-        if defined?(::Rack::Mime::MIME_TYPES) && type.kind_of?(String) &&
-           ::Rack::Mime::MIME_TYPES.key(type)
-          type = ::Rack::Mime::MIME_TYPES.key(type).sub(/\./,'').to_sym
-        end
-        CONTENT_TYPE_ALIASES[type] || type
-      end
     end
   end
 end

data/lib/padrino/rendering/erb_template.rb

@@ -1,18 +1,6 @@
 module Padrino
   module Rendering
     class SafeERB < ::ERB
-      class Compiler < ::ERB::Compiler
-        def add_insert_cmd(out, content)
-          out.push("@__in_ruby_literal = true")
-          super
-          out.push("@__in_ruby_literal = false")
-        end
-      end
-
-      def make_compiler(trim_mode)
-        Compiler.new(trim_mode)
-      end
-
       def set_eoutvar(compiler, eoutvar = '_erbout')
         compiler.put_cmd = "#{eoutvar}.safe_concat"
         compiler.insert_cmd = "#{eoutvar}.concat"

data/lib/padrino/rendering/erubis_template.rb

@@ -7,7 +7,7 @@ module Padrino
     # @api private
     module SafeBufferEnhancer
       def add_expr_literal(src, code)
-        src << " @__in_ruby_literal = true; #{@bufvar}.concat((" << code << ').to_s); @__in_ruby_literal = false;'
+        src << " #{@bufvar}.concat((" << code << ').to_s);'
       end
 
       def add_stmt(src, code)

data/padrino-helpers.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-support", Padrino.version)
-  s.add_dependency("tilt", ">= 1.4.1", "< 3")
+  s.add_dependency("tilt", "~> 1.4.1")
   s.add_dependency("i18n", "~> 0.6", ">= 0.6.7")
 end

data/test/fixtures/markup_app/views/form_for.erb

@@ -50,34 +50,6 @@
     <%= f.label :remember_me %>
     <%= f.check_box :remember_me, :value => '1' %>
   </p>
-  <p>
-    <%= f.label :datetime %>
-    <%= f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %>
-  </p>
-  <p>
-    <%= f.label :datetime_local %>
-    <%= f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0) %>
-  </p>
-  <p>
-    <%= f.label :date %>
-    <%= f.date_field :date, :max => DateTime.new(2000, 4, 1) %>
-  </p>
-  <p>
-    <%= f.label :month %>
-    <%= f.month_field :month, :max => DateTime.new(2000, 4, 1) %>
-  </p>
-  <p>
-    <%= f.label :week %>
-    <%= f.week_field :week, :max => DateTime.new(2000, 4, 1) %>
-  </p>
-  <p>
-    <%= f.label :time %>
-    <%= f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0) %>
-  </p>
-  <p>
-    <%= f.label :color %>
-    <%= f.color_field :color, :value => "#f00" %>
-  </p>
   <p><%= f.submit "Create", :class => 'success', :id => 'demo-button' %></p>
   <p><%= f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button' %></p>
 <% end %>

data/test/fixtures/markup_app/views/form_for.haml

@@ -38,28 +38,6 @@
   %p
     = f.label :remember_me
     = f.check_box :remember_me, :value => "1"
-  %p
-    = f.label :datetime
-    = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
-  %p
-    = f.label :datetime_local
-    = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
-  %p
-    = f.label :date
-    = f.date_field :date, :max => DateTime.new(2000, 4, 1)
-  %p
-    = f.label :month
-    = f.month_field :month, :max => DateTime.new(2000, 4, 1)
-  %p
-    = f.label :week
-    = f.week_field :week, :max => DateTime.new(2000, 4, 1)
-  %p
-    = f.label :time
-    = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0)
-  %p
-    = f.label :color
-    = f.color_field :color, :value => "#f00"
-  </p>
   %p
     = f.submit "Create", :class => 'success', :id => 'demo-button'
   %p

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

@@ -38,27 +38,6 @@
   p
     = f.label :remember_me
     = f.check_box :remember_me, :value => "1"
-  p
-    = f.label :datetime
-    = f.datetime_field :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
-  p
-    = f.label :datetime_local
-    = f.datetime_local_field :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0)
-  p
-    = f.label :date
-    = f.date_field :date, :max => DateTime.new(2000, 4, 1)
-  p
-    = f.label :month
-    = f.month_field :month, :max => DateTime.new(2000, 4, 1)
-  p
-    = f.label :week
-    = f.week_field :week, :max => DateTime.new(2000, 4, 1)
-  p
-    = f.label :time
-    = f.time_field :time, :max => Time.new(2008, 6, 21, 13, 30, 0)
-  p
-    = f.label :color
-    = f.color_field :color, :value => "#f00"
   p
     = f.submit "Create", :class => 'success', :id => 'demo-button'
   p

data/test/fixtures/markup_app/views/form_tag.erb

@@ -83,27 +83,6 @@
       <%= range_field_tag('ranger_with_min_max', :min => 1, :max => 50) %>
       <%= range_field_tag('ranger_with_range', :range => 1..5) %>
     </p>
-    <p>
-      <%= datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) %>
-    </p>
-    <p>
-      <%= datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0) %>
-    </p>
-    <p>
-      <%= date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %>
-    </p>
-    <p>
-      <%= month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %>
-    </p>
-    <p>
-      <%= week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1) %>
-    </p>
-    <p>
-      <%= time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0) %>
-    </p>
-    <p>
-      <%= color_field_tag :color, :value => "#f00" %>
-    </p>
   <% end %>
   <% field_set_tag(:class => 'buttons') do %>
     <%= submit_tag "Login" %>

data/test/fixtures/markup_app/views/form_tag.haml

@@ -69,20 +69,6 @@
     %p
       = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
       = range_field_tag('ranger_with_range', :range => 1..5)
-    %p
-      = datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
-    %p
-      = datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
-    %p
-      = date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
-    %p
-      = month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
-    %p
-      = week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
-    %p
-      = time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0)
-    %p
-      = color_field_tag :color, :value => "#f00"
   = field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
     = button_tag "Cancel"

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

@@ -69,20 +69,6 @@
     p
       = range_field_tag('ranger_with_min_max', :min => 1, :max => 50)
       = range_field_tag('ranger_with_range', :range => 1..5)
-    p
-      = datetime_field_tag :datetime, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
-    p
-      = datetime_local_field_tag :datetime_local, :max => DateTime.new(2000, 4, 1, 12, 0, 0), :min => DateTime.new(1993, 2, 24, 12, 30, 45), :value => DateTime.new(2000, 4, 1, 12, 0, 0)
-    p
-      = date_field_tag :date, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
-    p
-      = month_field_tag :month, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
-    p
-      = week_field_tag :week, :max => DateTime.new(2000, 4, 1), :min => DateTime.new(1993, 2, 24), :value => DateTime.new(2000, 4, 1)
-    p
-      = time_field_tag :time, :max => Time.new(2008, 6, 21, 13, 30, 0), :min => Time.new(1993, 2, 24, 1, 19, 12), :value => Time.new(2008, 6, 21, 13, 30, 0)
-    p
-      = color_field_tag :color, :value => "#f00"
 
   = field_set_tag(:class => 'buttons') do
     = submit_tag "Login"

data/test/helper.rb

@@ -4,22 +4,25 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/setup'
 require 'rack/test'
+require 'webrat'
+require 'active_support/time'
 require 'builder'
 require 'padrino-helpers'
-require 'padrino/rendering'
-require 'tilt/liquid'
-require 'tilt/builder'
 
 require 'ext/minitest-spec'
 require 'ext/rack-test-methods'
-require 'padrino/test-methods'
 
 class MiniTest::Spec
   include Padrino::Helpers::OutputHelpers
   include Padrino::Helpers::TagHelpers
   include Padrino::Helpers::AssetTagHelpers
   include Rack::Test::Methods
-  include Padrino::TestMethods
+  include Webrat::Methods
+  include Webrat::Matchers
+
+  Webrat.configure do |config|
+    config.mode = :rack
+  end
 
   def stop_time_for_test
     time = Time.now
@@ -41,7 +44,7 @@ class MiniTest::Spec
     path  = "/views/#{name}"
     path += ".#{options.delete(:locale)}" if options[:locale].present?
     path += ".#{options[:format]}" if options[:format].present?
-    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom|builder|liquid/
+    path += ".erb" unless options[:format].to_s =~ /erb|slim|haml|rss|atom|builder/
     path += ".builder" if options[:format].to_s =~ /rss|atom/
     file  = File.dirname(__FILE__) + path
     File.open(file, 'w') { |io| io.write content }
@@ -75,3 +78,11 @@ class MiniTest::Spec
     Rack::Lint.new(@app)
   end
 end
+
+module Webrat
+  module Logging
+    def logger # @private
+      @logger = nil
+    end
+  end
+end