gumdrop 0.6.3 → 0.6.4

data/ChangeLog.md

@@ -1,3 +1,9 @@
+# v0.6.4
+- Callbacks are cleared on each `Site#rescan()` to prevent duplicates.
+- Callback blocks are called with `site` as the parameter.
+- Added `Gumdrop.change_log`.
+- Added on_before* event for scan, generate, and render.
+
 # v0.6.3
 - Added `generated` flag to Content object
 - Added `config` to Generator context

data/lib/gumdrop/callbacks.rb

@@ -9,12 +9,15 @@ module Gumdrop
             if block
               @_#{name} = [] if @_#{name}.nil?
               @_#{name} << block
-            elsif @_#{name}
+            elsif @_#{name} and !@_#{name}.nil?
               @_#{name}.each do |cb|
                 cb.call(*args)
               end
             end
           end
+          def clear_#{name}()
+            @_#{name} = nil
+          end
         EOF
       end
     end

data/lib/gumdrop/content.rb

@@ -46,7 +46,6 @@ module Gumdrop
         context.reset_data 'current_depth'=>@level, 'current_slug'=>@slug, 'page'=>self, 'layout'=>default_layout, 'params'=>self.params
       end
       context.set_content self, locals
-      @site.report " Rendering: #{@uri}", :warning
       content= @template.render(context) 
       return content if ignore_layout
       layout= context.get_template()
@@ -59,7 +58,7 @@ module Gumdrop
     
     def renderTo(context, output_path, filters=[], opts={})
       return copyTo(output_path, opts) unless useLayout?
-      # @site.report " Rendering: #{@uri}", :warning
+      @site.report " Rendering: #{@uri}", :warning
       output= render(context)
       filters.each {|f| output= f.call(output, self) }
       File.open output_path, 'w' do |f|
@@ -93,6 +92,10 @@ module Gumdrop
     def useLayout?
       !@template.nil?
     end
+
+    def ignore?
+      @ignored
+    end
     
     def to_s
       @uri

data/lib/gumdrop/site.rb

@@ -36,8 +36,11 @@ module Gumdrop
     extend Callbacks
 
     callbacks :on_start, 
+              :on_before_scan,
               :on_scan, 
+              :on_before_generate,
               :on_generate, 
+              :on_before_render,
               :on_render, 
               :on_end
 
@@ -49,7 +52,9 @@ module Gumdrop
       reset_all()
     end
 
-    def contents(pattern=nil, opts={})
+    def contents(*args)
+      opts= args.extract_options!
+      pattern= args[0] || nil
       if pattern.nil?
         if opts[:as] == :hash
           @node_tree
@@ -71,29 +76,22 @@ module Gumdrop
       end
     end
 
-    def scan
-      build_tree()
-      on_scan()
-      run_generators()
-      on_generate()
-      @last_run= Time.now
-      self
-    end
-
     def rescan
+      on_start(self)
       reset_all()
       scan()
       @last_run= Time.now
+      # TODO: should on_before_render and on_render be called for rescan()?
+      on_end(self)
       self
     end
 
     def build
-      on_start()
+      on_start(self)
       scan()
       render()
-      on_render()
       @last_run= Time.now
-      on_end()
+      on_end(self)
       self
     end
 
@@ -119,6 +117,13 @@ module Gumdrop
 
   private
 
+    def scan
+      build_tree()
+      run_generators()
+      self
+    end
+
+
     def reset_all
       @content_filters = []
       @blacklist       = []
@@ -132,6 +137,15 @@ module Gumdrop
       
       @config          = Gumdrop::Config.new DEFAULT_OPTIONS
 
+      clear_on_start()
+      clear_on_before_scan()
+      clear_on_scan()
+      clear_on_before_generate()
+      clear_on_generate()
+      clear_on_before_render()
+      clear_on_render()
+      clear_on_end()
+
       load_sitefile()
       
       @data_path       = get_expanded_path(@config.data_dir)
@@ -148,6 +162,7 @@ module Gumdrop
         @log = Logger.new @config.log, 'daily'
       rescue
         @log = Logger.new STDOUT
+        report "Using STDOUT for logging because of exception: #{ $! }"
       end
       @log.formatter = proc do |severity, datetime, progname, msg|
         "#{datetime}: #{msg}\n"
@@ -164,13 +179,14 @@ module Gumdrop
 
     def load_sitefile
       source= File.read( @sitefile )
-      dsl = SitefileDSL.new self
+      dsl = Sitefile.new self
       dsl.instance_eval source
       dsl
     end
 
     def build_tree
       report "[Scanning from #{src_path}]", :info
+      on_before_scan(self)
       # Report blacklists and greylists
       blacklist.each do |path|
         report " blacklist: #{path}", :info
@@ -178,7 +194,6 @@ module Gumdrop
       greylist.each do |path|
         report "  greylist: #{path}", :info
       end
-
       # Scan Filesystem
       Dir.glob("#{src_path}/**/*", File::FNM_DOTMATCH).each do |path|
         unless File.directory? path or @config.ignore.include?( File.basename(path) )
@@ -209,21 +224,25 @@ module Gumdrop
           end
         end
       end
+      on_scan(self)
     end
 
     def run_generators
       report "[Executing Generators]", :info
+      on_before_generate(self)
       generators.each_pair do |path, generator|
         generator.execute()
       end
+      on_generate(self)
     end
 
     def render
       unless opts[:dry_run]
         report "[Compiling to #{@out_path}]", :info
+        on_before_render(self)
         @node_tree.keys.sort.each do |path|
           node= @node_tree[path]
-          unless node.ignored 
+          unless node.ignore?
             output_path= File.join(@out_path, node.to_s)
             FileUtils.mkdir_p File.dirname(output_path)
             node.renderTo render_context, output_path, content_filters
@@ -231,6 +250,7 @@ module Gumdrop
             report " -ignoring: #{node.to_s}", :info
           end
         end
+        on_render(self)
       end
     end
 
@@ -240,7 +260,7 @@ module Gumdrop
     end
   end
 
-  class SitefileDSL
+  class Sitefile
 
     def initialize(site)
       @site= site
@@ -282,12 +302,21 @@ module Gumdrop
     def on_start(&block)
       @site.on_start &block
     end
+    def on_before_scan(&block)
+      @site.on_before_scan &block
+    end
     def on_scan(&block)
       @site.on_scan &block
     end
+    def on_before_generate(&block)
+      @site.on_before_generate &block
+    end
     def on_generate(&block)
       @site.on_generate &block
     end
+    def on_before_render(&block)
+      @site.on_before_render &block
+    end
     def on_render(&block)
       @site.on_render &block
     end

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION = "0.6.3" unless defined?(::Gumdrop::VERSION)
+  VERSION = "0.6.4" unless defined?(::Gumdrop::VERSION)
   
 end

data/lib/gumdrop.rb

@@ -59,6 +59,11 @@ module Gumdrop
       File.dirname( fetch_site_file( filename ) )
     end
 
+    def change_log
+      here= File.dirname(__FILE__)
+      File.read File.join(here, "../ChangeLog.md")
+    end
+
   end
   
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Matt McCray