middleman-core 3.2.0 → 3.2.1

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/test/test_rendering.rb

@@ -60,14 +60,14 @@ describe "Rendering" do
     end
 
     should 'not use layout' do
-      with_layout :application, "this is a <%= yield %>" do
+      with_layout :application, "this is an <%= yield %>" do
         with_view :index, "index" do
           mock_app do
             get("/with/layout"){ render :index }
             get("/without/layout"){ render :index, :layout => false }
           end
           get "/with/layout"
-          assert_equal "this is a index", body
+          assert_equal "this is an index", body
           get "/without/layout"
           assert_equal "index", body
         end
@@ -528,5 +528,18 @@ describe "Rendering" do
       assert ok?
       assert_equal '<p><div>foo</div></p>', body.strip
     end
+
+    should "render correct erb when use sinatra as middleware" do
+      class Bar < Sinatra::Base
+        get "/" do
+          render :erb, "<&'>"
+        end
+      end
+      mock_app do
+        use Bar
+      end
+      get "/"
+      assert_equal "<&'>", body
+    end
   end
 end

data/lib/vendored-middleman-deps/padrino-core-0.11.4/test/test_rendering_extensions.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+describe "Rendering Extensions" do
+  context 'for haml' do
+    should 'render haml_tag correctly' do
+      mock_app do
+        get('/') { render :haml, '-haml_tag :div'}
+      end
+
+      get '/'
+      assert_match '<div></div>', last_response.body
+    end
+  end
+end

data/lib/vendored-middleman-deps/{padrino-core-0.11.2 → padrino-core-0.11.4}/test/test_routing.rb

@@ -109,6 +109,16 @@ describe "Routing" do
     assert_equal 'success!', body    
   end
 
+  should 'parse routes that include encoded slash' do
+    mock_app do
+      get('/:drive_alias/:path', :path => /.*/){
+        "Show #{params[:drive_alias]} and #{params[:path]}"
+      }
+    end
+    get("/drive%2Ffoo/some/path")
+    assert_equal "Show drive/foo and some/path", body
+  end
+
   should 'encode params using UTF-8' do
     skip unless ''.respond_to?(:encoding) # for 1.8.7
 
@@ -151,6 +161,20 @@ describe "Routing" do
     assert_equal 404, status
   end
 
+  should "parse params when use regex for parts of a route" do
+    mock_app do
+      post :index, :with => [:foo, :bar], :bar => /.+/ do
+        "show #{params[:foo]}"
+      end
+
+      get :index, :map => '/mystuff/:a_id/boing/:boing_id' do
+        "show #{params[:a_id]} and #{params[:boing_id]}"
+      end
+    end
+    get "/mystuff/5/boing/2"
+    assert_equal "show 5 and 2", body
+  end
+
   should "not generate overlapping head urls" do
     app = mock_app do
       get("/main"){ "hello" }
@@ -226,6 +250,28 @@ describe "Routing" do
     assert_equal 404, status
   end
 
+  should 'generate absolute urls' do
+    mock_app do
+      get(:hash, :with => :id){ absolute_url(:hash, :id => 1) }
+    end
+    get "/hash/2"
+    assert_equal "http://example.org/hash/1", body
+    get "https://example.org/hash/2"
+    assert_equal "https://example.org/hash/1", body
+  end
+
+  should 'generate proper absolute urls for mounted apps' do
+    class Test < Padrino::Application
+      get :foo do
+        absolute_url(:foo, :id => 1)
+      end
+    end
+    Padrino.mount("Test").to("/test")
+    @app = Padrino.application
+    get('/test/foo')
+    assert_equal 'http://example.org/test/foo?id=1', body
+  end
+
   should 'allow regex url with format' do
     mock_app do
       get(/.*/, :provides => :any) { "regexp" }
@@ -792,7 +838,6 @@ describe "Routing" do
 
 
   should 'respect priorities' do
-    skip
     route_order = []
     mock_app do
       get(:index, :priority => :normal) { route_order << :normal; pass }
@@ -804,6 +849,19 @@ describe "Routing" do
     assert_equal "hello", body
   end
 
+  should 'catch all after controllers' do
+    mock_app do
+      get(:index, :with => :slug, :priority => :low) { "catch all" }
+      controllers :contact do
+        get(:index) { "contact"}
+      end
+    end
+    get "/contact"
+    assert_equal "contact", body
+    get "/foo"
+    assert_equal "catch all", body
+  end
+
   should 'allow optionals' do
     mock_app do
       get(:show, :map => "/stories/:type(/:category)") do
@@ -1062,17 +1120,17 @@ describe "Routing" do
     mock_app do
       provides :xml
 
-      get("/foo"){ "Foo in #{content_type}" }
-      get("/bar"){ "Bar in #{content_type}" }
+      get("/foo"){ "Foo in #{content_type.inspect}" }
+      get("/bar"){ "Bar in #{content_type.inspect}" }
     end
 
     get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
     get '/foo'
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
 
     get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Bar in html', body
+    assert_equal 'Bar in nil', body
   end
 
   should "does not allow global provides in controller" do
@@ -1080,18 +1138,18 @@ describe "Routing" do
       controller :base do
         provides :xml
 
-        get(:foo, "/foo"){ "Foo in #{content_type}" }
-        get(:bar, "/bar"){ "Bar in #{content_type}" }
+        get(:foo, "/foo"){ "Foo in #{content_type.inspect}" }
+        get(:bar, "/bar"){ "Bar in #{content_type.inspect}" }
       end
     end
 
     get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
     get '/foo'
-    assert_equal 'Foo in xml', body
+    assert_equal 'Foo in :xml', body
 
     get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-    assert_equal 'Bar in html', body
+    assert_equal 'Bar in nil', body
   end
 
   should "map non named routes in controllers" do

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/README.rdoc

@@ -236,4 +236,4 @@ For more information on using the render and partial helpers, check out the guid
 
 == Copyright
 
-Copyright (c) 2011 Padrino. See LICENSE for details.
+Copyright (c) 2011-2013 Padrino. See LICENSE for details.

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

@@ -1,5 +1,4 @@
 require 'padrino-core/support_lite' unless defined?(SupportLite)
-require 'cgi'
 require 'i18n'
 require 'enumerator'
 require 'active_support/time_with_zone'               # next extension depends on this
@@ -9,8 +8,6 @@ require 'active_support/core_ext/object/with_options' # with_options
 require 'active_support/inflector'                    # humanize
 
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
-
-# Load our locales
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
 
 module Padrino
@@ -34,7 +31,7 @@ module Padrino
       #   Padrino::Helpers::Breadcrumbs
       #
       # @param [Sinatra::Application] app
-      #   The specified padrino application
+      #   The specified Padrino application.
       #
       # @example Register the helper module
       #   require 'padrino-helpers'
@@ -56,5 +53,5 @@ module Padrino
       end
       alias :included :registered
     end
-  end # Helpers
-end # Padrino
+  end
+end

data/lib/vendored-middleman-deps/{padrino-helpers-0.11.2 → padrino-helpers-0.11.4}/lib/padrino-helpers/asset_tag_helpers.rb

@@ -1,21 +1,21 @@
 module Padrino
   module Helpers
     ###
-    # Helpers related to producing assets (images,stylesheets,js,etc) within templates.
+    # Helpers related to producing assets (images, stylesheets, js, etc) within templates.
     #
     module AssetTagHelpers
       FRAGMENT_HASH = "#".html_safe.freeze
-      APPEND_ASSET_EXTENSIONS = ["js", "css"]  # assets that require an appended extension
-      ABSOLUTE_URL_PATTERN = %r{^(https?://)} # absolute url regex
+      APPEND_ASSET_EXTENSIONS = ["js", "css"]
+      ABSOLUTE_URL_PATTERN = %r{^(https?://)}
 
       ##
-      # Creates a div to display the flash of given type if it exists
+      # Creates a div to display the flash of given type if it exists.
       #
       # @param [Symbol] kind
       #   The type of flash to display in the tag.
       # @param [Hash] options
       #   The html options for this section.
-      #   use :bootstrap => true to support Twitter's bootstrap dismiss alert button
+      #   use :bootstrap => true to support Twitter's bootstrap dismiss alert button.
       #
       # @return [String] Flash tag html with specified +options+.
       #
@@ -26,7 +26,6 @@ module Padrino
       #   # Generates: <div class="error">flash-error</div>
       #   # <div class="success">flash-success</div>
       #
-      # @api public
       def flash_tag(*args)
         options = args.extract_options!
         bootstrap = options.delete(:bootstrap) if options[:bootstrap]
@@ -39,7 +38,7 @@ module Padrino
       end
 
       ##
-      # Creates a link element with given name, url and options
+      # Creates a link element with given name, url and options.
       #
       # @overload link_to(caption, url, options={})
       #   @param [String]  caption  The text caption.
@@ -51,15 +50,15 @@ module Padrino
       #   @param [Proc]    block    The link content.
       #
       # @option options [String] :anchor
-      #   The anchor for the link (i.e #something)
+      #   The anchor for the link (i.e #something).
       # @option options [String] :fragment
-      #   Synonym for anchor
+      #   Synonym for anchor.
       # @option options [Boolean] :if
-      #   If true, the link will appear, otherwise not;
+      #   If true, the link will appear, otherwise not.
       # @option options [Boolean] :unless
-      #   If false, the link will appear, otherwise not;
+      #   If false, the link will appear, otherwise not.
       # @option options [Boolean] :remote
-      #   If true, this link should be handled by a ajax ujs handler.
+      #   If true, this link should be handled by an ajax ujs handler.
       # @option options [String] :confirm
       #   Instructs ujs handler to alert confirm message.
       # @option options [Symbol] :method
@@ -74,13 +73,12 @@ module Padrino
       #   link_to('click me', :class => 'blocky') do; end
       #
       # Note that you can pass :+if+ or :+unless+ conditions, but if you provide :current as
-      # condition padrino return true/false if the request.path_info match the given url
+      # condition padrino return true/false if the request.path_info match the given url.
       #
-      # @api public
       def link_to(*args, &block)
-        options = args.extract_options!
-        fragment  = options.delete(:anchor).to_s if options[:anchor]
-        fragment  = options.delete(:fragment).to_s if options[:fragment]
+        options  = args.extract_options!
+        fragment = options.delete(:anchor).to_s if options[:anchor]
+        fragment = options.delete(:fragment).to_s if options[:fragment]
 
         url = ActiveSupport::SafeBuffer.new
         if block_given?
@@ -121,11 +119,11 @@ module Padrino
       # @param[Hash] options
       #   The options for the feed tag.
       # @option options [String] :rel ("alternate")
-      #   Specify the relation of this link
+      #   Specify the relation of this link.
       # @option options [String] :type
-      #   Override the auto-generated mime type
+      #   Override the auto-generated mime type.
       # @option options [String] :title
-      #   Specify the title of the link, defaults to the type
+      #   Specify the title of the link, defaults to the type.
       #
       # @return [String] Feed link html tag with specified +options+.
       #
@@ -135,7 +133,6 @@ module Padrino
       #   feed_tag :rss, url(:blog, :posts, :format => :rss)
       #   # Generates: <link type="application/rss+xml" rel="alternate" href="/blog/posts.rss" title="rss" />
       #
-      # @api public
       def feed_tag(mime, url, options={})
         full_mime = (mime == :atom) ? 'application/atom+xml' : 'application/rss+xml'
         tag(:link, options.reverse_merge(:rel => 'alternate', :type => full_mime, :title => mime, :href => url))
@@ -163,7 +160,6 @@ module Padrino
       #   # Generates: <a href="mailto:me@demo.com">My Email</a>
       #   mail_to "me@demo.com", "My Email"
       #
-      # @api public
       def mail_to(email, caption=nil, mail_options={})
         html_options = mail_options.slice!(:cc, :bcc, :subject, :body)
         mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@').gsub('&', '&amp;')
@@ -182,20 +178,19 @@ module Padrino
       # @return [String] Meta html tag with specified +options+.
       #
       # @example
-      #   # Generates: <meta name="keywords" content="weblog,news">
+      #   # Generates: <meta name="keywords" content="weblog,news" />
       #   meta_tag "weblog,news", :name => "keywords"
       #
-      #   # Generates: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+      #   # Generates: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       #   meta_tag "text/html; charset=UTF-8", 'http-equiv' => "Content-Type"
       #
-      # @api public
       def meta_tag(content, options={})
         options.reverse_merge!("content" => content)
         tag(:meta, options)
       end
 
       ##
-      # Generates a favicon link. looks inside images folder
+      # Generates a favicon link. Looks inside images folder
       #
       # @param [String] source
       #   The source image path for the favicon link tag.
@@ -210,7 +205,6 @@ module Padrino
       #   # or override some options
       #   favicon_tag 'favicon.png', :type => 'image/ico'
       #
-      # @api public
       def favicon_tag(source, options={})
         type = File.extname(source).gsub('.','')
         options = options.dup.reverse_merge!(:href => image_path(source), :rel => 'icon', :type => "image/#{type}")
@@ -218,7 +212,7 @@ module Padrino
       end
 
       ##
-      # Creates an image element with given url and options
+      # Creates an image element with given url and options.
       #
       # @param [String] url
       #   The source path for the image tag.
@@ -230,7 +224,6 @@ module Padrino
       # @example
       #   image_tag('icons/avatar.png')
       #
-      # @api public
       def image_tag(url, options={})
         options.reverse_merge!(:src => image_path(url))
         tag(:img, options)
@@ -250,7 +243,7 @@ module Padrino
       # @example
       #   stylesheet_link_tag 'style', 'application', 'layout'
       #
-      # @api public
+      # @api public.
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.symbolize_keys
         options.reverse_merge!(:media => 'screen', :rel => 'stylesheet', :type => 'text/css')
@@ -273,7 +266,6 @@ module Padrino
       # @example
       #   javascript_include_tag 'application', :extjs
       #
-      # @api public
       def javascript_include_tag(*sources)
         options = sources.extract_options!.symbolize_keys
         options.reverse_merge!(:type => 'text/javascript')
@@ -287,7 +279,7 @@ module Padrino
       # like app/public/images for inclusion. You can provide also a full path.
       #
       # @param [String] src
-      #   The path to the image file (relative or absolute)
+      #   The path to the image file (relative or absolute).
       #
       # @return [String] Path to an image given the +kind+ and +source+.
       #
@@ -301,10 +293,10 @@ module Padrino
       end
 
       ##
-      # Returns the path to the specified asset (css or javascript)
+      # Returns the path to the specified asset (css or javascript).
       #
       # @param [String] kind
-      #   The kind of asset (i.e :images, :js, :css)
+      #   The kind of asset (i.e :images, :js, :css).
       # @param [String] source
       #   The path to the asset (relative or absolute).
       #
@@ -320,7 +312,6 @@ module Padrino
       #   # Generates: /images/example.jpg?1269008689
       #   asset_path :images, 'example.jpg'
       #
-      # @api semipublic
       def asset_path(kind, source)
         source = asset_normalize_extension(kind, URI.escape(source.to_s))
         return source if source =~ ABSOLUTE_URL_PATTERN || source =~ /^\// # absolute source
@@ -332,7 +323,7 @@ module Padrino
 
       private
       ##
-      # Returns the uri root of the application with optional paths appended.
+      # Returns the URI root of the application with optional paths appended.
       #
       # @example
       #   uri_root_path("/some/path") => "/root/some/path"
@@ -344,7 +335,7 @@ module Padrino
       end
 
       ##
-      # Returns the timestamp mtime for an asset
+      # Returns the timestamp mtime for an asset.
       #
       # @example
       #   asset_timestamp("some/path/to/file.png") => "?154543678"
@@ -375,7 +366,8 @@ module Padrino
         end
       end
 
-      # Normalizes the extension for a given asset
+      ##
+      # Normalizes the extension for a given asset.
       #
       #  @example
       #
@@ -389,7 +381,7 @@ module Padrino
       end
 
       ##
-      # Parses link_to options for given correct conditions
+      # Parses link_to options for given correct conditions.
       #
       # @example
       #   parse_conditions("/some/url", :if => false) => true
@@ -404,6 +396,6 @@ module Padrino
           true
         end
       end
-    end # AssetTagHelpers
-  end # Helpers
-end # Padrino
+    end
+  end
+end