stasis 0.1.20 → 0.1.21

data/bin/stasis

@@ -16,12 +16,14 @@ options = slop.to_hash
 options.delete(:server) unless slop.server?
 
 if slop.development?
+  require 'stasis/dev_mode'
   Stasis::DevMode.new(Dir.pwd, options)
 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))

data/lib/stasis.rb

@@ -24,12 +24,12 @@ gem "tilt", "~> 1.3.3"
 
 $:.unshift File.dirname(__FILE__)
 
-# Require all Stasis library files.
+# Require all Stasis library files, except for 'stasis/dev_mode' and
+# 'stasis/server'. Those are demand-loaded when the corresponding command-line
+# options are passed.
 
-require 'stasis/dev_mode'
 require 'stasis/options'
 require 'stasis/plugin'
-require 'stasis/server'
 
 require 'stasis/scope'
 require 'stasis/scope/action'
@@ -82,8 +82,9 @@ class Stasis
     load_paths unless options[:development]
 
     # Create plugin instances.
-    @plugins = find_plugins.collect { |klass| klass.new(self) }
+    @plugins = Plugin.plugins.collect { |klass| klass.new(self) }
 
+    self.class.register_instance(self)
     load_controllers
   end
 
@@ -93,7 +94,7 @@ class Stasis
 
     # Reject paths that are directories or within the destination directory.
     @paths.reject! do |path|
-      !File.file?(path) || path[0..@destination.length-1] == @destination
+      !File.file?(path) || path[0..@destination.length] == @destination+'/'
     end
 
     # Reject paths that are controllers.
@@ -270,13 +271,22 @@ class Stasis
     collect if render_options[:collect]
   end
 
+  def self.register_instance(inst)
+    @instances ||= []
+    @instances << inst
+  end
+
+  def add_plugin(plugin)
+    plugin = plugin.new(self)
+    plugins << plugin
+    controller._bind_plugin(plugin, :controller_method)
+  end
+
   # Add a plugin to all existing controller instances. This method should be called by
   # all external plugins.
   def self.register(plugin)
-    ObjectSpace.each_object(::Stasis) do |stasis|
-      plugin = plugin.new(stasis)
-      stasis.plugins << plugin
-      stasis.controller._bind_plugin(plugin, :controller_method)
+    @instances.each do |stasis|
+      stasis.add_plugin(plugin)
     end
   end
 
@@ -296,15 +306,4 @@ class Stasis
     end
     priorities.uniq.sort.each(&block)
   end
-
-  # Returns an `Array` of `Stasis::Plugin` classes.
-  def find_plugins
-    plugins = []
-    ObjectSpace.each_object(Class) do |klass|
-      if klass < ::Stasis::Plugin
-        plugins << klass
-      end
-    end
-    plugins
-  end
 end

data/lib/stasis/dev_mode.rb

@@ -38,11 +38,12 @@ class Stasis
       if options[:development].is_a?(::Integer)
         mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
         mime_types.store 'js', 'application/javascript'
-
-        server = WEBrick::HTTPServer.new(
+        
+        outfile = (RUBY_PLATFORM =~ /mswin|mingw/) ? 'NUL:' : '/dev/null'
+        server  = WEBrick::HTTPServer.new(
           :AccessLog => [ nil, nil ],
           :DocumentRoot => @stasis.destination,
-          :Logger => WEBrick::Log.new("/dev/null"),
+          :Logger => WEBrick::Log.new(outfile),
           :MimeTypes => mime_types,
           :Port => options[:development]
         )

data/lib/stasis/plugin.rb

@@ -1,6 +1,15 @@
 class Stasis
   class Plugin
-    class <<self
+    class << self
+
+      def inherited(subclass)
+        @plugins ||= []
+        @plugins << subclass
+      end
+
+      def plugins
+        (@plugins || []).dup
+      end
 
       # `Hash` -- Keys are the "bind as" method names and values are the actual method
       # names on the `Plugin` instance.

data/spec/stasis/server_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'stasis/server'
 
 describe Stasis::Server do
 

data/stasis.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "stasis"
-  s.version     = '0.1.20'
+  s.version     = '0.1.21'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stasis
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 1
-  - 20
-  version: 0.1.20
+  - 21
+  version: 0.1.21
 platform: ruby
 authors: 
 - Winton Welsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-19 00:00:00 Z
+date: 2012-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement