middleman-core 3.0.0.rc.2 → 3.0.0.rc.3

data/features/automatic_directory_matcher.feature

@@ -0,0 +1,32 @@
+Feature: Map special characters to automatically put files in a directory
+  
+  Scenario: Building files with special character escape
+    Given a successfully built app at "automatic-directory-matcher-app"
+    When I cd to "build"
+    Then the following files should exist:
+      | root.html                                    |
+      | root-plain.html                              |
+      | sub/sub.html                                 |
+      | sub/sub-plain.html                           |
+      | sub/sub/sub.html                             |
+      | sub/sub/sub-plain.html                       |
+    Then the following files should not exist:  
+      | sub--sub.html                                 |
+      | sub--sub-plain.html                           |
+      | sub--sub--sub.html                            |
+      | sub--sub--sub-plain.html                      |
+
+  Scenario: Previewing files with special character escape
+    Given the Server is running at "automatic-directory-matcher-app"
+    When I go to "/root.html"
+    Then I should see "Root Erb"
+    When I go to "/root-plain.html"
+    Then I should see "Root Plain"
+    When I go to "/sub/sub.html"
+    Then I should see "Sub1 Erb"
+    When I go to "/sub/sub-plain.html"
+    Then I should see "Sub1 Plain"
+    When I go to "/sub/sub/sub.html"
+    Then I should see "Sub2 Erb"
+    When I go to "/sub/sub/sub-plain.html"
+    Then I should see "Sub2 Plain"

data/features/unicode_filenames.feature

@@ -1,14 +1,36 @@
+@encoding @travishatesme @wip
+
 Feature: Unicode filenames
   In order to support non-ASCII characters in filenames
 
-  #Scenario: Build with files containing unicode characters in their name
-  #  Given a successfully built app at "unicode-filenames-app"
-  #  When I cd to "build"
-  #   Then the file "snowmen-rule-☃.html" should contain "☃"
+  Scenario: Build with files containing unicode characters in their name
+    Given a fixture app "empty-app"
+    And a file named "config.rb" with:
+      """
+      """
+    And a file named "source/snowmen-rule-☃.html" with:
+      """
+      Snowman!
+      <div style="text-align:center; font-size:4000%;">
+        ☃
+      </div>
+      """
+    And a successfully built app at "empty-app"
+    When I cd to "build"
+    Then the file "snowmen-rule-☃.html" should contain "☃"
 
   Scenario: Preview with files containing unicode characters in their name
-    Given the Server is running at "unicode-filenames-app"
+    Given a fixture app "empty-app"
+    And a file named "config.rb" with:
+      """
+      """
+    And a file named "source/snowmen-rule-☃.html" with:
+      """
+      Snowman!
+      <div style="text-align:center; font-size:4000%;">
+        ☃
+      </div>
+      """
+    And the Server is running
     When I go to "/snowmen-rule-☃.html"
-    # There seem to be encoding issues w/ the test framework so we can't check the content
-    Then I should see "Snowman!"
-    
+    Then I should see "Snowman!"

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

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

data/fixtures/automatic-directory-matcher-app/source/root-plain.html

@@ -0,0 +1 @@
+Root Plain

data/fixtures/automatic-directory-matcher-app/source/root.html.erb

@@ -0,0 +1 @@
+Root Erb

data/fixtures/automatic-directory-matcher-app/source/sub--sub--sub-plain.html

@@ -0,0 +1 @@
+Sub2 Plain

data/fixtures/automatic-directory-matcher-app/source/sub--sub--sub.html.erb

@@ -0,0 +1 @@
+Sub2 Erb

data/fixtures/automatic-directory-matcher-app/source/sub--sub-plain.html

@@ -0,0 +1 @@
+Sub1 Plain

data/fixtures/automatic-directory-matcher-app/source/sub--sub.html.erb

@@ -0,0 +1 @@
+Sub1 Erb

data/lib/middleman-core/cli/build.rb

@@ -42,7 +42,7 @@ module Middleman::Cli
 
       require 'find'
       
-      @debugging = Middleman::Cli::Base.debugging
+      @debugging = Middleman::Cli::Base.respond_to?(:debugging) && Middleman::Cli::Base.debugging
       @had_errors = false
       
       self.class.shared_instance(options["verbose"])
@@ -56,7 +56,7 @@ module Middleman::Cli
       action GlobAction.new(self, opts)
 
       if @had_errors && !@debugging
-        self.shell.say "There were errors during this build, re-run with --debug to see the full exception."
+        self.shell.say "There were errors during this build, re-run with --verbose to see the full exception."
       end
       
       exit(1) if @had_errors
@@ -268,7 +268,7 @@ class ::Thor::Actions::CreateFile
     if identical?
       say_status :identical, :blue
     else
-      say_status :create, :green
+      say_status :update, :yellow
       block.call unless pretend?
     end
   end

data/lib/middleman-core/preview_server.rb

@@ -22,12 +22,14 @@ module Middleman
             set :logging, true
           end
         end
+
+        port = options[:port] || DEFAULT_PORT
     
-        puts "== The Middleman is standing watch on port #{options[:port]||4567}"
+        puts "== The Middleman is standing watch on port #{port}"
 
         @webrick ||= setup_webrick(
           options[:host]  || "0.0.0.0",
-          options[:port]  || DEFAULT_PORT,
+          port,
           options[:debug] || false
         )
         
@@ -53,6 +55,10 @@ module Middleman
       # @return [void]
       def stop
         puts "== The Middleman is shutting down"
+        if @listener
+          @listener.stop
+          @listener = nil
+        end
         unmount_instance
       end
     
@@ -76,16 +82,18 @@ module Middleman
         # Watcher Library
         require "listen"
     
-        listener = Listen.to(Dir.pwd, :relative_paths => true)
+        return if @listener
+
+        @listener = Listen.to(Dir.pwd, :relative_paths => true)
       
-        listener.change do |modified, added, removed|
+        @listener.change do |modified, added, removed|
           added_and_modified = (modified + added)
 
-          if added_and_modified.length > 0
+          unless added_and_modified.empty?
             # See if the changed file is config.rb or lib/*.rb
             if needs_to_reload?(added_and_modified)
               reload
-              return listener.stop
+              return
             end
 
             # Otherwise forward to Middleman
@@ -94,11 +102,11 @@ module Middleman
             end
           end
       
-          if removed.length > 0
+          unless removed.empty?
             # See if the changed file is config.rb or lib/*.rb
             if needs_to_reload?(removed)
               reload
-              return listener.stop
+              return
             end
 
             # Otherwise forward to Middleman
@@ -109,7 +117,7 @@ module Middleman
         end
     
         # Don't block this thread
-        listener.start(false)
+        @listener.start(false)
       end
       
       # Trap the interupt signal and shut down smoothly

data/lib/middleman-core/sitemap.rb

@@ -19,6 +19,9 @@ module Middleman
         app.register Middleman::Sitemap::Extensions::Proxies
         app.register Middleman::Sitemap::Extensions::Ignores
       
+        # Set to automatically convert some characters into a directory
+        app.set :automatic_directory_matcher, nil
+      
         # Setup callbacks which can exclude paths from the sitemap
         app.set :ignored_sitemap_matchers, {
           # dotfiles and folders in the root

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

@@ -144,7 +144,8 @@ module Middleman
       # just foo. Best for linking.
       # @return [String]
       def url
-        ('/' + destination_path).sub(/\/#{Regexp.escape(app.index_file)}$/, '/')
+        File.join(app.respond_to?(:http_prefix) ? app.http_prefix : '/',
+          destination_path.sub(/\/#{Regexp.escape(app.index_file)}$/, '/'))
       end
     end
   end

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

@@ -174,6 +174,12 @@ module Middleman
         return false unless file.include?(prefix)
   
         path = file.sub(prefix, "")
+        
+        # Replace a file name containing automatic_directory_matcher with a folder
+        unless @app.automatic_directory_matcher.nil?
+          path = path.gsub(@app.automatic_directory_matcher, "/")
+        end
+              
         extensionless_path(path)
       end
     

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.0.rc.2' unless const_defined?(:VERSION)
+  VERSION = '3.0.0.rc.3' unless const_defined?(:VERSION)
 end

data/middleman-core.gemspec

@@ -20,19 +20,19 @@ Gem::Specification.new do |s|
   
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
-  s.add_dependency("rack", ["~> 1.4.0"])
+  s.add_dependency("rack", ["~> 1.4.1"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   
   # Builder
   s.add_dependency("rack-test", ["~> 0.6.1"])
   
   # CLI
-  s.add_dependency("thor", ["~> 0.14.3"])
+  s.add_dependency("thor", ["~> 0.15.4"])
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.4.5"])
+  s.add_dependency("listen", ["~> 0.4.7"])
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.2
+  version: 3.0.0.rc.3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-17 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.3
+        version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.3
+        version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
 description: A static site generator. Provides dozens of templating languages (Haml,
   Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache
   busting, Yaml data (and more) an easy part of your development cycle.
@@ -140,6 +140,7 @@ files:
 - bin/middleman
 - features/3rd_party_cli.feature
 - features/auto_layout.feature
+- features/automatic_directory_matcher.feature
 - features/builder.feature
 - features/chained_templates.feature
 - features/clean_build.feature
@@ -166,6 +167,13 @@ files:
 - features/support/env.rb
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
+- fixtures/automatic-directory-matcher-app/config.rb
+- fixtures/automatic-directory-matcher-app/source/root-plain.html
+- fixtures/automatic-directory-matcher-app/source/root.html.erb
+- fixtures/automatic-directory-matcher-app/source/sub--sub--sub-plain.html
+- fixtures/automatic-directory-matcher-app/source/sub--sub--sub.html.erb
+- fixtures/automatic-directory-matcher-app/source/sub--sub-plain.html
+- fixtures/automatic-directory-matcher-app/source/sub--sub.html.erb
 - fixtures/basic-data-app/config.rb
 - fixtures/basic-data-app/data/test.yml
 - fixtures/basic-data-app/data/test2.json
@@ -335,8 +343,6 @@ files:
 - fixtures/traversal-app/source/sub/sibling2.html.erb
 - fixtures/traversal-app/source/sub/sub2/index.html.erb
 - fixtures/traversal-app/source/sub/sub3/deep.html.erb
-- fixtures/unicode-filenames-app/config.rb
-- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb
@@ -524,7 +530,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1155091797610046415
+      hash: 4571590905911767496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -540,6 +546,7 @@ summary: Hand-crafted frontend development
 test_files:
 - features/3rd_party_cli.feature
 - features/auto_layout.feature
+- features/automatic_directory_matcher.feature
 - features/builder.feature
 - features/chained_templates.feature
 - features/clean_build.feature
@@ -566,6 +573,13 @@ test_files:
 - features/support/env.rb
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
+- fixtures/automatic-directory-matcher-app/config.rb
+- fixtures/automatic-directory-matcher-app/source/root-plain.html
+- fixtures/automatic-directory-matcher-app/source/root.html.erb
+- fixtures/automatic-directory-matcher-app/source/sub--sub--sub-plain.html
+- fixtures/automatic-directory-matcher-app/source/sub--sub--sub.html.erb
+- fixtures/automatic-directory-matcher-app/source/sub--sub-plain.html
+- fixtures/automatic-directory-matcher-app/source/sub--sub.html.erb
 - fixtures/basic-data-app/config.rb
 - fixtures/basic-data-app/data/test.yml
 - fixtures/basic-data-app/data/test2.json
@@ -735,8 +749,6 @@ test_files:
 - fixtures/traversal-app/source/sub/sibling2.html.erb
 - fixtures/traversal-app/source/sub/sub2/index.html.erb
 - fixtures/traversal-app/source/sub/sub3/deep.html.erb
-- fixtures/unicode-filenames-app/config.rb
-- fixtures/unicode-filenames-app/source/snowmen-rule-☃.html
 - fixtures/wildcard-app/config.rb
 - fixtures/wildcard-app/source/admin/index.html.erb
 - fixtures/wildcard-app/source/admin/page.html.erb

data/fixtures/unicode-filenames-app/config.rb

@@ -1 +0,0 @@
-

data/fixtures/unicode-filenames-app/source/snowmen-rule-/342/230/203.html

@@ -1,4 +0,0 @@
-Snowman!
-<div style="text-align:center; font-size:4000%;">
-  ☃
-</div>