middleman-core 4.1.11 → 4.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e12dac8535ed4c817265c3aec998f827b74a78
-  data.tar.gz: a938f8e9d0e39de8f453776e83338fac6c625b19
+  metadata.gz: a4aab7bb8206e390c3d846d576720599102373fe
+  data.tar.gz: 86f6c84290c31e0e3081cb50ff76b6017a3c7551
 SHA512:
-  metadata.gz: ca37b7bed14ef6f64fbfb8ae3838e96ed73c748fee71706ee0ad1da6d4f6f6d88b45b0c9205721d767a3a748a637c58fb24e19f8fa3e6c948afaabebc0c3582f
-  data.tar.gz: 8db10682e0568d35753d05c7e9dfd8cbf2a11e5760b0e0e7d57df1c6e97aa8f63d2ba3b1f1f4aec13119f987cd6fd8c799dff209bc1482012d9bb3383de1d056
+  metadata.gz: 5575cf0341f1f0d3c42d952dfe2f96475e52fb694c3f99f3b87cbff8dcce2f36b66705fbdc7a4d8bd739b9f78cfac8993dbec8560be7520b5f4ca657d8e382f5
+  data.tar.gz: 90cc5b0ee7f35335d54ca46b87d104408e8588423d8f35eea76764959781c242a935ef96d85857df3edea0d5fb95590d2e26a83d06278a403fecadc64e046441

data/features/page-id.feature

@@ -3,14 +3,60 @@ Feature: Page IDs
   Scenario: link_to works with blocks (erb)
     Given the Server is running at "page-id-app"
     When I go to "/index.html"
-    Then I should see "I am: index.html"
+    Then I should see "I am: index"
     And I should see "URL1: /fm.html"
     And I should see "URL2: /2.html"
     And I should see 'URL3: <a href="/3.html">Hi</a>'
     And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
+    And I should see 'URL5: <a href="/implicit.html">Imp</a>'
+    And I should see 'URL6: <a href="/folder/foldern.html">Foldern</a>'
+    And I should see 'URL7: <a href="/feed.xml">Feed</a>'
 
     When I go to "/fm.html"
     Then I should see "I am: frontmatter"
+    When I go to "/implicit.html"
+    Then I should see "I am: implicit"
+    When I go to "/feed.xml"
+    Then I should see "I am: feed.xml"
+    When I go to "/folder/foldern.html"
+    Then I should see "I am: folder/foldern"
+
+    When I go to "/1.html"
+    Then I should see "I am: page1"
+    When I go to "/2.html"
+    Then I should see "I am: page2"
+    When I go to "/3.html"
+    Then I should see "I am: page3"
+
+    When I go to "/overwrites/from-default.html"
+    Then I should see "I am: something-else"
+
+    When I go to "/overwrites/from-frontmatter.html"
+    Then I should see "I am: from_frontmatter"
+
+  Scenario: Override page ID derivation with a proc
+    Given a fixture app "page-id-app"
+    And app "page-id-app" is using config "proc"
+    And the Server is running at "page-id-app"
+
+    When I go to "/index.html"
+    Then I should see "I am: index.html-foo"
+    And I should see "URL1: /fm.html"
+    And I should see "URL2: /2.html"
+    And I should see 'URL3: <a href="/3.html">Hi</a>'
+    And I should see 'URL4: <a href="/overwrites/from-default.html">Sym</a>'
+    And I should see 'URL8: <a href="/implicit.html">Imp</a>'
+    And I should see 'URL9: <a href="/folder/foldern.html">Foldern</a>'
+    And I should see 'URL10: <a href="/feed.xml">Feed</a>'
+
+    When I go to "/fm.html"
+    Then I should see "I am: frontmatter"
+    When I go to "/implicit.html"
+    Then I should see "I am: implicit.html-foo"
+    When I go to "/feed.xml"
+    Then I should see "I am: feed.xml-foo"
+    When I go to "/folder/foldern.html"
+    Then I should see "I am: folder/foldern.html-foo"
 
     When I go to "/1.html"
     Then I should see "I am: page1"

data/fixtures/page-id-app/config-proc.rb

@@ -0,0 +1,7 @@
+%w(1 2 3).each do |n|
+  proxy "/#{n}.html", "/index.html", id: "page#{n}"
+end
+
+page "/overwrites/*", id: :"something-else"
+
+config[:page_id_generator] = ->(path){ path + "-foo" }

data/fixtures/page-id-app/source/feed.xml.erb

@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>

data/fixtures/page-id-app/source/folder/foldern.html.erb

@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>

data/fixtures/page-id-app/source/implicit.html.erb

@@ -0,0 +1 @@
+I am: <%= current_resource.page_id %>

data/fixtures/page-id-app/source/index.html.erb

@@ -4,3 +4,11 @@ URL1: <%= url_for "frontmatter" %>
 URL2: <%= url_for "page2" %>
 URL3: <%= link_to "Hi", "page3" %>
 URL4: <%= link_to "Sym", :"something-else" %>
+URL5: <%= link_to "Imp", :implicit %>
+URL6: <%= link_to "Foldern", "folder/foldern" %>
+URL7: <%= link_to "Feed", "feed.xml" %>
+
+<%# If custom proc %>
+URL8: <%= link_to "Imp", "implicit.html-foo" %>
+URL9: <%= link_to "Foldern", "folder/foldern.html-foo" %>
+URL10: <%= link_to "Feed", "feed.xml-foo" %>

data/lib/middleman-core/preview_server.rb

@@ -160,6 +160,9 @@ module Middleman
                                     path: root,
                                     only: match_against
 
+              # Hack around bower_components in root.
+              watcher.listener.ignore(/^bower_components/)
+              
               # Hack around node_modules in root.
               watcher.listener.ignore(/^node_modules/)
 

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

@@ -74,7 +74,7 @@ module Middleman
           end
         end
 
-        class BlockIgnoreDescriptor
+        class BlockIgnoreDescriptor < IgnoreDescriptor
           def ignored?(match_path)
             block.call(match_path)
           end

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

@@ -87,7 +87,7 @@ module Middleman
 
       Contract Or[Symbol, String, Fixnum]
       def page_id
-        metadata[:page][:id] || destination_path
+        metadata[:page][:id] || make_implicit_page_id(destination_path)
       end
 
       # Merge in new metadata specific to this resource.
@@ -208,6 +208,30 @@ module Middleman
         "#<#{self.class} path=#{@path}>"
       end
       alias inspect to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
+
+      protected
+
+      # Makes a page id based on path (when not otherwise given)
+      #
+      # Removes .html extension and potential leading slashes or dots
+      # eg. "foo/bar/baz.foo.html" => "foo/bar/baz.foo"
+      Contract String => String
+      def make_implicit_page_id(path)
+        @id ||= begin
+          if prok = @app.config[:page_id_generator]
+            return prok.call(path)
+          end
+
+          basename = if ext == ".html"
+                       File.basename(path, ext)
+                     else
+                       File.basename(path)
+                     end
+
+          # Remove leading dot or slash if present
+          File.join(File.dirname(path), basename).gsub(/^\.?\//, '')
+        end
+      end
     end
 
     class StringResource < Resource

data/lib/middleman-core/util/paths.rb

@@ -1,7 +1,7 @@
 # Core Pathname library used for traversal
 require 'pathname'
 require 'uri'
-require 'addressable'
+require 'addressable/uri'
 require 'memoist'
 require 'tilt'
 
@@ -152,7 +152,8 @@ module Middleman
     def url_for(app, path_or_resource, options={})
       if path_or_resource.is_a?(String) || path_or_resource.is_a?(Symbol)
         r = app.sitemap.find_resource_by_page_id(path_or_resource)
-        path_or_resource = r if r
+
+        path_or_resource = r ? r : path_or_resource.to_s
       end
 
       # Handle Resources and other things which define their own url method

data/lib/middleman-core/version.rb

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

data/spec/middleman-core/util_spec.rb

@@ -220,7 +220,7 @@ describe Middleman::Util do
 
     it "does not loop infinitely when file name is a possible templating engine" do
       expect do
-        Timeout::timeout(0.5) do
+        Timeout::timeout(3.0) do
           result = Middleman::Util.step_through_extensions("markdown.scss")
           expect(result).to eq "markdown"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.1.11
+  version: 4.1.12
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1273,8 +1273,12 @@ 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/page-id-app/config-proc.rb
 - fixtures/page-id-app/config.rb
+- fixtures/page-id-app/source/feed.xml.erb
 - fixtures/page-id-app/source/fm.html.erb
+- fixtures/page-id-app/source/folder/foldern.html.erb
+- fixtures/page-id-app/source/implicit.html.erb
 - fixtures/page-id-app/source/index.html.erb
 - fixtures/page-id-app/source/overwrites/from-default.html.erb
 - fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb
@@ -2479,8 +2483,12 @@ 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/page-id-app/config-proc.rb
 - fixtures/page-id-app/config.rb
+- fixtures/page-id-app/source/feed.xml.erb
 - fixtures/page-id-app/source/fm.html.erb
+- fixtures/page-id-app/source/folder/foldern.html.erb
+- fixtures/page-id-app/source/implicit.html.erb
 - fixtures/page-id-app/source/index.html.erb
 - fixtures/page-id-app/source/overwrites/from-default.html.erb
 - fixtures/page-id-app/source/overwrites/from-frontmatter.html.erb