frank 0.2.0 → 0.2.1

data/README.md

@@ -137,13 +137,7 @@ Configuration
 In `settings.yml`, you can change your folder names, and server port & host name.
 Check the comments there if you need help.
 
-Once you've gotten comfortable with Frank, you will probably no longer want
-the example files included whenever you start a new project. You may also have
-preferred folder names, and languages that you always want to start
-projects with.
-
-To do this, create a new base project. Then just copy your base project to `~/.frank`.
-This folder will then be copied for you whenever you run the `frank` command.
+(NOTE: In order to reduce confusion, Frank no longer checks for a `~/.frank` folder to copy when you run the `frank` command. Instead, the preferred method is just to create a base Frank project wherever you please, and just `cp -r` to the location of your new project, since this is all the `frank` command did anyway)
   
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/frank.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
      "lib/frank/templates/imager/frank6.jpg",
      "lib/frank/templates/imager/frank7.jpg",
      "lib/frank/templates/imager/frank8.jpg",
-     "lib/frank/templates/imager/frank9.png",
+     "lib/frank/templates/imager/frank9.jpg",
      "lib/frank/tilt.rb",
      "lib/template/dynamic/css/frank.sass",
      "lib/template/dynamic/index.haml",

data/lib/frank/base.rb

@@ -120,7 +120,7 @@ module Frank
       
       TMPL_EXTS[ kind.nil? ? :html : kind.intern ].each do |ext|
         tmpl = "#{(name||'')}.#{ext}"
-        default = File.join((name||''), "#{@templates['default']}.#{ext}")
+        default = File.join((name||''), "index.#{ext}")
         
         if File.exists? File.join(@proj_dir, @dynamic_folder, tmpl)
           tmpl_ext = [tmpl, ext] 

data/lib/frank/rescue.rb

@@ -3,7 +3,7 @@ module Frank
     
     def render_404
       template = File.expand_path(File.dirname(__FILE__)) + '/templates/404.haml'
-      locals = { :request => @env, :dynamic_folder => @dynamic_folder }
+      locals = { :request => @env, :dynamic_folder => @dynamic_folder, :static_folder => @static_folder }
 
       @response['Content-Type'] = 'text/html'
       @response.status = 404

data/lib/frank/statik.rb

@@ -13,16 +13,26 @@ module Frank
     # looks for static access, if not found,
     # passes request to frank
     def call(env)
-      path = env['PATH_INFO']
+      path = env['PATH_INFO'].dup
  
       if path.include? '__frank__'
         env['PATH_INFO'].gsub!('/__frank__', '')
         result = @frank_server.call(env)
-      elsif path.index('/') == 0
+      else
+        env['PATH_INFO'] << '/' unless path.match(/(\.\w+|\/)$/)
+        env['PATH_INFO'] << 'index.html' if path[-1..-1] == '/'
         result = @static_server.call(env)
       end
-      return result if result[0] == 200
-      @app.call(env)
+      
+      # 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

data/lib/frank/templates/404.haml

@@ -13,4 +13,21 @@
     #wrapper
       %img{:src=>'/__frank__/frank-404.png'}
       %h1= "Not Found—"
-      %p= "Try creating <tt>#{request['REQUEST_PATH'][1..-1] if request['REQUEST_PATH']}.haml</tt> in the <tt>#{dynamic_folder}</tt> folder."
+      %p
+        - if request['REQUEST_PATH']
+          - path = request['REQUEST_PATH'][1..-1]
+          = "Try creating"
+          
+          - if path.match(/\.css$/)
+            = "<tt>#{path.match(/([\w\/]+)\./)[1]}.sass</tt>"
+          - elsif path.match(/\.js$/)
+            = "<tt>#{path.match(/([\w\/]+)\./)[1]}.coffee</tt>"
+          - else
+            = "<tt>#{path.gsub(/\/$/, '')}.haml</tt>"
+          = "in the <tt>#{dynamic_folder}</tt> folder, or"
+          
+          - if path.match(/\.\w+/)
+            = "<tt>#{path}</tt>"
+          - else
+            = "<tt>#{path.gsub(/\/$/, '')}.html</tt>"
+          = "in the <tt>#{static_folder}</tt> folder."

data/lib/template/settings.yml

@@ -24,7 +24,6 @@ server:
   hostname: 0.0.0.0
   port: 3601
 
-
 # ----------------------
 #  Static folder:
 #
@@ -44,9 +43,6 @@ dynamic_folder: dynamic
 # ----------------------
 #  Templates:
 #
-# 'default' is the optional default template to
-#  serve from a folder (include the root folder)
-#
 # 'layouts' is a list of layouts to use, where
 # 'name' is the filename (without extension).
 #  You can also use multiple layouts, and limit
@@ -56,7 +52,6 @@ dynamic_folder: dynamic
 #      - name: normal
 #        not: [blog, ajax]
 templates:
-    default: index
     layouts:
         - name: layout
 

data/test/template/settings.yml

@@ -45,9 +45,6 @@ dynamic_folder: dynamic
 # ----------------------
 #  Templates:
 #
-# 'default' is the optional default template to
-#  serve from a folder (include the root folder)
-#
 # 'layouts' is a list of layouts to use, where
 # 'name' is the filename (without extension).
 #  You can also use multiple layouts, and limit
@@ -57,8 +54,6 @@ dynamic_folder: dynamic
 #      - name: normal
 #        not: [blog, ajax]
 templates:
-    extension: haml
-    default: index
     layouts:
         - name: layout
           not: [builder, erb, liquid, markdown, mustache, redcloth]

data/test/test_helpers.rb

@@ -43,7 +43,7 @@ class TestBase < Test::Unit::TestCase
       
       should 'render image url using imager' do
         template = @frank.render_path('lorem_test.haml')
-        reg = /<img src='\/_img\/400x300.jpg\?random' \/>/
+        reg = /<img src='\/_img\/400x300.jpg\?random\d{5}' \/>/
         assert_match reg, template
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - blahed
@@ -105,7 +105,7 @@ files:
 - lib/frank/templates/imager/frank6.jpg
 - lib/frank/templates/imager/frank7.jpg
 - lib/frank/templates/imager/frank8.jpg
-- lib/frank/templates/imager/frank9.png
+- lib/frank/templates/imager/frank9.jpg
 - lib/frank/tilt.rb
 - lib/template/dynamic/css/frank.sass
 - lib/template/dynamic/index.haml