awestruct 0.1.1 → 0.1.2

data/lib/awestruct/commands/server.rb

@@ -1,10 +1,9 @@
-require 'mongrel'
+require 'webrick'
 
 module Awestruct
   module Commands
 
-    #Mongrel::DirHandler::MIME_TYPES['.atom'] = 'text/plain'
-    Mongrel::DirHandler::MIME_TYPES['.atom'] = 'application/atom+xml'
+    WEBrick::HTTPUtils::DefaultMimeTypes.store('atom', 'application/atom+xml')
 
     class Server
       attr_reader :server
@@ -16,11 +15,8 @@ module Awestruct
       end
 
       def run
-        @server = Mongrel::HttpServer.new( @bind_addr, @port )
-        handler = Mongrel::DirHandler.new( @path )
-        @server.register("/", handler )
-        $stderr.puts "Launching server on http://#{@bind_addr}:#{@port}/"
-        @server.run.join
+        @server = WEBrick::HTTPServer.new( :DocumentRoot=>@path, :Port=>@port, :BindAddress=>@bind_addr )
+        @server.start
       end
     end
   end

data/lib/awestruct/engine.rb

@@ -235,6 +235,7 @@ module Awestruct
     end
 
     def load_layouts
+      site.layouts.clear
       dir_pathname = Pathname.new( dir )
       Dir[ File.join( dir, config.layouts_dir, '*.haml' ) ].each do |layout_path|
         layout_pathname = Pathname.new( layout_path )
@@ -380,7 +381,7 @@ module Awestruct
         skin_pipeline_file = File.join( skin_ext_dir, 'pipeline.rb' )
         if ( File.exists?( skin_pipeline_file ) )
           skin_pipeline = eval File.read( skin_pipeline_file )
-          @helpers = skin_pipeline.helpers || []
+          @helpers = ( @helpers + skin_pipeline.helpers || [] ).flatten
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 -04:00
+date: 2010-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: bluecloth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -89,7 +89,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mongrel
+  name: org-ruby
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,20 +102,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: org-ruby
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id007
 description: 
 email: bob@mcwhirter.org
 executables: