frank 0.3.2 → 0.4.0

data/spec/output_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe Frank::Output do
-  include Rack::Test::Methods 
-  
+  include Rack::Test::Methods
+
   context 'default output' do
     before :all do
       bin_dir    = File.join(File.dirname(File.dirname(__FILE__)), 'bin', 'frankout')
@@ -12,80 +12,80 @@ describe Frank::Output do
         system "#{bin_dir} #{output_dir} > /dev/null"
       end
     end
-  
+
     it 'creates the output folder' do
       File.exist?(File.join(File.dirname(__FILE__), 'template/output')).should be_true
     end
-      
+
     it 'creates index.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/index.html')
       File.read(output).should == "<div id='p'>/</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/</h2>\n</div>\n"
     end
-      
+
     it 'creates partial_test.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/partial_test.html')
       File.read(output).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"
     end
-    
+
     it 'creates partial_locals_test.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/partial_locals_test.html')
       File.read(output).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"
     end
-    
+
     it 'creates child.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/nested/child.html')
       File.read(output).should == "<div id='nested_layout'>\n  <h1>hello from child</h1>\n</div>\n"
     end
-    
+
     it 'creates deep.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/nested/deeper/deep.html')
       File.read(output).should == "<div id='nested_layout'>\n  <h1>really deep</h1>\n</div>\n"
     end
-    
+
     it 'creates no_layout.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/no_layout.html')
       File.read(output).should == "<h1>i have no layout</h1>\n"
     end
-      
+
     it 'creates erb.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/erb.html')
       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 == "<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 == "<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 == "<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 == "<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 == "<div id='p'>/builder</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
-      
+
     it 'copies static.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/files/static.html')
       File.read(output).should == "hello from static"
     end
-      
+
     it "doesn't create partials" do
       File.exist?(File.join(File.dirname(__FILE__), 'template/output/_partial.html')).should be_false
     end
-    
+
     it 'handles lorem replacement fields' do
       output = File.join(File.dirname(__FILE__), 'template/output/lorem_test.html')
       File.read(output).should include("<p class='words'>replace-this</p>")
@@ -96,18 +96,18 @@ describe Frank::Output do
       File.read(output).should include("<p class='email'>replace-this</p>")
       File.read(output).should include("<img src='replace-this' />")
     end
-    
+
     it 'should not render the refresh js' do
       output = File.join(File.dirname(__FILE__), 'template/output/refresh.html')
       File.read(output).should == "<div id='p'>/refresh</div>\n<div id='layout'>\n  \n</div>\n"
     end
-    
+
     after(:all) do
       FileUtils.rm_r File.join(File.dirname(__FILE__), 'template/output')
     end
-  
+
   end
-  
+
   context 'productions output' do
     before :all do
       bin_dir    = File.join(File.dirname(File.dirname(__FILE__)), 'bin', 'frankout')
@@ -117,80 +117,80 @@ describe Frank::Output do
         system "#{bin_dir} #{output_dir} --production > /dev/null"
       end
     end
-  
+
     it 'creates the output folder' do
       File.exist?(File.join(File.dirname(__FILE__), 'template/output')).should be_true
     end
-  
+
     it 'creates index.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/index.html')
       File.read(output).should == "<div id='p'>/</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/</h2>\n</div>\n"
     end
-  
+
     it 'creates partial_test.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/partial_test/index.html')
       File.read(output).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"
     end
-    
+
     it 'creates partial_locals_test.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/partial_locals_test/index.html')
       File.read(output).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"
     end
-    
+
     it 'creates child.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/nested/child/index.html')
       File.read(output).should == "<div id='nested_layout'>\n  <h1>hello from child</h1>\n</div>\n"
     end
-    
+
     it 'creates deep.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/nested/deeper/deep/index.html')
       File.read(output).should == "<div id='nested_layout'>\n  <h1>really deep</h1>\n</div>\n"
     end
-    
+
     it 'creates no_layout.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/no_layout/index.html')
       File.read(output).should == "<h1>i have no layout</h1>\n"
     end
-  
+
     it 'creates erb.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/erb/index.html')
       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 == "<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 == "<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 == "<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 == "<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 == "<div id='p'>/builder</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
-  
+
     it 'copies static.html' do
       output = File.join(File.dirname(__FILE__), 'template/output/files/static.html')
       File.read(output).should == "hello from static"
     end
-  
+
     it "doesn't create partials" do
       File.exist?(File.join(File.dirname(__FILE__), 'template/output/_partial/index.html')).should be_false
     end
-    
+
     it 'handles lorem replacement fields' do
       output = File.join(File.dirname(__FILE__), 'template/output/lorem_test/index.html')
       File.read(output).should include("<p class='words'>replace-this</p>")
@@ -201,16 +201,16 @@ describe Frank::Output do
       File.read(output).should include("<p class='email'>replace-this</p>")
       File.read(output).should include("<img src='replace-this' />")
     end
-    
+
     it 'should not render the refresh js' do
       output = File.join(File.dirname(__FILE__), 'template/output/refresh/index.html')
       File.read(output).should == "<div id='p'>/refresh</div>\n<div id='layout'>\n  \n</div>\n"
     end
-  
+
     after(:all) do
       FileUtils.rm_r File.join(File.dirname(__FILE__), 'template/output')
     end
-    
+
   end
-  
+
 end

data/spec/render_spec.rb

@@ -1,59 +1,54 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe Frank::Render do
-  include Rack::Test::Methods 
-  
+  include Rack::Test::Methods
+
   def app
-    proj_dir = File.join(File.dirname(__FILE__), 'template')
-    settings = YAML.load_file(File.join(proj_dir, 'settings.yml'))
+    Frank.bootstrap(File.join(File.dirname(__FILE__), 'template'))
     Frank.new do
-      settings.each do |name, value|
-        set name.to_s, value
-      end
       set :environment, :test
-      set :proj_dir, proj_dir
     end
   end
-  
+
   before(:all) do
     @app = app
   end
-  
+
   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"
   end
-  
+
   it 'renders a template using layout2' do
     template = @app.render('layout2_test.haml')
     template.should == "<div id='layout2'>\n  <h1>hi inside layout2</h1>\n</div>\n"
   end
-  
+
   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"
   end
-  
+
   it 'renders a nested template with a nested layout' do
     template = @app.render('/nested/child.haml')
     template.should == "<div id='nested_layout'>\n  <h1>hello from child</h1>\n</div>\n"
   end
-  
+
   it 'renders a deeply nested template with a nested layout' do
     template = @app.render('/nested/deeper/deep.haml')
     template.should == "<div id='nested_layout'>\n  <h1>really deep</h1>\n</div>\n"
   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
-    
+
    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  <h2>/partial_test</h2>\n  <p>hello from partial</p>\n</div>\n"
@@ -63,44 +58,56 @@ describe Frank::Render 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"
    end
-   
+
    it 'renders sass template' do
-     template = @app.render('sass.sass')
-     template.should == "#hello-worlds {\n  background: red; }\n"
+     template = @app.render('stylesheets/sass.sass')
+     template.should include("#hello-worlds {\n  background: red;\n}\n")
    end
-    
+
+   it 'renders sass with compass reset' do
+     template = @app.render('stylesheets/sass_with_compass.sass')
+     template.should include("h1, h2, h3, h4, h5, h6, p, blockquote, pre,\n")
+   end
+
+   it 'renders scss with compass mixin' do
+     template = @app.render('stylesheets/scss_with_compass.scss')
+     template.should include("-moz-border-radius: 5px;\n")
+     template.should include("-webkit-border-radius: 5px;\n")
+     template.should include("border-radius: 5px;\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

data/spec/template/dynamic/500.haml

@@ -1 +1 @@
-= non_method if @environment == :test
+= non_method if @blowup_sometimes

data/spec/template/dynamic/lorem_test.haml

@@ -4,4 +4,8 @@
 %p.date= lorem.date '%Y-%m-%d', 'replace-this'
 %p.name= lorem.name 'replace-this'
 %p.email= lorem.email 'replace-this'
-%img{:src => lorem.image(400, 300, true, 'replace-this')}
+%img{:src => lorem.image('400x300', :random_color => true)}
+%img{:src => lorem.image('400x300', :background_color => '444', :color => 'eee', :replacement => 'replace-this')}
+%img{:src => lorem.image('400x300', :color => 'aaa')}
+%img{:src => lorem.image('400x300', :background_color => '444', :text => 'blah')}
+

data/spec/template/dynamic/setting_in_layout.haml

@@ -0,0 +1,2 @@
+- title "BLAH!"
+%h1 hello

data/spec/template/dynamic/stylesheets/sass_with_compass.sass

@@ -0,0 +1 @@
+@import compass/reset

data/spec/template/dynamic/stylesheets/scss_with_compass.scss

@@ -0,0 +1,5 @@
+@import "compass/css3";
+
+.panel {
+  @include border-radius(5px);
+}

data/spec/template/helpers.rb

@@ -2,4 +2,9 @@ module FrankHelpers
   def hello_helper
     'hello from helper'
   end
+
+  def title(val = nil)
+    @title = val if val
+    @title || ""
+  end
 end

data/spec/template/layouts/default.haml

@@ -1,3 +1,5 @@
+- if @title
+  #title= @title
 #p= current_path
 #layout
   = yield

data/spec/template/setup.rb

@@ -0,0 +1 @@
+Frank.environment = :test

data/spec/template_helpers_spec.rb

@@ -1,78 +1,84 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe Frank::TemplateHelpers do
-  include Rack::Test::Methods 
-  
+  include Rack::Test::Methods
+
   def app
-    proj_dir = File.join(File.dirname(__FILE__), 'template')
-    settings = YAML.load_file(File.join(proj_dir, 'settings.yml'))
-    require File.join(proj_dir, 'helpers')
+    Frank.bootstrap(File.join(File.dirname(__FILE__), 'template'))
+    require File.join(Frank.root, 'helpers')
     Frank.new do
-      settings.each do |name, value|
-        set name.to_s, value
-      end
       set :environment, :test
-      set :proj_dir, proj_dir
     end
   end
-  
+
   before(:all) do
     @app = app
   end
-  
+
   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"
   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"
+  end
+
   it 'should render the refresh javascript' do
     template = @app.render('refresh.haml')
     template.should include("<script type=\"text/javascript\">\n            (function(){")
   end
-  
+
   context 'Lorem' do
     it 'render haml with 3 random lorem words' do
       template = @app.render('lorem_test.haml')
       reg = /<p class='words'>(?:\w+\s?){3}<\/p>/
       template.should =~ reg
     end
-  
+
     it 'render haml with 2 random lorem sentences' do
       template = @app.render('lorem_test.haml')
       reg = /<p class='sentences'>(?:[^.]+.){2}<\/p>/
       template.should =~ reg
     end
-    
+
     it 'render haml with 1 random lorem paragraph' do
       template = @app.render('lorem_test.haml')
       reg = /<p class='paragraphs'>(?:[^\n]+(?:\n\n)?){1}<\/p>/m
       template.should =~ reg
     end
-    
+
     it 'render haml with lorem name' do
       template = @app.render('lorem_test.haml')
       reg = /<p class='name'>[\w']+\s[\w']+<\/p>/m
       template.should =~ reg
     end
-    
+
     it 'render haml with lorem email' do
       template = @app.render('lorem_test.haml')
       reg = /<p class='email'>[\w-]+@\w+\.\w+<\/p>/m
       template.should =~ reg
     end
-    
+
     it 'render haml with lorem date' do
       template = @app.render('lorem_test.haml')
       reg = /<p class='date'>\d{4}-\d{2}-\d{2}<\/p>/m
       template.should =~ reg
     end
-    
+
     it 'render image url using imager' do
       template = @app.render('lorem_test.haml')
-      reg = /<img src='\/_img\/400x300.jpg\?random\d{5}' \/>/
-      template.should =~ reg
+      reg1 = /<img src='http:\/\/placehold\.it\/400x300\/[a-z0-9]{6}\/[a-z0-9]{6}' \/>/
+      reg2 = /<img src='http:\/\/placehold\.it\/400x300\/444\/eee' \/>/
+      reg3 = /<img src='http:\/\/placehold\.it\/400x300\/ccc\/aaa' \/>/
+      reg4 = /<img src='http:\/\/placehold\.it\/400x300\/444(&amp;|&)text=blah' \/>/
+
+      template.should =~ reg1
+      template.should =~ reg2
+      template.should =~ reg3
+      template.should =~ reg4
     end
   end
-  
+
 end
-