spohlenz-sassic 0.1 → 0.2

data/lib/sassic/exec.rb

@@ -10,7 +10,8 @@ class Sassic::Exec
       Sassic::Tasks.generate(target)
     else
       # Start server
-      Sassic::Server.new(options[:port] && options[:port] > 0 ? options[:port] : 2000).start
+      port = options[:port] && options[:port] > 0 ? options[:port] : 2000
+      Sassic::Server.new(port).start
     end
   end
 

data/lib/sassic/page.rb

@@ -3,11 +3,14 @@ require 'erb'
 class Sassic::Page
   def initialize(template)
     @template = template
-    @template_content = File.read(template_path(template)) if exists?
-    @layout_content = File.read(layout_path)
     
-    # Preparse template content
-    content
+    if exists?
+      @template_content = File.read(template_path(template))
+      @layout_content = File.read(layout_path)
+    
+      # Preparse template content
+      content
+    end
   end
   
   def template_path(template)

data/lib/sassic/server.rb

@@ -9,19 +9,19 @@ class Sassic::Server
     @port = port
   end
   
-  def start
-    s = HTTPServer.new(:Port => @port)
+  def start(options={})
+    s = HTTPServer.new(options.merge(:Port => @port))
     setup_mount_points(s)
     trap("INT") { s.shutdown }
     s.start
   end
-
+  
 private
   def setup_mount_points(s)
     setup_static_mount_point(s, '/javascripts')
     setup_static_mount_point(s, '/images')
     s.mount("/stylesheets", Sassic::Servlets::SassServlet)
-    s.mount("/", Sassic::Servlets::LayoutServlet)
+    s.mount("/", Sassic::Servlets::TemplateServlet)
   end
   
   def setup_static_mount_point(s, folder)

data/lib/sassic/servlets.rb

@@ -1,4 +1,4 @@
 module Sassic::Servlets; end
 
-require File.dirname(__FILE__) + '/servlets/layout'
+require File.dirname(__FILE__) + '/servlets/template'
 require File.dirname(__FILE__) + '/servlets/sass'

data/lib/sassic/tasks.rb

@@ -4,11 +4,7 @@ module Sassic::Tasks
   end
   
   def self.build(options={})
-    port = options[:port] || 2000
-    
-    # TODO: Start a new server
-    
-    # Run builder
+    port = options[:port] && options[:port] > 0 ? options[:port] : 2000
     Sassic::Builder.new("http://localhost:#{port}", options).run!
   end
 end

data/sassic.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "sassic"
-  s.version = "0.1"
-  s.date = "2008-09-11"
+  s.version = "0.2"
+  s.date = "2008-09-17"
   
   s.authors = [ "Sam Pohlenz" ]
   s.email = "sam@sampohlenz.com"
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
 		
 	s.executables = ['sassic']
   
-  #s.add_dependency("diff-lcs", ["> 0.0.0"])
-  #s.add_dependency("mime-types", ["> 0.0.0"])
-  #s.add_dependency("open4", ["> 0.0.0"])
+  s.add_dependency("hpricot", ["> 0.6"])
+  s.add_dependency("haml", ["> 2.0.0"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spohlenz-sassic
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -9,10 +9,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-11 00:00:00 -07:00
+date: 2008-09-17 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
+    version: 
 description: Sassic is a simple framework for creating static web sites using SASS stylesheets.
 email: sam@sampohlenz.com
 executables: 

data/lib/sassic/servlets/layout.rb

@@ -1,14 +0,0 @@
-require File.dirname(__FILE__) + '/../page'
-
-class Sassic::Servlets::LayoutServlet < WEBrick::HTTPServlet::AbstractServlet
-  def do_GET(req, res)
-    page = Sassic::Page.new(req.path == '/' ? 'index' : req.path.sub(/^\//, ''))
-    
-    if page.exists?
-      res.body = page.render
-    else
-      res.status = 404
-      res.body = "<h1>404 Not Available</h1>"
-    end
-  end
-end