deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Split maruku and markaby support into their own folders

Browse source
This commit is contained in:
tdreyno 2009-08-12 10:00:06 -07:00
parent dbaf43c1b5
commit 397944faeb
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/mm-build
View file

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

16
lib/middleman.rb
View file

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

4
lib/middleman/markaby.rb Normal file
View file

@ -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"

4
lib/middleman/maruku.rb Normal file
View file

@ -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"

2
spec/fixtures/sample/init.rb vendored Normal file
View file

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