middleman-core 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5edb6179e1b8db65a77a208907ba89912542d232
-  data.tar.gz: eb2c10c41dae6b5cda0dc3d637ab3e72622243ee
+  metadata.gz: 58d1f92ae43159b3ae4a6096479f56e409ee540a
+  data.tar.gz: 6f6634ba7c4340dd2d5229f9222b8c1924a1b6a4
 SHA512:
-  metadata.gz: 83ba70dcaafdd039ce05654b00800e5e1e3d54f820dfa23a062373d89214d18e8ebe675bc39f31289a7dc44ae22929b87ec8acac08cda3545b78d44d0bc91a46
-  data.tar.gz: 6283466a1bb102a867a43c61651c11b7271b08f29557b065eebb2d8b156c9f8f9d3b4673e3ae375bca5c5b48387b39aefd2a5561c427908b1b4113e3bd08aec4
+  metadata.gz: a937e12df16c26ec28ef901feac136da3ed1534fff3d0a5bbad69f22e0e78721bc01f6ca158f2f4219a73b674581b3341496a5bed270d17473de7fc8692d0a47
+  data.tar.gz: 60aca4dc123e02ec8e906360e09cebad68bc0e98d53d6af7cddc995a60b986f2ff218c3696386dba6a59ee9f70941341dd38633b308c3a459b3e9be590e35963

data/features/asset_hash.feature

@@ -1,5 +1,5 @@
 Feature: Assets get a file hash appended to their and references to them are updated
-  Scenario: Hashed-asset files are produced, and HTML, CSS, and JavaScript gets rewritten to reference the new files
+  Scenario: Hashed-asset files are produced, and HTML, CSS, JSON and JavaScript gets rewritten to reference the new files
     Given a successfully built app at "asset-hash-app"
     When I cd to "build"
     Then the following files should exist:
@@ -14,6 +14,8 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | index.html |
       | subdir/index.html |
       | other/index.html |
+      | api.json |
+      | subdir/api.json |
     And the following files should not exist:
       | images/100px.png |
       | images/100px.jpg |
@@ -33,6 +35,12 @@ Feature: Assets get a file hash appended to their and references to them are upd
     And the file "other/index.html" should contain 'href="../stylesheets/site-50eaa978.css"'
     And the file "other/index.html" should contain 'src="../javascripts/application-1d8d5276.js"'
     And the file "other/index.html" should contain 'src="../images/100px-5fd6fb90.jpg"'
+    And the file "api.json" should contain 'images/100px-5fd6fb90.gif'
+    And the file "api.json" should contain 'images/100px-5fd6fb90.jpg'
+    And the file "api.json" should contain 'images/100px-1242c368.png'
+    And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.gif'
+    And the file "subdir/api.json" should contain 'images/100px-5fd6fb90.jpg'
+    And the file "subdir/api.json" should contain 'images/100px-1242c368.png'
 
   Scenario: Hashed assets work in preview server
     Given the Server is running at "asset-hash-app"
@@ -53,6 +61,14 @@ Feature: Assets get a file hash appended to their and references to them are upd
     Then I should see "img.src = '/images/100px-5fd6fb90.jpg'"
     When I go to "/stylesheets/site-50eaa978.css"
     Then I should see "background-image: url('../images/100px-5fd6fb90.jpg')"
+    When I go to "/api.json"
+    Then I should see 'images/100px-5fd6fb90.gif'
+    And I should see 'images/100px-5fd6fb90.jpg'
+    And I should see 'images/100px-1242c368.png'
+    When I go to "/subdir/api.json"
+    Then I should see 'images/100px-5fd6fb90.gif'
+    And I should see 'images/100px-5fd6fb90.jpg'
+    And I should see 'images/100px-1242c368.png'
 
   Scenario: Enabling an asset host still produces hashed files and references
     Given the Server is running at "asset-hash-host-app"
@@ -127,6 +143,8 @@ Feature: Assets get a file hash appended to their and references to them are upd
       | index.html |
       | subdir/index.html |
       | other/index.html |
+      | api.json |
+      | subdir/api.json |
     And the following files should not exist:
       | images/100px-1242c368.png |
       | images/100px-5fd6fb90.jpg |

data/features/chained_templates.feature

@@ -16,4 +16,91 @@ Feature: Templates should be chainable
 
     And the file "index.html" should contain "Title</h1>"
     And the file "index.html" should contain "Subtitle</h2>"
-    And the file "index.html" should contain "Sup</h3>"
+    And the file "index.html" should contain "Sup</h3>"
+
+  Scenario: Partials are parsed by multiple template engines: Outer template has .erb and inner .md.erb
+    Given a fixture app "partial-chained_templates-app"
+    And a template named "my_template.html.erb" with:
+    """
+    <h1>My Template</h1>
+
+    <%= partial 'my_partial' %>
+    """
+    And a template named "my_partial.html.md.erb" with:
+    """
+    ## My Partial
+    
+    <%= 'hello world' %>
+    """
+    And the Server is running
+    When I go to "/my_template.html"
+    Then I should see:
+    """
+    <h1>My Template</h1>
+    """
+    Then I should see:
+    """
+    <h2 id="my-partial">My Partial</h2>
+    """
+    Then I should see:
+    """
+    <p>hello world</p>
+    """
+
+  Scenario: Partials are parsed by multiple template engines: Outer template has .md.erb and inner .md.erb
+    Given a fixture app "partial-chained_templates-app"
+    And a template named "my_template.html.md.erb" with:
+    """
+    # My Template
+
+    <%= partial 'my_partial' %>
+    """
+    And a template named "my_partial.html.md.erb" with:
+    """
+    ## My Partial
+    
+    <%= 'hello world' %>
+    """
+    And the Server is running
+    When I go to "/my_template.html"
+    Then I should see:
+    """
+    <h1 id="my-template">My Template</h1>
+    """
+    Then I should see:
+    """
+    <h2 id="my-partial">My Partial</h2>
+    """
+    Then I should see:
+    """
+    <p>hello world</p>
+    """
+
+  Scenario: Partials are parsed by multiple template engines: Outer template has .md.erb, and inner .erb
+    Given a fixture app "partial-chained_templates-app"
+    And a template named "my_template.html.md.erb" with:
+    """
+    # My Template
+
+    <%= partial 'my_partial' %>
+    """
+    And a template named "my_partial.html.erb" with:
+    """
+    <h2>My Partial</h2>
+    
+    <%= 'hello world' %>
+    """
+    And the Server is running
+    When I go to "/my_template.html"
+    Then I should see:
+    """
+    <h1 id="my-template">My Template</h1>
+    """
+    Then I should see:
+    """
+    <h2>My Partial</h2>
+    """
+    Then I should see:
+    """
+    <p>hello world</p>
+    """

data/features/working_directory.feature

@@ -0,0 +1,33 @@
+Feature: Honour working directory 
+  Honour the working directory during testing
+  In order to support helpers which work with the current directories
+
+  Scenario: Set working directory for helpers in tests
+    Given a fixture app "empty-app"
+    And a file named "source/index.erb" with:
+    """
+    <%= Dir.getwd %>
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see:
+    """
+    aruba
+    """
+
+  Scenario: Set working directory for config.rb in tests
+    Given a fixture app "empty-app"
+    And a file named "config.rb" with:
+    """
+    set :my_working_directory, Dir.getwd
+    """
+    And a file named "source/index.erb" with:
+    """
+    <%= my_working_directory %>
+    """
+    And the Server is running
+    When I go to "/index.html"
+    Then I should see:
+    """
+    aruba
+    """

data/fixtures/asset-hash-app/source/api.json.erb

@@ -0,0 +1 @@
+<%= {gif: image_path('100px.gif'), jpg: image_path('100px.jpg'), png: image_path('100px.png')}.to_json %>

data/fixtures/asset-hash-app/source/subdir/api.json.erb

@@ -0,0 +1 @@
+<%= {gif: image_path('100px.gif'), jpg: image_path('100px.jpg'), png: image_path('100px.png')}.to_json %>

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

@@ -146,18 +146,7 @@ module Middleman
           @current_locs = locs
           @current_opts = opts
 
-          # Keep rendering template until we've used up all extensions. This
-          # handles cases like `style.css.sass.erb`
-          content = nil
-          while ::Tilt[path]
-            begin
-              opts[:template_body] = content if content
-              content = render_individual_file(path, locs, opts, context)
-              path = File.basename(path, File.extname(path))
-            rescue LocalJumpError
-              raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{source}/#{config[:layouts_dir]}."
-            end
-          end
+          content = _render_with_all_renderers(path, locs, context, opts)
 
           # If we need a layout and have a layout, use it
           if layout_path = fetch_layout(engine, opts)
@@ -175,6 +164,34 @@ module Middleman
           @current_opts = nil
         end
 
+        private
+
+        def _render_with_all_renderers(path, locs, context, opts, &block)
+          # Keep rendering template until we've used up all extensions. This
+          # handles cases like `style.css.sass.erb`
+          content = nil
+
+          while ::Tilt[path]
+            begin
+              opts[:template_body] = content if content
+
+              content = if block_given?
+                render_individual_file(path, locs, opts, context, &block)
+              else
+                render_individual_file(path, locs, opts, context)
+              end
+
+              path = File.basename(path, File.extname(path))
+            rescue LocalJumpError
+              raise "Tried to render a layout (calls yield) at #{path} like it was a template. Non-default layouts need to be in #{source}/#{config[:layouts_dir]}."
+            end
+          end
+
+          content
+        end
+
+        public
+
         # Sinatra/Padrino compatible render method signature referenced by some view
         # helpers. Especially partials.
         #
@@ -198,7 +215,7 @@ module Middleman
 
           if ::Tilt[found_partial]
             # Render the partial if found, otherwide throw exception
-            render_individual_file(found_partial, locals, options, self, &block)
+            _render_with_all_renderers(found_partial, locals, self, options, &block)
           else
             File.read(found_partial)
           end

data/lib/middleman-core/meta_pages/sitemap_resource.rb

@@ -39,7 +39,7 @@ module Middleman
         build_path = 'Not built' if ignored?
         props['Build Path'] = build_path if @resource.path != build_path
         props['URL'] = content_tag(:a, @resource.url, href: @resource.url) unless ignored?
-        props['Source File'] = @resource.source_file.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '')
+        props['Source File'] = @resource.source_file ? @resource.source_file.sub(/^#{Regexp.escape(ENV['MM_ROOT'] + '/')}/, '') : 'Dynamic'
 
         data = @resource.data
         props['Data'] = data.inspect unless data.empty?

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

@@ -66,6 +66,10 @@ module Middleman
             super(store, path)
           end
 
+          def get_source_file
+            nil
+          end
+
           def template?
             true
           end

data/lib/middleman-core/step_definitions/server_steps.rb

@@ -34,6 +34,7 @@ end
 Given /^the Server is running$/ do
   root_dir = File.expand_path(current_dir)
 
+
   if File.exists?(File.join(root_dir, 'source'))
     ENV['MM_SOURCE'] = 'source'
   else
@@ -48,9 +49,11 @@ Given /^the Server is running$/ do
     set :show_exceptions, false
   }
 
-  @server_inst = Middleman::Application.server.inst do
-    initialize_commands.each do |p|
-      instance_exec(&p)
+  in_current_dir do
+    @server_inst = Middleman::Application.server.inst do
+      initialize_commands.each do |p|
+        instance_exec(&p)
+      end
     end
   end
 
@@ -63,42 +66,66 @@ Given /^the Server is running at "([^\"]*)"$/ do |app_path|
   step %Q{the Server is running}
 end
 
+Given /^a template named "([^\"]*)" with:$/ do |name, string|
+  step %Q{a file named "source/#{name}" with:}, string
+end
+
 When /^I go to "([^\"]*)"$/ do |url|
-  @browser.get(URI.escape(url))
+  in_current_dir do
+    @browser.get(URI.escape(url))
+  end
 end
 
 Then /^going to "([^\"]*)" should not raise an exception$/ do |url|
-  expect{ @browser.get(URI.escape(url)) }.to_not raise_exception
+  in_current_dir do
+    expect{ @browser.get(URI.escape(url)) }.to_not raise_exception
+  end
 end
 
 Then /^the content type should be "([^\"]*)"$/ do |expected|
-  expect(@browser.last_response.content_type).to start_with(expected)
+  in_current_dir do
+    expect(@browser.last_response.content_type).to start_with(expected)
+  end
 end
 
 Then /^I should see "([^\"]*)"$/ do |expected|
-  expect(@browser.last_response.body).to include(expected)
+  in_current_dir do
+    expect(@browser.last_response.body).to include(expected)
+  end
 end
 
 Then /^I should see '([^\']*)'$/ do |expected|
-  expect(@browser.last_response.body).to include(expected)
+  in_current_dir do
+    expect(@browser.last_response.body).to include(expected)
+  end
 end
 
 Then /^I should see:$/ do |expected|
-  expect(@browser.last_response.body).to include(expected)
+  in_current_dir do
+    expect(@browser.last_response.body).to include(expected)
+  end
 end
 
 Then /^I should not see "([^\"]*)"$/ do |expected|
-  expect(@browser.last_response.body).to_not include(expected)
+  in_current_dir do
+    expect(@browser.last_response.body).to_not include(expected)
+  end
 end
 
 Then /^I should not see:$/ do |expected|
-  expect(@browser.last_response.body).to_not include(expected.chomp)
+  in_current_dir do
+    expect(@browser.last_response.body).to_not include(expected.chomp)
+  end
 end
 
 Then /^the status code should be "([^\"]*)"$/ do |expected|
-  expect(@browser.last_response.status).to eq expected.to_i
+  in_current_dir do
+    expect(@browser.last_response.status).to eq expected.to_i
+  end
 end
 
 Then /^I should see "([^\"]*)" lines$/ do |lines|
-  expect(@browser.last_response.body.chomp.split($/).length).to eq(lines.to_i)
+  in_current_dir do
+    expect(@browser.last_response.body.chomp.split($/).length).to eq(lines.to_i)
+  end
 end

data/lib/middleman-core/templates/extension/Gemfile

@@ -1,6 +1,6 @@
-# If you have OpenSSL installed, we recommend updating
-# the following line to use "https"
-source 'http://rubygems.org'
+# If you do not have OpenSSL installed, update
+# the following line to use "http://" instead
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in <%= name %>.gemspec
 gemspec

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

@@ -1,6 +1,6 @@
-# If you have OpenSSL installed, we recommend updating
-# the following line to use "https"
-source 'http://rubygems.org'
+# If you do not have OpenSSL installed, update
+# the following line to use "http://" instead
+source 'https://rubygems.org'
 
 gem "middleman", "~><%= Middleman::VERSION %>"
 

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.3.6' unless const_defined?(:VERSION)
+  VERSION = '3.3.7' unless const_defined?(:VERSION)
 end

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

@@ -12,7 +12,7 @@ class Padrino::Helpers::OutputHelpers::ErbHandler
     raw = block.call(*args)
     captured = template.instance_variable_get(:@_out_buf)
     self.output_buffer = _buf_was
-    engine_matches?(block) ? captured : raw
+    engine_matches?(block) && !captured.empty? ? captured : raw
   end
 end
 

data/lib/middleman-more/extensions/asset_hash.rb

@@ -75,7 +75,7 @@ class Middleman::Extensions::AssetHash < ::Middleman::Extension
 
       path = ::Middleman::Util.full_path(env['PATH_INFO'], @middleman_app)
 
-      if path =~ /(^\/$)|(\.(htm|html|php|css|js)$)/
+      if path =~ /(^\/$)|(\.(htm|html|php|css|js|json)$)/
         body = ::Middleman::Util.extract_response_text(response)
         if body
           status, headers, response = Rack::Response.new(rewrite_paths(body, path), status, headers).finish

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -305,6 +305,7 @@ files:
 - features/v3_extensions.feature
 - features/v4_extension_callbacks.feature
 - features/wildcard_page_helper.feature
+- features/working_directory.feature
 - fixtures/asciidoc-app/config.rb
 - fixtures/asciidoc-app/source/_include.adoc
 - fixtures/asciidoc-app/source/code.adoc
@@ -320,6 +321,7 @@ files:
 - fixtures/asciidoc-app/source/master.adoc
 - fixtures/asset-hash-app/config.rb
 - fixtures/asset-hash-app/lib/middleware.rb
+- fixtures/asset-hash-app/source/api.json.erb
 - fixtures/asset-hash-app/source/apple-touch-icon.png
 - fixtures/asset-hash-app/source/favicon.ico
 - fixtures/asset-hash-app/source/images/100px.gif
@@ -333,6 +335,7 @@ files:
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
+- fixtures/asset-hash-app/source/subdir/api.json.erb
 - fixtures/asset-hash-app/source/subdir/index.html.erb
 - fixtures/asset-hash-host-app/config.rb
 - fixtures/asset-hash-host-app/source/images/100px.gif
@@ -830,6 +833,7 @@ files:
 - fixtures/page-helper-layout-block-app/source/layouts/layout.erb
 - fixtures/page-helper-layout-block-app/source/path/child.html.erb
 - fixtures/page-helper-layout-block-app/source/path/index.html.erb
+- fixtures/partial-chained_templates-app/config.rb
 - fixtures/partials-app/config.rb
 - fixtures/partials-app/source/_code_snippet.html
 - fixtures/partials-app/source/_locals.erb
@@ -1370,6 +1374,7 @@ test_files:
 - features/v3_extensions.feature
 - features/v4_extension_callbacks.feature
 - features/wildcard_page_helper.feature
+- features/working_directory.feature
 - fixtures/asciidoc-app/config.rb
 - fixtures/asciidoc-app/source/_include.adoc
 - fixtures/asciidoc-app/source/code.adoc
@@ -1385,6 +1390,7 @@ test_files:
 - fixtures/asciidoc-app/source/master.adoc
 - fixtures/asset-hash-app/config.rb
 - fixtures/asset-hash-app/lib/middleware.rb
+- fixtures/asset-hash-app/source/api.json.erb
 - fixtures/asset-hash-app/source/apple-touch-icon.png
 - fixtures/asset-hash-app/source/favicon.ico
 - fixtures/asset-hash-app/source/images/100px.gif
@@ -1398,6 +1404,7 @@ test_files:
 - fixtures/asset-hash-app/source/stylesheets/_partial.sass
 - fixtures/asset-hash-app/source/stylesheets/site.css.scss
 - fixtures/asset-hash-app/source/stylesheets/uses_partials.css.sass
+- fixtures/asset-hash-app/source/subdir/api.json.erb
 - fixtures/asset-hash-app/source/subdir/index.html.erb
 - fixtures/asset-hash-host-app/config.rb
 - fixtures/asset-hash-host-app/source/images/100px.gif
@@ -1895,6 +1902,7 @@ test_files:
 - fixtures/page-helper-layout-block-app/source/layouts/layout.erb
 - fixtures/page-helper-layout-block-app/source/path/child.html.erb
 - fixtures/page-helper-layout-block-app/source/path/index.html.erb
+- fixtures/partial-chained_templates-app/config.rb
 - fixtures/partials-app/config.rb
 - fixtures/partials-app/source/_code_snippet.html
 - fixtures/partials-app/source/_locals.erb