spohlenz-sassic 0.2.3 → 0.2.4

data/Rakefile

@@ -0,0 +1,9 @@
+require 'echoe'
+
+Echoe.new('sassic', '0.2.4') do |p|
+  p.author = "Sam Pohlenz"
+  p.email = "sam@sampohlenz.com"
+  p.description = "Sassic is a simple framework for creating static web sites using SASS stylesheets."
+  p.url = "http://github.com/spohlenz/sassic"
+  p.runtime_dependencies = [ "hpricot", "haml", "rack", "mongrel" ]
+end

data/lib/sassic/handlers.rb

@@ -0,0 +1,4 @@
+module Sassic::Handlers; end
+
+require File.dirname(__FILE__) + '/handlers/template'
+require File.dirname(__FILE__) + '/handlers/stylesheet'

data/lib/sassic/handlers/stylesheet.rb

@@ -0,0 +1,22 @@
+require 'sass'
+
+class Sassic::Handlers::StylesheetHandler
+  def call(env)
+    sass = Dir::pwd + '/sass' + env['PATH_INFO'].sub(/\.css$/, '.sass')
+    
+    # Ensure logger shows correct path
+    env['PATH_INFO'] = env['REQUEST_URI']
+    
+    if File.exists?(sass)
+      [200, { 'Content-Type' => 'text/css' }, sassify(sass)]
+    else
+      env['rack.showstatus.detail'] = "Missing file #{sass}"
+      [404, {}, '']
+    end
+  end
+
+private
+  def sassify(file)
+    Sass::Engine.new(File.read(file), :style => :expanded, :load_paths => Dir::pwd + '/sass').render
+  end
+end

data/lib/sassic/handlers/template.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/../page'
+
+class Sassic::Handlers::TemplateHandler
+  def call(env)
+    path = env['PATH_INFO'].sub(/^\//, '')
+    page = Sassic::Page.new(path == '' ? 'index' : path)
+    
+    if page.exists?
+      [200, { 'Content-Type' => 'text/html' }, page.render]
+    else
+      env['rack.showstatus.detail'] = "Missing template #{page.template_path}"
+      [404, {}, '']
+    end
+  end
+end

data/lib/sassic/page.rb

@@ -13,7 +13,7 @@ class Sassic::Page
     end
   end
   
-  def template_path(template)
+  def template_path(template=@template)
     Dir::pwd + '/templates/' + template + '.html.erb'
   end
   

data/lib/sassic/server.rb

@@ -1,30 +1,48 @@
-require 'webrick'
+require 'rack'
 
-require File.dirname(__FILE__) + '/servlets'
+require File.dirname(__FILE__) + "/handlers"
 
 class Sassic::Server
-  include WEBrick
-  
   def initialize(port=2000)
     @port = port
   end
   
   def start(options={})
-    s = HTTPServer.new(options.merge(:Port => @port))
-    setup_mount_points(s)
-    trap("INT") { s.shutdown }
-    s.start
+    puts "Started Sassic server on port #{@port}."
+    handler.run app, :Port => @port
   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::TemplateServlet)
+  def app
+    Rack::Builder.new {
+      use Rack::CommonLogger
+      use Rack::ShowExceptions
+      use Rack::ShowStatus
+      
+      use Rack::Static, :urls => [ "/images", "/javascripts" ]
+      
+      map '/' do
+        run Sassic::Handlers::TemplateHandler.new
+      end
+      
+      map '/stylesheets' do
+        run Sassic::Handlers::StylesheetHandler.new
+      end
+    }
   end
   
-  def setup_static_mount_point(s, folder)
-    s.mount(folder, HTTPServlet::FileHandler, Dir::pwd + folder)
+  def handler
+    Rack::Handler::Mongrel
   end
+  
+  # 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::TemplateServlet)
+  # end
+  # 
+  # def setup_static_mount_point(s, folder)
+  #   s.mount(folder, HTTPServlet::FileHandler, Dir::pwd + folder)
+  # end
 end

data/sassic.gemspec

@@ -1,36 +1,48 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
-  s.name = "sassic"
-  s.version = "0.2.3"
-  s.date = "2008-11-19"
-  
-  s.authors = [ "Sam Pohlenz" ]
-  s.email = "sam@sampohlenz.com"
-  s.homepage = "http://github.com/spohlenz/sassic"
-  
-  s.summary = "Simply Ruby web framework with SASS support"
-  s.description = "Sassic is a simple framework for creating static web sites using SASS stylesheets."
-  
-  s.has_rdoc = false
-  
-  s.files = [ "README", 
-		          "sassic.gemspec",
-		          "lib/sassic/exec.rb",
-		          "lib/sassic/files/index.html.erb",
-		          "lib/sassic/files/layout.html.erb",
-		          "lib/sassic/files/screen.sass",
-		          "lib/sassic/generator.rb",
-		          "lib/sassic/page.rb",
-		          "lib/sassic/server.rb",
-		          "lib/sassic/servlets/template.rb",
-		          "lib/sassic/servlets/sass.rb",
-		          "lib/sassic/servlets.rb",
-		          "lib/sassic/builder.rb",
-		          "lib/sassic/tasks.rb",
-		          "lib/sassic.rb",
-		          "bin/sassic" ]
-		
-	s.executables = ['sassic']
-  
-  s.add_dependency("hpricot", ["> 0.6"])
-  s.add_dependency("haml", ["> 2.0.0"])
+  s.name = %q{sassic}
+  s.version = "0.2.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sam Pohlenz"]
+  s.date = %q{2008-11-20}
+  s.default_executable = %q{sassic}
+  s.description = %q{Sassic is a simple framework for creating static web sites using SASS stylesheets.}
+  s.email = %q{sam@sampohlenz.com}
+  s.executables = ["sassic"]
+  s.extra_rdoc_files = ["bin/sassic", "lib/sassic/builder.rb", "lib/sassic/exec.rb", "lib/sassic/files/index.html.erb", "lib/sassic/files/layout.html.erb", "lib/sassic/files/screen.sass", "lib/sassic/generator.rb", "lib/sassic/handlers/stylesheet.rb", "lib/sassic/handlers/template.rb", "lib/sassic/handlers.rb", "lib/sassic/page.rb", "lib/sassic/server.rb", "lib/sassic/tasks.rb", "lib/sassic.rb", "README"]
+  s.files = ["bin/sassic", "lib/sassic/builder.rb", "lib/sassic/exec.rb", "lib/sassic/files/index.html.erb", "lib/sassic/files/layout.html.erb", "lib/sassic/files/screen.sass", "lib/sassic/generator.rb", "lib/sassic/handlers/stylesheet.rb", "lib/sassic/handlers/template.rb", "lib/sassic/handlers.rb", "lib/sassic/page.rb", "lib/sassic/server.rb", "lib/sassic/tasks.rb", "lib/sassic.rb", "Rakefile", "README", "sassic.gemspec", "Manifest"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/spohlenz/sassic}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sassic", "--main", "README"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{sassic}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Sassic is a simple framework for creating static web sites using SASS stylesheets.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_runtime_dependency(%q<mongrel>, [">= 0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<mongrel>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<mongrel>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spohlenz-sassic
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -9,26 +9,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-19 00:00:00 -08:00
-default_executable: 
+date: 2008-11-20 00:00:00 -08:00
+default_executable: sassic
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0"
     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: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mongrel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 description: Sassic is a simple framework for creating static web sites using SASS stylesheets.
 email: sam@sampohlenz.com
@@ -36,30 +63,51 @@ executables:
 - sassic
 extensions: []
 
-extra_rdoc_files: []
-
-files: 
-- README
-- sassic.gemspec
+extra_rdoc_files: 
+- bin/sassic
+- lib/sassic/builder.rb
 - lib/sassic/exec.rb
 - lib/sassic/files/index.html.erb
 - lib/sassic/files/layout.html.erb
 - lib/sassic/files/screen.sass
 - lib/sassic/generator.rb
+- lib/sassic/handlers/stylesheet.rb
+- lib/sassic/handlers/template.rb
+- lib/sassic/handlers.rb
 - lib/sassic/page.rb
 - lib/sassic/server.rb
-- lib/sassic/servlets/template.rb
-- lib/sassic/servlets/sass.rb
-- lib/sassic/servlets.rb
-- lib/sassic/builder.rb
 - lib/sassic/tasks.rb
 - lib/sassic.rb
+- README
+files: 
 - bin/sassic
-has_rdoc: false
+- lib/sassic/builder.rb
+- lib/sassic/exec.rb
+- lib/sassic/files/index.html.erb
+- lib/sassic/files/layout.html.erb
+- lib/sassic/files/screen.sass
+- lib/sassic/generator.rb
+- lib/sassic/handlers/stylesheet.rb
+- lib/sassic/handlers/template.rb
+- lib/sassic/handlers.rb
+- lib/sassic/page.rb
+- lib/sassic/server.rb
+- lib/sassic/tasks.rb
+- lib/sassic.rb
+- Rakefile
+- README
+- sassic.gemspec
+- Manifest
+has_rdoc: true
 homepage: http://github.com/spohlenz/sassic
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Sassic
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -72,14 +120,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: sassic
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Simply Ruby web framework with SASS support
+summary: Sassic is a simple framework for creating static web sites using SASS stylesheets.
 test_files: []
 

data/lib/sassic/servlets.rb

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

data/lib/sassic/servlets/sass.rb

@@ -1,17 +0,0 @@
-require 'sass'
-
-class Sassic::Servlets::SassServlet < WEBrick::HTTPServlet::AbstractServlet
-  def do_GET(req, res)
-    sass = Dir::pwd + req.path.sub('/stylesheets', '/sass').sub(/\.css$/, '.sass')
-    
-    if File.exists?(sass)
-      res.body = sassify(sass)
-    else
-      res.status = 404
-    end
-  end
-  
-  def sassify(file)
-    Sass::Engine.new(File.read(file), :style => :expanded, :load_paths => Dir::pwd + '/sass').render
-  end
-end

data/lib/sassic/servlets/template.rb

@@ -1,14 +0,0 @@
-require File.dirname(__FILE__) + '/../page'
-
-class Sassic::Servlets::TemplateServlet < 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