guinness 0.0.2 → 0.1.0

data/bin/guinness

@@ -2,7 +2,7 @@
 
 require File.expand_path('../../lib/guinness', __FILE__)
 
-cmd = ARGV[0] || 'drink'
+cmd = ARGV[0] || 'serve'
 dir = ARGV[1] || '_source'
 puts "#{Guinness::EMOJI} Guinness : App root is: '#{dir}'"
 
@@ -10,17 +10,21 @@ case cmd
 
 when 'new'
   require 'fileutils'
+
   File.open(File.join(FileUtils.mkpath(dir), 'index.html'), 'w') do |f|
     f.puts 'Cheers from Guinness!'
   end
 
-when 'build', 'drink'
+  ["/stylesheets", "/javascripts", "/images"].each do |path|
+    FileUtils.mkdir_p(File.join(dir, path)) unless File.exists?(path)
+  end
+
+when 'serve'
   abort "#{Guinness::EMOJI} Guinness : Unable to locate: '#{dir}'" unless Dir.exists?(dir)
   @app = Guinness::Application.new(root: dir)
-  @app.send cmd
+  @app.send(cmd)
 
 else
   puts "'#{cmd}' is not a valid guinness command"
-  puts 'Usage: guinness (build,drink,new) <directory>'
-
+  puts 'Usage: guinness (serve,new) <directory>'
 end

data/lib/guinness.rb

@@ -5,8 +5,8 @@ require 'tilt'
 
 require "guinness/version"
 require "guinness/application"
-require "guinness/server"
 require "guinness/view"
+require "guinness/server"
 
 module Guinness
   EMOJI = "🍻 "

data/lib/guinness/application.rb

@@ -4,38 +4,19 @@ class Guinness::Application
 
   def initialize(options = {})
     @settings = { output_dir: '../' }.merge options
-
+    
     app = self
-    @builder = Rack::Builder.new do
+    @builder = Rack::Builder.new do |builder|
       use Rack::CommonLogger
       use Rack::ShowStatus      # Nice looking 404s and other messages
       use Rack::ShowExceptions  # Nice looking errors
+      use Rack::Static, :urls => ["/stylesheets", "/javascripts", "/images"]
       run Guinness::Server.new app
     end
   end
 
-  def drink
+  def serve
     Rack::Handler::Thin.run @builder, Port: 9393
   end
 
-  def build
-    FileUtils.cd @settings[:root] do
-      # collect all files that don't start with '_'
-      files = Dir[File.join('**', '*')].reject { |f| f =~ /(^_|\/_)/ }
-
-      files.each do |file|
-        path = File.join @settings[:output_dir], file
-
-        if Tilt[path]
-          body = Guinness::View.new(file).render
-          File.open(path.chomp(File.extname(path)), 'w') { |f| f.write body }
-        elsif Dir.exists? file
-          FileUtils.mkpath path
-        else
-          FileUtils.cp file, path
-        end
-      end
-    end
-  end
-
 end

data/lib/guinness/version.rb

@@ -1,3 +1,3 @@
 module Guinness
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/guinness/view.rb

@@ -4,18 +4,6 @@ class Guinness::View
     @template = template
   end
 
-  def partial(path, locals = {})
-    filepath = File.join File.dirname(@template), path.to_s
-    # insert a '_' before the filename before we search
-    _partial = Dir["#{filepath.sub(/\/(?!.*\/)/, '/_')}*"].first
-
-    if _partial
-      Tilt.new(_partial).render(self, locals)
-    else
-      raise "#{Guinness::EMOJI} Guinness : Unable to locate partial at: '#{filepath}'"
-    end
-  end
-
   # return a view body or nil if adequate template cannot be found
   def render
     template_body = Tilt.new(@template).render(self)

data/test/sampleton/index.html

@@ -0,0 +1 @@
+<h1> Sampleton App </h1>

data/test/spec_helper.rb

@@ -0,0 +1 @@
+require 'minitest/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guinness
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -89,6 +89,8 @@ files:
 - lib/guinness/version.rb
 - lib/guinness/view.rb
 - lib/guinness.rb
+- test/sampleton/index.html
+- test/spec_helper.rb
 homepage: ''
 licenses:
 - MIT