middleman 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/mm-build

@@ -6,7 +6,10 @@ ENV['MM_ENV'] = "build"
 require File.join(File.dirname(__FILE__), "..", "lib", "middleman")
 require 'middleman/builder'
 
+# Initialize server once so features are loaded
+Middleman::Server.new
+
 # Middleman::Server.init!
 Middleman::Builder.init!
 
-Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))
+Middleman::Generators.run_cli(Dir.pwd, 'mm-build', 1,  %w(build --force).concat(ARGV))

data/fixtures/test-app/config.rb

@@ -25,4 +25,4 @@ end
 
 get "/sub1/sub2/auto-css.html" do
   haml :"auto-css.html", :layout => false
-end
+end

data/lib/middleman/builder.rb

@@ -57,4 +57,4 @@ module Middleman
 
     add :build, ::Middleman::Builder
   end
-end
+end

data/lib/middleman/features/slickmap.rb

@@ -5,13 +5,14 @@ module Middleman::Features::Slickmap
     def registered(app)
       require 'slickmap'
 
-      @sitemap_url = config[:url] || "sitemap.html"
+      @sitemap_url = "sitemap.html"
+      @sitemap_url = app.sitemap_url if app.respond_to?(:slickmap_url)
 
-      if Middleman::Server.environment == :build
+      if app.environment == :build
         Middleman::Builder.template :slickmap, @sitemap_url, @sitemap_url
       end
 
-      Middleman::Server.helpers do
+      app.helpers do
         def sitemap_node(n, first=false)
           if n.children.length < 1
             if !first && File.extname(n.dir).length > 0
@@ -45,7 +46,7 @@ module Middleman::Features::Slickmap
         end
       end
 
-      Middleman::Server.get "/#{@sitemap_url}" do
+      app.get "/#{@sitemap_url}" do
         # Return :utility to put it util top menu. False to ignore
         @tree, @utility = Middleman::Features::Slickmap.build_sitemap do |file_name|
           :valid
@@ -86,4 +87,4 @@ module Middleman::Features::Slickmap
 
     entry
   end
-end
+end

data/lib/middleman/templater+dynamic_renderer.rb

@@ -23,4 +23,4 @@ class Templater::Actions::Template
       @@rack_test.last_response.body
     end
   end
-end
+end

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2010-09-24}
+  s.date = %q{2010-10-31}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 -07:00
+date: 2010-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency