middleman-core 3.0.12 → 3.0.13

data/features/unicode_filecontents.feature

@@ -0,0 +1,13 @@
+Feature: Unicode filecontents
+  In order to support non-ASCII characters in file contents
+
+  Scenario: Rebuild with files containing unicode characters in their name
+    Given a fixture app "clean-app"
+    And a file named "source/index.html.erb" with:
+      """
+      你好
+      """
+    And a successfully built app at "clean-app"
+    And a modification time for a file named "build/index.html"
+    And a successfully built app at "clean-app"
+    Then the file "build/index.html" should not have been updated

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

@@ -137,7 +137,7 @@ module Middleman::Cli
             response = self.class.shared_rack.get(URI.escape(resource.destination_path))
 
             if response.status == 200
-              create_file(output_file, response.body)
+              create_file(output_file, binary_encode(response.body))
             else
               handle_error(output_file, response.body)
             end
@@ -160,6 +160,13 @@ module Middleman::Cli
           self.shell.error(response)
         end
       end
+
+      def binary_encode(string)
+        if string.respond_to?(:force_encoding)
+          string.force_encoding("ascii-8bit")
+        end
+        string
+      end
     }
   end
 

data/lib/middleman-core/core_extensions/rendering.rb

@@ -22,6 +22,8 @@ module Middleman
           app.define_hook :before_render
           app.define_hook :after_render
 
+          ::Tilt.mappings.delete('html') # WTF, Tilt?
+
           # Activate custom renderers
           require "middleman-core/renderers/erb"
           app.register Middleman::Renderers::ERb

data/lib/middleman-core/core_extensions/request.rb

@@ -248,7 +248,7 @@ module Middleman
           current_path = resource.destination_path
 
           # Set a HTTP content type based on the request's extensions
-          content_type(res, resource.mime_type)
+          content_type(res, mime_type(resource.ext))
 
           begin
             # Write out the contents of the page
@@ -277,6 +277,7 @@ module Middleman
         # @return [void]
         def mime_type(type, value=nil)
           return type if type.nil? || type.to_s.include?('/')
+          return ::Rack::Mime.mime_type('.txt') if type.empty?
           type = ".#{type}" unless type.to_s[0] == ?.
           return ::Rack::Mime.mime_type(type, nil) unless value
           ::Rack::Mime::MIME_TYPES[type] = value
@@ -311,7 +312,7 @@ module Middleman
         # @param [Hash] params
         # @return [void]
         def content_type(res, type, params={})
-          return res['Content-Type'] unless type
+          return unless type
           default = params.delete :default
           mime_type = mime_type(type) || default
           throw "Unknown media type: %p" % type if mime_type.nil?

data/lib/middleman-core/logger.rb

@@ -1,6 +1,5 @@
 # Use the Ruby/Rails logger
 require 'active_support/core_ext/logger'
-require "securerandom"
 
 module Middleman
 

data/lib/middleman-core/preview_server.rb

@@ -30,6 +30,12 @@ module Middleman
           ::Middleman::Profiling.report("server_start")
 
           @webrick.start
+
+          # $mm_shutdown is set by the signal handler
+          if $mm_shutdown
+            shutdown
+            exit
+          end
         end
       end
 
@@ -117,8 +123,9 @@ module Middleman
         %w(INT HUP TERM QUIT).each do |sig|
           if Signal.list[sig]
             Signal.trap(sig) do
-              shutdown
-              exit
+              # Do as little work as possible in the signal context
+              $mm_shutdown = true
+              @webrick.stop
             end
           end
         end

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

@@ -102,12 +102,6 @@ module Middleman
         File.extname(path)
       end
 
-      # Mime type of the path
-      # @return [String]
-      def mime_type
-        app.mime_type ext
-      end
-
       # Render this resource
       # @return [String]
       def render(opts={}, locs={}, &block)

data/lib/middleman-core/step_definitions/builder_steps.rb

@@ -1,5 +1,9 @@
 require 'fileutils'
 
+Before do
+  @modification_times = Hash.new
+end
+
 Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
   target = File.join(PROJECT_ROOT_PATH, "fixtures", path)
   config_path = File.join(current_dir, "config-#{config_name}.rb")
@@ -50,6 +54,16 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path,
   step %Q{was successfully built}
 end
 
+Given /^a modification time for a file named "([^\"]*)"$/ do |file|
+  target = File.join(current_dir, file)
+  @modification_times[target] = File.mtime(target)
+end
+
+Then /^the file "([^\"]*)" should not have been updated$/ do |file|
+  target = File.join(current_dir, file)
+  File.mtime(target).should == @modification_times[target]
+end
+
 # Provide this Aruba overload in case we're matching something with quotes in it
 Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
   check_file_content(file, partial_content, true)

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.12' unless const_defined?(:VERSION)
+  VERSION = '3.0.13' unless const_defined?(:VERSION)
 end

data/middleman-core-x86-mingw32.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
   s.add_dependency("rack", ["~> 1.4.1"])
-  s.add_dependency("tilt", ["~> 1.3.1"])
+  s.add_dependency("tilt", ["~> 1.3.6"])
   
   # Builder
   s.add_dependency("rack-test", ["~> 0.6.1"])

data/middleman-core.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   # Core
   s.add_dependency("bundler", ["~> 1.1"])
   s.add_dependency("rack", ["~> 1.4.1"])
-  s.add_dependency("tilt", ["~> 1.3.1"])
+  s.add_dependency("tilt", ["~> 1.3.6"])
   
   # Builder
   s.add_dependency("rack-test", ["~> 0.6.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 3.0.12
+  version: 3.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - features/strip_url.feature
 - features/support/env.rb
 - features/tilde_directories.feature
+- features/unicode_filecontents.feature
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
 - fixtures/automatic-directory-matcher-app/config.rb
@@ -599,7 +600,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2551336720657793160
+      hash: 1023379904574155336
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -608,7 +609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2551336720657793160
+      hash: 1023379904574155336
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -648,6 +649,7 @@ test_files:
 - features/strip_url.feature
 - features/support/env.rb
 - features/tilde_directories.feature
+- features/unicode_filecontents.feature
 - features/unicode_filenames.feature
 - features/wildcard_page_helper.feature
 - fixtures/automatic-directory-matcher-app/config.rb