awestruct 0.4.2.x8 → 0.4.2.x9

data/lib/awestruct/cli/auto.rb

@@ -16,13 +16,8 @@ module Awestruct
         listener.ignore( %r(^#{File.basename( @config.tmp_dir )}) )
         listener.ignore( %r(^#{File.basename( @config.output_dir )}) )
         listener.change do |modified, added, removed|
-          puts "modified #{modified.inspect}"
-          puts "added #{added.inspect}"
-          puts "removed #{removed.inspect}"
           modified.each do |path|
             engine = ::Awestruct::Engine.instance
-            puts "path -> #{path}"
-            puts "bn -> #{File.basename( engine.config.output_dir )}"
             unless ( path =~ %r(#{File.basename( engine.config.output_dir) }) || path =~ /.awestruct/ )
               engine.generate_page_by_output_path( path )
             end

data/lib/awestruct/cli/server.rb

@@ -1,10 +1,12 @@
-require 'webrick'
+#require 'webrick'
+require 'thin'
+require 'awestruct/rack/app'
 
 module Awestruct
   module CLI
 
-    WEBrick::HTTPUtils::DefaultMimeTypes.store('atom', 'application/atom+xml')
-    WEBrick::HTTPUtils::DefaultMimeTypes.store('appcache', 'text/cache-manifest')
+    #WEBrick::HTTPUtils::DefaultMimeTypes.store('atom', 'application/atom+xml')
+    #WEBrick::HTTPUtils::DefaultMimeTypes.store('appcache', 'text/cache-manifest')
 
     class Server
       attr_reader :server
@@ -16,6 +18,11 @@ module Awestruct
       end
 
       def run
+        @server = Thin::Server.new( '0.0.0.0', @port, Awestruct::Rack::App.new( @path ) )
+        @server.start
+      end
+
+      def run_webrick
         @server = WEBrick::HTTPServer.new( :DocumentRoot=>@path, :Port=>@port, :BindAddress=>@bind_addr )
         @server.start
       end

data/lib/awestruct/rack/app.rb

@@ -0,0 +1,63 @@
+
+module Awestruct
+  module Rack
+
+    class App
+      def initialize(doc_root)
+        @doc_root = doc_root
+      end
+
+      def call(env)
+        path = env['REQUEST_PATH']
+        fs_path = File.join( @doc_root, path )
+        
+        if ( File.directory?( fs_path ) )
+          if ( ! ( path =~ %r(/$) ) )
+            return [ 301,
+                     { :location=>path + '/' },
+                     "Redirecting to: #{path}" ]
+          elsif ( File.exist?( File.join( fs_path, 'index.html' ) ) )
+            fs_path = File.join( fs_path, 'index.html' )
+          end
+        end
+
+        if ( File.exist?( fs_path ) )
+          [ 200,
+            {},
+            read_content( fs_path ) ]
+        else
+          [ 404,
+            {},
+            read_error_document(path) ]
+        end
+      end
+
+      def read_error_document( path )
+        doc_path = nil
+        htaccess = File.join( @doc_root, '.htaccess' ) 
+        if ( File.exist?( htaccess ) )
+          File.open( htaccess ).each_line do |line|
+            if ( line =~ %r(^.*ErrorDocument[ \t]+404[ \t]+(.+)$) )
+              doc_path = $1
+            end
+          end
+        end
+        if ( doc_path )
+          fs_doc_path = File.join( @doc_root, doc_path )
+          return read_content( fs_doc_path ) if File.exist?( fs_doc_path ) 
+        end
+        "404: Not Found: #{path}"
+      end
+
+
+      def read_content( path )
+        input_stream = IO.open(IO.sysopen(path, "rb"), "rb" )
+        result = input_stream.read
+        return result
+      ensure
+        input_stream.close
+      end
+    end
+
+  end
+end

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.4.2.x8'
+  VERSION='0.4.2.x9'
 end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
+  hash: 756435199
   prerelease: 6
-  version: 0.4.2.x8
+  segments: 
+  - 0
+  - 4
+  - 2
+  - x
+  - 9
+  version: 0.4.2.x9
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -13,203 +20,308 @@ cert_chain: []
 date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 8
+        - 6
         version: 0.8.6
-  type: :runtime
-  prerelease: false
+  name: hpricot
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: haml
+  prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 1
+        - 4
         version: 3.1.4
-  type: :runtime
-  prerelease: false
+  name: haml
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sass
+  prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 3
+        - 1
+        - 15
         version: 3.1.15
-  type: :runtime
-  prerelease: false
+  name: sass
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hashery
+  prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-  type: :runtime
-  prerelease: false
+  name: hashery
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  prerelease: false
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 6
+        - 8
         version: 1.6.8
-  type: :runtime
-  prerelease: false
+  name: rdiscount
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 4
+        - 2
+        - 9
         version: 4.2.9
-  type: :runtime
-  prerelease: false
+  name: RedCloth
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: coffee-script
+  prerelease: false
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-  type: :runtime
-  prerelease: false
+  name: coffee-script
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  prerelease: false
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-  type: :runtime
-  prerelease: false
+  name: nokogiri
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: compass
+  prerelease: false
+  type: :runtime
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 0
+        - 12
+        - 1
         version: 0.12.1
-  type: :runtime
-  prerelease: false
+  name: compass
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: compass-960-plugin
+  prerelease: false
+  type: :runtime
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 10
+        - 4
         version: 0.10.4
-  type: :runtime
-  prerelease: false
+  name: compass-960-plugin
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: bootstrap-sass
+  prerelease: false
+  type: :runtime
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
         version: 2.0.1
-  type: :runtime
-  prerelease: false
+  name: bootstrap-sass
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: org-ruby
+  prerelease: false
+  type: :runtime
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-  type: :runtime
-  prerelease: false
+  name: org-ruby
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: json
+  prerelease: false
+  type: :runtime
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        - 6
         version: 1.6.6
-  type: :runtime
-  prerelease: false
+  name: json
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: notifier
+  prerelease: false
+  type: :runtime
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
-  type: :runtime
-  prerelease: false
+  name: notifier
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: git
+  prerelease: false
+  type: :runtime
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
-  type: :runtime
-  prerelease: false
+  name: git
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: listen
+  prerelease: false
+  type: :runtime
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
-  type: :runtime
-  prerelease: false
+  name: listen
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  prerelease: false
+  type: :runtime
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.9"
-  type: :development
-  prerelease: false
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  name: thin
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: rake
+  prerelease: false
+  type: :development
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.2
-  type: :development
-  prerelease: false
+        hash: 17
+        segments: 
+        - 2
+        - 9
+        version: "2.9"
+  name: rspec
   version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  name: rake
+  version_requirements: *id019
 description: Awestruct is a framework for creating static HTML sites.
 email: bob@mcwhirter.org
 executables: 
@@ -287,6 +399,7 @@ files:
 - lib/awestruct/page.rb
 - lib/awestruct/page_loader.rb
 - lib/awestruct/pipeline.rb
+- lib/awestruct/rack/app.rb
 - lib/awestruct/site.rb
 - lib/awestruct/util/default_inflections.rb
 - lib/awestruct/util/inflector.rb
@@ -313,7 +426,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4586524403344190985
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -322,6 +435,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []