stasis 0.1.19 → 0.1.20

data/lib/stasis.rb

@@ -79,25 +79,26 @@ class Stasis
     @destination = args[0] || @root + '/public'
     @destination = File.expand_path(@destination, @root)
 
+    load_paths unless options[:development]
+
+    # Create plugin instances.
+    @plugins = find_plugins.collect { |klass| klass.new(self) }
+
+    load_controllers
+  end
+
+  def load_paths
     # Create an `Array` of paths that Stasis will act upon.
     @paths = Dir.glob("#{@root}/**/*", File::FNM_DOTMATCH)
-    
+
     # Reject paths that are directories or within the destination directory.
     @paths.reject! do |path|
       !File.file?(path) || path[0..@destination.length-1] == @destination
     end
 
-    # Create plugin instances.
-    @plugins = find_plugins.collect { |klass| klass.new(self) }
-
-    # Create a controller instance.
-    @controller = Controller.new(self)
-
     # Reject paths that are controllers.
     @paths.reject! do |path|
       if File.basename(path) == 'controller.rb'
-        # Add controller to `Controller` instance.
-        @controller._add(path)
         true
       else
         false
@@ -105,6 +106,16 @@ class Stasis
     end
   end
 
+  def load_controllers
+    # Create a controller instance.
+    @controller = Controller.new(self)
+
+    # Reload controllers
+    Dir["#{@root}/**/controller.rb"].each do |path|
+      @controller._add(path) unless path[0..@destination.length-1] == @destination
+    end
+  end
+
   def render(*only)
     collect = {}
     render_options = {}

data/lib/stasis/dev_mode.rb

@@ -14,6 +14,7 @@ class Stasis
 
       @dir = dir
       @options = options
+      @options[:development] ||= true
 
       @stasis = Stasis.new(*[ @dir, @options[:public], @options ].compact)
 
@@ -34,7 +35,7 @@ class Stasis
       dw.add_observer { render }
       dw.start
 
-      if options[:development]
+      if options[:development].is_a?(::Integer)
         mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
         mime_types.store 'js', 'application/javascript'
 
@@ -43,7 +44,7 @@ class Stasis
           :DocumentRoot => @stasis.destination,
           :Logger => WEBrick::Log.new("/dev/null"),
           :MimeTypes => mime_types,
-          :Port => options[:development] || 3000
+          :Port => options[:development]
         )
         
         ['INT', 'TERM'].each do |signal|
@@ -61,6 +62,9 @@ class Stasis
     def render
       puts "\n[#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}] Regenerating #{@options[:only] ? @options[:only].join(', ') : 'project'}..."
       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}`"
@@ -70,4 +74,4 @@ class Stasis
       end
     end
   end
-end
+end

data/lib/stasis/plugin.rb

@@ -19,6 +19,7 @@ class Stasis
         before_all
         before_render
         controller_method
+        reset
       ).each do |method|
         method = method.to_sym
         # Define method on the `Plugin` class.
@@ -73,4 +74,4 @@ class Stasis
       end
     end
   end
-end
+end

data/lib/stasis/plugins/before.rb

@@ -5,10 +5,11 @@ class Stasis
     before_render :before_render
     controller_method :before
     priority 1
+    reset :reset
 
     def initialize(stasis)
       @stasis = stasis
-      @blocks = {}
+      reset
     end
 
     # This method is bound to all controllers. Stores a block in the `@blocks` `Hash`,
@@ -46,5 +47,10 @@ class Stasis
         end
       end
     end
+
+    # This event resets all instance variables.
+    def reset
+      @blocks = {}
+    end
   end
-end
+end

data/lib/stasis/plugins/helpers.rb

@@ -3,10 +3,11 @@ class Stasis
 
     controller_method :helpers
     before_render :before_render
+    reset :reset
 
     def initialize(stasis)
       @stasis = stasis
-      @blocks = []
+      reset
     end
 
     #  This event triggers before each file renders through Stasis. For each helper
@@ -25,5 +26,10 @@ class Stasis
         @blocks << [ @stasis.path, block ]
       end
     end
+
+    # This event resets all instance variables.
+    def reset
+      @blocks = []
+    end
   end
 end

data/lib/stasis/plugins/ignore.rb

@@ -3,10 +3,11 @@ class Stasis
 
     before_render :before_render
     controller_method :ignore
+    reset :reset
 
     def initialize(stasis)
       @stasis = stasis
-      @ignore = {}
+      reset
     end
 
     # This event triggers before each file renders. Rejects any `paths` that are included
@@ -31,5 +32,10 @@ class Stasis
         end
       end
     end
+
+    # This event resets all instance variables.
+    def reset
+      @ignore = {}
+    end
   end
 end

data/lib/stasis/plugins/layout.rb

@@ -4,10 +4,11 @@ class Stasis
     action_method :layout => :layout_action
     before_render :before_render
     controller_method :layout => :layout_controller
+    reset :reset
 
     def initialize(stasis)
       @stasis = stasis
-      @layouts = {}
+      reset
     end
 
     # This event triggers before each file renders through Stasis. It sets the `action`
@@ -79,5 +80,10 @@ class Stasis
         hash
       }
     end
+
+    # This event resets all instance variables.
+    def reset
+      @layouts = {}
+    end
   end
 end

data/lib/stasis/plugins/priority.rb

@@ -5,10 +5,11 @@ class Stasis
     before_all :before_all
     controller_method :priority
     priority 2
+    reset :reset
 
     def initialize(stasis)
       @stasis = stasis
-      @priorities = {}
+      reset
     end
 
     # This event triggers before all files render through Stasis. Collect matching
@@ -37,5 +38,10 @@ class Stasis
       end
       @priorities.merge!(hash)
     end
+
+    # This event resets all instance variables.
+    def reset
+      @priorities = {}
+    end
   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.19'
+  s.version     = '0.1.20'
   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: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - Winton Welsh