middleman-core 3.0.0.beta.1 → 3.0.0.beta.2

data/Rakefile

@@ -1,49 +1,7 @@
 # coding:utf-8
 RAKE_ROOT = __FILE__
 
+GEM_NAME = "middleman-core"
+
 require 'rubygems'
 require File.expand_path(File.dirname(__FILE__) + '/../gem_rake_helper')
-
-desc "Build vendored gems"
-task :build_vendor do
-  raise unless File.exist?('Rakefile')
-
-  # Destroy vendor
-  sh "rm -rf lib/middleman-core/vendor/darwin"
-  sh "rm -rf lib/middleman-core/vendor/linux"
-
-  # Clone the correct gems
-  sh "git clone https://github.com/thibaudgg/rb-fsevent.git lib/middleman-core/vendor/darwin"
-  sh "cd lib/middleman-core/vendor/darwin && git checkout 1ca42b987596f350ee7b19d8f8210b7b6ae8766b"
-  sh "git clone https://github.com/nex3/rb-inotify.git lib/middleman-core/vendor/linux"
-  sh "cd lib/middleman-core/vendor/linux && git checkout 01e7487e7a8d8f26b13c6835a321390c6618ccb7"
-
-  # Strip out the .git directories
-  %w[darwin linux].each {|platform| sh "rm -rf lib/middleman-core/vendor/#{platform}/.git"}
-
-  # Move ext directory of darwin to root
-  sh "mkdir -p ext"
-  sh "cp -r lib/middleman-core/vendor/darwin/ext/* ext/"
-
-  # Alter darwin extconf.rb
-  extconf_path = File.expand_path("../ext/extconf.rb", __FILE__)
-  extconf_contents = File.read(extconf_path)
-  extconf_contents.sub!(/puts "Warning/, '#\0')
-  extconf_contents.gsub!(/bin\/fsevent_watch/, 'bin/fsevent_watch_guard')
-  File.open(extconf_path, 'w') { |f| f << extconf_contents }
-
-  # Alter lib/middleman-core/vendor/darwin/lib/rb-fsevent/fsevent.rb
-  fsevent_path = File.expand_path("../lib/middleman-core/vendor/darwin/lib/rb-fsevent/fsevent.rb", __FILE__)
-  fsevent_contents = File.read(fsevent_path)
-  fsevent_contents.sub!(/fsevent_watch/, 'fsevent_watch_guard')
-  fsevent_contents.sub!(/'\.\.'/, "'..', '..', '..', '..', '..'")
-
-  File.open(fsevent_path, 'w') { |f| f << fsevent_contents }
-end
-
-desc "Compile mac executable"
-task :build_mac_exec do
-  Dir.chdir(File.expand_path("../ext", __FILE__)) do
-    system("ruby extconf.rb") or raise
-  end
-end

data/bin/middleman

@@ -33,23 +33,27 @@ end
 # Default command is server
 ARGV.unshift("server") if ARGV.length < 1 || ARGV.first.include?("-")
 
-# Require Middleman
-require 'middleman-core'
-
 begin
-  # Rubygems
-  require "middleman-more"
+  # Local
+  require File.expand_path(File.join(File.dirname(File.dirname(libdir)), "middleman-more", "lib", "middleman-more"))
 rescue LoadError
   begin
-    # Local
-    require File.expand_path(File.join(File.dirname(File.dirname(libdir)), "middleman-more", "lib", "middleman-more"))
+    # Rubygems
+    require "middleman-more"
   rescue LoadError
+    # Require Middleman
+    require 'middleman-core'
   end
 end
 
+# Automatically discover extensions in RubyGems
+Middleman.load_extensions_in_path
+
+require "middleman-core/cli"
+
 # Change directory to the root
 Dir.chdir(ENV["MM_ROOT"] || Dir.pwd) do
   
   # Start the CLI
   Middleman::Cli::Base.start
-end
+end

data/features/3rd_party_cli.feature

@@ -1,5 +1,15 @@
 Feature: Allow config.rb and extensions to add CLI commands
-  Scenario: Test 3rd Party Command
-    Given a fixture app "3rd-party-command"
+
+  Scenario: Command autoloaded from tasks/ directory
+    Given an empty app
+    And a file named "tasks/hello_task.rb" with:
+      """
+      class Hello < Thor
+        desc "hello", "Say hello"
+        def hello
+          puts "Hello World"
+        end
+      end
+      """
     When I run `middleman hello`
     Then the output should contain "Hello World"

data/features/builder.feature

@@ -14,10 +14,10 @@ Feature: Builder
       | images/Read me (example).txt                  |
       | images/Child folder/regular_file(example).txt |
       | .htaccess                                     |
+      | feed.xml                                      |
     Then the following files should not exist:
       | _partial                                      |
       | layout                                        |
-      | other_layout                                  |
       | layouts/custom                                |
       | layouts/content_for                           |
       

data/features/clean_build.feature

@@ -3,29 +3,39 @@ Feature: Build Clean
     Given a fixture app "clean-app"
     And app "clean-app" is using config "empty"
     And a successfully built app at "clean-app"
+    Then the following files should exist:
+      | build/index.html              |
+      | build/should_be_ignored.html  |
+      | build/should_be_ignored2.html |
+      | build/should_be_ignored3.html |
     And app "clean-app" is using config "complications"
-    
     Given a successfully built app at "clean-app" with flags "--clean"
-    When I cd to "build"
     Then the following files should not exist:
-      | should_be_ignored.html                        |
-      | should_be_ignored2.html                       |
-      | should_be_ignored3.html                       |
-    And the file "index.html" should contain "Comment in layout"
+      | build/should_be_ignored.html  |
+      | build/should_be_ignored2.html |
+      | build/should_be_ignored3.html |
+    And the file "build/index.html" should contain "Comment in layout"
 
   Scenario: Clean an app with directory indexes
     Given a successfully built app at "clean-dir-app"
-    When I cd to "build"
     Then the following files should exist:
-      | about/index.html                               |
-    
+      | build/about/index.html        |
     Given a successfully built app at "clean-dir-app" with flags "--clean"
-      When I cd to "build"
     Then the following files should exist:
-      | about/index.html                               |
-
+      | build/about/index.html        |
+    
   Scenario: Clean build an app that's never been built
     Given a successfully built app at "clean-dir-app" with flags "--clean"
-    When I cd to "build"
     Then the following files should exist:
-      | about/index.html                               |
+      | build/about/index.html        |
+
+  Scenario: Clean build an app with newly ignored files and a nested output directory
+    Given a built app at "clean-nested-app"
+    Then a directory named "sub/dir" should exist
+    Then the following files should exist:
+      | sub/dir/about.html        |
+    When I append to "config.rb" with "ignore 'about.html'"
+    Given a built app at "clean-nested-app" with flags "--clean"
+    Then the following files should not exist:
+      | sub/dir/about.html        |
+      

data/features/cli.feature

@@ -5,6 +5,7 @@ Feature: Middleman CLI
     Then the exit status should be 0
     When I cd to "MY_PROJECT"
     Then the following files should exist:
+      | Gemfile                                       |
       | config.rb                                     |
       | source/index.html.erb                         |
       | source/images/background.png                  |
@@ -18,11 +19,11 @@ Feature: Middleman CLI
     When I run `middleman i MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
     
-  Scenario: Create a new project (alias i)
+  Scenario: Create a new project (alias new)
     When I run `middleman new MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
   
-  Scenario: Create a new project (alias i)
+  Scenario: Create a new project (alias n)
     When I run `middleman n MY_PROJECT`
     Then a directory named "MY_PROJECT" should exist
     
@@ -33,17 +34,16 @@ Feature: Middleman CLI
     Then the following files should exist:
       | config.rb                                     |
       | config.ru                                     |
-    Then the following files should not exist:
       | Gemfile                                       |
     
-  Scenario: Create a new project with Bundler
-    When I run `middleman init MY_PROJECT --bundler`
+  Scenario: Create a new project without Bundler
+    When I run `middleman init MY_PROJECT --no-bundler`
     Then a directory named "MY_PROJECT" should exist
     When I cd to "MY_PROJECT"
     Then the following files should exist:
       | config.rb                                     |
-      | Gemfile                                       |
     Then the following files should not exist:  
+      | Gemfile                                       |
       | config.ru                                     |
       
   Scenario: Create a new HTML5 project
@@ -52,9 +52,10 @@ Feature: Middleman CLI
     When I cd to "MY_PROJECT"
     Then the following files should exist:
       | config.rb                                     |
+      | Gemfile                                       |
     Then the following files should not exist:
       | config.ru                                     |
-      | Gemfile                                       |
+    And the file "config.rb" should contain "set :js_dir, 'js'"
     Then a directory named "source" should exist
     When I cd to "source"
     Then the following files should exist:
@@ -69,28 +70,17 @@ Feature: Middleman CLI
     Then the following files should exist:
       | config.rb                                     |
       | config.ru                                     |
-    Then the following files should not exist:
       | Gemfile                                       |
     
-  Scenario: Create a new HTML5 project with Bundler
-    When I run `middleman init MY_PROJECT --bundler --template=html5`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | config.rb                                     |
-      | Gemfile                                       |
-    Then the following files should not exist:  
-      | config.ru                                     |
-      
   Scenario: Create a new Mobile HTML5 project
     When I run `middleman init MY_PROJECT --template=mobile`
     Then a directory named "MY_PROJECT" should exist
     When I cd to "MY_PROJECT"
     Then the following files should exist:
       | config.rb                                     |
+      | Gemfile                                       |
     Then the following files should not exist:
       | config.ru                                     |
-      | Gemfile                                       |
     Then a directory named "source" should exist
     When I cd to "source"
     Then the following files should exist:
@@ -105,15 +95,4 @@ Feature: Middleman CLI
     Then the following files should exist:
       | config.rb                                     |
       | config.ru                                     |
-    Then the following files should not exist:
       | Gemfile                                       |
-    
-  Scenario: Create a new Mobile HTML5 project with Bundler
-    When I run `middleman init MY_PROJECT --bundler --template=mobile`
-    Then a directory named "MY_PROJECT" should exist
-    When I cd to "MY_PROJECT"
-    Then the following files should exist:
-      | config.rb                                     |
-      | Gemfile                                       |
-    Then the following files should not exist:  
-      | config.ru                                     |

data/features/custom_layouts.feature

@@ -12,6 +12,12 @@ Feature: Custom layouts
     And the Server is running at "custom-layout-app2"
     When I go to "/custom-layout.html"
     Then I should see "Custom Layout"
+
+  Scenario: Using with_layout block with globs
+    Given "/custom-*" with_layout block has layout "custom"
+    And the Server is running at "custom-layout-app2"
+    When I go to "/custom-layout.html"
+    Then I should see "Custom Layout"
     
   Scenario: Using custom :layout attribute with folders
     Given page "/custom-layout-dir/" has layout "custom"

data/features/directory_index.feature

@@ -8,6 +8,7 @@ Feature: Directory Index
       | needs_index/index.html                        |
       | a_folder/needs_index/index.html               |
       | leave_me_alone.html                           |
+      | wildcard_leave_me_alone.html                  |
       | regular/index.html                            |
       | .htaccess                                     |
     Then the following files should not exist:
@@ -15,6 +16,7 @@ Feature: Directory Index
       | needs_index.html                              |
       | a_folder/needs_index.html                     |
       | leave_me_alone/index.html                     |
+      | wildcard_leave_me_alone/index.html            |
     And the file "needs_index/index.html" should contain "Indexable"
     And the file "a_folder/needs_index/index.html" should contain "Indexable"
     And the file "leave_me_alone.html" should contain "Stay away"

data/features/dynamic_pages.feature

@@ -46,23 +46,60 @@ Feature: Dynamic Pages
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/one.html"
     Then I should see "I am real: one"
+    Then I should see "Global: I am one glob"
+    Then I should see "All: I am all glob"
+    
     When I go to "/fake2/one.html"
     Then I should see "I am real: one"
+    Then I should see "Global: I am two glob"
+    Then I should see "All: I am all glob"
+    
     When I go to "/fake3/one.html"
     Then I should see "I am real: one"
+    Then I should see "Global: I am three glob"
+    Then I should see "All: I am all glob"
+    
     When I go to "/fake4/one.html"
     Then I should see "I am real: one"
+    Then I should see "Global: I am four glob"
+    Then I should see "All: I am all glob"
     
   Scenario: Preview proxy with variable two
     Given the Server is running at "dynamic-pages-app"
     When I go to "/fake/two.html"
     Then I should see "I am real: two"
+    Then I should see "Global: I am one glob"
+    Then I should see "All: I am all glob"
+    
     When I go to "/fake2/two.html"
     Then I should see "I am real: two"
+    Then I should see "Global: I am two glob"
+    Then I should see "All: I am all glob"
+    
     When I go to "/fake3/two.html"
     Then I should see "I am real: two"
+    Then I should see "Global: I am three glob"
+    Then I should see "All: I am all glob"
+    
     When I go to "/fake4/two.html"
     Then I should see "I am real: two"
+    Then I should see "Global: I am four glob"
+    Then I should see "All: I am all glob"
+
+  Scenario: Build proxy with variable one
+    Given a successfully built app at "dynamic-pages-app"
+    When I cd to "build"
+    Then the file "fake/one.html" should contain "I am real: one"
+    Then the file "fake/one.html" should contain "Global: I am one glob"
+    Then the file "fake/one.html" should contain "All: I am all glob"
+
+    Then the file "fake2/one.html" should contain "I am real: one"
+    Then the file "fake2/one.html" should contain "Global: I am two glob"
+    Then the file "fake2/one.html" should contain "All: I am all glob"
+
+    Then the file "fake3/one.html" should contain "I am real: one"
+    Then the file "fake3/one.html" should contain "Global: I am three glob"
+    Then the file "fake3/one.html" should contain "All: I am all glob"
     
   Scenario: Target ignore
     Given the Server is running at "dynamic-pages-app"

data/features/extensionless_text_files.feature

@@ -0,0 +1,58 @@
+Feature: Text Files Without Extensions Should Build and Preview
+
+  Scenario: Building Text Files without directory indexes
+  
+    Given a fixture app "extensionless-text-files-app"
+    And a file named "config.rb" with:
+      """
+      """
+    And a successfully built app at "extensionless-text-files-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | CNAME   |
+      | LICENSE |
+      | README  |
+
+  Scenario: Building Text Files with directory indexes
+
+    Given a fixture app "extensionless-text-files-app"
+    And a file named "config.rb" with:
+      """
+      activate :directory_indexes
+      """
+    And a successfully built app at "extensionless-text-files-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | CNAME   |
+      | LICENSE |
+      | README  |
+    Then the following files should not exist:
+      | CNAME/index.html   |
+      | LICENSE/index.html |
+      | README/index.html  |
+  
+  Scenario: Previewing Text Files without directory indexes
+    Given "directory_indexes" feature is "disabled"
+    Given the Server is running at "extensionless-text-files-app"
+    When I go to "/CNAME"
+    Then I should see "test.github.com"
+    When I go to "/LICENSE"
+    Then I should see "You have the right to remain classy."
+    When I go to "/README"
+    Then I should see "Bork bork bork"
+    
+  Scenario: Previewing Text Files with directory indexes
+    Given "directory_indexes" feature is "enabled"
+    Given the Server is running at "extensionless-text-files-app"
+    When I go to "/CNAME"
+    Then I should see "test.github.com"
+    When I go to "/LICENSE"
+    Then I should see "You have the right to remain classy."
+    When I go to "/README"
+    Then I should see "Bork bork bork"
+    # When I go to "/CNAME/index.html"
+    # Then I should see "File Not Found"
+    # When I go to "/LICENSE/index.html"
+    # Then I should see "File Not Found"
+    # When I go to "/README/index.html"
+    # Then I should see "File Not Found"

data/features/former_padrino_helpers.feature

@@ -1,10 +1,12 @@
 Feature: Built-in macro view helpers
   In order to simplify generating HTML
 
-  Scenario: Using the link_to helper
+  Scenario: Using the padrino helpers
     Given the Server is running at "padrino-helpers-app"
     When I go to "/former_padrino_test.html"
     And I should see 'href="test2.com"'
     And I should see 'src="/images/test2.png"'
-    Then I should see 'src="/javascripts/test1.js"'
-    Then I should see 'href="/stylesheets/test1.css"'
+    And I should see 'src="/javascripts/test1.js"'
+    And I should see 'href="/stylesheets/test1.css"'
+    And I should see '1 KB'
+                

data/features/frontmatter_page_settings.feature

@@ -0,0 +1,27 @@
+Feature: Setting page settings through frontmatter
+  Scenario: Setting layout, ignoring, and disabling directory indexes through frontmatter (build)
+    Given a successfully built app at "frontmatter-settings-app"
+    Then the following files should exist:
+      | build/proxied/index.html  |
+      | build/no_index.html       |
+    And the file "build/alternate_layout/index.html" should contain "Alternate layout"
+    And the following files should not exist:
+      | build/ignored/index.html  |
+      | build/no_index/index.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 "/proxied/"
+    # Then I should not see "File Not Found"
+    When I go to "/no_index.html"
+    Then I should not see "File Not Found"
+    When I go to "/alternate_layout/"
+    Then I should not see "File Not Found"
+    And I should see "Alternate layout"
+    When I go to "/ignored.html"
+    Then I should see "File Not Found"
+    When I go to "/ignored/index.html"
+    Then I should see "File Not Found"
+    When I go to "/no_index/index.html"
+    Then I should see "File Not Found"

data/features/helpers_external.feature

@@ -3,4 +3,10 @@ Feature: Helpers in external files
   Scenario: Hello Helper
     Given the Server is running at "external-helpers"
     Then going to "/index.html" should not raise an exception
-    And I should see "Hello World"
+    And I should see "Hello World"
+
+  Scenario: Automatic Helpers
+    Given the Server is running at "external-helpers"
+    Then going to "/automatic.html" should not raise an exception
+    And I should see "One:Two:Three:Four"
+    

data/features/i18n_builder.feature

@@ -0,0 +1,121 @@
+Feature: i18n Builder
+  In order to preview localized html
+  
+  Scenario: Running localize with the default config
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      localize
+      """
+    Given a successfully built app at "i18n-test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+      | hello.html                                    |
+      | es/index.html                                 |
+      | es/hola.html                                  |
+    Then the following files should not exist:
+      | en/index.html                                 |
+    And the file "index.html" should contain "Howdy"  
+    And the file "hello.html" should contain "Hello World"
+    And the file "es/index.html" should contain "Como Esta?"
+    And the file "es/hola.html" should contain "Hola World"
+    
+  Scenario: Running localize with the alt path config
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      localize :path => "/lang_:locale/"
+      """
+    Given a successfully built app at "i18n-test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+      | hello.html                                    |
+      | lang_es/index.html                            |
+      | lang_es/hola.html                             |
+    Then the following files should not exist:
+      | lang_en/index.html                            |
+    And the file "index.html" should contain "Howdy"  
+    And the file "hello.html" should contain "Hello World"
+    And the file "lang_es/index.html" should contain "Como Esta?"
+    And the file "lang_es/hola.html" should contain "Hola World"
+    
+  Scenario: Running localize with the alt root config
+    Given a fixture app "i18n-alt-root-app"
+    And a file named "config.rb" with:
+      """
+      localize :templates_dir => "lang_data"
+      """
+    Given a successfully built app at "i18n-alt-root-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+      | hello.html                                    |
+      | es/index.html                                 |
+      | es/hola.html                                  |
+    Then the following files should not exist:
+      | en/index.html                                 |
+    And the file "index.html" should contain "Howdy"  
+    And the file "hello.html" should contain "Hello World"
+    And the file "es/index.html" should contain "Como Esta?"
+    And the file "es/hola.html" should contain "Hola World"
+    
+  Scenario: Running localize with the lang map config
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      localize :lang_map => { :en => :english, :es => :spanish }
+      """
+    Given a successfully built app at "i18n-test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+      | hello.html                                    |
+      | spanish/index.html                            |
+      | spanish/hola.html                             |
+    Then the following files should not exist:
+      | english/index.html                            |
+    And the file "index.html" should contain "Howdy"  
+    And the file "hello.html" should contain "Hello World"
+    And the file "spanish/index.html" should contain "Como Esta?"
+    And the file "spanish/hola.html" should contain "Hola World"
+    
+  Scenario: Running localize with the no mount config
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      localize :mount_at_root => false
+      """
+    Given a successfully built app at "i18n-test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | en/index.html                                 |
+      | en/hello.html                                 |
+      | es/index.html                                 |
+      | es/hola.html                                  |
+    Then the following files should not exist:
+      | index.html                                    |
+      | hello.html                                    |
+    And the file "en/index.html" should contain "Howdy"  
+    And the file "en/hello.html" should contain "Hello World"
+    And the file "es/index.html" should contain "Como Esta?"
+    And the file "es/hola.html" should contain "Hola World"
+    
+  Scenario: Running localize with the subset config
+    Given a fixture app "i18n-test-app"
+    And a file named "config.rb" with:
+      """
+      localize :langs => [:en]
+      """
+    Given a successfully built app at "i18n-test-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | index.html                                    |
+      | hello.html                                    |
+    Then the following files should not exist:
+      | en/index.html                                 |
+      | es/index.html                                 |
+      | es/hola.html                                  |
+    And the file "index.html" should contain "Howdy"  
+    And the file "hello.html" should contain "Hello World"