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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d409fa4b4685ed3179880f7ec5f6b3d738b02cb5
-  data.tar.gz: 85297e96e43c14c1cdc4f08acb9c909f5eef6e04
+  metadata.gz: 25781ccd8de535b9b6789b101762fa1dc753ae58
+  data.tar.gz: 0be523cddc28bbb739c6b2afb37221fe9afd53b1
 SHA512:
-  metadata.gz: eb1fc2f29f119b5972c274f85bad7601e981aeba564a33ea0ec97fe3be68e84da70e5db0e08e6120f73e4c9c4f740b2f38c78aeb87b971c0cfa3e715a66de476
-  data.tar.gz: d5487e80ecd0b193602ab72ea0de5764685998a1838c8bfca0f3fd1a320c21e542dd568abd660085aa5acc33d32fd74f50d61f16f17edc272fd878f20f1f88bc
+  metadata.gz: 9f2a22f4e27d44ee57fb3ad1a690736dd2bb626073e1ce69462bf687fa9048afdaac3ff571f28114e60c6ed307e7d355d244ad94e81cbc78104f7daccc76dfdb
+  data.tar.gz: bcffd4386d2100d62175e025a2bc236d90865e45666a46cdb856a60501f5a9f25779aee651ff7803d78befe3ac5f5aab5f2935c38fdc2425195395031dbc44a7

data/features/helpers_link_to.feature

@@ -1,5 +1,20 @@
 Feature: link_to helper
 
+  Scenario: link_to works with blocks (erb)
+    Given the Server is running at "link-to-app"
+    When I go to "/link_to_erb.html"
+    Then I should see "erb <s>with html tags</s>"
+
+  Scenario: link_to works with blocks (slim)
+    Given the Server is running at "link-to-app"
+    When I go to "/link_to_slim.html"
+    Then I should see "<s>slim with html tags</s>"
+
+  Scenario: link_to works with blocks (haml)
+    Given the Server is running at "link-to-app"
+    When I go to "/link_to_haml.html"
+    Then I should see "<s>haml with html tags</s>"
+
   Scenario: link_to produces relative links
     Given a fixture app "indexable-app"
     And an empty file named "config.rb"

data/features/markdown.feature

@@ -10,4 +10,14 @@ Feature: Markdown support
   Scenario: Markdown extensions (Maruku)
     Given the Server is running at "markdown-app"
     When I go to "/smarty_pants.html"
-    Then I should see "“Hello”"
+    Then I should see "“Hello”"
+
+  Scenario: Links with block syntax in ERB layout (erb)
+    Given the Server is running at "more-markdown-app"
+    When I go to "/with_layout_erb.html"
+    Then I should see '<a href="layout_block_link.html">'
+  
+  Scenario: Links with block syntax in ERB layout and markdown
+    Given the Server is running at "more-markdown-app"
+    When I go to "/with_layout.html"
+    Then I should see '<a href="layout_block_link.html">'

data/features/mount_rack.feature

@@ -5,4 +5,63 @@ Feature: Support Rack apps mounted using map
     When I go to "/"
     Then I should see "Hello World (Middleman)"
     When I go to "/sinatra/"
-    Then I should see "Hello World (Sinatra)"
+    Then I should see "Hello World (Sinatra)"
+
+  Scenario: Built Mounted Rack App at /sinatra
+    Given a successfully built app at "sinatra-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+    Then the following files should not exist:
+      | sinatra/index.html |
+      | sinatra/index2.html |
+
+  Scenario: Static Ruby Endpoints
+    Given a fixture app "sinatra-app"
+    And a file named "config.rb" with:
+    """
+    endpoint "hello.html" do
+      "world"
+    end
+    """
+    And the Server is running at "sinatra-app"
+    When I go to "/hello.html"
+    Then I should see "world"
+
+  Scenario: Built Mounted Rack App at /sinatra (including rack endpoints)
+    Given a fixture app "sinatra-app"
+    And a file named "config.rb" with:
+      """
+      require "sinatra"
+
+      class MySinatra < Sinatra::Base
+        get "/" do
+          "Hello World (Sinatra)"
+        end
+        get "/derp.html" do
+          "De doo"
+        end
+      end
+
+      map "/sinatra" do
+        run MySinatra
+      end
+
+      configure :build do
+        endpoint "sinatra/index2.html", :path => "/sinatra/"
+      end
+
+      endpoint "dedoo.html", :path => "/sinatra/derp.html"
+
+      endpoint "hello.html" do
+        "world"
+      end
+      """
+    And a successfully built app at "sinatra-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html |
+      | sinatra/index2.html |
+      | dedoo.html |
+    And the file "sinatra/index2.html" should contain 'Hello World (Sinatra)'
+    And the file "dedoo.html" should contain 'De doo'

data/fixtures/link-to-app/source/link_to_erb.html.erb

@@ -0,0 +1,3 @@
+<% link_to "/" do %>
+  erb <s>with html tags</s>
+<% end %>

data/fixtures/link-to-app/source/link_to_haml.html.haml

@@ -0,0 +1,2 @@
+- link_to "/" do
+  %s haml with html tags

data/fixtures/link-to-app/source/link_to_slim.html.slim

@@ -0,0 +1,2 @@
+- link_to "/" do
+  s slim with html tags

data/fixtures/more-markdown-app/source/layouts/layout.erb

@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>My Sample Site</title>
+    <!-- Comment in layout -->
+  </head>
+  <body>
+    <%= yield %>
+
+    <% link_to "layout_block_link.html" do %>
+      Block link text
+    <% end %>
+  </body>
+</html>

data/fixtures/more-markdown-app/source/with_layout.markdown

@@ -0,0 +1,4 @@
+---
+layout: layout
+---
+Hello World

data/fixtures/more-markdown-app/source/with_layout_erb.markdown.erb

@@ -0,0 +1,4 @@
+---
+layout: layout
+---
+Hello World

data/fixtures/sinatra-app/config.rb

@@ -4,6 +4,9 @@ class MySinatra < Sinatra::Base
   get "/" do
     "Hello World (Sinatra)"
   end
+  get "/derp.html" do
+    "De doo"
+  end
 end
 
 map "/sinatra" do

data/lib/middleman-core/cli/build.rb

@@ -135,7 +135,7 @@ module Middleman::Cli
           FileUtils.cp(resource.source_file, output_file)
         else
           begin
-            response = self.class.shared_rack.get(URI.escape(resource.destination_path))
+            response = self.class.shared_rack.get(URI.escape(resource.request_path))
 
             if response.status == 200
               create_file(output_file, binary_encode(response.body))

data/lib/middleman-core/core_extensions/rendering.rb

@@ -123,12 +123,9 @@ module Middleman
         # @param [Hash] opts
         # @return [String]
         def render_template(path, locs={}, opts={}, blocks=[])
-          # Detect the remdering engine from the extension
           extension = File.extname(path)
           engine = extension[1..-1].to_sym
 
-          # Store last engine for later (could be inside nested renders)
-          @current_engine, engine_was = engine, @current_engine
           if defined?(::I18n)
             old_locale = ::I18n.locale
             ::I18n.locale = opts[:lang] if opts[:lang]
@@ -171,7 +168,6 @@ module Middleman
           # Pop all the saved variables from earlier as we may be returning to a
           # previous render (layouts, partials, nested layouts).
           ::I18n.locale = old_locale if defined?(::I18n)
-          @current_engine = engine_was
           @content_blocks = nil
           @current_locs = nil
           @current_opts = nil
@@ -238,6 +234,13 @@ module Middleman
         def render_individual_file(path, locs = {}, opts = {}, context = self, &block)
           path = path.to_s
 
+          # Detect the remdering engine from the extension
+          extension = File.extname(path)
+          engine = extension[1..-1].to_sym
+
+          # Store last engine for later (could be inside nested renders)
+          context.current_engine, engine_was = engine, context.current_engine
+          
           # Save current buffer for later
           @_out_buf, _buf_was = "", @_out_buf
 
@@ -283,6 +286,7 @@ module Middleman
         ensure
           # Reset stored buffer
           @_out_buf = _buf_was
+          context.current_engine = engine_was
         end
 
         # Get the template data from a path
@@ -394,13 +398,13 @@ module Middleman
           # Save current buffer for later
           @_out_buf, _buf_was = "", @_out_buf
 
-          layout_path = locate_layout(layout_name, current_engine)
+          layout_path = locate_layout(layout_name, self.current_engine)
 
           extension = File.extname(layout_path)
           engine = extension[1..-1].to_sym
 
           # Store last engine for later (could be inside nested renders)
-          @current_engine, engine_was = engine, @current_engine
+          self.current_engine, engine_was = engine, self.current_engine
 
           begin
             content = if block_given?
@@ -415,13 +419,19 @@ module Middleman
 
           concat_safe_content render_individual_file(layout_path, @current_locs || {}, @current_opts || {}, self) { content }
         ensure
-          @current_engine = engine_was
+          self.current_engine = engine_was
         end
 
         # The currently rendering engine
         # @return [Symbol, nil]
         def current_engine
-          @current_engine ||= nil
+          @_current_engine ||= nil
+        end
+
+        # The currently rendering engine
+        # @return [Symbol, nil]
+        def current_engine=(v)
+          @_current_engine = v
         end
 
         # Find a template on disk given a output path

data/lib/middleman-core/sitemap.rb

@@ -2,6 +2,7 @@ require "middleman-core/sitemap/store"
 require "middleman-core/sitemap/resource"
 
 require "middleman-core/sitemap/extensions/on_disk"
+require "middleman-core/sitemap/extensions/request_endpoints"
 require "middleman-core/sitemap/extensions/proxies"
 require "middleman-core/sitemap/extensions/ignores"
 
@@ -16,6 +17,7 @@ module Middleman
       # Once registered
       def registered(app)
 
+        app.register Middleman::Sitemap::Extensions::RequestEndpoints
         app.register Middleman::Sitemap::Extensions::Proxies
         app.register Middleman::Sitemap::Extensions::Ignores
 

data/lib/middleman-core/sitemap/extensions/request_endpoints.rb

@@ -0,0 +1,177 @@
+module Middleman
+
+  module Sitemap
+
+    module Extensions
+
+      module RequestEndpoints
+
+        # Setup extension
+        class << self
+
+          # Once registered
+          def registered(app)
+            # ::Middleman::Sitemap::Resource.send :include, ResourceInstanceMethods
+
+            # Include methods
+            app.send :include, InstanceMethods
+          end
+
+          alias :included :registered
+        end
+
+        # module ResourceInstanceMethods
+        #   # Whether this page is a proxy
+        #   # @return [Boolean]
+        #   def proxy?
+        #     !!@proxied_to
+        #   end
+
+        #   # Set this page to proxy to a target path
+        #   # @param [String] target
+        #   # @return [void]
+        #   def proxy_to(target)
+        #     target = ::Middleman::Util.normalize_path(target)
+        #     raise "You can't proxy #{path} to itself!" if target == path
+        #     @proxied_to = target
+        #   end
+
+        #   # The path of the page this page is proxied to, or nil if it's not proxied.
+        #   # @return [String]
+        #   def proxied_to
+        #     @proxied_to
+        #   end
+
+        #   # The resource for the page this page is proxied to. Throws an exception
+        #   # if there is no resource.
+        #   # @return [Sitemap::Resource]
+        #   def proxied_to_resource
+        #     proxy_resource = store.find_resource_by_path(proxied_to)
+
+        #     unless proxy_resource
+        #       raise "Path #{path} proxies to unknown file #{proxied_to}:#{store.resources.map(&:path)}"
+        #     end
+
+        #     if proxy_resource.proxy?
+        #       raise "You can't proxy #{path} to #{proxied_to} which is itself a proxy."
+        #     end
+
+        #     proxy_resource
+        #   end
+
+        #   def get_source_file
+        #     if proxy?
+        #       proxied_to_resource.source_file
+        #     else
+        #       super
+        #     end
+        #   end
+
+        #   def content_type
+        #     mime_type = super
+        #     return mime_type if mime_type
+
+        #     if proxy?
+        #       proxied_to_resource.content_type
+        #     else
+        #       nil
+        #     end
+        #   end
+        # end
+
+        module InstanceMethods
+          def endpoint_manager
+            @_endpoint_manager ||= EndpointManager.new(self)
+          end
+
+          def endpoint(*args, &block)
+            endpoint_manager.create_endpoint(*args, &block)
+          end
+        end
+
+        # Manages the list of proxy configurations and manipulates the sitemap
+        # to include new resources based on those configurations
+        class EndpointManager
+          def initialize(app)
+            @app = app
+            @endpoints = {}
+          end
+
+          # Setup a proxy from a path to a target
+          # @param [String] path
+          # @param [Hash] The :path value gives a request path if it
+          # differs from the output path
+          # @return [void]
+          def create_endpoint(path, opts={}, &block)
+            endpoint = {
+              :request_path => path
+            }
+
+            if block_given?
+              endpoint[:output] = block
+            else
+              endpoint[:request_path] = opts[:path] if opts.has_key?(:path)
+            end
+
+            @endpoints[path] = endpoint
+
+            @app.sitemap.rebuild_resource_list!(:added_endpoint)
+          end
+
+          # Update the main sitemap resource list
+          # @return [void]
+          def manipulate_resource_list(resources)
+            resources + @endpoints.map do |path, config|
+              r = EndpointResource.new(
+                @app.sitemap,
+                path,
+                config[:request_path]
+              )
+              r.output = config[:output] if config.has_key?(:output)
+              r
+            end
+          end
+        end
+
+        class EndpointResource < ::Middleman::Sitemap::Resource
+          attr_accessor :output
+
+          def initialize(store, path, source_file)
+            @request_path = ::Middleman::Util.normalize_path(source_file)
+
+            super(store, path)
+          end
+
+          def template?
+            true
+          end
+      
+          def render(*args, &block)
+            return self.output.call if self.output
+          end
+
+          def request_path
+            @request_path
+          end
+
+          def binary?
+            false
+          end
+
+          def raw_data
+            {}
+          end
+
+          def ignored?
+            false
+          end
+
+          def metadata
+            @local_metadata.dup
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/middleman-core/sitemap/resource.rb

@@ -105,6 +105,10 @@ module Middleman
         File.extname(path)
       end
 
+      def request_path
+        self.destination_path
+      end
+
       # Render this resource
       # @return [String]
       def render(opts={}, locs={}, &block)

data/lib/middleman-core/sitemap/store.rb

@@ -36,6 +36,9 @@ module Middleman
         # Register classes which can manipulate the main site map list
         register_resource_list_manipulator(:on_disk, Middleman::Sitemap::Extensions::OnDisk.new(self))
 
+        # Request Endpoints
+        register_resource_list_manipulator(:request_endpoints, @app.endpoint_manager)
+
         # Proxies
         register_resource_list_manipulator(:proxies, @app.proxy_manager)
       end

data/lib/middleman-core/templates/empty/Gemfile.tt

@@ -1,3 +1,8 @@
 source 'https://rubygems.org'
 
 gem "middleman", "~><%= Middleman::VERSION %>"
+
+# Cross-templating language block fix for Ruby 1.8
+platforms :mri_18 do
+  gem "ruby18_source_location"
+end

data/lib/middleman-core/templates/shared/Gemfile.tt

@@ -8,4 +8,9 @@ gem "middleman", "~><%= Middleman::VERSION %>"
 gem "middleman-livereload", "~> 3.1.0"
 
 # For faster file watcher updates:
-# gem "wdm", "~> 0.1.0") # Windows
+# gem "wdm", "~> 0.1.0") # Windows
+
+# Cross-templating language block fix for Ruby 1.8
+platforms :mri_18 do
+  gem "ruby18_source_location"
+end

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.1.0.rc.3' unless const_defined?(:VERSION)
+  VERSION = '3.1.0.rc.4' unless const_defined?(:VERSION)
 end

data/lib/middleman-more/core_extensions/default_helpers.rb

@@ -1,3 +1,14 @@
+# Required to hack around Padrino blocks within different template types.
+require 'rbconfig'
+if RUBY_VERSION =~ /1.8/ && RbConfig::CONFIG['ruby_install_name'] == 'ruby'
+  begin
+    require 'ruby18_source_location'
+  rescue LoadError
+    $stderr.puts "Ruby 1.8 requires the 'ruby18_source_location' gem be added to your Gemfile"
+    exit(1)
+  end
+end
+
 if !defined?(::Padrino::Helpers)
   require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
   require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
@@ -36,6 +47,28 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
 
   # The helpers
   helpers do
+
+    # Make all block content html_safe
+    def content_tag(name, content = nil, options = nil, &block)
+      mark_safe(super(name, mark_safe(content), options, &block))
+    end
+
+    def capture_html(*args, &block)
+      handler = auto_find_proper_handler(&block)
+      captured_block, captured_html = nil, ""
+      if handler && handler.is_type? && handler.block_is_type?(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? && ( captured_block || block.call(*args) )  if captured_html.blank?
+      captured_html
+    end
+
+    def auto_find_proper_handler(&block)
+      engine = block_given? ? File.extname(block.source_location[0])[1..-1].to_sym : current_engine
+      ::Padrino::Helpers::OutputHelpers.handlers.map { |h| h.new(self) }.find { |h| h.engines.include?(engine) && h.is_type? }
+    end
+
     # Disable Padrino cache buster
     def asset_stamp
       false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc.3
+  version: 3.1.0.rc.4
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -546,6 +546,10 @@ files:
 - fixtures/layouts-dir-app/source/layouts/layout.erb
 - fixtures/layouts-dir-app/source/layouts2/layout.erb
 - fixtures/layouts-dir-app/source/nested/layouts2/layout.erb
+- fixtures/link-to-app/config.rb
+- fixtures/link-to-app/source/link_to_erb.html.erb
+- fixtures/link-to-app/source/link_to_haml.html.haml
+- fixtures/link-to-app/source/link_to_slim.html.slim
 - fixtures/liquid-app/config.rb
 - fixtures/liquid-app/data/test.yml
 - fixtures/liquid-app/data/test2.json
@@ -633,6 +637,9 @@ files:
 - fixtures/more-instance-vars-app/source/instance-var-set.html.erb
 - fixtures/more-instance-vars-app/source/layout.erb
 - fixtures/more-instance-vars-app/source/no-instance-var.html.erb
+- fixtures/more-markdown-app/source/layouts/layout.erb
+- fixtures/more-markdown-app/source/with_layout.markdown
+- fixtures/more-markdown-app/source/with_layout_erb.markdown.erb
 - fixtures/more-preview-app/config.rb
 - fixtures/more-preview-app/source/content.html.erb
 - fixtures/more-preview-app/source/layout.erb
@@ -940,6 +947,7 @@ files:
 - lib/middleman-core/sitemap/extensions/ignores.rb
 - lib/middleman-core/sitemap/extensions/on_disk.rb
 - lib/middleman-core/sitemap/extensions/proxies.rb
+- lib/middleman-core/sitemap/extensions/request_endpoints.rb
 - lib/middleman-core/sitemap/extensions/traversal.rb
 - lib/middleman-core/sitemap/queryable.rb
 - lib/middleman-core/sitemap/resource.rb
@@ -1736,6 +1744,10 @@ test_files:
 - fixtures/layouts-dir-app/source/layouts/layout.erb
 - fixtures/layouts-dir-app/source/layouts2/layout.erb
 - fixtures/layouts-dir-app/source/nested/layouts2/layout.erb
+- fixtures/link-to-app/config.rb
+- fixtures/link-to-app/source/link_to_erb.html.erb
+- fixtures/link-to-app/source/link_to_haml.html.haml
+- fixtures/link-to-app/source/link_to_slim.html.slim
 - fixtures/liquid-app/config.rb
 - fixtures/liquid-app/data/test.yml
 - fixtures/liquid-app/data/test2.json
@@ -1823,6 +1835,9 @@ test_files:
 - fixtures/more-instance-vars-app/source/instance-var-set.html.erb
 - fixtures/more-instance-vars-app/source/layout.erb
 - fixtures/more-instance-vars-app/source/no-instance-var.html.erb
+- fixtures/more-markdown-app/source/layouts/layout.erb
+- fixtures/more-markdown-app/source/with_layout.markdown
+- fixtures/more-markdown-app/source/with_layout_erb.markdown.erb
 - fixtures/more-preview-app/config.rb
 - fixtures/more-preview-app/source/content.html.erb
 - fixtures/more-preview-app/source/layout.erb