snack 0.1 → 0.2.1

data/bin/snack

@@ -1,15 +1,21 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../lib/snack', __FILE__)
 
-command = ARGV[0] || 'serve'
-directory = ARGV[1] || '_source'
+cmd = ARGV[0] || 'serve'
+dir = ARGV[1] || '_source'
+puts "-: Snack :- App root is: '#{dir}'"
 
-if %w[ build serve new ].include?(command)
-  abort "-: Snack :- Unable to locate: '#{directory}'" unless command == 'new' || File.exists?(directory)
-  puts "-: Snack :- App root is: '#{directory}'"
-  @app = Snack::Application.new(:root => directory)
-  @app.send(command)
+case cmd
+when 'new'
+  require 'fileutils'
+  File.open(File.join(FileUtils.mkpath(dir), 'index.html'), 'w') do |f|
+    f.puts 'Hello from snack!'
+  end
+when 'build', 'serve'
+  abort "-: Snack :- Unable to locate: '#{dir}'" unless Dir.exists?(dir)
+  @app = Snack::Application.new(:root => dir)
+  @app.send cmd
 else
-  puts "'#{command}' is not a valid snack command"
-  puts "Usage: snack {build,serve,new} <directory>"
+  puts "'#{cmd}' is not a valid snack command"
+  puts 'Usage: snack (build,serve,new) <directory>'
 end

data/lib/snack.rb

@@ -1,12 +1,12 @@
-%w[ rubygems ostruct rack tilt ].each{ |s| require s }
+%w[ rack tilt ].each { |s| require s }
 
 module Snack
   class Application
     attr_accessor :settings, :builder
 
     def initialize(options = {})
-      @settings = OpenStruct.new(options)
-      @settings.output_dir ||= '../'
+      @settings = options
+      @settings[:output_dir] ||= '../'
 
       app = self
       @builder = Rack::Builder.new do
@@ -17,40 +17,27 @@ module Snack
       end
     end
 
-    def method_missing(sym)
-      settings.send sym
-    end
-
     def serve
       Rack::Handler::Thin.run @builder, :Port => 9393
     end
 
-    def new
-      FileUtils.mkdir root unless File.exists? root
-      FileUtils.cd root do
-        File.open('index.html.haml', 'w') { |f| f.puts 'Hello from snack!' }
-      end
-    end
-
     def build
-      FileUtils.cd root do
+      FileUtils.cd @settings[:root] do
         # collect all files that don't start with '_'
-        files = Dir[File.join('**', '*')].reject{ |f| f.include?('/_') || f.start_with?('_') }
+        files = Dir[File.join('**', '*')].reject { |f| f =~ /(^_|\/_)/ }
 
         files.each do |file|
-          new_path = File.join(output_dir, file)
+          path = File.join @settings[:output_dir], file
 
-          if File.directory?(file)
-            FileUtils.mkdir(new_path) unless File.exists?(new_path)
-          elsif Tilt.registered?(File.extname(file).gsub('.', ''))
+          if Tilt[path]
             body = View.new(file).render
-            new_path = new_path.gsub(File.extname(new_path), '') # trim template extension
-            File.open(new_path, 'w') { |f| f.write(body) }
+            File.open(path.chomp(File.extname(path)), 'w') { |f| f.write body }
+          elsif Dir.exists? file
+            FileUtils.mkpath path
           else
-            FileUtils.cp(file, new_path)
+            FileUtils.cp file, path
           end
         end
-        
       end
     end
   end
@@ -61,46 +48,38 @@ module Snack
     end
 
     def call(env)
-      body = render File.join(@app.root, env['PATH_INFO'])
+      body = render File.join(@app.settings[:root], env['PATH_INFO'])
       if body
-        [200, {"Content-Type" => Rack::Mime.mime_type(File.extname(env['PATH_INFO']), 'text/html')}, [body]]
+        [200, { 'Content-Type' => Rack::Mime.mime_type(File.extname(env['PATH_INFO']), 'text/html') }, [body]]
       else
-        [404, {"Content-Type" => "text/plain"}, "Not Found"]
+        [404, { 'Content-Type' => 'text/plain' }, 'Not Found']
       end
     end
 
-    def render(template_path)
-      return File.read template_path if File.file? template_path
+    def render(path)
+      return File.read path if File.file? path
 
       # default to index if path to directory
-      template_path = File.join(template_path, 'index') if File.directory? template_path
+      path = File.join(path, 'index') if Dir.exists? path
 
       # return the first filename that matches file
-      template = Dir[File.join(template_path + '*')].first
+      template = Dir[File.join("#{path}*")].first
       return View.new(template).render if template
     end
-
   end
 
-  # Basically take a template and render a string from it
   class View
     def initialize(template)
       @template = template
     end
 
-    # return the path to a valid layout file
-    def layout
-      Dir[File.join(File.dirname(@template), @layout) + '*'].first if @layout
-    end
-
     def partial(path, locals = {})
-      pieces = path.to_s.split('/')
-      name = '_' + pieces.pop
-      filepath = File.join(File.dirname(@template), pieces, name)
-      template = Dir[filepath + '*'].first
+      filepath = File.join File.dirname(@template), path.to_s
+      # insert a '_' before the filename before we search
+      _partial = Dir["#{filepath.sub(/\/(?!.*\/)/, '/_')}*"].first
 
-      if template
-        Tilt.new(template).render(self, locals)
+      if _partial
+        Tilt.new(_partial).render(self, locals)
       else
         raise "-: Snack :- Unable to locate partial at: '#{filepath}'"
       end
@@ -109,10 +88,10 @@ module Snack
     # return a view body or nil if adequate template cannot be found
     def render
       template_body = Tilt.new(@template).render(self)
-      if layout
+      if @layout
+        layout = Dir[File.join(File.dirname(@template), @layout) + '*'].first
+        raise "-: Snack :- Unable to locate layout at: '#@layout'" unless layout
         @body = Tilt.new(layout).render(self) { template_body }
-      elsif @layout # user changed; alert them to fails
-        raise "-: Snack :- Unable to locate layout at: '#{@layout}'"
       end
       @body || template_body
     end

data/test/snack_test.rb

@@ -1,5 +1,5 @@
+# use 'turn test/snack_test.rb' for pretty output
 # TODO: test build and new commands?
-require 'rubygems'
 require 'minitest/spec'
 require 'rack/test'
 require File.expand_path('../../lib/snack', __FILE__)
@@ -13,27 +13,27 @@ describe Snack::Server do
     @app = Snack::Application.new(:root => "#{File.dirname(__FILE__)}/test_app").builder
   end
 
-  it "should respond with 404 on bad requests" do
+  it 'should respond with 404 on bad requests' do
     get('/foo')
     last_response.status.must_equal 404
   end
 
-  it "should serve file directly first if a file matches the request" do
+  it 'should serve static file directly first' do
     get('/public/style.css')
     last_response.body.must_equal "body {\n\tbackground: blue;\n}"
   end
 
-  it "should serve sass files compiled through tilt if request path exists with sass extension" do
+  it 'should compile and serve sass files' do
     get('/public/sass_style.css')
     last_response.body.must_equal "body {\n  background: blue; }\n"
   end
 
-  it "should serve coffeescript files compiled through tilt if request path exists with coffee extension" do
+  it 'should serve coffeescript files compiled through tilt if request path exists with coffee extension' do
     get('/public/application.js')
-    last_response.body.must_equal "(function() {\n  $(document).ready(function() {\n    return alert('hello from snack');\n  });\n})();\n"
+    last_response.body.must_equal "(function() {\n\n  $(document).ready(function() {\n    return alert('hello from snack');\n  });\n\n}).call(this);\n"
   end
 
-  it "should default to index.html if directory is requested" do
+  it 'should default to index.html if directory is requested' do
     direct = get('/index.html')
     response = get('/')
 
@@ -42,31 +42,31 @@ describe Snack::Server do
   end
 
   # partials
-  it "should render partials if found" do
+  it 'should render partials if found' do
     get('/pages/partial-normal.html')
     last_response.body.must_equal "This is a partial!\n"
   end
 
-  it "should error if partial not found" do
+  it 'should error if partial not found' do
     get('/pages/partial-failing.html')
     last_response.status.must_equal 500
   end
 
   # layouts
-  it "should render a page within a layout if layout exists" do
+  it 'should render a page within a layout if layout exists' do
     get('/pages/layout-normal.html')
     last_response.body.must_equal "<div id='content'>\n  <h1>Page Content</h1>\n</div>\n"
   end
 
-  it "should error if user set layout and layout not found" do
+  it 'should error if user set layout and layout not found' do
     get('/pages/layout-failing.html')
     last_response.status.must_equal 500
   end
 
   # variables
-  it "should pass variables defined in the page to the layout" do
+  it 'should pass variables defined in the page to the layout' do
     get('/pages/variable-normal.html')
     last_response.body.must_equal "happy\nsad\nmad\n"
   end
 
-end
+end

data/test/test_app/index.html.haml

@@ -1,2 +1,35 @@
 - @layout = nil
-%h1 Just Testing
+%h1 Snack Tests
+
+%h2 Snack::Server
+%h3 Basic
+%ul
+  %li
+    %a{:href => '/foo'} should respond with 404 on bad requests
+  %li
+    %a{:href => '/public/style.css'} should serve static file directly first
+  %li
+    %a{:href => '/public/sass_style.css'} should compile and serve sass files
+  %li
+    %a{:href => '/public/application.js'} should serve coffeescript files compiled through tilt if request path exists with coffee extension
+  %li
+    %a{:href => '/'} should default to index.html if directory is requested
+
+%h3 Partials
+%ul
+  %li
+    %a{:href => '/pages/partial-normal.html'} should render partials if found
+  %li
+    %a{:href => '/pages/partial-failing.html'} should error if partial not found
+
+%h3 Layouts
+%ul
+  %li
+    %a{:href => '/pages/layout-normal.html'} should render a page within a layout if layout exists
+  %li
+    %a{:href => '/pages/layout-failing.html'} should error if user set layout and layout not found
+
+%h3 Variables
+%ul
+  %li
+    %a{:href => '/pages/variable-normal.html'} should pass variables defined in the page to the layout

data/test/test_app/pages/_layouts/normal.html.haml

@@ -1,2 +1,2 @@
 #content
-	= yield
+  = yield

data/test/test_app/pages/_layouts/variable.html.haml

@@ -1,2 +1,2 @@
 - @emotions.each do |emotion|
-	= emotion
+  = emotion

data/test/test_app/pages/variable-normal.html.haml

@@ -1,2 +1,2 @@
 - @layout = '_layouts/variable'
-- @emotions = %w[happy sad mad]
+- @emotions = %w[ happy sad mad ]

data/test/test_app/public/application.js.coffee

@@ -1,2 +1 @@
-$(document).ready () ->
-	alert('hello from snack')
+$(document).ready () -> alert('hello from snack')

metadata

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: snack
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  version: "0.1"
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Rob Law
@@ -13,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -07:00
-default_executable: snack
+date: 2012-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -24,10 +20,8 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -37,23 +31,19 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: coffee-script
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -63,28 +53,22 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 11
         version: 2.2.11
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: coffee-script
+  name: minitest
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
 description: Snack is a small framework for building static websites.
-email: rob@varietyour.com
+email: rob@robmadethis.com
 executables: 
 - snack
 extensions: []
@@ -108,8 +92,7 @@ files:
 - test/test_app/public/application.js.coffee
 - test/test_app/public/sass_style.css.sass
 - test/test_app/public/style.css
-has_rdoc: true
-homepage: http://github.com/robinator/snack/
+homepage: http://robmadethis.com/snack
 licenses: []
 
 post_install_message: 
@@ -122,25 +105,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A static website framework.