frank 1.0.8 → 1.0.9

data/spec/helper.rb

@@ -19,3 +19,21 @@ module Kernel
    $stdout = STDOUT
  end
 end
+
+module Frank
+  module Spec
+    module Helpers
+      BIN_DIR = File.join(File.dirname(File.dirname(__FILE__)), 'bin')
+
+      def frank(command, *args)
+        result = system "#{BIN_DIR}/frank #{command} #{args * ' '}"
+
+        if $?.success?
+          result
+        else
+          exit 1
+        end
+      end
+    end
+  end
+end

data/spec/publish_spec.rb

@@ -2,18 +2,18 @@ require File.dirname(__FILE__) + '/helper'
 
 describe Frank::Publish do
   include Rack::Test::Methods
+  include Frank::Spec::Helpers
 
-    before :all do
-      @proj_dir   = File.join(File.dirname(__FILE__), 'template')
+    let(:proj_dir) { File.join(File.dirname(__FILE__), 'template') }
 
-      bin_dir    = File.join(File.dirname(File.dirname(__FILE__)), 'bin')
-      Dir.chdir @proj_dir do
-        system "#{bin_dir}/frank publish"
+    before :all do
+      Dir.chdir proj_dir do
+        frank 'publish'
       end
     end
 
     it 'creates the published folder' do
-      File.exist?("/tmp/frankexp-#{@proj_dir.split('/').last}").should be_true
+      File.exist?("/tmp/frankexp-#{proj_dir.split('/').last}").should be_true
     end
 
     after(:all) do

data/spec/render_spec.rb

@@ -14,7 +14,7 @@ describe Frank::Render do
 
   it 'renders a template using layout' 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"
+    template.should == "\n<div id='p'>/</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/</h2>\n</div>\n"
   end
 
   it 'renders a template using layout2' do
@@ -24,7 +24,7 @@ describe Frank::Render do
 
   it 'renders a markdown template inside haml layout' do
     template = @app.render('markdown_in_haml.md')
-    template.should == "<div id='p'>/markdown_in_haml</div>\n<div id='layout'>\n  <h1>hi inside layout</h1>\n</div>\n"
+    template.should == "\n<div id='p'>/markdown_in_haml</div>\n<div id='layout'>\n  <h1>hi inside layout</h1>\n</div>\n"
   end
 
   it 'renders a nested template with a nested layout' do
@@ -44,17 +44,22 @@ describe Frank::Render do
 
    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"
+     template.should == "\n<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  <h2>/partial_test</h2>\n  <p>hello from partial</p>\n</div>\n"
+     template.should == "\n<div id='p'>/partial_test</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/partial_test</h2>\n  <p>hello from partial</p>\n</div>\n"
    end
 
    it 'renders a partial with locals' do
      template = @app.render('partial_locals_test.haml')
-     template.should == "<div id='p'>/partial_locals_test</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/partial_locals_test</h2>\n  <p>hello from local</p>\n</div>\n"
+     template.should == "\n<div id='p'>/partial_locals_test</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/partial_locals_test</h2>\n  <p>hello from local</p>\n</div>\n"
+   end
+   
+   it 'renders less template' do
+     template = @app.render('stylesheets/less.less')
+     template.should include("#hello-worlds { background: red; }")
    end
 
    it 'renders sass template' do
@@ -76,32 +81,32 @@ describe Frank::Render do
 
    it 'renders coffee template' do
       template = @app.render('coffee.coffee')
-      template.should == "(function(){\n  var greeting;\n  greeting = \"Hello CoffeeScript\";\n})();"
+      template.should == "(function() {\n  ({\n    greeting: \"Hello CoffeeScript\"\n  });\n}).call(this);\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"
+     template.should == "\n<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"
+     template.should == "\n<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"
+     template.should == "\n<div id='p'>/markdown</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"
+     template.should == "\n<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"
+     template.should == "\n<div id='p'>/builder</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
    end
 
    it 'raise template error' do

data/spec/template/dynamic/content_for_erb.erb

@@ -0,0 +1,3 @@
+<% content_for :head do %>
+  <meta foo='content' />
+<% end %>

data/spec/template/dynamic/content_for_haml.haml

@@ -0,0 +1,2 @@
+- content_for :head do
+  %meta{:foo => 'content'}

data/spec/template/dynamic/lorem_test.haml

@@ -1,7 +1,7 @@
 %p.words= lorem.words 3, 'replace-this'
 %p.sentences= lorem.sentences 2, 'replace-this'
 %p.paragraphs= lorem.paragraphs 1, 'replace-this'
-%p.date= lorem.date '%Y-%m-%d', 'replace-this'
+%p.date= lorem.date '%Y-%m-%d', 1910..1919, 'replace-this'
 %p.name= lorem.name 'replace-this'
 %p.email= lorem.email 'replace-this'
 %img{:src => lorem.image('400x300')}

data/spec/template/dynamic/stylesheets/less.less

@@ -0,0 +1,5 @@
+@color: red;
+
+#hello-worlds {
+  background: @color;
+}

data/spec/template/layouts/default.haml

@@ -1,5 +1,6 @@
 - if @title
   #title= @title
+= content_for :head
 #p= current_path
 #layout
   = yield

data/spec/template_helpers_spec.rb

@@ -15,18 +15,28 @@ describe Frank::TemplateHelpers do
 
   it 'render haml and use hello_helper' do
     template = @app.render('helper_test.haml')
-    template.should == "<div id='p'>/helper_test</div>\n<div id='layout'>\n  <h1>hello from helper</h1>\n</div>\n"
+    template.should == "\n<div id='p'>/helper_test</div>\n<div id='layout'>\n  <h1>hello from helper</h1>\n</div>\n"
   end
 
   it 'sets an instance variable, which the layout should render correctly' do
     template = @app.render('setting_in_layout.haml')
-    template.should == "<div id='title'>BLAH!</div>\n<div id='p'>/setting_in_layout</div>\n<div id='layout'>\n  <h1>hello</h1>\n</div>\n"
+    template.should == "<div id='title'>BLAH!</div>\n\n<div id='p'>/setting_in_layout</div>\n<div id='layout'>\n  <h1>hello</h1>\n</div>\n"
   end
 
   it 'should render the refresh javascript' do
     template = @app.render('refresh.haml')
     template.should include("<script type=\"text/javascript\">\n            (function(){")
   end
+  
+  it 'renders content_for haml in the layout' do
+    template = @app.render('content_for_haml.haml')
+    template.should == "<meta foo='content' />\n<div id='p'>/content_for_haml</div>\n<div id='layout'>\n  \n</div>\n"
+  end
+  
+  it 'renders content_for erb in the layout' do
+    template = @app.render('content_for_erb.erb')
+    template.should == "  <meta foo='content' />\n<div id='p'>/content_for_erb</div>\n<div id='layout'>\n  \n</div>\n"
+  end
 
   context 'Lorem' do
     it 'render haml with 3 random lorem words' do
@@ -65,6 +75,12 @@ describe Frank::TemplateHelpers do
       template.should =~ reg
     end
 
+    it 'render haml with lorem date between 1910 and 1919' do
+      template = @app.render('lorem_test.haml')
+      reg = /<p class='date'>191(\d{1})-\d{2}-\d{2}<\/p>/m
+      template.should =~ reg
+    end
+
     it 'render image url using imager' do
       template = @app.render('lorem_test.haml')
       reg1 = /<img src='http:\/\/placehold\.it\/400x300' \/>/

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - blahed
@@ -16,32 +16,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -05:00
-default_executable: frank
+date: 2011-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rack
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 1
-        - 0
-        version: "1.0"
-  requirement: *id001
+        - 1
+        version: "1.1"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: mongrel
-  type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 1923831981
         segments: 
@@ -51,133 +49,103 @@ dependencies:
         - pre
         - 2
         version: 1.2.0.pre2
-  requirement: *id002
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: haml
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
         - 3
         - 0
         version: "3.0"
-  requirement: *id003
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: tilt
-  type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 9
         segments: 
-        - 0
-        - 9
-        version: "0.9"
-  requirement: *id004
+        - 1
+        - 3
+        version: "1.3"
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: net-ssh
-  type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
         - 2
         - 0
         version: "2.0"
-  requirement: *id005
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: net-scp
-  type: :runtime
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: jeweler
-  type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rspec
-  type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196421
+        hash: 23
         segments: 
         - 2
+        - 6
         - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
-  requirement: *id008
+        version: 2.6.0
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rack-test
-  type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
         - 0
         - 5
         version: "0.5"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rake
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  name: contest
-  type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -186,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: builder
-  type: :development
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -200,12 +168,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
+  type: :development
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: erubis
-  type: :development
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -214,15 +182,15 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
+  type: :development
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: compass
-  type: :development
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 51
         segments: 
@@ -230,26 +198,12 @@ dependencies:
         - 10
         - 2
         version: 0.10.2
-  requirement: *id014
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rdiscount
   type: :development
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id015
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
+  name: rdiscount
   prerelease: false
-  name: liquid
-  type: :development
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -258,12 +212,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id016
+  type: :development
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
+  name: liquid
   prerelease: false
-  name: less
-  type: :development
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -272,12 +226,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id017
+  type: :development
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
+  name: less
   prerelease: false
-  name: coffee-script
-  type: :development
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -286,26 +240,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id018
+  type: :development
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
+  name: coffee-script
   prerelease: false
-  name: RedCloth
-  type: :development
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 2
+        - 2
         - 0
-        version: "0"
-  requirement: *id019
+        version: 2.2.0
+  type: :development
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
+  name: RedCloth
   prerelease: false
-  name: ruby-debug
-  type: :development
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -314,17 +270,19 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id020
+  type: :development
+  version_requirements: *id017
 description: Rapidly develop static sites using any supported templating language
-email: travis.dunn@thisismedium.com
+email: 
+- tdunn13@gmail
 executables: 
 - frank
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -361,6 +319,7 @@ files:
 - lib/frank/templates/imager/frank9.jpg
 - lib/frank/tilt_setup.rb
 - lib/frank/upgrades.rb
+- lib/frank/version.rb
 - lib/template/dynamic/css/frank.sass
 - lib/template/dynamic/index.haml
 - lib/template/helpers.rb
@@ -379,6 +338,8 @@ files:
 - spec/template/dynamic/_partial_with_locals.haml
 - spec/template/dynamic/builder.builder
 - spec/template/dynamic/coffee.coffee
+- spec/template/dynamic/content_for_erb.erb
+- spec/template/dynamic/content_for_haml.haml
 - spec/template/dynamic/erb.erb
 - spec/template/dynamic/helper_test.haml
 - spec/template/dynamic/index.haml
@@ -395,6 +356,7 @@ files:
 - spec/template/dynamic/redcloth.textile
 - spec/template/dynamic/refresh.haml
 - spec/template/dynamic/setting_in_layout.haml
+- spec/template/dynamic/stylesheets/less.less
 - spec/template/dynamic/stylesheets/sass.sass
 - spec/template/dynamic/stylesheets/sass_with_compass.sass
 - spec/template/dynamic/stylesheets/scss_with_compass.scss
@@ -405,8 +367,7 @@ files:
 - spec/template/setup.rb
 - spec/template/static/files/static.html
 - spec/template_helpers_spec.rb
-has_rdoc: true
-homepage: http://github.com/blahed/frank
+homepage: 
 licenses: []
 
 post_install_message: 
@@ -434,17 +395,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.4.0
+rubyforge_project: frank
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Static Site Non-Framework
+summary: Rapidly develop static sites using any supported templating language
 test_files: 
 - spec/base_spec.rb
 - spec/compile_spec.rb
 - spec/helper.rb
 - spec/publish_spec.rb
 - spec/render_spec.rb
+- spec/template/dynamic/500.haml
+- spec/template/dynamic/_partial.haml
+- spec/template/dynamic/_partial_with_locals.haml
+- spec/template/dynamic/builder.builder
+- spec/template/dynamic/coffee.coffee
+- spec/template/dynamic/content_for_erb.erb
+- spec/template/dynamic/content_for_haml.haml
+- spec/template/dynamic/erb.erb
+- spec/template/dynamic/helper_test.haml
+- spec/template/dynamic/index.haml
+- spec/template/dynamic/layout2_test.haml
+- spec/template/dynamic/liquid.liquid
+- spec/template/dynamic/lorem_test.haml
+- spec/template/dynamic/markdown.md
+- spec/template/dynamic/markdown_in_haml.md
+- spec/template/dynamic/nested/child.haml
+- spec/template/dynamic/nested/deeper/deep.haml
+- spec/template/dynamic/no_layout.haml
+- spec/template/dynamic/partial_locals_test.haml
+- spec/template/dynamic/partial_test.haml
+- spec/template/dynamic/redcloth.textile
+- spec/template/dynamic/refresh.haml
+- spec/template/dynamic/setting_in_layout.haml
+- spec/template/dynamic/stylesheets/less.less
+- spec/template/dynamic/stylesheets/sass.sass
+- spec/template/dynamic/stylesheets/sass_with_compass.sass
+- spec/template/dynamic/stylesheets/scss_with_compass.scss
 - spec/template/helpers.rb
+- spec/template/layouts/default.haml
+- spec/template/layouts/explicit/layout2.haml
+- spec/template/layouts/nested/default.haml
 - spec/template/setup.rb
+- spec/template/static/files/static.html
 - spec/template_helpers_spec.rb