middleman-core 4.0.0.alpha.2 → 4.0.0.alpha.3

data/middleman-core.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   # Core
   s.add_dependency('bundler', ['~> 1.1'])
+  s.add_dependency('backports', ['~> 3.6'])
   s.add_dependency('rack', ['>= 1.4.5', '< 2.0'])
   s.add_dependency('tilt', ['~> 1.4.1'])
   s.add_dependency('erubis')
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
   # Helpers
   s.add_dependency('activesupport', ['~> 4.1.0'])
   s.add_dependency('padrino-helpers', ['~> 0.12.3'])
+  s.add_dependency("addressable", ["~> 2.3.5"])
 
   # Watcher
   s.add_dependency('listen', ['>= 2.7.9', '< 3.0'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha.2
+  version: 4.0.0.alpha.3
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +130,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.3
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -264,6 +292,8 @@ files:
 - features/cli_extension.feature
 - features/cli_init.feature
 - features/coffee-script.feature
+- features/collections.feature
+- features/console.feature
 - features/content_for.feature
 - features/content_type.feature
 - features/custom-source.feature
@@ -309,12 +339,12 @@ files:
 - features/more-extensionless_text_files.feature
 - features/more-frontmatter_page_settings.feature
 - features/more-ignore.feature
-- features/more-instance_vars.feature
 - features/more-sitemap_traversal.feature
 - features/more-wildcard_page_helper.feature
 - features/mount_rack.feature
 - features/multiple-sources.feature
 - features/nested_layouts.feature
+- features/paginate.feature
 - features/partials.feature
 - features/preview_changes.feature
 - features/proxy_pages.feature
@@ -334,13 +364,17 @@ files:
 - features/unicode_filenames.feature
 - features/v4_extension_callbacks.feature
 - features/wildcard_page_helper.feature
+- features/working_directory.feature
 - 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
 - fixtures/asset-hash-app/source/images/100px.jpg
 - fixtures/asset-hash-app/source/images/100px.png
+- fixtures/asset-hash-app/source/images/200px.jpg
+- fixtures/asset-hash-app/source/images/300px.jpg
 - fixtures/asset-hash-app/source/index.html.erb
 - fixtures/asset-hash-app/source/javascripts/application.js
 - fixtures/asset-hash-app/source/layout.erb
@@ -349,6 +383,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
@@ -440,6 +475,12 @@ files:
 - fixtures/coffeescript-app/source/inline-coffeescript.html.haml
 - fixtures/coffeescript-app/source/javascripts/broken-coffee.js.coffee
 - fixtures/coffeescript-app/source/javascripts/coffee_test.js.coffee
+- fixtures/collections-app/config.rb
+- fixtures/collections-app/source/blog1/2011-01-01-new-article.html.markdown
+- fixtures/collections-app/source/blog1/2011-01-02-another-article.html.markdown
+- fixtures/collections-app/source/blog2/2011-01-01-new-article.html.markdown
+- fixtures/collections-app/source/blog2/2011-01-02-another-article.html.markdown
+- fixtures/collections-app/source/index.html.erb
 - fixtures/content-for-app/config.rb
 - fixtures/content-for-app/source/content_for_erb.html.erb
 - fixtures/content-for-app/source/content_for_haml.html.haml
@@ -554,6 +595,7 @@ files:
 - fixtures/frontmatter-app/source/front-matter-change.html.erb
 - fixtures/frontmatter-app/source/front-matter-encoding.html.erb
 - fixtures/frontmatter-app/source/front-matter-line-2.html.erb
+- fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb
 - fixtures/frontmatter-app/source/json-front-matter-2.php.erb
 - fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb
 - fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb
@@ -779,11 +821,6 @@ files:
 - fixtures/more-ignore-app/source/plain.html
 - fixtures/more-ignore-app/source/reports/another.html
 - fixtures/more-ignore-app/source/reports/index.html
-- fixtures/more-instance-vars-app/config.rb
-- fixtures/more-instance-vars-app/source/_vartial.erb
-- 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.html.markdown
 - fixtures/more-markdown-app/source/with_layout_erb.html.markdown.erb
@@ -869,6 +906,18 @@ 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/paginate-app/config.rb
+- fixtures/paginate-app/source/archive/2011/index.html.erb
+- fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-02-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-03-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-04-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-05-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown
+- fixtures/paginate-app/source/index.html.erb
+- fixtures/paginate-app/source/tag.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
@@ -1063,6 +1112,11 @@ files:
 - lib/middleman-core/configuration.rb
 - lib/middleman-core/contracts.rb
 - lib/middleman-core/core_extensions.rb
+- lib/middleman-core/core_extensions/collections.rb
+- lib/middleman-core/core_extensions/collections/lazy_root.rb
+- lib/middleman-core/core_extensions/collections/lazy_step.rb
+- lib/middleman-core/core_extensions/collections/pagination.rb
+- lib/middleman-core/core_extensions/collections/step_context.rb
 - lib/middleman-core/core_extensions/data.rb
 - lib/middleman-core/core_extensions/default_helpers.rb
 - lib/middleman-core/core_extensions/external_helpers.rb
@@ -1170,7 +1224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Hand-crafted frontend development
@@ -1190,6 +1244,8 @@ test_files:
 - features/cli_extension.feature
 - features/cli_init.feature
 - features/coffee-script.feature
+- features/collections.feature
+- features/console.feature
 - features/content_for.feature
 - features/content_type.feature
 - features/custom-source.feature
@@ -1235,12 +1291,12 @@ test_files:
 - features/more-extensionless_text_files.feature
 - features/more-frontmatter_page_settings.feature
 - features/more-ignore.feature
-- features/more-instance_vars.feature
 - features/more-sitemap_traversal.feature
 - features/more-wildcard_page_helper.feature
 - features/mount_rack.feature
 - features/multiple-sources.feature
 - features/nested_layouts.feature
+- features/paginate.feature
 - features/partials.feature
 - features/preview_changes.feature
 - features/proxy_pages.feature
@@ -1260,13 +1316,17 @@ test_files:
 - features/unicode_filenames.feature
 - features/v4_extension_callbacks.feature
 - features/wildcard_page_helper.feature
+- features/working_directory.feature
 - 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
 - fixtures/asset-hash-app/source/images/100px.jpg
 - fixtures/asset-hash-app/source/images/100px.png
+- fixtures/asset-hash-app/source/images/200px.jpg
+- fixtures/asset-hash-app/source/images/300px.jpg
 - fixtures/asset-hash-app/source/index.html.erb
 - fixtures/asset-hash-app/source/javascripts/application.js
 - fixtures/asset-hash-app/source/layout.erb
@@ -1275,6 +1335,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
@@ -1366,6 +1427,12 @@ test_files:
 - fixtures/coffeescript-app/source/inline-coffeescript.html.haml
 - fixtures/coffeescript-app/source/javascripts/broken-coffee.js.coffee
 - fixtures/coffeescript-app/source/javascripts/coffee_test.js.coffee
+- fixtures/collections-app/config.rb
+- fixtures/collections-app/source/blog1/2011-01-01-new-article.html.markdown
+- fixtures/collections-app/source/blog1/2011-01-02-another-article.html.markdown
+- fixtures/collections-app/source/blog2/2011-01-01-new-article.html.markdown
+- fixtures/collections-app/source/blog2/2011-01-02-another-article.html.markdown
+- fixtures/collections-app/source/index.html.erb
 - fixtures/content-for-app/config.rb
 - fixtures/content-for-app/source/content_for_erb.html.erb
 - fixtures/content-for-app/source/content_for_haml.html.haml
@@ -1480,6 +1547,7 @@ test_files:
 - fixtures/frontmatter-app/source/front-matter-change.html.erb
 - fixtures/frontmatter-app/source/front-matter-encoding.html.erb
 - fixtures/frontmatter-app/source/front-matter-line-2.html.erb
+- fixtures/frontmatter-app/source/front-matter-pandoc.html.md.erb
 - fixtures/frontmatter-app/source/json-front-matter-2.php.erb
 - fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb
 - fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb
@@ -1705,11 +1773,6 @@ test_files:
 - fixtures/more-ignore-app/source/plain.html
 - fixtures/more-ignore-app/source/reports/another.html
 - fixtures/more-ignore-app/source/reports/index.html
-- fixtures/more-instance-vars-app/config.rb
-- fixtures/more-instance-vars-app/source/_vartial.erb
-- 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.html.markdown
 - fixtures/more-markdown-app/source/with_layout_erb.html.markdown.erb
@@ -1795,6 +1858,18 @@ 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/paginate-app/config.rb
+- fixtures/paginate-app/source/archive/2011/index.html.erb
+- fixtures/paginate-app/source/blog/2011-01-01-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-02-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-03-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-04-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-01-05-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-02-01-test-article.html.markdown
+- fixtures/paginate-app/source/blog/2011-02-02-test-article.html.markdown
+- fixtures/paginate-app/source/index.html.erb
+- fixtures/paginate-app/source/tag.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

data/features/more-instance_vars.feature

@@ -1,18 +0,0 @@
-Feature: Instance Vars
-  In order to share data with layouts and partials via instance variables
-
-  Scenario: Setting an instance var in a template should be visible in its layout
-    Given the Server is running at "more-instance-vars-app"
-    When I go to "/instance-var-set.html"
-    Then I should see "Var is 100"
-
-  Scenario: Setting an instance var in a template should be visible in a partial
-    Given the Server is running at "more-instance-vars-app"
-    When I go to "/instance-var-set.html"
-    Then I should see "My var is here!"
-
-  Scenario: Setting an instance var in one file should not be visible in another
-    Given the Server is running at "more-instance-vars-app"
-    When I go to "/instance-var-set.html"
-    When I go to "/no-instance-var.html"
-    Then I should see "No var..."

data/fixtures/more-instance-vars-app/source/_vartial.erb

@@ -1,5 +0,0 @@
-<% if @my_var %>
-  My var is here!
-<% else %>
-  No var...
-<% end %>

data/fixtures/more-instance-vars-app/source/instance-var-set.html.erb

@@ -1,2 +0,0 @@
-<% @my_var = 100 %>
-<%= partial 'vartial' %>

data/fixtures/more-instance-vars-app/source/layout.erb

@@ -1,3 +0,0 @@
-Var is <%= @my_var %>
-
-<%= yield %>

data/fixtures/more-instance-vars-app/source/no-instance-var.html.erb

@@ -1 +0,0 @@
-<%= partial 'vartial' %>