middleman-core 3.0.0 → 3.0.1.pre

data/.cane

@@ -0,0 +1,2 @@
+--exclusions-file .cane-exclusions.yml
+--no-doc

data/.cane-exclusions.yml

@@ -0,0 +1,5 @@
+style:
+  - lib/middleman-core/vendor/hooks-0.2.0/lib/hooks/inheritable_attribute.rb
+  - lib/middleman-core/vendor/hooks-0.2.0/test/hooks_test.rb
+  - lib/middleman-core/vendor/hooks-0.2.0/test/inheritable_attribute_test.rb
+  - lib/middleman-core/vendor/hooks-0.2.0/lib/hooks.rb

data/Rakefile

@@ -1,7 +1,7 @@
 # coding:utf-8
 RAKE_ROOT = __FILE__
 
-GEM_NAME = "middleman-core"
+GEM_NAME = ENV["NAME"] || "middleman-core"
 
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')

data/bin/middleman

@@ -7,65 +7,19 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 moredir = File.expand_path(File.join(File.dirname(File.dirname(libdir)), "middleman-more", "lib", "middleman-more"))
 $LOAD_PATH.unshift(moredir) unless $LOAD_PATH.include?(moredir)
 
-# Core Pathname library used for traversal
-require "pathname"
-
-# Recursive method to find config.rb
-def locate_root(cwd = Pathname.new(Dir.pwd))
-  return cwd.to_s if (cwd + 'config.rb').exist?
-  return false if cwd.root?
-  locate_root(cwd.parent)
-end
-
-# Only look for config.rb if MM_ROOT isn't set
-if !ENV["MM_ROOT"] && found_path = locate_root
-  ENV["MM_ROOT"] = found_path
-end
-
-is_bundler_setup = false
-
-# If we've found the root, try to setup Bundler
-if ENV["MM_ROOT"]
-  
-  root_gemfile = File.expand_path('Gemfile', ENV["MM_ROOT"])
-  ENV['BUNDLE_GEMFILE'] ||= root_gemfile
-  
-  if !File.exists?(ENV['BUNDLE_GEMFILE'])
-    git_gemfile = Pathname.new(__FILE__).expand_path.parent.parent.parent + "Gemfile"
-    ENV['BUNDLE_GEMFILE'] = git_gemfile.to_s
-  end
-  
-  if File.exists?(ENV['BUNDLE_GEMFILE'])
-    is_bundler_setup = true
-    require 'bundler/setup'
-  end
+require 'middleman-core/profiling'
+if ARGV.include? '--profile'
+  Middleman::Profiling.profiler = Middleman::Profiling::RubyProfProfiler.new
 end
+Middleman::Profiling.start
 
-# Automatically discover extensions in RubyGems
-require "middleman-core/extensions"
-
-if is_bundler_setup
-  Bundler.require
-else
-  ::Middleman.load_extensions_in_path
-end
+require "middleman-core/load_paths"
+Middleman.setup_load_paths
 
 require "middleman-core/cli"
 
-# Change flag to a module
-ARGV.unshift("help") if ARGV.delete("--help")
-
-# Default command is server
-if ARGV[0] != "help" && (ARGV.length < 1 || ARGV.first.include?("-"))
-  ARGV.unshift("server")
-end
+# Change directory to the root
+Dir.chdir(ENV["MM_ROOT"]) if ENV["MM_ROOT"]
 
 # Start the CLI
-if ENV["MM_ROOT"]
-  # Change directory to the root
-  Dir.chdir(ENV["MM_ROOT"]) do
-    Middleman::Cli::Base.start
-  end
-else
-  Middleman::Cli::Base.start
-end
+Middleman::Cli::Base.start

data/features/cli_extension.feature

@@ -11,3 +11,4 @@ Feature: Middleman New Extension CLI
       | features/support/env.rb                       |
       | lib/middleman_extension.rb                    |
       | lib/my-extension-library.rb                   |
+      | .gitignore                                    |

data/features/frontmatter_page_settings.feature

@@ -6,7 +6,7 @@ Feature: Setting page settings through frontmatter
     And the file "build/alternate_layout.html" should contain "Alternate layout"
     And the following files should not exist:
       | build/ignored.html  |
-    
+
   Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (preview)
     Given the Server is running at "frontmatter-settings-app"
     When I go to "/alternate_layout.html"
@@ -31,3 +31,13 @@ Feature: Setting page settings through frontmatter
       """
     When I go to "/ignored.html"
     Then I should see "This file is no longer ignored."
+
+  Scenario: Overriding layout through frontmatter
+    Given the Server is running at "frontmatter-settings-app"
+    When I go to "/override_layout.html"
+    Then I should see "Layout in use: Override"
+
+  Scenario: Setting layout through frontmatter even if page is mentioned in config
+    Given the Server is running at "frontmatter-settings-app"
+    When I go to "/page_mentioned.html"
+    Then I should see "Layout in use: Override"

data/features/instance_vars.feature

@@ -0,0 +1,9 @@
+Feature: Instance Variables
+  Scenario: A dynamic page template using instance variables
+    Given the Server is running at "instance-vars-app"
+    When I go to "/a.html"
+    Then I should see "A: 'set'"
+    Then I should see "B: ''"
+    When I go to "/b.html"
+    Then I should see "A: ''"
+    Then I should see "B: 'set'"

data/features/step_definitions/page_layout_steps.rb

@@ -1,7 +1,7 @@
 Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
   @initialize_commands ||= []
-  @initialize_commands << lambda { 
-    page(url, :layout => layout.to_sym) 
+  @initialize_commands << lambda {
+    page(url, :layout => layout.to_sym)
   }
 end
 
@@ -12,4 +12,4 @@ Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
       page(url)
     end
   }
-end
+end

data/features/strip_url.feature

@@ -0,0 +1,40 @@
+Feature: Strip the index_file from urls
+
+  Scenario: Default behaviour, strip with trailing slash
+    Given the Server is running at "strip-url-app"
+    When I go to "/"
+    Then I should see "URL: '/'"
+    When I go to "/index.html"
+    Then I should see "URL: '/'"
+    When I go to "/other.html"
+    Then I should see "URL: '/other.html'"
+    When I go to "/subdir/index.html"
+    Then I should see "URL: '/subdir/'"
+
+  Scenario: Trailing slash off
+    Given a fixture app "strip-url-app"
+    And a file named "config.rb" with:
+       """
+       set :trailing_slash, false
+       """
+    And the Server is running
+    When I go to "/"
+    Then I should see "URL: '/'"
+    When I go to "/other.html"
+    Then I should see "URL: '/other.html'"
+    When I go to "/subdir/index.html"
+    Then I should see "URL: '/subdir'"
+
+  Scenario: Strip index off
+    Given a fixture app "strip-url-app"
+    And a file named "config.rb" with:
+       """
+       set :strip_index_file, false
+       """
+    And the Server is running
+    When I go to "/"
+    Then I should see "URL: '/index.html'"
+    When I go to "/other.html"
+    Then I should see "URL: '/other.html'"
+    When I go to "/subdir/index.html"
+    Then I should see "URL: '/subdir/index.html'"

data/features/support/env.rb

@@ -3,4 +3,4 @@ ENV["AUTOLOAD_SPROCKETS"] = "false"
 
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core')
-require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core', 'step_definitions')
+require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-core', 'step_definitions')

data/fixtures/automatic-directory-matcher-app/config.rb

@@ -1 +1 @@
-set :automatic_directory_matcher, "--"
+set :automatic_directory_matcher, "--"

data/fixtures/basic-data-app/config.rb

@@ -1,4 +1,4 @@
 with_layout false do
   page "/data.html"
   page "/data3.html"
-end
+end

data/fixtures/build-with-errors-app/config.rb

@@ -1 +1 @@
-set :layout, false
+set :layout, false

data/fixtures/clean-app/config-complications.rb

@@ -8,4 +8,4 @@ page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => tru
   page "/fake/#{num}.html", :proxy => "/real/index.html" do
     @num = num
   end
-end
+end

data/fixtures/clean-app/config.rb

@@ -8,4 +8,4 @@ page "/target_ignore.html", :proxy => "/should_be_ignored3.html", :ignore => tru
   page "/fake/#{num}.html", :proxy => "/real/index.html" do
     @num = num
   end
-end
+end

data/fixtures/current-page-app/config.rb

@@ -1,3 +1,3 @@
 with_layout false do
   page "/request-path.html"
-end
+end

data/fixtures/custom-layout-app/config.rb

@@ -1 +1 @@
-set :erb, :layout_engine => :str
+set :erb, :layout_engine => :str

data/fixtures/data-app/config.rb

@@ -1,3 +1,3 @@
 data.pages.each do |p|
   page p.from, :proxy => p.to
-end
+end

data/fixtures/external-helpers/config.rb

@@ -1,4 +1,4 @@
 require "lib/hello_helper"
 helpers HelloHelper
 
-page "/", :layout => false
+page "/", :layout => false

data/fixtures/external-helpers/helpers/derp.rb

@@ -1,3 +1,3 @@
 module Derp
   def three; "Three"; end
-end
+end

data/fixtures/external-helpers/helpers/four_helpers.rb

@@ -1,3 +1,3 @@
 module FourHelpers
   def four; "Four"; end
-end
+end

data/fixtures/external-helpers/helpers/one_helper.rb

@@ -1,3 +1,3 @@
 module OneHelper
   def one; "One"; end
-end
+end

data/fixtures/external-helpers/helpers/yet_another_thingy.rb

@@ -1,3 +1,3 @@
 module YetAnotherThingy
   def two; "Two"; end
-end
+end

data/fixtures/external-helpers/lib/hello_helper.rb

@@ -2,4 +2,4 @@ module HelloHelper
   def hello
     "Hello World"
   end
-end
+end

data/fixtures/feature-params-app/config.rb

@@ -9,4 +9,4 @@ module ExtensionA
   end
 end
 
-activate ExtensionA, :hello => "world", :hola => "mundo"
+activate ExtensionA, :hello => "world", :hola => "mundo"

data/fixtures/frontmatter-settings-app/config.rb

@@ -1,2 +1,4 @@
 # Proxy ignored.html, which should ignore itself through a frontmatter
-page 'proxied.html', :proxy => 'ignored.html'
+page 'proxied.html', :proxy => 'ignored.html'
+page 'override_layout.html', :layout => :alternate
+page 'page_mentioned.html'

data/fixtures/frontmatter-settings-app/source/layouts/override.erb

@@ -0,0 +1,2 @@
+<%= yield %>
+ Override.

data/fixtures/frontmatter-settings-app/source/override_layout.html.erb

@@ -0,0 +1,4 @@
+---
+layout: override
+---
+Layout in use:

data/fixtures/frontmatter-settings-app/source/page_mentioned.html.erb

@@ -0,0 +1,4 @@
+---
+layout: override
+---
+Layout in use:

data/fixtures/generator-test/config.rb

@@ -1,4 +1,4 @@
-### 
+###
 # Compass
 ###
 
@@ -16,13 +16,13 @@
 ###
 
 # Per-page layout changes:
-# 
+#
 # With no layout
 # page "/path/to/file.html", :layout => false
-# 
+#
 # With alternative layout
 # page "/path/to/file.html", :layout => :otherlayout
-# 
+#
 # A path which all have the same layout
 # with_layout :admin do
 #   page "/admin/*"
@@ -60,21 +60,21 @@
 configure :build do
   # For example, change the Compass output style for deployment
   # activate :minify_css
-  
+
   # Minify Javascript on build
   # activate :minify_javascript
-  
+
   # Enable cache buster
   # activate :cache_buster
-  
+
   # Use relative URLs
   # activate :relative_assets
-  
+
   # Compress PNGs after build
   # First: gem install middleman-smusher
   # require "middleman-smusher"
   # activate :smusher
-  
+
   # Or use a different image path
   # set :http_path, "/Content/images/"
-end
+end

data/fixtures/glob-app/config.rb

@@ -1 +1 @@
-page "/index.html", :layout => false
+page "/index.html", :layout => false

data/fixtures/instance-vars-app/config.rb

@@ -0,0 +1,7 @@
+page "a.html", :proxy => 'content.html', :ignore => true do
+  @a = "set"
+end
+
+page "b.html", :proxy => 'content.html', :ignore => true do
+  @b = "set"
+end

data/fixtures/instance-vars-app/source/content.html.erb

@@ -0,0 +1,2 @@
+A: '<%= @a %>'
+B: '<%= @b %>'

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

@@ -0,0 +1 @@
+<%= yield %>

data/fixtures/large-build-app/config.rb

@@ -1,3 +1,3 @@
 with_layout false do
   page "/spaces in file.html"
-end
+end

data/fixtures/large-build-app/source/images/Child folder/regular_file(example).txt

@@ -1 +1 @@
-Regular
+Regular

data/fixtures/large-build-app/source/images/Read me (example).txt

@@ -1 +1 @@
-README
+README

data/fixtures/manual-layout-missing/config.rb

@@ -1 +1 @@
-set :layout, :custom
+set :layout, :custom

data/fixtures/manual-layout-override/config.rb

@@ -1,3 +1,3 @@
 set :layout, :custom
 
-page "/", :layout => :another
+page "/", :layout => :another

data/fixtures/manual-layout/config.rb

@@ -1 +1 @@
-set :layout, :custom
+set :layout, :custom

data/fixtures/page-helper-layout-block-app/config.rb

@@ -3,4 +3,4 @@ page "/path/*", :layout => "alt"
 # Doesn't work, and shouldn't
 # page "/path/*" do
 #   set :layout, "alt"
-# end
+# end

data/fixtures/sinatra-app/config.rb

@@ -8,4 +8,4 @@ end
 
 map "/sinatra" do
   run MySinatra
-end
+end

data/fixtures/strip-url-app/source/index.html.erb

@@ -0,0 +1 @@
+URL: '<%= current_page.url %>'

data/fixtures/strip-url-app/source/other.html.erb

@@ -0,0 +1 @@
+URL: '<%= current_page.url %>'