gumdrop 0.8.0 → 1.0.0

data/lib/gumdrop/renderer.rb

@@ -0,0 +1,272 @@
+module Gumdrop
+
+  class Renderer
+    include Util::SiteAccess
+
+    SPECIAL_OPTS= %w(layout force_partial)
+    MUNGABLE_RE= Regexp.new(%Q<(href|data|src)([\s]*)=([\s]*)('|"|&quot;|&#34;|&#39;)?\\/([\\/]?)>, 'i')
+
+    attr_reader :context
+
+    def initialize
+      site.active_renderer= self
+      @context, @content, @opts= nil, nil, nil
+      @stack= []
+    end
+
+    def draw(content, opts={})
+      event_block :render_item do |data|
+        data[:content]= content
+        log.debug " rendering: #{ content.source_filename } (#{ content.uri })"
+        if content.binary? or content.missing?
+          log.warn "Missing content body for: #{ content.uri }"
+          nil
+        else
+          _in_context(content, opts) do
+            data[:context]= @context
+            data[:output]= _render_content!
+          end
+        end
+      end
+    end
+
+  private
+
+    def _render_content!
+      output= @content.body
+      _render_pipeline(@content.source_filename) do |template_class|
+        output= _render_text(output, template_class)
+      end
+      output= _render_layouts output
+      _relativize_uris output
+    end
+
+    def _render_text(text, template_class, sub_content="")
+      log.debug "            #{ template_class.to_s }"
+      template= template_class.new(@content.source_path) { text }
+      template.render(@context, content:sub_content) { sub_content }
+    end
+
+    def _render_layouts(text)
+      _layout_pipeline do |layout_class|
+        text= _render_layout text, layout_class
+      end
+      text
+    end
+
+    def _render_layout(text, layout)
+      log.debug "    layout: #{layout.source_filename}"
+      _render_pipeline(layout.source_filename) do |layout_class|
+        text = _render_text(layout.body, layout_class, text)
+      end
+      text
+    end
+
+    # NOTE: Currently, the render pipeline ends when Renderer.for
+    # returns nil for an ext. Should it continue on until all the
+    # possible file ext templates are looked up?
+    def _render_pipeline(path)
+      filename_parts= path.split('.')
+      begin
+        ext= filename_parts.pop
+        template_class= Renderer.for(ext)
+        yield template_class unless template_class.nil?
+      end while !template_class.nil? #and filename_parts.size
+    end
+
+    def _layout_pipeline
+      layout = _layout_for_content
+      unless layout.nil?
+        yield layout
+        # Nested Layouts!
+        sub_layout= _sub_layout_for(layout)
+        while !sub_layout.nil?
+          yield sub_layout
+          sub_layout= _sub_layout_for(sub_layout)
+        end 
+      end 
+    end
+
+    def _relativize_uris(text)
+      return text unless _relativize?
+      path_to_root= _path_to_root
+      text.force_encoding("UTF-8") if text.respond_to? :force_encoding
+      text.gsub MUNGABLE_RE do |match|
+        if $5 == '/'
+          "#{ $1 }#{ $2 }=#{ $3 }#{ $4 }/"
+        else
+          "#{ $1 }#{ $2 }=#{ $3 }#{ $4 }#{ path_to_root }"
+        end
+      end
+    end
+
+    def _relativize?
+      return false if !site.config.relative_paths
+      return false if @context.force_absolute
+      return true if site.config.relative_paths_exts == :all
+      site.config.relative_paths_exts.include?(@content.ext)
+    end
+
+    def _layout_for_content
+      case
+        when @opts[:inline_render] then nil
+        when (@content.params.has_key?(:layout) and !@content.params.layout) then nil
+        # when (@content.partial? and !@opts[:layout] and !@content.params.layout) then nil
+        else
+          layout= @opts[:layout] || @content.params.layout || @context.get(:layout)
+          site.layouts.first layout
+      end
+    end
+
+    def _sub_layout_for(layout)
+      sub_layout_name= @context.get :layout
+      return nil if sub_layout_name.nil?
+      sub_layout= site.layouts.first sub_layout_name
+      return nil if sub_layout.nil?
+      return nil if sub_layout.uri == layout.uri
+      sub_layout
+    end
+
+    def _default_layout
+      if site.config.layout_exts.include? @content.ext
+        site.config.default_layout
+      else
+        nil
+      end
+    end
+
+    def _path_to_root
+      '../' * @content.level
+    end
+
+    def _in_context(content, opts)
+      _new_context(content, opts)
+      output= yield
+      _revert_context
+      output
+    end
+
+    def _new_context(content, opts)
+      @stack.push({
+        content: @content,
+        context: @context,
+        opts: @opts
+      }.to_hash_object)
+      @context= RenderContext.new content, self, @context
+      safe_opts= opts.reject { |o| SPECIAL_OPTS.include? o.to_s }
+      @context.set safe_opts
+      @content= content
+      @opts= opts
+      if @stack.size == 1
+        @context.set :layout, _default_layout
+      end
+    end
+
+    def _revert_context
+      prev= @stack.pop
+      case @opts[:hoist]
+        when :all, true
+          _hoist_data(prev.context)
+        when Array
+          _hoist_data(prev.context, @opts[:hoist])
+      end
+      @context= prev.context
+      @content= prev.content
+      @opts= prev.opts
+    end
+
+    def _hoist_data(to_context, keys=nil)
+      keys ||= @context.state.keys
+      safe_keys= keys.reject {|k| SPECIAL_OPTS.include? k.to_s }
+      safe_keys.each do |key|
+        to_context.set key, @context.state[key]
+      end
+    end
+
+    def _previous
+      @stack.last
+    end
+
+    class << self
+
+      # Returns the `Tilt::Template` for the given `ext` or nil
+      def for(ext)
+        Tilt[ext] 
+      rescue LoadError # stupid tilt and redcarpet, they don't play well together!
+        nil
+      end
+
+    end
+  end
+
+  class RenderContext
+    include Util::SiteAccess
+    include Util::ViewHelpers
+
+    attr_reader :content, :state
+
+    def initialize(content, renderer, parent=nil)
+      @content= content
+      @renderer= renderer
+      @parent= parent
+      @state= {}
+    end
+
+    def render(path=nil, opts={})
+      content= site.resolve path, opts
+      raise StandardError, "Content or Partial cannot be found at: #{path} (#{opts})" if content.nil?
+      opts[:force_partial]= true
+      @renderer.draw content, opts
+    end
+
+    def get(key)
+      _get_from_state key.to_sym
+    end
+
+    def set(key, value=nil)
+      if key.is_a? Hash
+        key.each do |k,v|
+          @state[k.to_s.to_sym]= v
+        end
+      else
+        @state[key.to_s.to_sym]= value
+      end
+    end
+
+    def method_missing(sym, *args, &block)
+      if sym.to_s.ends_with? '='
+        key= sym.to_s.chop
+        set key, args[0]
+      else
+        get(sym)
+      end
+    end
+
+  private
+
+    def _get_from_state(key)
+      if @state.has_key? key
+        @state[key]
+      else
+        _get_from_parent key
+      end
+    end
+
+    def _get_from_parent(key)
+      if @parent.nil? or !@parent.has_key?(key)
+        _get_from_content key 
+      else
+        @parent.get key
+      end
+    end
+
+    def _get_from_content(key)
+      return nil if @content.nil?
+      return @content.send(key.to_sym) if @content.respond_to?(key.to_sym)
+      return @content.params[key] if @content.params.has_key?(key)
+      nil
+    end
+
+  end
+
+end

data/lib/gumdrop/server.rb

@@ -1,67 +1,76 @@
-# Rework this to be nicer.. Extend Sintra::Base?
+
+# Maybe use Gserver?
 
 require 'sinatra/base'
-require 'logger'
 
 module Gumdrop
 
   STATIC_ASSETS= %w(.jpg .jpe .jpeg .gif .ico .png .swf)
 
   class Server < Sinatra::Base
-    site= Gumdrop.fetch_site
+    include Util::Loggable
+
+    site= Gumdrop.site
 
     unless site.nil?
-      site.rescan()
+      site.scan true
 
       set :port, site.config.server_port if site.config.server_port
       
       if site.config.proxy_enabled
-        require 'gumdrop/support/proxy_handler'
+        require 'gumdrop/server/proxy_handler'
         get     '/-proxy/*' do handle_proxy(params, env) end
         post    '/-proxy/*' do handle_proxy(params, env) end
         put     '/-proxy/*' do handle_proxy(params, env) end
         delete  '/-proxy/*' do handle_proxy(params, env) end
         patch   '/-proxy/*' do handle_proxy(params, env) end
         options '/-proxy/*' do handle_proxy(params, env) end
-        site.report 'Enabled proxy at /-proxy/*', :info
+        log.info 'Enabled proxy at /-proxy/*'
       end
 
       get '/*' do
-        site.report "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+        # log.info "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
 
         file_path= get_content_path params[:splat].join('/'), site
-        site.report "[#{$$}] GET /#{params[:splat].join('/')} -> #{file_path}"
+        log.info "\n\n[#{$$}] GET /#{params[:splat].join('/')} -> #{file_path}"
         
         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()
+            log.info "[#{$$}] Rebuilding from Source (#{since_last_build} > #{site.config.server_timeout})"
+            site.scan true
           end
         end
         
-        if site.content_hash.has_key? file_path
-          content= site.content_hash[file_path]
-          if content.useLayout?
-            site.report "[#{$$}]  *Dynamic: #{file_path} (#{content.ext})"
-            content_type :css if content.ext == '.css' # Meh?
-            content_type :js if content.ext == '.js' # Meh?
-            content_type :xml if content.ext == '.xml' # Meh?
-            output= content.render 
-            site.content_filters.each {|f| output= f.call(output, content) }
-            output
+        if site.contents.has_key? file_path
+          renderer= Renderer.new
+          content= site.contents[file_path]
+          content_type :css if content.ext == '.css' # Meh?
+          content_type :js if content.ext == '.js' # Meh?
+          content_type :xml if content.ext == '.xml' # Meh?
+          unless content.binary?
+            log.info "[#{$$}]  *Dynamic: #{file_path} (#{content.ext})"
+            begin
+              content= renderer.draw content  
+            rescue => ex
+              log.error "ERROR!"
+              log.error ex
+              $stderr.puts "\n\n --------- \n Error! (#{content.uri}) #{ex}\n --------- \n\n"
+              raise ex
+            end
+            content
           else
-            site.report "[#{$$}]  *Static: #{file_path}"
-            send_file File.join( site.src_path, file_path)
+            log.info "[#{$$}]  *Static: #{file_path} (binary)"
+            send_file site.source_path / file_path
           end
         
-        elsif File.exists? File.join(site.config.output_dir, file_path)
-            site.report "[#{$$}]  *Static (from OUTPUT): #{file_path}"
-            send_file File.join(site.config.output_dir, file_path)
+        elsif File.exists? site.output_path / file_path
+            log.info "[#{$$}]  *Static (from OUTPUT): #{file_path}"
+            send_file site.output_path / file_path
         
         else
-          site.report "[#{$$}]  *Missing: #{file_path}", :error
+          log.warn "[#{$$}]  *Missing: #{file_path}"
           "#{file_path} Not Found"
         end
       end      
@@ -75,7 +84,7 @@ module Gumdrop
         if file_path == ""
           "index.html"
         else
-          keys.detect {|k| site.content_hash.has_key?(k) } or file_path
+          keys.detect {|k| site.contents.has_key?(k) } or file_path
         end
       end