middleman 0.3.10 → 0.4.0

data/.gitmodules

@@ -1,12 +0,0 @@
-[submodule "vendor/sinatra-markaby"]
-	path = vendor/sinatra-markaby
-	url = git://github.com/sbfaulkner/sinatra-markaby.git
-[submodule "vendor/sinatra-maruku"]
-	path = vendor/sinatra-maruku
-	url = git://github.com/wbzyl/sinatra-maruku.git
-[submodule "vendor/rack-test"]
-	path = vendor/rack-test
-	url = git://github.com/brynary/rack-test.git
-[submodule "vendor/sinatra-content-for"]
-	path = vendor/sinatra-content-for
-	url = git://github.com/foca/sinatra-content-for.git

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.4.0

data/bin/mm-build

@@ -26,6 +26,7 @@ module Generators
       
       if (args[0] === args[1])
         newext = case File.extname(args.first)
+        # Middleman.supported_formats.map { |ext| ".#{ext}" }
         when '.haml', '.erb', '.mab', '.maruku'
           '.html'
         when '.sass'
@@ -51,7 +52,7 @@ module Generators
       file(action.downcase.gsub(/[^a-z0-9]+/, '_').to_sym, action, action.gsub('public/', ''))
     end
 
-    glob! "views", %w(haml sass erb builder mab maruku)
+    glob! "views", (Middleman.supported_formats << "sass")
   end
 
   add :build, Builder

data/lib/middleman.rb

@@ -3,12 +3,6 @@ require 'haml'
 require 'compass' #must be loaded before sinatra
 require 'sinatra/base'
 
-# Include markaby support
-require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-markaby', 'lib', 'sinatra', 'markaby')
-
-# Include maruku support
-require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-maruku', 'lib', 'sinatra', 'maruku')
-
 # Include content_for support
 require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for')
 
@@ -17,9 +11,9 @@ class Middleman < Sinatra::Base
   set :static, true
   set :root, Dir.pwd
   set :environment, defined?(MIDDLEMAN_BUILDER) ? :build : :development
-
-  helpers Sinatra::Markaby
-  helpers Sinatra::Maruku
+  
+  set :supported_formats, %w(haml erb builder)
+  
   helpers Sinatra::ContentFor
 
   def self.run!(options={}, &block)
@@ -84,6 +78,7 @@ class Middleman < Sinatra::Base
     end
   end
   
+  # All other files
   get /(.*)/ do |path|
     path << "index.html" if path.match(%r{/$})
     path.gsub!(%r{^/}, '')
@@ -91,9 +86,8 @@ class Middleman < Sinatra::Base
     
     result = nil
     begin
-      %w(haml erb builder maruku mab).detect do |renderer|
+      options.supported_formats.detect do |renderer|
         next false if !File.exists?(File.join(options.views, "#{path}.#{renderer}"))
-        renderer = "markaby" if renderer == "mab"
         result = send(renderer.to_sym, path.to_sym)
       end
     rescue Haml::Error => e
@@ -103,6 +97,4 @@ class Middleman < Sinatra::Base
     
     result || pass
   end
-end
-
-require File.join(File.dirname(__FILE__), 'middleman', 'helpers')
+end

data/lib/middleman/markaby.rb

@@ -0,0 +1,4 @@
+# Include markaby support
+require File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'sinatra-markaby', 'lib', 'sinatra', 'markaby')
+Middleman.helpers Sinatra::Markaby
+Middleman.supported_formats << "mab"

data/lib/middleman/maruku.rb

@@ -0,0 +1,4 @@
+# Include maruku support
+require File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'sinatra-maruku', 'lib', 'sinatra', 'maruku')
+Middleman.helpers Sinatra::Maruku
+Middleman.supported_formats << "maruku"

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.3.10"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-08-11}
+  s.date = %q{2009-08-12}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -29,12 +29,15 @@ Gem::Specification.new do |s|
      "bin/mm-server",
      "lib/middleman.rb",
      "lib/middleman/helpers.rb",
+     "lib/middleman/markaby.rb",
+     "lib/middleman/maruku.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",
      "middleman.gemspec",
      "spec/builder_spec.rb",
+     "spec/fixtures/sample/init.rb",
      "spec/fixtures/sample/public/static.html",
      "spec/fixtures/sample/public/stylesheets/static.css",
      "spec/fixtures/sample/views/_partial.haml",
@@ -113,6 +116,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A static site generator utilizing Haml and Sass}
   s.test_files = [
     "spec/builder_spec.rb",
+     "spec/fixtures/sample/init.rb",
      "spec/generator_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/fixtures/sample/init.rb

@@ -0,0 +1,2 @@
+require File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "middleman", "maruku")
+require File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "middleman", "markaby")

data/vendor/sinatra-markaby/lib/sinatra/markaby.rb

@@ -8,7 +8,7 @@ module Sinatra
     #
     # Options for markaby may be specified in Sinatra using set :markaby, { ... }
     # TODO: the options aren't actually used yet
-    def markaby(template=nil, options={}, locals = {}, &block)
+    def mab(template=nil, options={}, locals = {}, &block)
       options, template = template, nil if template.is_a?(Hash)
       template = lambda { block } if template.nil?
       render :mab, template, options, locals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-11 00:00:00 -07:00
+date: 2009-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,12 +96,15 @@ files:
 - bin/mm-server
 - lib/middleman.rb
 - lib/middleman/helpers.rb
+- lib/middleman/markaby.rb
+- lib/middleman/maruku.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
 - middleman.gemspec
 - spec/builder_spec.rb
+- spec/fixtures/sample/init.rb
 - spec/fixtures/sample/public/static.html
 - spec/fixtures/sample/public/stylesheets/static.css
 - spec/fixtures/sample/views/_partial.haml
@@ -201,5 +204,6 @@ specification_version: 3
 summary: A static site generator utilizing Haml and Sass
 test_files: 
 - spec/builder_spec.rb
+- spec/fixtures/sample/init.rb
 - spec/generator_spec.rb
 - spec/spec_helper.rb