frank 0.3.0.beta → 0.3.0.beta2

data/bin/frankup

@@ -41,7 +41,7 @@ if File.exist? 'settings.yml'
   settings = YAML.load_file('settings.yml')
 else
   settings = { 
-    :server => { 'handler' => 'mongrel', 'hostname' => '127.0.0.1', 'port' => 3601 },
+    :server => { 'handler' => 'mongrel', 'hostname' => '0.0.0.0', 'port' => 3601 },
     :static_folder => '.', 
     :dynamic_folder => '.',
     :environment => :serving  

data/frank.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "0.3.0.beta"
+  s.version = "0.3.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
-  s.date = %q{2010-06-12}
+  s.date = %q{2010-06-18}
   s.description = %q{Rapidly develop static sites using any supported templating language}
   s.email = %q{travis.dunn@thisismedium.com}
   s.executables = ["frank", "frankout", "frankup"]
@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
      "spec/template/dynamic/500.haml",
      "spec/template/dynamic/_partial.haml",
      "spec/template/dynamic/builder.builder",
-     "spec/template/dynamic/coffee.coffee",
      "spec/template/dynamic/erb.erb",
      "spec/template/dynamic/helper_test.haml",
      "spec/template/dynamic/index.haml",

data/lib/frank/base.rb

@@ -6,7 +6,7 @@ require 'frank/middleware/imager'
 require 'frank/middleware/refresh'
 
 module Frank
-  VERSION = '0.3.0.beta'
+  VERSION = '0.3.0.beta2'
   
   module Render; end
   
@@ -83,9 +83,10 @@ module Frank
     
     TMPL_EXTS = { 
       :html => %w[haml erb rhtml builder liquid mustache textile md mkd markdown],
-      :css  => %w[sass less],
-      :js   => %w[coffee]
-    }         
+      :css  => %w[sass less scss]
+    }
+    
+    LAYOUT_EXTS = %w[.haml .erb .rhtml .liquid .mustache]
     
     # render request path or template path
     def render(path)
@@ -97,7 +98,7 @@ module Frank
 
       # regex for kinds that don't support meta
       # and define the meta delimiter
-      nometa, delimiter  = /\/_|\.(js|coffee|css|sass|less)$/, /^META-{3,}\n$/
+      nometa, delimiter  = /\/_|\.(sass|less)$/, /^META-{3,}\n$/
       
       # set the layout
       layout = path.match(nometa) ? nil : layout_for(path)
@@ -164,21 +165,36 @@ module Frank
     # reverse walks the layouts folder until we find a layout
     # returns nil if layout is not found
     def layout_for(path)
-      default = "default#{File.extname(path)}"
-      path = path.sub /\/[\w-]+\.[\w-]+$/, ''
-      folders = path.split('/')
-      
+      layout_exts = LAYOUT_EXTS.dup
+      ext         = File.extname(path)
+      default     = 'default' << layout_ext_or_first(layout_exts, ext)
+      file_path   = path.sub(/\/[\w-]+\.[\w-]+$/, '')
+      folders     = file_path.split('/')
+            
       until File.exist? File.join(@proj_dir, @layouts_folder, folders, default)
-        break if folders.empty?
-        folders.pop
+        break if layout_exts.empty? && folders.empty?
+        
+        if layout_exts.empty?
+          layout_exts = LAYOUT_EXTS.dup
+          default = 'default' << layout_ext_or_first(layout_exts, ext)
+          folders.pop
+        else
+          default = 'default' << layout_exts.shift
+        end
       end
-
-      if File.exist? File.join(@proj_dir, @layouts_folder, folders, default)
+      
+      if File.exists? File.join(@proj_dir, @layouts_folder, folders, default)
         File.join(folders, default)
       else
         nil
       end
     end
+    
+    # if the given ext is a layout ext, pop it off and return it
+    # otherwise return the first layout ext
+    def layout_ext_or_first(layout_exts, ext)
+      layout_exts.include?(ext) ? layout_exts.delete(ext) : layout_exts.first
+    end
           
     # setup an object and extend it with TemplateHelpers and Render
     # then send everything to tilt and get some template markup back
@@ -254,8 +270,10 @@ module Frank
   def self.stub(project)
     puts "\nFrank is...\n - \033[32mCreating\033[0m your project '#{project}'"
     Dir.mkdir project
+    
     puts " - \033[32mCopying\033[0m Frank template"
     FileUtils.cp_r( Dir.glob(File.join(LIBDIR, 'template/*')), project )
+    
     puts "\n \033[32mCongratulations, '#{project}' is ready to go!\033[0m"
   rescue Errno::EEXIST
     puts "\n \033[31muh oh, directory '#{project}' already exists...\033[0m"

data/lib/frank/lorem.rb

@@ -10,9 +10,7 @@ module Frank
     def word(replacement = nil)
       words 1, replacement
     end
-    
-    require 'ruby-debug'
-    
+        
     def words(total, replacement = nil)
       if @environment == :output && replacement
         replacement

data/lib/frank/templates/404.haml

@@ -22,8 +22,6 @@
           
             - if path.match(/\.css$/)
               = "<tt>#{path.match(/([\w\/]+)\./)[1]}.sass</tt>"
-            - elsif path.match(/\.js$/)
-              = "<tt>#{path.match(/([\w\/]+)\./)[1]}.coffee</tt>"
             - else
               = "<tt>#{path.gsub(/\/$/, '')}.haml</tt>"
             = "in the <tt>#{dynamic_folder}</tt> folder, or"

data/lib/frank/tilt.rb

@@ -526,6 +526,7 @@ module Tilt
     end
   end
   register 'sass', SassTemplate
+  register 'scss', SassTemplate
 
 
   # Lessscss template implementation. See:

data/spec/base_spec.rb

@@ -51,13 +51,6 @@ describe Frank::Base do
     last_response.body.should == "#hello-worlds {\n  background: red; }\n"
   end
   
-  it 'renders dynamic javascript without a layout' do
-    get '/coffee.js'
-    
-    last_response.should be_ok
-    last_response.body.should == "(function(){\n  var greeting;\n  greeting = \"Hello CoffeeScript\";\n})();"
-  end
-  
   it 'renders a 404 page if template not found' do
     get '/not_here.css'
                             

data/spec/output_spec.rb

@@ -51,32 +51,32 @@ describe Frank::Output do
       
     it 'creates erb.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/erb.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n\n"
+      File.read(output).should == "<div id='p'>/erb</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
       
     it 'creates redcloth.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/redcloth.html')
-      File.read(output).should == "<h1>hello worlds</h1>"
+      File.read(output).should == "<div id='p'>/redcloth</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
       
     it 'creates markdown.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/markdown.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n"
+      File.read(output).should == "<div id='p'>/markdown</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
       
     it 'creates mustache.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/mustache.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n\n"
+      File.read(output).should == "<div id='p'>/mustache</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
       
     it 'creates liquid.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/liquid.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n"
+      File.read(output).should == "<div id='p'>/liquid</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
       
     it 'creates builder.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/builder.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n"
+      File.read(output).should == "<div id='p'>/builder</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
       
     it 'copies static.html' do
@@ -158,32 +158,32 @@ describe Frank::Output do
   
     it 'creates erb.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/erb/index.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n\n"
+      File.read(output).should == "<div id='p'>/erb</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
   
     it 'creates redcloth.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/redcloth/index.html')
-      File.read(output).should == "<h1>hello worlds</h1>"
+      File.read(output).should == "<div id='p'>/redcloth</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
   
     it 'creates markdown.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/markdown/index.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n"
+      File.read(output).should == "<div id='p'>/markdown</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
   
     it 'creates mustache.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/mustache/index.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n\n"
+      File.read(output).should == "<div id='p'>/mustache</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
   
     it 'creates liquid.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/liquid/index.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n"
+      File.read(output).should == "<div id='p'>/liquid</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
   
     it 'creates builder.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/builder/index.html')
-      File.read(output).should == "<h1>hello worlds</h1>\n"
+      File.read(output).should == "<div id='p'>/builder</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
   
     it 'copies static.html' do

data/spec/render_spec.rb

@@ -45,62 +45,57 @@ describe Frank::Render do
   end
    
   it 'renders a haml template with no layout' do
-    template = @app.render('no_layout.haml')
-    template.should == "<h1>i have no layout</h1>\n"
-  end
+     template = @app.render('no_layout.haml')
+     template.should == "<h1>i have no layout</h1>\n"
+   end
+    
+   it 'renders haml template' do
+     template = @app.render('index.haml')
+     template.should == "<div id='p'>/</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/</h2>\n</div>\n"
+   end
    
-  it 'renders haml template' do
-    template = @app.render('index.haml')
-    template.should == "<div id='p'>/</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/</h2>\n</div>\n"
-  end
-  
-  it 'renders haml template with a haml partial' do
-    template = @app.render('partial_test.haml')
-    template.should == "<div id='p'>/partial_test</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <p>hello from partial</p>\n</div>\n"
-  end
-  
-  it 'renders sass template' do
-    template = @app.render('sass.sass')
-    template.should == "#hello-worlds {\n  background: red; }\n"
-  end
-  
-  it 'renders coffee template' do
-    template = @app.render('coffee.coffee')
-    template.should == "(function(){\n  var greeting;\n  greeting = \"Hello CoffeeScript\";\n})();"
-  end
+   it 'renders haml template with a haml partial' do
+     template = @app.render('partial_test.haml')
+     template.should == "<div id='p'>/partial_test</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <p>hello from partial</p>\n</div>\n"
+   end
    
-  it 'renders erb template' do
-    template = @app.render('erb.erb')
-    template.should == "<h1>hello worlds</h1>\n\n"
-  end
-  
-  it 'renders redcloth template' do
-    template = @app.render('redcloth.textile')
-    template.should == "<h1>hello worlds</h1>"
-  end
-  
-  it 'renders rdiscount template' do
-    template = @app.render('markdown.md')
-    template.should == "<h1>hello worlds</h1>\n"
-  end
-  
-  it 'renders mustache template' do
-    template = @app.render('mustache.mustache')
-    template.should == "<h1>hello worlds</h1>\n\n"
-  end
-  
-  it 'renders liquid template' do
-    template = @app.render('liquid.liquid')
-    template.should == "<h1>hello worlds</h1>\n"
-  end
-  
-  it 'renders builder template' do
-    template = @app.render('builder.builder')
-    template.should == "<h1>hello worlds</h1>\n"
-  end
-  
-  it 'raise template error' do
-    lambda { @app.render('not_a.template') }.should raise_error(Frank::TemplateError)
-  end
+   it 'renders sass template' do
+     template = @app.render('sass.sass')
+     template.should == "#hello-worlds {\n  background: red; }\n"
+   end
+    
+   it 'renders erb template' do
+     template = @app.render('erb.erb')
+     template.should == "<div id='p'>/erb</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+   end
+   
+   it 'renders redcloth template' do
+     template = @app.render('redcloth.textile')
+     template.should == "<div id='p'>/redcloth</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+   end
+   
+   it 'renders rdiscount template' do
+     template = @app.render('markdown.md')
+     template.should == "<div id='p'>/markdown</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+   end
+   
+   it 'renders mustache template' do
+     template = @app.render('mustache.mustache')
+     template.should == "<div id='p'>/mustache</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+   end
+   
+   it 'renders liquid template' do
+     template = @app.render('liquid.liquid')
+     template.should == "<div id='p'>/liquid</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+   end
+   
+   it 'renders builder template' do
+     template = @app.render('builder.builder')
+     template.should == "<div id='p'>/builder</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+   end
+   
+   it 'raise template error' do
+     lambda { @app.render('not_a.template') }.should raise_error(Frank::TemplateError)
+   end
    
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 3
   - 0
-  - beta
-  version: 0.3.0.beta
+  - beta2
+  version: 0.3.0.beta2
 platform: ruby
 authors: 
 - blahed
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 -04:00
+date: 2010-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,7 +142,6 @@ files:
 - spec/template/dynamic/500.haml
 - spec/template/dynamic/_partial.haml
 - spec/template/dynamic/builder.builder
-- spec/template/dynamic/coffee.coffee
 - spec/template/dynamic/erb.erb
 - spec/template/dynamic/helper_test.haml
 - spec/template/dynamic/index.haml

data/spec/template/dynamic/coffee.coffee

@@ -1 +0,0 @@
-greeting: "Hello CoffeeScript"