middleman 0.3.7 → 0.3.8

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/middleman.rb

@@ -82,16 +82,14 @@ class Middleman < Sinatra::Base
   get /(.*)/ do |path|
     path << "index.html" if path.match(%r{/$})
     path.gsub!(%r{^/}, '')
-
-    @template = path.gsub(File.extname(path), '').to_sym
-    @full_request_path = path
+    path.gsub!(File.extname(path), '')
     
     result = nil
     begin
       %w(haml erb builder maruku mab).detect do |renderer|
-        next false if !File.exists?(File.join(options.views, "#{@template}.#{renderer}"))
+        next false if !File.exists?(File.join(options.views, "#{path}.#{renderer}"))
         renderer = "markaby" if renderer == "mab"
-        result = send(renderer.to_sym, @template)
+        result = send(renderer.to_sym, path.to_sym)
       end
     rescue Haml::Error => e
       result = "Haml Error: #{e}"

data/lib/middleman/helpers.rb

@@ -5,8 +5,12 @@ def link_to(title, url="#", params={})
 end
 
 def page_classes(*additional)
+  path = env["REQUEST_PATH"]
+  path << "index.html" if path.match(%r{/$})
+  path.gsub!(%r{^/}, '')
+  
   classes = []
-  parts = @full_request_path.split('.')[0].split('/')
+  parts = path.split('.')[0].split('/')
   parts.each_with_index { |path, i| classes << parts.first(i+1).join('_') }
 
   classes << "index" if classes.empty?

data/middleman.gemspec

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

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

@@ -8,8 +8,8 @@ module Sinatra
     end
     
   private
-    def render_maruku(data, options, locals, &block)
-      maruku_src = render_erb(data, options, locals, &block)
+    def render_maruku(template, data, options, locals, &block)
+      maruku_src = render_erb(template, data, options, locals, &block)
       instance = ::Maruku.new(maruku_src, options)
       if block_given?
         # render layout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-09 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency