frank 0.2.6 → 0.3.0.beta

data/spec/template/dynamic/500.haml

@@ -0,0 +1 @@
+= non_method if @environment == :test

data/spec/template/dynamic/index.haml

@@ -0,0 +1,5 @@
+title: hello worlds
+META---------------------------------
+
+%h1= title
+%h2= current_path

data/spec/template/dynamic/layout2_test.haml

@@ -0,0 +1,4 @@
+layout: explicit/layout2.haml
+META--------------------
+
+%h1 hi inside layout2

data/spec/template/dynamic/lorem_test.haml

@@ -0,0 +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.name= lorem.name 'replace-this'
+%p.email= lorem.email 'replace-this'
+%img{:src => lorem.image(400, 300, true, 'replace-this')}

data/spec/template/dynamic/markdown_in_haml.md

@@ -0,0 +1,4 @@
+layout: default.haml
+META--------------------
+
+# hi inside layout

data/spec/template/dynamic/nested/child.haml

@@ -0,0 +1 @@
+%h1 hello from child

data/spec/template/dynamic/nested/deeper/deep.haml

@@ -0,0 +1 @@
+%h1 really deep

data/spec/template/dynamic/no_layout.haml

@@ -0,0 +1,4 @@
+layout: nil
+META-------------------
+
+%h1 i have no layout

data/spec/template/dynamic/partial_test.haml

@@ -0,0 +1,2 @@
+%h1 hello worlds
+= render_partial('partial.haml')

data/spec/template/dynamic/refresh.haml

@@ -0,0 +1 @@
+=refresh

data/spec/template/layouts/default.haml

@@ -0,0 +1,3 @@
+#p= current_path
+#layout
+  = yield

data/spec/template/layouts/nested/default.haml

@@ -0,0 +1,2 @@
+#nested_layout
+  = yield

data/spec/template/settings.yml

@@ -0,0 +1,45 @@
+env: test
+# ----------------------
+#  Server settings:
+#
+#  Change the server host/port to bind rack to.
+# 'server' can be any Rack-supported server, e.g.
+#  Mongrel, Thin, WEBrick
+#
+server:
+  handler: mongrel
+  hostname: 0.0.0.0
+  port: 3601
+
+# ----------------------
+#  Static folder:
+#
+#  All files in this folder will be served up
+#  directly, without interpretation
+#
+static_folder: static
+
+# ----------------------
+#  Dynamic folder:
+#
+#  Frank will try to interpret any of the files
+#  in this folder based on their extension
+#
+dynamic_folder: dynamic
+
+# ----------------------
+#  Layouts folder:
+#
+#  Frank will look for layouts in this folder
+#  the default layout is `default'
+#  it respects nested layouts that correspond to nested
+#  folders in the `dynamic_folder'
+#  for example: a template: `dynamic_folder/blog/a-blog-post.haml'
+#  would look for a layout: `layouts/blog/default.haml'
+#  and if not found use the default: `layouts/default.haml'
+#  
+#  Frank also supports defining layouts on an
+#  individual template basis using meta data
+#  you can do this by defining a meta field `layout: my_layout.haml'
+#
+layouts_folder: layouts

data/spec/template_helpers_spec.rb

@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe Frank::TemplateHelpers do
+  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.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 '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
+    end
+  end
+  
+end
+  

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 2
-  - 6
-  version: 0.2.6
+  - 3
+  - 0
+  - beta
+  version: 0.3.0.beta
 platform: ruby
 authors: 
 - blahed
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 -04:00
+date: 2010-06-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,16 +59,15 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
         - 0
-        version: "2.0"
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -83,7 +83,7 @@ dependencies:
         version: "0.5"
   type: :development
   version_requirements: *id005
-description: Create/Dump static builds using whatever templating/helper languages you wish
+description: Rapidly develop static sites using any supported templating language
 email: travis.dunn@thisismedium.com
 executables: 
 - frank
@@ -96,6 +96,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
+- Featurelist
 - LICENSE
 - README.md
 - Rakefile
@@ -105,11 +106,12 @@ files:
 - frank.gemspec
 - lib/frank.rb
 - lib/frank/base.rb
-- lib/frank/imager.rb
 - lib/frank/lorem.rb
+- lib/frank/middleware/imager.rb
+- lib/frank/middleware/refresh.rb
+- lib/frank/middleware/statik.rb
 - lib/frank/output.rb
 - lib/frank/rescue.rb
-- lib/frank/statik.rb
 - lib/frank/template_helpers.rb
 - lib/frank/templates/404.haml
 - lib/frank/templates/500.haml
@@ -128,37 +130,42 @@ files:
 - lib/frank/tilt.rb
 - lib/template/dynamic/css/frank.sass
 - lib/template/dynamic/index.haml
-- lib/template/dynamic/layout.haml
 - lib/template/helpers.rb
+- lib/template/layouts/default.haml
 - lib/template/settings.yml
 - lib/template/static/images/frank-med.png
 - lib/template/static/js/frank.js
-- test/helper.rb
-- test/suite.rb
-- test/template/dynamic/_partial.haml
-- test/template/dynamic/builder.builder
-- test/template/dynamic/coffee.coffee
-- test/template/dynamic/erb.erb
-- test/template/dynamic/helper_test.haml
-- test/template/dynamic/index.haml
-- test/template/dynamic/layout.haml
-- test/template/dynamic/layout2.haml
-- test/template/dynamic/layout2_test.haml
-- test/template/dynamic/layout_test.haml
-- test/template/dynamic/liquid.liquid
-- test/template/dynamic/lorem_test.haml
-- test/template/dynamic/markdown.md
-- test/template/dynamic/mustache.mustache
-- test/template/dynamic/partial_test.haml
-- test/template/dynamic/redcloth.textile
-- test/template/dynamic/sass.sass
-- test/template/helpers.rb
-- test/template/settings.yml
-- test/template/static/static.html
-- test/test_base.rb
-- test/test_helpers.rb
-- test/test_output.rb
-- test/test_render.rb
+- spec/base_spec.rb
+- spec/helper.rb
+- spec/output_spec.rb
+- spec/render_spec.rb
+- 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
+- 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/mustache.mustache
+- spec/template/dynamic/nested/child.haml
+- spec/template/dynamic/nested/deeper/deep.haml
+- spec/template/dynamic/no_layout.haml
+- spec/template/dynamic/partial_test.haml
+- spec/template/dynamic/redcloth.textile
+- spec/template/dynamic/refresh.haml
+- spec/template/dynamic/sass.sass
+- spec/template/helpers.rb
+- spec/template/layouts/default.haml
+- spec/template/layouts/explicit/layout2.haml
+- spec/template/layouts/nested/default.haml
+- spec/template/settings.yml
+- spec/template/static/files/static.html
+- spec/template_helpers_spec.rb
 has_rdoc: true
 homepage: http://github.com/blahed/frank
 licenses: []
@@ -177,23 +184,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Stupidly Simple Static Slinger
+summary: Static Site Non-Framework
 test_files: 
-- test/helper.rb
-- test/suite.rb
-- test/template/helpers.rb
-- test/test_base.rb
-- test/test_helpers.rb
-- test/test_output.rb
-- test/test_render.rb
+- spec/base_spec.rb
+- spec/helper.rb
+- spec/output_spec.rb
+- spec/render_spec.rb
+- spec/template/helpers.rb
+- spec/template_helpers_spec.rb

data/lib/frank/imager.rb

@@ -1,39 +0,0 @@
-module Frank
-  begin
-    require 'mini_magick'
-  rescue LoadError
-  end
-
-  class Imager
-  
-    def initialize(app, options={})
-      @app = app
-    end
-  
-    # choose a random image if random is in the query
-    def image_filename(dims, query)      
-      if query.include?('random')
-        "frank#{rand(10)}.jpg"
-      else
-        "frank#{dims.hash.to_s[-1..-1]}.jpg"
-      end  
-    end
-  
-    # catch a request for _img/0x0, get an image, resize it to given dims
-    def call(env)
-      path = env['PATH_INFO']
-      image_path = File.expand_path(File.dirname(__FILE__)) + '/templates/imager/'
-
-      if defined?(MiniMagick) && path.include?('_img')
-        dims = '!' + path.split('/').last.match(/\d+x\d+/i).to_s
-        filename = image_filename(dims, env['QUERY_STRING'])
-      
-        image = MiniMagick::Image.from_file(image_path + filename)
-        image.resize dims
-        return [ 200, { 'Content-Type' => 'image/jpg' }, image.to_blob ] 
-      end
-      @app.call(env)
-    end
- 
-  end
-end

data/lib/frank/statik.rb

@@ -1,39 +0,0 @@
-module Frank
-  class Statik
- 
-    def initialize(app, options={})
-      @app = app
-      frank_root = File.expand_path(File.dirname(__FILE__)) + '/templates'
-      root = options[:root] || Dir.pwd
-      @frank_server = Rack::File.new(frank_root)
-      @static_server = Rack::File.new(root)
-    end
- 
-    # handles serving from __frank__
-    # looks for static access, if not found,
-    # passes request to frank
-    def call(env)
-      path = env['PATH_INFO'].dup
- 
-      if path.include? '__frank__'
-        env['PATH_INFO'].gsub!('/__frank__', '')
-        result = @frank_server.call(env)
-      else
-        env['PATH_INFO'] << '/' unless path.match(/(\.\w+|\/)$/)
-        env['PATH_INFO'] << 'index.html' if path[-1..-1] == '/'
-        result = @static_server.call(env)
-      end
-      
-      # return if static assets found
-      # else reset the path and pass to frank
-      if result[0] == 200
-        result
-      else
-        env['PATH_INFO'] = path
-        @app.call(env)
-      end
-      
-    end
- 
-  end
-end