frank 1.0.6 → 1.0.7

data/frank.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
-  s.date = %q{2010-12-09}
+  s.date = %q{2011-01-20}
   s.default_executable = %q{frank}
   s.description = %q{Rapidly develop static sites using any supported templating language}
   s.email = %q{travis.dunn@thisismedium.com}
@@ -102,7 +102,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/blahed/frank}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.0}
   s.summary = %q{Static Site Non-Framework}
   s.test_files = [
     "spec/base_spec.rb",
@@ -116,7 +116,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/frank/base.rb

@@ -6,7 +6,7 @@ require 'frank/middleware/statik'
 require 'frank/middleware/refresh'
 
 module Frank
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
   extend Frank::Upgrades
 
   module Render; end
@@ -105,14 +105,14 @@ module Frank
       # let tilt determine the template handler
       # and return some template markup
       if layout.nil?
-        tilt(page, ext, template, locals)
+        tilt(page, ext, template, template_path, locals)
       else
         layout_path = File.join(Frank.root, Frank.layouts_folder, layout)
         # add layout_path to locals
         raise Frank::TemplateError, "Layout not found #{layout_path}" unless File.exist? layout_path
 
-        page_content = tilt(page, ext, template, locals)
-        tilt(page, File.extname(layout), layout_path, locals) do
+        page_content = tilt(page, ext, template, template_path, locals)
+        tilt(page, File.extname(layout), nil, layout_path, locals) do
           page_content
         end
       end
@@ -139,16 +139,13 @@ module Frank
     end
 
     # lookup the original ext for given template path
-    # TODO: make non-ugly
     def ext_from_handler(extension)
-      orig_ext = nil
-      TMPL_EXTS.each do |ext, engines|
-        orig_ext = ext.to_s if engines.include? extension[1..-1]
+      ext = extension[1..-1]
+      TMPL_EXTS.each do |orig_ext, engines|
+        return orig_ext.to_s if engines.include? ext
       end
-      orig_ext
     end
 
-
     # reverse walks the layouts folder until we find a layout
     # returns nil if layout is not found
     def layout_for(path)
@@ -184,14 +181,9 @@ module Frank
     end
 
     # render a page using tilt and get the result template markup back
-    def tilt(page, ext, source, locals={}, &block)
-      Tilt[ext].new do
-        source = source.to_str if source.respond_to?(:to_str)
-        if source.match(/^[^\n]+$/) && File.exist?(source)
-          File.read(source)
-        else
-          source
-        end
+    def tilt(page, ext, source, filename, locals={}, &block)
+      Tilt[ext].new(filename) do
+        source || File.read(filename)
       end.render(page, locals=locals, &block)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - blahed
@@ -16,11 +16,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: frank
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rack
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,29 +33,30 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  name: rack
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: mongrel
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1876988191
+        hash: 1923831981
         segments: 
         - 1
         - 2
         - 0
-        - pre2
+        - pre
+        - 2
         version: 1.2.0.pre2
-  type: :runtime
-  name: mongrel
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: haml
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +66,12 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  type: :runtime
-  name: haml
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: tilt
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -77,12 +81,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  type: :runtime
-  name: tilt
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: net-ssh
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,12 +96,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  type: :runtime
-  name: net-ssh
-  prerelease: false
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: net-scp
+  type: :runtime
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,12 +111,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  name: net-scp
-  prerelease: false
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: jeweler
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,12 +125,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: jeweler
-  prerelease: false
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,12 +143,12 @@ dependencies:
         - beta
         - 19
         version: 2.0.0.beta.19
-  type: :development
-  name: rspec
-  prerelease: false
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rack-test
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,12 +158,12 @@ dependencies:
         - 0
         - 5
         version: "0.5"
-  type: :development
-  name: rack-test
-  prerelease: false
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rake
+  type: :development
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +172,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: rake
-  prerelease: false
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: contest
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,12 +186,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: contest
-  prerelease: false
-  version_requirements: *id011
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: builder
+  type: :development
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,12 +200,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: builder
-  prerelease: false
-  version_requirements: *id012
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: erubis
+  type: :development
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,12 +214,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: erubis
-  prerelease: false
-  version_requirements: *id013
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: compass
+  type: :development
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -226,12 +230,12 @@ dependencies:
         - 10
         - 2
         version: 0.10.2
-  type: :development
-  name: compass
-  prerelease: false
-  version_requirements: *id014
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rdiscount
+  type: :development
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -240,12 +244,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: rdiscount
-  prerelease: false
-  version_requirements: *id015
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: liquid
+  type: :development
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -254,12 +258,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: liquid
-  prerelease: false
-  version_requirements: *id016
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: less
+  type: :development
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -268,12 +272,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: less
-  prerelease: false
-  version_requirements: *id017
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: coffee-script
+  type: :development
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -282,12 +286,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: coffee-script
-  prerelease: false
-  version_requirements: *id018
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: RedCloth
+  type: :development
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -296,12 +300,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: RedCloth
-  prerelease: false
-  version_requirements: *id019
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: ruby-debug
+  type: :development
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -310,10 +314,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: ruby-debug
-  prerelease: false
-  version_requirements: *id020
+  requirement: *id020
 description: Rapidly develop static sites using any supported templating language
 email: travis.dunn@thisismedium.com
 executables: 
@@ -434,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.0
 signing_key: 
 specification_version: 3
 summary: Static Site Non-Framework