frank 1.0.8 → 1.0.9

data/lib/frank/compile.rb

@@ -43,10 +43,30 @@ module Frank
         static_folder = File.join(Frank.root, Frank.static_folder)
         FileUtils.cp_r(File.join(static_folder, '/.'), Frank.export.path)
       end
+      
+      # ask the user if they want to overwrite the folder
+      # get the input and return it
+      def ask_nicely
+        print "\033[31mA folder named `#{Frank.export.path}' already exists, overwrite it?\033[0m [y/n] "
+        STDIN.gets.chomp.downcase
+      end
+      
+      # verify that the user wants to overwrite the folder
+      # remove it if so, exit if not
+      def verify_overwriting
+        overwrite = ask_nicely
+        
+        while overwrite.empty?
+          overwrite = ask_nicely
+        end
+        
+        overwrite == 'y' ? FileUtils.rm_rf(Frank.export.path) : exit
+      end
 
       # TODO verbose everywhere is lame
       # create the dump dir, compile templates, copy over static assets
       def export!
+        verify_overwriting if File.exist?(Frank.export.path)
         FileUtils.mkdir(Frank.export.path)
 
         unless Frank.silent_export?

data/lib/frank/lorem.rb

@@ -45,11 +45,11 @@ module Frank
       end
     end
 
-    def date(fmt = '%a %b %d, %Y', replacement = nil)
+    def date(fmt = '%a %b %d, %Y', range = 1950..2010, replacement = nil)
       if Frank.exporting? && replacement
         replacement
       else
-        y = rand(20) + 1990
+        y = rand(range.last - range.first) + range.first
         m = rand(12) + 1
         d = rand(31) + 1
         Time.local(y,m,d).strftime(fmt)

data/lib/frank/publish.rb

@@ -5,8 +5,10 @@ module Frank
       def self.execute!
         exit_unless_configured
 
-        puts "\nFrank is..."
-        puts " - \033[32mExporting templates\033[0m"
+        unless Frank.silent_export?
+          puts "\nFrank is..."
+          puts " - \033[32mExporting templates\033[0m"
+        end
 
         tmp_folder = "/tmp/frankexp-#{Frank.proj_name}"
 
@@ -18,7 +20,7 @@ module Frank
         Frank.export.silent = true
         Frank::Compile.export!
 
-        puts " - \033[32mPublishing to:\033[0m `#{Frank.publish.host}:#{Frank.publish.path}'"
+        puts " - \033[32mPublishing to:\033[0m `#{Frank.publish.host}:#{Frank.publish.path}'" unless Frank.silent_export?
 
         ssh_options = {
           :password => Frank.publish.password,
@@ -31,7 +33,7 @@ module Frank
         Net::SSH.start(Frank.publish.host, Frank.publish.username, ssh_options) do |ssh|
           ssh.scp.upload!("#{tmp_folder}/", Frank.publish.path, :recursive => true, :chunk_size => 2048) do |ch, name, sent, total|
 
-            puts "   - #{name[tmp_folder.length..-1]}" unless name == current
+            puts "   - #{name[tmp_folder.length..-1]}" unless name == current || Frank.silent_export?
 
             current = name
           end
@@ -40,7 +42,7 @@ module Frank
         # cleanup by removing tmp folder
         FileUtils.rm_rf(tmp_folder)
 
-        puts "\n\033[32mPublish complete!\033[0m"
+        puts "\n\033[32mPublish complete!\033[0m" unless Frank.silent_export?
       end
 
       def self.exit_unless_configured

data/lib/frank/settings.rb

@@ -34,7 +34,7 @@ module Frank
 
       # export settings
       @export = OpenStruct.new
-      @export.path = nil
+      @export.path = "exported"
       @export.silent = false
 
       # publish options
@@ -101,4 +101,4 @@ module Frank
     end
 
   end
-end
+end

data/lib/frank/template_helpers.rb

@@ -14,6 +14,32 @@ module Frank
     def lorem
       Frank::Lorem.new
     end
+    
+    def content_for(name, &block)
+      @content_for ||= {}
+      
+      if block_given?
+        @content_for[name.to_sym] = capture(&block)
+      else
+        @content_for[name.to_sym]
+      end
+    end
+    
+    def content_for?(name)
+      !@content_for[name.to_sym].nil?
+    end
+    
+    def capture(&block)
+      erbout        = eval('_erbout', block.binding)
+      erbout_length = erbout.length
+
+      block.call
+      
+      erbout_addition = erbout[erbout_length..-1]
+      erbout[erbout_length..-1] = ''
+
+      erbout_addition
+    end
 
     def refresh
       if Frank.exporting?

data/lib/frank/version.rb

@@ -0,0 +1,3 @@
+module Frank
+  VERSION = '1.0.9'
+end

data/lib/template/setup.rb

@@ -42,6 +42,13 @@ Frank.dynamic_folder = "dynamic"
 #
 Frank.layouts_folder = "layouts"
 
+# ----------------------
+# Export settings:
+#
+# Projects will be exported to default to the following directory
+#
+Frank.export.path = "exported"
+
 # ----------------------
 #  Publish settings:
 #
@@ -67,4 +74,4 @@ Frank.layouts_folder = "layouts"
 # Initializers:
 #
 # Add any other project setup code, or requires here
-# ....
+# ....

data/spec/base_spec.rb

@@ -76,4 +76,4 @@ describe Frank::Base do
     FileUtils.rm_r File.join(Dir.pwd, 'stubbed')
   end
 
-end
+end

data/spec/compile_spec.rb

@@ -2,139 +2,162 @@ require File.dirname(__FILE__) + '/helper'
 
 describe Frank::Compile do
   include Rack::Test::Methods
+  include Frank::Spec::Helpers
+
+  let(:proj_dir) { File.join(File.dirname(__FILE__), 'template') }
 
   context 'default output' do
-    before :all do
-      bin_dir    = File.join(File.dirname(File.dirname(__FILE__)), 'bin', 'frank export')
-      proj_dir   = File.join(File.dirname(__FILE__), 'template')
-      output_dir = File.join(proj_dir, 'output')
-      Dir.chdir proj_dir do
-        system "#{bin_dir} #{output_dir} > /dev/null"
+
+    context 'without specifying an export dir' do
+      after do
+        FileUtils.rm_r File.join(proj_dir, Frank.export.path)
       end
-    end
 
-    it 'creates the output folder' do
-      File.exist?(File.join(File.dirname(__FILE__), 'template/output')).should be_true
-    end
+      it 'creates the default export dir' do
+        Dir.chdir proj_dir do
+          frank 'export'
 
-    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"
+          File.directory?(Frank.export.path).should be_true
+        end
+      end
     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
+    context 'specifying an export dir' do
+      let(:output_dir) { File.join(proj_dir, 'output') }
 
-    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
+      before(:all) do
+        Dir.chdir proj_dir do
+          frank 'export', output_dir
+        end
+      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
+      after(:all) do
+        FileUtils.rm_r output_dir
+      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 the output folder' do
+        File.exist?(File.join(File.dirname(__FILE__), 'template/output')).should be_true
+      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 index.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/index.html')
+        File.read(output).should == "\n<div id='p'>/</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n  <h2>/</h2>\n</div>\n"
+      end
 
-    it 'creates coffee.js' do
-      output = File.join(File.dirname(__FILE__), 'template/output/coffee.js')
-      File.read(output).should == "(function(){\n  var greeting;\n  greeting = \"Hello CoffeeScript\";\n})();"
-    end
+      it 'creates partial_test.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/partial_test.html')
+        File.read(output).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 '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 partial_locals_test.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/partial_locals_test.html')
+        File.read(output).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 '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 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 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 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 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 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 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 'creates coffee.js' do
+        output = File.join(File.dirname(__FILE__), 'template/output/coffee.js')
+        File.read(output).should == "(function() {\n  ({\n    greeting: \"Hello CoffeeScript\"\n  });\n}).call(this);\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 'creates erb.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/erb.html')
+        File.read(output).should == "\n<div id='p'>/erb</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+      end
 
-    it "doesn't create partials" do
-      File.exist?(File.join(File.dirname(__FILE__), 'template/output/_partial.html')).should be_false
-    end
+      it 'creates redcloth.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/redcloth.html')
+        File.read(output).should == "\n<div id='p'>/redcloth</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+      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>")
-      File.read(output).should include("<p class='sentences'>replace-this</p>")
-      File.read(output).should include("<p class='paragraphs'>replace-this</p>")
-      File.read(output).should include("<p class='date'>replace-this</p>")
-      File.read(output).should include("<p class='name'>replace-this</p>")
-      File.read(output).should include("<p class='email'>replace-this</p>")
-      File.read(output).should include("<img src='replace-this' />")
-    end
+      it 'creates markdown.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/markdown.html')
+        File.read(output).should == "\n<div id='p'>/markdown</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+      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
+      it 'creates liquid.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/liquid.html')
+        File.read(output).should == "\n<div id='p'>/liquid</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
+      end
 
-    after(:all) do
-      FileUtils.rm_r File.join(File.dirname(__FILE__), 'template/output')
+      it 'creates builder.html' do
+        output = File.join(File.dirname(__FILE__), 'template/output/builder.html')
+        File.read(output).should == "\n<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>")
+        File.read(output).should include("<p class='sentences'>replace-this</p>")
+        File.read(output).should include("<p class='paragraphs'>replace-this</p>")
+        File.read(output).should include("<p class='date'>replace-this</p>")
+        File.read(output).should include("<p class='name'>replace-this</p>")
+        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 == "\n<div id='p'>/refresh</div>\n<div id='layout'>\n  \n</div>\n"
+      end
     end
 
   end
 
   context 'productions output' do
+
+    let(:output_dir) { File.join(proj_dir, 'output') }
+
     before :all do
-      bin_dir    = File.join(File.dirname(File.dirname(__FILE__)), 'bin', 'frank export')
-      proj_dir   = File.join(File.dirname(__FILE__), 'template')
-      output_dir = File.join(proj_dir, 'output')
       Dir.chdir proj_dir do
-        system "#{bin_dir} #{output_dir} --production > /dev/null"
+        frank 'export', output_dir, '--production'
       end
     end
 
+    after(:all) do
+      FileUtils.rm_r output_dir
+    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"
+      File.read(output).should == "\n<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"
+      File.read(output).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 '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"
+      File.read(output).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 'creates child.html' do
@@ -154,32 +177,32 @@ describe Frank::Compile do
 
     it 'creates	coffee.js' do
       output = File.join(File.dirname(__FILE__), 'template/output/coffee.js')
-      File.read(output).should == "(function(){\n  var greeting;\n  greeting = \"Hello CoffeeScript\";\n})();"
+      File.read(output).should == "(function() {\n  ({\n    greeting: \"Hello CoffeeScript\"\n  });\n}).call(this);\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"
+      File.read(output).should == "\n<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"
+      File.read(output).should == "\n<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"
+      File.read(output).should == "\n<div id='p'>/markdown</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"
+      File.read(output).should == "\n<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"
+      File.read(output).should == "\n<div id='p'>/builder</div>\n<div id='layout'>\n  <h1>hello worlds</h1>\n</div>\n"
     end
 
     it 'copies static.html' do
@@ -204,11 +227,7 @@ describe Frank::Compile do
 
     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')
+      File.read(output).should == "\n<div id='p'>/refresh</div>\n<div id='layout'>\n  \n</div>\n"
     end
 
   end