middleman-core 4.0.0.beta.2 → 4.0.0.rc.1

data/middleman-core.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency("addressable", ["~> 2.3.5"])
 
   # Watcher
-  s.add_dependency('listen', ['>= 2.7.9', '< 3.0'])
+  s.add_dependency('listen', ['~> 3.0'])
 
   # i18n
   s.add_dependency('i18n', ['~> 0.7.0'])
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
   # Testing
   s.add_dependency('contracts', ['~> 0.9.0'])
 
-  # Immutability
+  # Hash stuff
+  s.add_dependency('hashie', ['~> 3.4'])
   s.add_dependency('hamster', ['~> 1.0'])
 end

data/spec/middleman-core/util_spec.rb

@@ -54,43 +54,23 @@ describe Middleman::Util do
   end
 
   describe "::recursively_enhance" do
-    it "returns IndifferentHash if given one" do
-      input   = Middleman::Util::IndifferentHash.new({test: "subject"})
-      subject = Middleman::Util.recursively_enhance input
-
-      expect( subject ).to be_a Middleman::Util::IndifferentHash
-      expect( subject.test ).to eq "subject"
-    end
-
-    it "returns IndifferentHash if given a hash" do
+    it "returns Hashie extended Hash if given a hash" do
       input   = {test: "subject"}
       subject = Middleman::Util.recursively_enhance input
-
-      expect( subject ).to be_a Middleman::Util::IndifferentHash
+      
       expect( subject.test ).to eq "subject"
     end
 
     it "returns Array with strings, or IndifferentHash, true, false" do
-      indifferent_hash = Middleman::Util::IndifferentHash.new({test: "subject"})
+      indifferent_hash = {test: "subject"}
       regular_hash     = {regular: "hash"}
       input   = [ indifferent_hash, regular_hash, true, false ]
       subject = Middleman::Util.recursively_enhance input
 
-      expect( subject[0] ).to be_a Middleman::Util::IndifferentHash
-      expect( subject[1] ).to be_a Middleman::Util::IndifferentHash
       expect( subject[1].regular ).to eq "hash"
       expect( subject[2] ).to eq true
       expect( subject[3] ).to eq false
     end
-
-    it "returns duplicated & frozen original object if not special cased" do
-      input   = "foo"
-      subject = Middleman::Util.recursively_enhance input
-
-      expect( subject ).to eq input
-      expect( subject.object_id ).not_to eq input.object_id
-      expect( subject ).to be_frozen
-    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta.2
+  version: 4.0.0.rc.1
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,20 +134,14 @@ dependencies:
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.9
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.9
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -248,6 +242,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
@@ -301,6 +309,7 @@ files:
 - features/data.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
+- features/extension_hooks.feature
 - features/extensionless_text_files.feature
 - features/feature_params.feature
 - features/former_padrino_helpers.feature
@@ -330,6 +339,7 @@ files:
 - features/markdown.feature
 - features/markdown_kramdown.feature
 - features/markdown_kramdown_in_haml.feature
+- features/markdown_kramdown_in_slim.feature
 - features/markdown_redcarpet.feature
 - features/markdown_redcarpet_in_haml.feature
 - features/minify_css.feature
@@ -572,6 +582,8 @@ files:
 - fixtures/env-app/environments/production.rb
 - fixtures/env-app/source/index.html.erb
 - fixtures/env-app/source/stylesheets/site.css.scss
+- fixtures/extension-hooks-app/config.rb
+- fixtures/extension-hooks-app/source/index.html.erb
 - fixtures/extensionless-text-files-app/config.rb
 - fixtures/extensionless-text-files-app/source/CNAME
 - fixtures/extensionless-text-files-app/source/LICENSE
@@ -597,10 +609,6 @@ files:
 - 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
-- fixtures/frontmatter-app/source/json-front-matter.html.erb
 - fixtures/frontmatter-app/source/raw-front-matter.html
 - fixtures/frontmatter-app/source/raw-front-matter.php
 - fixtures/frontmatter-neighbor-app/config.rb
@@ -610,10 +618,6 @@ files:
 - fixtures/frontmatter-neighbor-app/source/front-matter-change.html.erb.frontmatter
 - fixtures/frontmatter-neighbor-app/source/front-matter-encoding.html.erb
 - fixtures/frontmatter-neighbor-app/source/front-matter-encoding.html.erb.frontmatter
-- fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb
-- fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter
-- fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb
-- fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter
 - fixtures/frontmatter-neighbor-app/source/raw-front-matter.html
 - fixtures/frontmatter-neighbor-app/source/raw-front-matter.html.frontmatter
 - fixtures/frontmatter-neighbor-app/source/raw-front-matter.php
@@ -791,6 +795,9 @@ files:
 - fixtures/markdown-in-haml-app/config.rb
 - fixtures/markdown-in-haml-app/source/images/blank.gif
 - fixtures/markdown-in-haml-app/source/link_target.html.markdown
+- fixtures/markdown-in-slim-app/config.rb
+- fixtures/markdown-in-slim-app/source/images/blank.gif
+- fixtures/markdown-in-slim-app/source/link_target.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
 - fixtures/minify-css-app/source/more-css/site.css
 - fixtures/minify-css-app/source/stylesheets/report.css
@@ -878,6 +885,8 @@ files:
 - fixtures/nested-data-app/data/examples/deeper/stuff.yml
 - fixtures/nested-data-app/data/examples/more.yml
 - fixtures/nested-data-app/data/examples/test.yml
+- fixtures/nested-data-app/data/examples/withcontent.yaml
+- fixtures/nested-data-app/source/extracontent.html.haml.erb
 - fixtures/nested-data-app/source/test.html.erb
 - fixtures/nested-layout-app/config.rb
 - fixtures/nested-layout-app/source/another.html.markdown
@@ -1200,6 +1209,7 @@ files:
 - lib/middleman-core/template_context.rb
 - lib/middleman-core/template_renderer.rb
 - lib/middleman-core/util.rb
+- lib/middleman-core/util/data.rb
 - lib/middleman-core/version.rb
 - lib/middleman/rack.rb
 - middleman-core.gemspec
@@ -1262,6 +1272,7 @@ test_files:
 - features/data.feature
 - features/directory_index.feature
 - features/dynamic_pages.feature
+- features/extension_hooks.feature
 - features/extensionless_text_files.feature
 - features/feature_params.feature
 - features/former_padrino_helpers.feature
@@ -1291,6 +1302,7 @@ test_files:
 - features/markdown.feature
 - features/markdown_kramdown.feature
 - features/markdown_kramdown_in_haml.feature
+- features/markdown_kramdown_in_slim.feature
 - features/markdown_redcarpet.feature
 - features/markdown_redcarpet_in_haml.feature
 - features/minify_css.feature
@@ -1533,6 +1545,8 @@ test_files:
 - fixtures/env-app/environments/production.rb
 - fixtures/env-app/source/index.html.erb
 - fixtures/env-app/source/stylesheets/site.css.scss
+- fixtures/extension-hooks-app/config.rb
+- fixtures/extension-hooks-app/source/index.html.erb
 - fixtures/extensionless-text-files-app/config.rb
 - fixtures/extensionless-text-files-app/source/CNAME
 - fixtures/extensionless-text-files-app/source/LICENSE
@@ -1558,10 +1572,6 @@ test_files:
 - 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
-- fixtures/frontmatter-app/source/json-front-matter.html.erb
 - fixtures/frontmatter-app/source/raw-front-matter.html
 - fixtures/frontmatter-app/source/raw-front-matter.php
 - fixtures/frontmatter-neighbor-app/config.rb
@@ -1571,10 +1581,6 @@ test_files:
 - fixtures/frontmatter-neighbor-app/source/front-matter-change.html.erb.frontmatter
 - fixtures/frontmatter-neighbor-app/source/front-matter-encoding.html.erb
 - fixtures/frontmatter-neighbor-app/source/front-matter-encoding.html.erb.frontmatter
-- fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb
-- fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter
-- fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb
-- fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter
 - fixtures/frontmatter-neighbor-app/source/raw-front-matter.html
 - fixtures/frontmatter-neighbor-app/source/raw-front-matter.html.frontmatter
 - fixtures/frontmatter-neighbor-app/source/raw-front-matter.php
@@ -1752,6 +1758,9 @@ test_files:
 - fixtures/markdown-in-haml-app/config.rb
 - fixtures/markdown-in-haml-app/source/images/blank.gif
 - fixtures/markdown-in-haml-app/source/link_target.html.markdown
+- fixtures/markdown-in-slim-app/config.rb
+- fixtures/markdown-in-slim-app/source/images/blank.gif
+- fixtures/markdown-in-slim-app/source/link_target.html.markdown
 - fixtures/minify-css-app/source/inline-css.html.haml
 - fixtures/minify-css-app/source/more-css/site.css
 - fixtures/minify-css-app/source/stylesheets/report.css
@@ -1839,6 +1848,8 @@ test_files:
 - fixtures/nested-data-app/data/examples/deeper/stuff.yml
 - fixtures/nested-data-app/data/examples/more.yml
 - fixtures/nested-data-app/data/examples/test.yml
+- fixtures/nested-data-app/data/examples/withcontent.yaml
+- fixtures/nested-data-app/source/extracontent.html.haml.erb
 - fixtures/nested-data-app/source/test.html.erb
 - fixtures/nested-layout-app/config.rb
 - fixtures/nested-layout-app/source/another.html.markdown

data/fixtures/frontmatter-app/source/json-front-matter-2.php.erb

@@ -1,7 +0,0 @@
-;;;
-  "layout": false,
-  "title":  "This is the title"
-;;;
-
-<h1><%= current_page.data.title %></h1>
-<?php echo "sup"; ?>

data/fixtures/frontmatter-app/source/json-front-matter-encoding.html.erb

@@ -1,7 +0,0 @@
-# encoding: UTF-8
-;;;
-"layout": false,
-"title": "This is the title"
-;;;
-
-<h1><%= current_page.data.title %></h1>

data/fixtures/frontmatter-app/source/json-front-matter-line-2.html.erb

@@ -1,7 +0,0 @@
-<h2> Test</h2>
-;;;
-layout: false,
-title: "This is the title"
-;;;
-
-<h1><%= current_page.data.title %></h1>

data/fixtures/frontmatter-app/source/json-front-matter.html.erb

@@ -1,6 +0,0 @@
-;;;
-  "layout": false,
-  "title":  "This is the title"
-;;;
-
-<h1><%= current_page.data.title %></h1>

data/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb

@@ -1,2 +0,0 @@
-<h1><%= current_page.data.title %></h1>
-<?php echo "sup"; ?>

data/fixtures/frontmatter-neighbor-app/source/json-front-matter-2.php.erb.frontmatter

@@ -1,4 +0,0 @@
-;;;
-  "layout": false,
-  "title":  "This is the title"
-;;;

data/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb

@@ -1 +0,0 @@
-<h1><%= current_page.data.title %></h1>

data/fixtures/frontmatter-neighbor-app/source/json-front-matter.html.erb.frontmatter

@@ -1,4 +0,0 @@
-;;;
-  "layout": false,
-  "title":  "This is the title"
-;;;