frank 0.1.0 → 0.1.1

data/README.md

@@ -3,11 +3,10 @@ Frank
 
 Inspired by [Sinatra][0]'s simplicity and ease of use, Frank lets you build
 static sites using your favorite libs, painlessly. It uses [Tilt][1], so it
-comes with support for [Haml & Sass][2], [Builder][3], [ERB][4],
+comes with support for [Haml & Sass][2], [LESS][10], [Builder][3], [ERB][4],
 [Liquid][5], & [Mustache][6].
 
-Frank also supports [CoffeeScript][7] for writing JavaScript in style, and
-[LESS][8] is planned for the near future.
+Frank also supports [CoffeeScript][7] for writing JavaScript in style.
 
 Overview
 --------
@@ -124,4 +123,5 @@ Installation
 [6]: http://github.com/defunkt/mustache
 [7]: http://jashkenas.github.com/coffee-script/
 [8]: http://lesscss.org/
-[9]: http://rack.rubyforge.org/
+[9]: http://rack.rubyforge.org/
+[10]: http://lesscss.org/

data/Rakefile

@@ -7,6 +7,9 @@ begin
     gemspec.email = "travis.dunn@thisismedium.com"
     gemspec.homepage = "http://github.com/blahed/frank"
     gemspec.authors = ["blahed", "nwah"]
+    gemspec.add_dependency 'rack'
+    gemspec.add_dependency 'mongrel'
+    gemspec.add_dependency 'haml'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/frank.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-16}
   s.description = %q{Create/Dump static builds using whatever templating/helper languages you wish}
   s.email = %q{travis.dunn@thisismedium.com}
   s.executables = ["frank", "frankout", "frankup"]
@@ -40,11 +40,11 @@ Gem::Specification.new do |s|
      "lib/frank/tilt.rb",
      "lib/template/dynamic/css/frank.sass",
      "lib/template/dynamic/index.haml",
-     "lib/template/dynamic/js/frank.coffee",
      "lib/template/dynamic/layout.haml",
      "lib/template/helpers.rb",
      "lib/template/settings.yml",
-     "lib/template/static/images/frank-med.png"
+     "lib/template/static/images/frank-med.png",
+     "lib/template/static/js/frank.js"
   ]
   s.homepage = %q{http://github.com/blahed/frank}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -57,9 +57,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<mongrel>, [">= 0"])
+      s.add_runtime_dependency(%q<haml>, [">= 0"])
     else
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<mongrel>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<mongrel>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 0"])
   end
 end
 

data/lib/frank/tilt.rb

@@ -1,5 +1,5 @@
 module Tilt
-  VERSION = '0.4'
+  VERSION = '0.5'
 
   @template_mappings = {}
 
@@ -325,6 +325,25 @@ module Tilt
   register 'sass', SassTemplate
 
 
+  # Lessscss template implementation. See:
+  # http://lesscss.org/
+  #
+  # Less templates do not support object scopes, locals, or yield.
+  class LessTemplate < Template
+    def initialize_engine
+      require_template_library 'less' unless defined? ::Less::Engine
+    end
+
+    def compile!
+      @engine = ::Less::Engine.new(data)
+    end
+
+    def evaluate(scope, locals, &block)
+      @engine.to_css
+    end
+  end
+  register 'less', LessTemplate
+
   # Builder template implementation. See:
   # http://builder.rubyforge.org/
   class BuilderTemplate < Template
@@ -523,4 +542,4 @@ module Tilt
     end
   end
   register 'coffee', CoffeeTemplate
-end
+end

data/lib/template/dynamic/css/frank.sass

@@ -59,7 +59,7 @@ em
       margin-left: -3px
     
   #help
-    top: 180px
+    top: 150px
     border-top: 1px #7a7a7a solid
     
     li

data/lib/template/dynamic/index.haml

@@ -8,8 +8,9 @@
   
 %ol#help
   %li
-    %p= "Edit <em>settings.yml</em> to set the hostname/port to your liking. Also make sure to set your preferred languages as well. You can also set up multiple layouts for your views."
+    %p= "Edit <em>settings.yml</em> to set your server options, folder names for static/dynamic content, and layouts for your views."
   %li
-    %p= "Stash your static files (images, flash movies, &c.) in the <em>[project]/public</em> folder."
+    %p= "Stash your static files (images, flash movies, etc) in the folder that you set as <em>[static_folder]</em>."
   %li
-    %p= "The files in your <em>css</em> & <em>js</em> folders will be auto- matically parsed from the source files. For example if you visit <em>/js/example.js</em>, Frank will parse & return <em>[project]/js/example.coffee</em>"
+    %p= "Frank will look for files in the <em>[dynamic_folder]</em> first and try to compile them."
+    %p= "Example: a request for <em>/css/blah.css</em> will look for a file in <em>[dynamic_folder]/css/</em> named <em>blah</em>. Frank uses the file extension to determine the correct compiler."

data/lib/template/static/js/frank.js

@@ -0,0 +1,48 @@
+(function(){
+  var collapse, easeInOutQuad, expand, expanded, expanding, init, slide, toggle;
+  // -----------------------------------------------
+  //
+  //  This is pretty gross; Gotta love what those
+  //  JS libraries do for you
+  //
+  //  -
+  // Easing function borrowed from jQuery.easing
+  easeInOutQuad = function easeInOutQuad(t, b, c, d) {
+    return ((t /= d / 2) < 1) && (c / 2 * t * t + b) || (-c / 2 * ((--t) * (t - 2) - 1) + b);
+  };
+  // Expand / Collapse help info
+  expanded = false;
+  expanding = false;
+  slide = function slide(el, end, duration, start, now) {
+    now = now || 0.001;
+    start = start || parseInt(document.defaultView.getComputedStyle(el, null).getPropertyValue('left'));
+    el.style.left = Math.round(start + (end - start) * easeInOutQuad(now, 0, 1, duration)) + 'px';
+    now += 30;
+    return now < duration ? setTimeout(function() {
+      return slide(el, end, duration, start, now);
+    }, 30) : expanding = false;
+  };
+  expand = function expand() {
+    document.getElementById('tooltip').style.display = 'none';
+    slide(document.getElementById('header'), 75, 600);
+    return slide(document.getElementById('help'), 525, 600);
+  };
+  collapse = function collapse() {
+    document.getElementById('tooltip').style.display = 'block';
+    slide(document.getElementById('header'), 300, 600);
+    return slide(document.getElementById('help'), 300, 600);
+  };
+  toggle = function toggle(e) {
+    if (expanding) {
+      return false;
+    }
+    expanded = !expanded;
+    expanding = true;
+    expanded ? expand() : collapse();
+    return false;
+  };
+  init = function init() {
+    return document.addEventListener('click', toggle, false);
+  };
+  window.onload = init;
+})();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - blahed
@@ -10,10 +10,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -05:00
+date: 2010-01-16 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Create/Dump static builds using whatever templating/helper languages you wish
 email: travis.dunn@thisismedium.com
 executables: 
@@ -48,11 +77,11 @@ files:
 - lib/frank/tilt.rb
 - lib/template/dynamic/css/frank.sass
 - lib/template/dynamic/index.haml
-- lib/template/dynamic/js/frank.coffee
 - lib/template/dynamic/layout.haml
 - lib/template/helpers.rb
 - lib/template/settings.yml
 - lib/template/static/images/frank-med.png
+- lib/template/static/js/frank.js
 has_rdoc: true
 homepage: http://github.com/blahed/frank
 licenses: []

data/lib/template/dynamic/js/frank.coffee

@@ -1,49 +0,0 @@
-# -----------------------------------------------
-#
-#  This is pretty gross; Gotta love what those
-#  JS libraries do for you
-#
-#  -
-
-
-# Easing function borrowed from jQuery.easing
-easeInOutQuad: t, b, c, d =>
-  ((t/=d/2) < 1) and (c/2*t*t + b) or (-c/2 * ((--t)*(t-2) - 1) + b)
-
-# Expand / Collapse help info
-expanded: false
-expanding: false
-slide: el, end, duration, start, now =>
-  now ||= 0.001
-  start ||= parseInt(document.defaultView.getComputedStyle(el,null).getPropertyValue('left'))
-  el.style.left = Math.round(start + (end-start) * easeInOutQuad(now, 0, 1, duration)) + 'px'
-  
-  now += 30
-  if now < duration
-    setTimeout(
-      => slide(el, end, duration, start, now)
-      30 )
-  else
-    expanding: false
-
-expand: =>
-  document.getElementById('tooltip').style.display = 'none';
-  slide( document.getElementById('header'), 75, 600)
-  slide( document.getElementById('help'), 525, 600)
-  
-collapse: =>
-  document.getElementById('tooltip').style.display = 'block';
-  slide( document.getElementById('header'), 300, 600)
-  slide( document.getElementById('help'), 300, 600)
-
-toggle: e =>
-  return false if expanding
-  expanded = !expanded
-  expanding: true
-  if expanded then expand() else collapse()
-  false
-  
-init: =>
-  document.addEventListener('click', toggle, false)
-  
-window.onload: init