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

data/lib/middleman-core/templates.rb

@@ -15,9 +15,9 @@ module Middleman::Templates
     # @param [Symbol] name The name of the template
     # @param [Class] klass The class to be executed for this template
     # @return [Hash] List of registered templates
-    def register(*args)
+    def register(name=nil, klass=nil)
       @_template_mappings ||= {}
-      @_template_mappings[args[0]] = args[1] if args.length == 2
+      @_template_mappings[name] = klass if name && klass
       @_template_mappings
     end
     
@@ -50,18 +50,24 @@ module Middleman::Templates
       template "shared/config.ru", File.join(location, "config.ru")
     end
     
-    # Output a Gemfile file for Bundler if --bundler is passed
-    class_option :bundler, :type => :boolean, :default => true
-    
     # Write a Bundler Gemfile file for project
     # @return [void]
     def generate_bundler!
-      return unless options[:bundler]
       template "shared/Gemfile.tt", File.join(location, "Gemfile")
       
       inside(location) do
-        run('bundle install', :capture => true)
-      end
+        ::Middleman::Cli::Bundle.new.invoke(:bundle)
+      end unless ENV["TEST"]
+    end
+
+    # Output a .gitignore file
+    class_option :git, :type => :boolean, :default => true
+    
+    # Write a .gitignore file for project
+    # @return [void]
+    def generate_gitignore!
+      return unless options[:git]
+      copy_file "shared/gitignore", File.join(location, ".gitignore")
     end
   end
 end

data/lib/middleman-core/util.rb

@@ -29,7 +29,27 @@ module Middleman
     # @param [String] path
     # @return [String]
     def self.normalize_path(path)
-      path.sub(/^\//, "").gsub("%20", " ")
+      # The tr call works around a bug in Ruby's Unicode handling
+      path.sub(/^\//, "").tr('','') 
+    end
+
+    # Extract the text of a Rack response as a string.
+    # Useful for extensions implemented as Rack middleware.
+    # @param response The response from #call
+    # @return [String] The whole response as a string.
+    def self.extract_response_text(response)
+      case(response)
+      when String
+        response
+      when Array
+        response.join
+      when Rack::Response
+        response.body.join
+      when Rack::File
+        File.read(response.path)
+      else
+        response.to_s
+      end
     end
     
     # Simple shared cache implementation
@@ -41,15 +61,14 @@ module Middleman
 
       # Either get the cached key or save the contents of the block
       #
-      # @param Anything Hash can use as a key
-      # @return Cached value
+      # @param key Anything Hash can use as a key
       def fetch(*key)
         @cache[key] ||= yield
       end
 
       # Whether the key is in the cache
       # 
-      # @param Anything Hash can use as a key
+      # @param key Anything Hash can use as a key
       # @return [Boolean]
       def has_key?(key)
         @cache.has_key?(key)
@@ -57,31 +76,34 @@ module Middleman
 
       # Get a specific key
       #
-      # @param Anything Hash can use as a key
-      # @return Cached value
+      # @param key Anything Hash can use as a key
       def get(key)
         @cache[key]
       end
 
+      # Array of keys
+      # @return [Array]
       def keys
         @cache.keys
       end
 
       # Clear the entire cache
+      # @return [void]
       def clear
         @cache = {}
       end
 
       # Set a specific key
       #
-      # @param Anything Hash can use as a key
-      # @param Cached value
+      # @param key Anything Hash can use as a key
+      # @param value Cached value
+      # @return [void]
       def set(key, value)
         @cache[key] = value
       end
 
       # Remove a specific key
-      # @param Anything Hash can use as a key
+      # @param key Anything Hash can use as a key
       def remove(*key)
         @cache.delete(key)
       end

data/lib/middleman-core/version.rb

@@ -4,7 +4,7 @@ require "rubygems"
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.0.beta.2' unless const_defined?(:VERSION)
+  VERSION = '3.0.0.beta.3' unless const_defined?(:VERSION)
   
   # Parsed version for RubyGems
   # @private

data/lib/middleman-core.rb

@@ -1,12 +1,14 @@
-# Using a bunch of convenience methods
-require "active_support"
-
 # Setup our load paths
 libdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Top-level Middleman namespace
-module Middleman; end
+module Middleman
+  
+  # Backwards compatibility namespace
+  module Features; end
+  
+end
 
 require "middleman-core/version"
 require "middleman-core/util"

data/middleman-core.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.summary     = "Hand-crafted frontend development"
   s.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."
 
-  s.files        = `git ls-files`.split("\n")
-  s.test_files   = `git ls-files -- {fixtures,features}/*`.split("\n")
+  s.files        = `git ls-files -z`.split("\0")
+  s.test_files   = `git ls-files -z -- {fixtures,features}/*`.split("\0")
   s.executable   = "middleman"
   s.require_path = "lib"
   
@@ -31,13 +31,11 @@ Gem::Specification.new do |s|
   
   # Helpers
   s.add_dependency("activesupport", ["~> 3.2.0"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.6"])
   
   # Watcher
-  s.add_dependency("listen", ["~> 0.4.1"])
+  s.add_dependency("listen", ["~> 0.4.2"])
   
-  # Web Server
-  s.add_dependency("thin", ["~> 1.3.1"])
-
   # i18n
   s.add_dependency("i18n", ["~> 0.6.0"])
 end