gumdrop 0.6.2 → 0.6.3

data/ChangeLog.md

@@ -1,3 +1,14 @@
+# v0.6.3
+- Added `generated` flag to Content object
+- Added `config` to Generator context
+- Added callbacks to site build process. Callbacks:
+    - on_start
+    - on_scan
+    - on_generate
+    - on_render
+    - on_end
+- Dev server doesn't check last build time for static assets.
+
 # v0.6.2
 - Consolidated stitch support code into single file
 - Bugfix: Generates better relative paths for Content objects

data/gumdrop.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |s|
    s.add_dependency 'tilt'
    s.add_dependency 'active_support'
    s.add_dependency 'trollop'
-   # s.add_dependency 'haml'
-   # s.add_dependency 'sass'
    s.add_dependency 'i18n'
    s.add_dependency 'bundle'
 

data/lib/gumdrop/callbacks.rb

@@ -0,0 +1,27 @@
+module Gumdrop
+  module Callbacks
+    
+    # For defining callbacks
+    def callback(*callback_names)
+      callback_names.each do |name|
+        class_eval <<-EOF
+          def #{name}(*args, &block)
+            if block
+              @_#{name} = [] if @_#{name}.nil?
+              @_#{name} << block
+            elsif @_#{name}
+              @_#{name}.each do |cb|
+                cb.call(*args)
+              end
+            end
+          end
+        EOF
+      end
+    end
+  
+    alias_method :callbacks, :callback
+    alias_method :define_callback, :callback
+    alias_method :define_callbacks, :callback
+  
+  end
+end

data/lib/gumdrop/content.rb

@@ -15,6 +15,7 @@ module Gumdrop
                   :params, 
                   :site, 
                   :ignored, 
+                  :generated,
                   :full_path
     
     def initialize(path, site, params={})
@@ -22,6 +23,7 @@ module Gumdrop
       @params= HashObject.new params
       @full_path= path
       @ignored= false
+      @generated= false
       @path= get_source_path
       @level= (@path.split('/').length - 1)
       @source_filename= File.basename path
@@ -44,6 +46,7 @@ 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()
@@ -56,7 +59,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|
@@ -117,7 +120,7 @@ module Gumdrop
     end
 
     def get_uri
-      uri= File.join File.dirname(@path), @filename #  path_parts.join('/')
+      uri= File.join File.dirname(@path), @filename
       if uri.starts_with? './'
         uri[2..-1]
       else

data/lib/gumdrop/context.rb

@@ -70,21 +70,17 @@ module Gumdrop
       @site
     end
 
-    # Access to settings from configure block
+    # Access to settings as defined in the configure block
     def config
       @site.config
     end
   
     def reset_data(preset={})
-      # TODO: Add a setting for reloading data on every request/page
-      #  was this for the server?
-      # @site.data.reset if !Gumdrop.config.cache_data
       @state = preset
     end
 
     def method_missing(name, value=nil)
       @state=  Hash.new {|h,k| h[k]= nil } if @state.nil? 
-      # puts "Looking for >> #{name} in #{@state.keys}"
       unless value.nil?
         @state[name.to_s]= value
       else

data/lib/gumdrop/generator.rb

@@ -20,9 +20,9 @@ module Gumdrop
     # This should probably not be accessible to the generators
     def execute
       if @content.is_a? Proc
-        run_dsl_from_proc @content
+        instance_eval &@content
       else
-        run_dsl_from_source IO.readlines(@content.path).join('')
+        instance_eval File.read(@content.path)
       end
     end
 
@@ -33,6 +33,10 @@ module Gumdrop
     def data
       @site.data
     end
+
+    def config
+      @site.config
+    end
     
     def set(var_name, value)
       params[var_name]= value
@@ -120,18 +124,6 @@ module Gumdrop
         end
       end
     end
-
-  private
-    
-    def run_dsl_from_source(source)
-      # puts source
-      instance_eval source
-    end
-
-    def run_dsl_from_proc(proc)
-      # puts source
-      instance_eval &proc
-    end
     
   end
   
@@ -139,8 +131,9 @@ module Gumdrop
     # Nothing special, per se...
 
     def initialize(path, block, site, params={})
-      @content_block= block
       super(path, site, params)
+      @content_block= block
+      @generated= true
     end
 
     def render(context=nil, ignore_layout=false,  reset_context=true, locals={})

data/lib/gumdrop/server.rb

@@ -5,6 +5,8 @@ require 'logger'
 
 module Gumdrop
 
+  STATIC_ASSETS= %w(.jpg .jpe .jpeg .gif .ico .png)
+
   class Server < Sinatra::Base
     site_file= Gumdrop.fetch_site_file
     unless site_file.nil?
@@ -29,11 +31,13 @@ module Gumdrop
 
         file_path= get_content_path params[:splat].join('/'), site
         site.report "[#{$$}] GET /#{params[:splat].join('/')} -> #{file_path}"
-        since_last_build= Time.now.to_i - site.last_run.to_i
-        # site.report "!>!>>>>> since_last_build: #{since_last_build}"
-        if since_last_build > site.config.server_timeout
-          site.report "[#{$$}] Rebuilding from Source (#{since_last_build} > #{site.config.server_timeout})"
-          site.rescan()
+        unless static_asset file_path
+          since_last_build= Time.now.to_i - site.last_run.to_i
+          # site.report "!>!>>>>> since_last_build: #{since_last_build}"
+          if since_last_build > site.config.server_timeout
+            site.report "[#{$$}] Rebuilding from Source (#{since_last_build} > #{site.config.server_timeout})"
+            site.rescan()
+          end
         end
         
         if site.node_tree.has_key? file_path
@@ -79,6 +83,10 @@ module Gumdrop
         Gumdrop.handle_proxy opts, proxy_to, env
       end
       
+      def static_asset(file_path)
+        STATIC_ASSETS.include? File.extname(file_path).to_s
+      end
+      
       run!
     else
       puts "Not in a valid Gumdrop site directory."

data/lib/gumdrop/site.rb

@@ -1,7 +1,5 @@
 require 'pathname'
 
-# WORK IN PROGRESS!
-
 module Gumdrop
 
   DEFAULT_OPTIONS= {
@@ -34,12 +32,20 @@ module Gumdrop
                 :sitefile,
                 :node_tree,
                 :last_run
-    
+
+    extend Callbacks
+
+    callbacks :on_start, 
+              :on_scan, 
+              :on_generate, 
+              :on_render, 
+              :on_end
 
     def initialize(sitefile, opts={})
-      @sitefile        = File.expand_path sitefile
-      @root_path       = File.dirname @sitefile
-      @opts            = opts
+      @sitefile  = File.expand_path sitefile
+      @root_path = File.dirname @sitefile
+      @opts      = opts
+      @last_run  = nil
       reset_all()
     end
 
@@ -67,7 +73,9 @@ module Gumdrop
 
     def scan
       build_tree()
+      on_scan()
       run_generators()
+      on_generate()
       @last_run= Time.now
       self
     end
@@ -80,19 +88,21 @@ module Gumdrop
     end
 
     def build
+      on_start()
       scan()
       render()
+      on_render()
       @last_run= Time.now
+      on_end()
       self
     end
 
     def report(msg, level=:info)
-      # ll= @config.log_level
       case level
-      when :info
-        @log.info msg
-      when :warning
-        @log.warn msg
+        when :info
+          @log.info msg
+        when :warning
+          @log.warn msg
       else
         puts msg
         @log.error msg
@@ -114,29 +124,30 @@ module Gumdrop
       @blacklist       = []
       @greylist        = []
       @redirects       = []
-      @last_run        = nil
+
       @node_tree       = Hash.new {|h,k| h[k]= nil }
       @layouts         = Hash.new {|h,k| h[k]= nil }
       @partials        = Hash.new {|h,k| h[k]= nil }
       @generators      = Hash.new {|h,k| h[k]= nil }
+      
       @config          = Gumdrop::Config.new DEFAULT_OPTIONS
 
       load_sitefile()
       
       @data_path       = get_expanded_path(@config.data_dir)
-      @data            = Gumdrop::DataManager.new self, @data_path
       @src_path        = get_expanded_path(@config.source_dir)
-      @src_path_parts  = @src_path.split('/')
       @out_path        = get_expanded_path(@config.output_dir)
 
+      @data            = Gumdrop::DataManager.new self, @data_path
+
       init_logging()
     end
 
     def init_logging
       begin
-        @log           = Logger.new @config.log, 'daily'
+        @log = Logger.new @config.log, 'daily'
       rescue
-        @log           = Logger.new STDOUT
+        @log = Logger.new STDOUT
       end
       @log.formatter = proc do |severity, datetime, progname, msg|
         "#{datetime}: #{msg}\n"
@@ -152,7 +163,7 @@ module Gumdrop
     end
 
     def load_sitefile
-      source= IO.readlines( @sitefile ).join('')
+      source= File.read( @sitefile )
       dsl = SitefileDSL.new self
       dsl.instance_eval source
       dsl
@@ -169,7 +180,6 @@ module Gumdrop
       end
 
       # Scan Filesystem
-      #puts "Running in: #{root}"
       Dir.glob("#{src_path}/**/*", File::FNM_DOTMATCH).each do |path|
         unless File.directory? path or @config.ignore.include?( File.basename(path) )
           node= Content.new(path, self)
@@ -192,6 +202,7 @@ module Gumdrop
               # puts "Creating partial #{partial_name} from #{path}"
               partials[partial_name]= node
               partials[partial_node_path]= node
+            
             else
               @node_tree[path]= node
             end
@@ -212,8 +223,7 @@ module Gumdrop
         report "[Compiling to #{@out_path}]", :info
         @node_tree.keys.sort.each do |path|
           node= @node_tree[path]
-          unless node.ignored #greylist.any? {|pattern| path_match path, pattern }
-            # node= @node_tree[path]
+          unless node.ignored 
             output_path= File.join(@out_path, node.to_s)
             FileUtils.mkdir_p File.dirname(output_path)
             node.renderTo render_context, output_path, content_filters
@@ -267,6 +277,23 @@ module Gumdrop
         @site.config.instance_eval &block
       end
     end
+    
+    # Callbacks
+    def on_start(&block)
+      @site.on_start &block
+    end
+    def on_scan(&block)
+      @site.on_scan &block
+    end
+    def on_generate(&block)
+      @site.on_generate &block
+    end
+    def on_render(&block)
+      @site.on_render &block
+    end
+    def on_end(&block)
+      @site.on_end &block
+    end
   
   end
 

data/lib/gumdrop/stitch_support.rb

@@ -1,6 +1,5 @@
 
 require 'stitch-rb'
-# require 'stitch'
 
 class Stitch::Source
   # Patch for gumdrop style filenames

data/lib/gumdrop/version.rb

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

data/lib/gumdrop.rb

@@ -6,6 +6,7 @@ require 'active_support/all'
 
 module Gumdrop
 
+  autoload :Callbacks, "gumdrop/callbacks"
   autoload :Context, "gumdrop/context"
   autoload :Content, "gumdrop/content"
   autoload :DataManager, "gumdrop/data_manager"
@@ -13,7 +14,6 @@ module Gumdrop
   autoload :HashObject, "gumdrop/hash_object"
   autoload :Pager, "gumdrop/data_manager"
   autoload :Server, "gumdrop/server"
-  # autoload :Site, "gumdrop/site"
   autoload :VERSION, "gumdrop/version"
   autoload :ViewHelpers, "gumdrop/view_helpers"
   
@@ -30,7 +30,7 @@ module Gumdrop
         site.build
         
         Dir.chdir old
-        
+
         puts "Done."
       else
         puts "Not in a valid Gumdrop site directory."

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Matt McCray
@@ -113,6 +113,7 @@ files:
 - bin/gumdrop
 - gumdrop.gemspec
 - lib/gumdrop.rb
+- lib/gumdrop/callbacks.rb
 - lib/gumdrop/cli.rb
 - lib/gumdrop/content.rb
 - lib/gumdrop/context.rb