middleman 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/bin/mm-build

@@ -3,6 +3,8 @@
 # Require app
 require 'rubygems'
 require 'templater'
+
+MIDDLEMAN_BUILDER = true
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
 require File.join(File.dirname(__FILE__), '..', 'vendor', 'rack-test', 'lib', 'rack', 'test')
 
@@ -36,7 +38,6 @@ module Generators
     end
 
     def self.file(name, *args, &block)
-      puts args.inspect
       args[1] = args[0].gsub('views/', '') if (args[0] === args[1])
       super(name, *args, &block)
     end
@@ -54,8 +55,6 @@ module Generators
   add :build, Builder
 end
 
-Middleman.set :root, Dir.pwd
-
 # Monkey-patch to use a dynamic renderer
 class Templater::Actions::Template
   def render

data/bin/mm-init

@@ -18,7 +18,8 @@ module Generators
     def self.source_root
       File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'template')
     end
-
+    
+    file :init, "init.rb"
     glob! :views
     glob! :public
     empty_directory :stylesheets, "public/stylesheets"

data/lib/middleman.rb

@@ -11,6 +11,10 @@ require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-maruku', 'lib
 
 class Middleman < Sinatra::Base
   set :app_file, __FILE__
+  set :static, true
+  set :root, Dir.pwd
+  set :environment, defined?(MIDDLEMAN_BUILDER) ? :build : :development
+    
   helpers Sinatra::Markaby
   helpers Sinatra::Maruku
   
@@ -45,7 +49,14 @@ class Middleman < Sinatra::Base
       config.http_images_path = "/images/"
     end
   end
-
+  
+  # Check for local config
+  local_config = File.join(self.root, "init.rb")
+  if File.exists? local_config
+    puts "== Local config at: #{local_config}"
+    class_eval File.read(local_config)
+  end
+  
   get /(.*)/ do |path|
     path << "index.html" if path.match(%r{/$})
     path.gsub!(%r{^/}, '')

data/lib/middleman/template/init.rb

@@ -0,0 +1,17 @@
+# Helpers
+helpers do
+end
+
+# Or inject more templating languages
+# helpers Sinatra::Markdown
+
+# Build-specific configuration
+configure :build do
+  Compass.configuration do |config|
+    # For example, change the Compass output style for deployment
+    # config.output_style = :compressed
+    
+    # Or use a different image path
+    # config.http_images_path = "/Content/images/"
+  end
+end

data/middleman.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-07-28}
+  s.date = %q{2009-07-29}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "bin/mm-init",
      "bin/mm-server",
      "lib/middleman.rb",
+     "lib/middleman/template/init.rb",
      "lib/middleman/template/views/index.haml",
      "lib/middleman/template/views/layout.haml",
      "lib/middleman/template/views/stylesheets/site.sass",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-28 00:00:00 -07:00
+date: 2009-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - bin/mm-init
 - bin/mm-server
 - lib/middleman.rb
+- lib/middleman/template/init.rb
 - lib/middleman/template/views/index.haml
 - lib/middleman/template/views/layout.haml
 - lib/middleman/template/views/stylesheets/site.sass