stasis 0.1.13 → 0.1.14

data/README.md

@@ -195,6 +195,12 @@ Development mode (auto-regenerate on save):
 
     $ stasis -d
 
+Specify a port to start an HTTP server:
+
+<!-- highlight:-d language:console -->
+
+    $ stasis -d 3000
+
 Only render specific files or directories:
 
 <!-- highlight:-o language:console -->

data/bin/stasis

@@ -6,7 +6,7 @@ gem "slop", "~> 2.1.0"
 require 'slop'
 
 slop = Slop.parse :help => true do
-  on :d, :development, "Development mode\t\t(auto-regenerate)"
+  on :d, :development, "Development mode\t\t(auto-regenerate)", :optional => true, :as => Integer
   on :o, :only, "Only generate specific files\t(comma-separated)", :optional => true, :as => Array
   on :p, :public, "Public directory path", :optional => true
   on :s, :server, "Server mode\t\t\t(default redis host: localhost:6379/0)", :optional => true, :default => "localhost:6379/0"

data/lib/stasis/dev_mode.rb

@@ -1,6 +1,9 @@
 gem "directory_watcher", "~> 1.4.1"
 require 'directory_watcher'
 
+require 'logger'
+require 'webrick'
+
 class Stasis
   class DevMode
 
@@ -31,7 +34,26 @@ class Stasis
       dw.add_observer { render }
       dw.start
 
-      loop { sleep 1000 }
+      if options[:development]
+        mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
+        mime_types.store 'js', 'application/javascript'
+
+        server = WEBrick::HTTPServer.new(
+          :AccessLog => [ nil, nil ],
+          :DocumentRoot => @stasis.destination,
+          :Logger => WEBrick::Log.new("/dev/null"),
+          :MimeTypes => mime_types,
+          :Port => options[:development] || 3000
+        )
+        
+        ['INT', 'TERM'].each do |signal|
+          trap(signal) { server.shutdown }
+        end
+
+        server.start
+      else
+        loop { sleep 1000 }
+      end
     end
 
     private

data/lib/stasis/plugins/layout.rb

@@ -13,6 +13,7 @@ class Stasis
     # This event triggers before each file renders through Stasis. It sets the `action`
     # layout from the matching layout for `path`.
     def before_render
+      return unless @stasis.path
       @stasis.action._layout = nil
       matches = _match_key?(@layouts, @stasis.path)
       # Find matching layout with same extension.

data/lib/stasis/plugins/priority.rb

@@ -30,7 +30,7 @@ class Stasis
     # `@@priorities` `Hash`, where the key is a path and the value is the priority.
     def priority(hash)
       hash = hash.inject({}) do |hash, (key, value)|
-        force = key[0..0] == '/'
+        force = key[0..0] == '/' if key.is_a?(::String)
         key = @stasis.controller._resolve(key)
         hash[key] = [ @stasis.path, value, force ] if key
         hash

data/stasis.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "stasis"
-  s.version     = '0.1.13'
+  s.version     = '0.1.14'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]
@@ -19,7 +19,10 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
   s.test_files = `cd #{root} && git ls-files -- {features,test,spec}/*`.split("\n")
 
+  s.add_development_dependency "albino"
+  s.add_development_dependency "coffee-script"
   s.add_development_dependency "haml"
+  s.add_development_dependency "nokogiri"
   s.add_development_dependency "rocco"
   s.add_development_dependency "rspec", "~> 1.0"
 

metadata

@@ -1,155 +1,145 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: stasis
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.1.14
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 13
-  version: 0.1.13
 platform: ruby
-authors: 
+authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-11-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: albino
+  requirement: &70292072374900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70292072374900
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: &70292072374300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70292072374300
+- !ruby/object:Gem::Dependency
   name: haml
+  requirement: &70292072373600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70292072373600
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70292072372980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70292072372980
+- !ruby/object:Gem::Dependency
   name: rocco
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70292072372100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70292072372100
+- !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70292072370660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
-        version: 1.4.1
-  requirement: *id004
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
   prerelease: false
+  version_requirements: *70292072370660
+- !ruby/object:Gem::Dependency
   name: directory_watcher
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70292072369860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
-  requirement: *id005
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
   prerelease: false
+  version_requirements: *70292072369860
+- !ruby/object:Gem::Dependency
   name: redis
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70292072369060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  requirement: *id006
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+  type: :runtime
   prerelease: false
+  version_requirements: *70292072369060
+- !ruby/object:Gem::Dependency
   name: slop
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70292072368120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  requirement: *id007
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
   prerelease: false
+  version_requirements: *70292072368120
+- !ruby/object:Gem::Dependency
   name: tilt
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70292072367200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id008
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
   prerelease: false
+  version_requirements: *70292072367200
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
+  requirement: &70292072365880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
+  prerelease: false
+  version_requirements: *70292072365880
 description: Stasis is a dynamic framework for static sites.
-email: 
+email:
 - mail@wintoni.us
-executables: 
+executables:
 - stasis
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -220,38 +210,35 @@ files:
 - stasis.gemspec
 homepage: http://stasis.me
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 356971476928678245
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 356971476928678245
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Static sites made powerful
-test_files: 
+test_files:
 - spec/fixtures/project/_partial.html.haml
 - spec/fixtures/project/before_render_partial.html.haml
 - spec/fixtures/project/before_render_text.html.haml