stasis 0.1.23 → 0.2.0.pre

data/README.md

@@ -3,6 +3,8 @@ Stasis
 
 Stasis is a dynamic framework for static sites.
 
+[![Build Status](https://secure.travis-ci.org/winton/stasis.png)](http://travis-ci.org/winton/stasis)
+
 Install
 -------
 
@@ -266,44 +268,6 @@ Stasis uses [Tilt](https://github.com/rtomayko/tilt) to support the following te
     WikiCloth (Wiki markup)    .wiki, .mediawiki, .mw
     Yajl                       .yajl
 
-### Server Mode
-
-Stasis can run as a server that uses [redis](http://redis.io) to wait for render jobs.
-
-Stasis server that uses redis on port 6379:
-
-<!-- highlight:-s language:console -->
-
-    $ stasis -s localhost:6379/0
-
-Push to the server (in Ruby):
-
-    Stasis::Server.push(
-      # Paths to render
-      :paths => [ "index.html.haml", "subdirectory" ],
-
-      # Made available to views as `params`
-      :params => {},
-
-      # Redis address
-      :redis => "localhost:6379/0",
-
-      # Return rendered templates (false by default)
-      :return => false,
-
-      # Block until templates generate (false by default)
-      :wait => false,
-
-      # Write to the filesystem (true by default)
-      :write => true,
-
-      # Cache ttl for returned templates (nil by default)
-      :ttl => nil,
-
-      # Force write even if cached (false by default)
-      :force => false
-    )
-
 ### This Web Site
 
 [Take a look at the Stasis project](https://github.com/winton/stasis/tree/master/site) that automatically generated this web site from the project [README](https://github.com/winton/stasis/blob/master/README.md).

data/bin/stasis

@@ -2,18 +2,17 @@
 
 require File.expand_path(File.dirname(__FILE__) + "/../lib/stasis")
 
-gem "slop", "~> 2.1.0"
+gem "slop", "3.3.2"
 require 'slop'
 
-slop = Slop.parse :help => true do
-  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"
+slop = Slop.parse :help => true, :optional_arguments => true do
+  on :d, :development, "Development mode", :as => Integer
+  on :o, :only, "Only generate specific files (comma-separated)", :as => Array
+  on :p, :public, "Public directory path"
 end
 
+exit if slop.help?
 options = slop.to_hash
-options.delete(:server) unless slop.server?
 
 if slop.development?
   require 'stasis/dev_mode'
@@ -22,9 +21,6 @@ elsif slop.only? && slop.public?
   Stasis.new(Dir.pwd, slop[:public], options).render(*slop[:only])
 elsif slop.only?
   Stasis.new(Dir.pwd, options).render(*slop[:only])
-elsif slop.server?
-  require 'stasis/server'
-  Stasis::Server.new(Dir.pwd, options)
 elsif slop.public?
   Stasis.new(Dir.pwd, slop[:public], options).render(*(slop[:only].to_a))
 else

data/lib/ext/string.rb

@@ -0,0 +1,20 @@
+class String
+
+  # Colors
+
+  def blue
+    "\e[34m#{self}\e[0m"
+  end
+
+  def green
+    "\e[32m#{self}\e[0m"
+  end
+
+  def red
+    "\e[31m#{self}\e[0m"
+  end
+
+  def yellow
+    "\e[33m#{self}\e[0m"
+  end
+end

data/lib/stasis.rb

@@ -18,7 +18,7 @@ end
 
 # Activate the [Tilt][ti] gem.
 
-gem "tilt", "~> 1.3.3"
+gem "tilt", "1.3.3"
 
 # Add the project directory to the load paths.
 
@@ -28,6 +28,8 @@ $:.unshift File.dirname(__FILE__)
 # 'stasis/server'. Those are demand-loaded when the corresponding command-line
 # options are passed.
 
+require 'ext/string'
+
 require 'stasis/options'
 require 'stasis/plugin'
 
@@ -115,7 +117,7 @@ class Stasis
     @controller = Controller.new(self)
 
     # Reload controllers
-    Dir["#{@root}/**/controller.rb"].each do |path|
+    Dir["#{@root}/**/controller.rb"].sort.each do |path|
       @controller._add(path) unless path[0..@destination.length-1] == @destination
     end
   end
@@ -179,6 +181,9 @@ class Stasis
         Tilt.mappings.keys.detect do |ext|
           File.extname(@path)[1..-1] == ext
         end
+
+      # Change current working directory.
+      Dir.chdir(File.dirname(@path))
       
       # Trigger all plugin `before_render` events.
       trigger(:before_render)
@@ -186,9 +191,6 @@ class Stasis
       # Skip if `@path` set to `nil`.
       next unless @path
 
-      # Change current working directory.
-      Dir.chdir(File.dirname(@path))
-
       # Render the view.
       view =
         # If the path has an extension supported by [Tilt][ti]...
@@ -294,8 +296,10 @@ class Stasis
   # Add a plugin to all existing controller instances. This method should be called by
   # all external plugins.
   def self.register(plugin)
-    @instances.each do |stasis|
-      stasis.add_plugin(plugin)
+    if @instances
+      @instances.each do |stasis|
+        stasis.add_plugin(plugin)
+      end
     end
   end
 

data/lib/stasis/dev_mode.rb

@@ -1,4 +1,4 @@
-gem "directory_watcher", "~> 1.4.1"
+gem 'directory_watcher', '1.4.1'
 require 'directory_watcher'
 
 require 'logger'
@@ -10,43 +10,48 @@ class Stasis
     def initialize(dir, options={})
       trap("INT") { exit }
 
-      puts "\nDevelopment mode enabled: #{dir}"
+      puts "\nDevelopment mode enabled: ".green + dir 
       $stdout.flush
 
-      @dir = dir
       @options = options
       @options[:development] ||= true
 
-      @stasis = Stasis.new(*[ @dir, @options[:public], @options ].compact)
+      @stasis = Stasis.new(*[ dir, @options[:public], @options ].compact)
 
-      dw = DirectoryWatcher.new(@stasis.root)
-      dw.interval = 0.1
-
-      Dir.chdir(@stasis.root) do
-        within_public = @stasis.destination[0..@stasis.root.length-1] == @stasis.root
-        rel_public = @stasis.destination[@stasis.root.length+1..-1] rescue nil
-        dw.glob = Dir["*"].inject(["*"]) do |array, path|
-          if File.directory?(path) && (!within_public || path != rel_public)
-            array << "#{path}/**/*"
+      glob =
+        Dir.chdir(@stasis.root) do
+          # If destination is within root
+          if @stasis.destination[0..@stasis.root.length] == "#{@stasis.root}/"
+            relative = @stasis.destination[@stasis.root.length+1..-1] rescue nil
+            Dir["*"].inject(["*"]) do |array, path|
+              if File.directory?(path) && path != relative
+                array.push("#{path}/**/*")
+              end
+              array
+            end
+          else
+            [ "*", "**/*" ]
           end
-          array
         end
-      end
 
+      dw = DirectoryWatcher.new(@stasis.root)
       dw.add_observer { render }
+      dw.glob = glob
+      dw.interval = 0.1
       dw.start
 
-      if options[:development].is_a?(::Integer)
+      if @options[:development].is_a?(::Integer)
         mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
         mime_types.store 'js', 'application/javascript'
         
-        outfile = (RUBY_PLATFORM =~ /mswin|mingw/) ? 'NUL:' : '/dev/null'
         server  = WEBrick::HTTPServer.new(
           :AccessLog => [ nil, nil ],
           :DocumentRoot => @stasis.destination,
-          :Logger => WEBrick::Log.new(outfile),
+          :Logger => WEBrick::Log.new(
+            (RUBY_PLATFORM =~ /mswin|mingw/) ? 'NUL:' : '/dev/null'
+          ),
           :MimeTypes => mime_types,
-          :Port => options[:development]
+          :Port => @options[:development]
         )
         
         ['INT', 'TERM'].each do |signal|
@@ -55,24 +60,24 @@ class Stasis
 
         server.start
       else
-        loop { sleep 1000 }
+        loop { sleep 1 }
       end
     end
 
     private
 
     def render
-      puts "\n[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] Regenerating #{@options[:only] ? @options[:only].join(', ') : 'project'}..."
+      puts "\n[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]" + " Regenerating #{@options[:only] ? @options[:only].join(', ') : 'project'}...".yellow
       begin
         @stasis.load_paths
         @stasis.trigger(:reset)
         @stasis.load_controllers
         @stasis.render(*[ @options[:only] ].flatten.compact)
       rescue Exception => e
-        puts "\n[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] Error: #{e.message}`"
+        puts "\n[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]" + " Error: #{e.message}`".red
         puts "\t#{e.backtrace.join("\n\t")}"
       else
-        puts "\n[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] Complete"
+        puts "\n[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}]" + " Complete".green
       end
       $stdout.flush
     end

data/spec/fixtures/project/_locals.html.haml

@@ -0,0 +1 @@
+= x

data/spec/fixtures/project/before_render_locals.html.haml

@@ -0,0 +1 @@
+fail

data/spec/fixtures/project/controller.rb

@@ -41,6 +41,10 @@ before 'before_non_existent.html' do
   instead render(:path => '_partial.html.haml')
 end
 
+before 'before_render_locals.html.haml' do
+  instead render(:path => '_locals.html.haml', :locals => { :x => true })
+end
+
 # Helpers
 
 helpers do

data/spec/fixtures/project/render_locals.html.haml

@@ -0,0 +1 @@
+= render :path => '_locals.html.haml', :locals => { :x => true }

data/spec/fixtures/project/subdirectory/_locals.html.haml

@@ -0,0 +1 @@
+= x

data/spec/fixtures/project/subdirectory/before_render_locals.html.haml

@@ -0,0 +1 @@
+fail

data/spec/fixtures/project/subdirectory/controller.rb

@@ -31,6 +31,10 @@ before 'before_render_partial.html.haml', 'before_non_existent.html' do
   instead render(:path => '_partial.html.haml')
 end
 
+before 'before_render_locals.html.haml' do
+  instead render(:path => '_locals.html.haml', :locals => { :x => true })
+end
+
 # Helpers
 
 helpers do

data/spec/fixtures/project/subdirectory/render_locals.html.haml

@@ -0,0 +1 @@
+= render :path => '_locals.html.haml', :locals => { :x => true }

data/spec/stasis/plugins/render_spec.rb

@@ -20,4 +20,20 @@ describe Stasis::Render do
     $files['no_controller/index.html'].should =~ /render from root\nroot/
     $files['no_controller/index.html'].should =~ /render from subdirectory\nsubdirectory/
   end
+
+  it "should render locals into before_render_locals.html" do
+    $files['before_render_locals.html'].should =~ /true/
+  end
+
+  it "should render locals into subdirectory/before_render_locals.html" do
+    $files['subdirectory/before_render_locals.html'].should =~ /true/
+  end
+
+  it "should render locals into render_locals.html" do
+    $files['render_locals.html'].should =~ /true/
+  end
+
+  it "should render locals into subdirectory/render_locals.html" do
+    $files['subdirectory/render_locals.html'].should =~ /true/
+  end
 end

data/stasis.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "stasis"
-  s.version     = '0.1.23'
+  s.version     = '0.2.0.pre'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]
@@ -27,9 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rocco"
   s.add_development_dependency "rspec", "~> 1.0"
 
-  s.add_dependency "directory_watcher", "~> 1.4.1"
-  s.add_dependency "redis",             "~> 2.2.2"
-  s.add_dependency "slop",              "~> 2.1.0"
-  s.add_dependency "tilt",              "~> 1.3.3"
-  s.add_dependency "yajl-ruby",         "~> 1.0.0"
+  s.add_dependency "directory_watcher", "1.4.1"
+  s.add_dependency "slop", "3.3.2"
+  s.add_dependency "tilt", "1.3.3"
 end

metadata

@@ -1,211 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: stasis
-version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 23
-  version: 0.1.23
+version: !ruby/object:Gem::Version
+  version: 0.2.0.pre
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
+date: 2012-07-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: albino
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rocco
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
-        version: 1.4.1
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
   prerelease: false
-  type: :runtime
-  name: directory_watcher
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
-  prerelease: false
-  type: :runtime
-  name: redis
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: directory_watcher
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  prerelease: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
   name: slop
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  prerelease: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.2
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+- !ruby/object:Gem::Dependency
   name: tilt
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  prerelease: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
-  name: yajl-ruby
-  requirement: *id012
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 description: Stasis is a dynamic framework for static sites.
-email: 
+email:
 - mail@wintoni.us
-executables: 
+executables:
 - stasis
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -213,6 +186,7 @@ files:
 - README.md
 - Rakefile
 - bin/stasis
+- lib/ext/string.rb
 - lib/stasis.rb
 - lib/stasis/dev_mode.rb
 - lib/stasis/options.rb
@@ -227,7 +201,6 @@ files:
 - lib/stasis/scope.rb
 - lib/stasis/scope/action.rb
 - lib/stasis/scope/controller.rb
-- lib/stasis/server.rb
 - site/arrow.png
 - site/controller.rb
 - site/github.png
@@ -237,7 +210,9 @@ files:
 - site/stasis.js.coffee
 - site/stasis.png
 - spec/fixtures/project/.dotfile
+- spec/fixtures/project/_locals.html.haml
 - spec/fixtures/project/_partial.html.haml
+- spec/fixtures/project/before_render_locals.html.haml
 - spec/fixtures/project/before_render_partial.html.haml
 - spec/fixtures/project/before_render_text.html.haml
 - spec/fixtures/project/controller.rb
@@ -254,7 +229,10 @@ files:
 - spec/fixtures/project/not_dynamic.html
 - spec/fixtures/project/params.html.haml
 - spec/fixtures/project/plugin.rb
+- spec/fixtures/project/render_locals.html.haml
+- spec/fixtures/project/subdirectory/_locals.html.haml
 - spec/fixtures/project/subdirectory/_partial.html.haml
+- spec/fixtures/project/subdirectory/before_render_locals.html.haml
 - spec/fixtures/project/subdirectory/before_render_partial.html.haml
 - spec/fixtures/project/subdirectory/before_render_text.html.haml
 - spec/fixtures/project/subdirectory/controller.rb
@@ -265,6 +243,7 @@ files:
 - spec/fixtures/project/subdirectory/layout_action_from_root.html.haml
 - spec/fixtures/project/subdirectory/layout_controller.html.haml
 - spec/fixtures/project/subdirectory/layout_controller_from_root.html.haml
+- spec/fixtures/project/subdirectory/render_locals.html.haml
 - spec/fixtures/project/time.html.haml
 - spec/spec_helper.rb
 - spec/stasis/plugins/before_spec.rb
@@ -273,45 +252,40 @@ files:
 - spec/stasis/plugins/layout_spec.rb
 - spec/stasis/plugins/priority_spec.rb
 - spec/stasis/plugins/render_spec.rb
-- spec/stasis/server_spec.rb
 - spec/stasis_spec.rb
 - 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: -658786105732867218
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Static sites made powerful
-test_files: 
+test_files:
 - spec/fixtures/project/.dotfile
+- spec/fixtures/project/_locals.html.haml
 - spec/fixtures/project/_partial.html.haml
+- spec/fixtures/project/before_render_locals.html.haml
 - spec/fixtures/project/before_render_partial.html.haml
 - spec/fixtures/project/before_render_text.html.haml
 - spec/fixtures/project/controller.rb
@@ -328,7 +302,10 @@ test_files:
 - spec/fixtures/project/not_dynamic.html
 - spec/fixtures/project/params.html.haml
 - spec/fixtures/project/plugin.rb
+- spec/fixtures/project/render_locals.html.haml
+- spec/fixtures/project/subdirectory/_locals.html.haml
 - spec/fixtures/project/subdirectory/_partial.html.haml
+- spec/fixtures/project/subdirectory/before_render_locals.html.haml
 - spec/fixtures/project/subdirectory/before_render_partial.html.haml
 - spec/fixtures/project/subdirectory/before_render_text.html.haml
 - spec/fixtures/project/subdirectory/controller.rb
@@ -339,6 +316,7 @@ test_files:
 - spec/fixtures/project/subdirectory/layout_action_from_root.html.haml
 - spec/fixtures/project/subdirectory/layout_controller.html.haml
 - spec/fixtures/project/subdirectory/layout_controller_from_root.html.haml
+- spec/fixtures/project/subdirectory/render_locals.html.haml
 - spec/fixtures/project/time.html.haml
 - spec/spec_helper.rb
 - spec/stasis/plugins/before_spec.rb
@@ -347,5 +325,4 @@ test_files:
 - spec/stasis/plugins/layout_spec.rb
 - spec/stasis/plugins/priority_spec.rb
 - spec/stasis/plugins/render_spec.rb
-- spec/stasis/server_spec.rb
 - spec/stasis_spec.rb

data/lib/stasis/server.rb

@@ -1,116 +0,0 @@
-gem "redis", "~> 2.2.2"
-gem "yajl-ruby", "~> 1.0.0"
-
-require 'digest/sha1'
-require 'redis'
-require 'yajl'
-
-class Stasis
-  class Server
-
-    def initialize(root, options={})
-      puts "\nStarting Stasis server (redis @ #{options[:server]})..."
-
-      redis = Redis.connect(:url => "redis://#{options[:server]}")
-      stasis = Stasis.new(*[ root, options[:public], options ].compact)
-      retries = 0
-
-      begin
-        while true
-          sleep(1.0 / 1000.0)
-          request = redis.lpop('stasis:requests')
-
-          if request
-            files = {}
-            request = Yajl::Parser.parse(request)
-            paths = request['paths']
-
-            unless request['force']
-              paths = request['paths'].reject do |path|
-                files[path] = redis.get("stasis:caches:#{root}:#{path}")
-              end
-            end
-
-            if paths.empty? && !request['paths'].empty?
-              new_files = {}
-            else
-              params = request['paths'] + [
-                {
-                  :collect => request['return'] || request['force'],
-                  :params => request['params'],
-                  :write => request['write']
-                }
-              ]
-              new_files = stasis.render(*params) || {}
-            end
-
-            if request['ttl']
-              new_files.each do |path, body|
-                key = "stasis:caches:#{root}:#{path}"
-                redis.set(key, body)
-                redis.expire(key, request['ttl'])
-              end
-            end
-
-            if request['return']
-              request['wait'] = true
-            end
-
-            if request['wait']
-              response = files.merge(new_files)
-              redis.publish(self.class.response_key(request['id']), Yajl::Encoder.encode(response))
-            end
-          end
-        end
-      rescue Interrupt
-        shut_down
-      rescue Exception => e
-        puts "\nError: #{e.message}"
-        puts "\t#{e.backtrace.join("\n\t")}"
-        retries += 1
-        shut_down if retries >= 10
-        retry
-      end
-    end
-
-    def shut_down
-      puts "\nShutting down Stasis server..."
-      exit
-    end
-
-    class <<self
-      def push(options)
-        options[:id] = Digest::SHA1.hexdigest("#{options['paths']}#{rand}")
-        redis_url = "redis://#{options.delete(:redis) || "localhost:6379/0"}"
-        response = nil
-
-        redis_1 = Redis.connect(:url => redis_url)
-        redis_2 = Redis.connect(:url => redis_url)
-
-        if options[:return] || options[:wait]
-          redis_1.subscribe(response_key(options[:id])) do |on|
-            on.subscribe do |channel, subscriptions|
-              redis_2.rpush("stasis:requests", Yajl::Encoder.encode(options))
-            end
-
-            on.message do |channel, message|
-              response = Yajl::Parser.parse(message)
-              redis_1.unsubscribe
-            end
-          end
-        else
-          redis_1.rpush("stasis:requests", Yajl::Encoder.encode(options))
-        end
-
-        redis_1.quit
-        redis_2.quit
-
-        response
-      end
-
-      def response_key(id)
-        "stasis:response:#{id}"
-      end
-    end
-  end
-end

data/spec/stasis/server_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper'
-require 'stasis/server'
-
-describe Stasis::Server do
-
-  before(:all) do
-    generate
-    @thread = Thread.new do
-      Stasis::Server.new($fixture, :server => 'localhost:6379/0')
-    end
-  end
-
-  after(:all) do
-    @thread.kill
-  end
-  
-  it "should change time.html" do
-    time = $files['time.html'].split("time")[1].strip
-    new_time = Stasis::Server.push(
-      :paths => [ 'time.html.haml' ],
-      :redis => 'localhost:6379/0',
-      :return => true
-    )['time.html.haml'].split("time")[1].strip
-    time.should_not == new_time
-    generate_files
-    new_time_from_file = $files['time.html'].split("time")[1].strip
-    new_time_from_file.should == new_time
-    new_time_from_file.should_not == time
-  end
-
-  it "should pass params" do
-    params = Stasis::Server.push(
-      :paths => [ 'params.html.haml' ],
-      :params => { :test => true },
-      :redis => 'localhost:6379/0',
-      :return => true
-    )['params.html.haml'].split("params")[1].strip
-    eval(params).should == { :test => true }
-  end
-
-  it "should expire after ttl" do
-    time = Stasis::Server.push(
-      :paths => [ 'time.html.haml' ],
-      :redis => 'localhost:6379/0',
-      :return => true,
-      :ttl => 1,
-      :write => false
-    )['time.html.haml'].split("time")[1].strip
-    time2 = Stasis::Server.push(
-      :paths => [ 'time.html.haml' ],
-      :redis => 'localhost:6379/0',
-      :return => true,
-      :write => false
-    )['time.html.haml'].split("time")[1].strip
-    time.should == time2
-    sleep 2
-    time3 = Stasis::Server.push(
-      :paths => [ 'time.html.haml' ],
-      :redis => 'localhost:6379/0',
-      :return => true,
-      :write => false
-    )['time.html.haml'].split("time")[1].strip
-    time2.should_not == time3
-  end
-end