gumdrop 0.2.4 → 0.2.7

data/ChangeLog.md

@@ -1,3 +1,15 @@
+# v0.2.7
+- Added support for `yield` in templates
+- Added support for content_for -- only tested in SLIM
+
+# v0.2.6
+- Update pager_for to accept a symbol or an array
+
+# v0.2.5
+- New feature: Generators, from source tree or centreally in lib/site.rb
+- Server can reload the entire site for each request, by default this feature is off
+- Added Pager class for creating tumblr-like pagesets
+
 # v0.2.4
 - Modernized Sinatra usage. Added an example site (just boilerplate at this point).
 

data/Notes.md

@@ -1,4 +1,8 @@
 # Future Features/Changes
-- Generator support of some kind... Where you can define how pages can be built from data. Include support for paging and RSS/ATOM feeds.
+- Add support for `data.pager_for(key, opts={})`
+- Add support for Sprockets
+- Add support for js and css compression
 - Add options to config for `source/` and `output/` folder names. `data/` too? 
+- Page generation from lib/site.rb
+- HTML Manifest generation??
 - Some kind of admin? What would that even do?

data/examples/simple/Gemfile

@@ -2,9 +2,9 @@ source "http://rubygems.org"
 
 here= File.dirname(__FILE__)
 
+gem "i18n"
 gem "sinatra"
 gem "active_support"
-gem "i18n"
 gem "rake"
 gem "gumdrop", :path=>"#{here}/../../"
 
@@ -16,4 +16,7 @@ gem "coffee-script"
 # gem "rdiscount"
 # gem "less"
 # gem "haml"
+gem "slim"
 
+gem 'maruku'
+gem 'builder'

data/examples/simple/data/config.yml

@@ -1,2 +1,10 @@
 title: My Site
 tagline: My home on thar intarwebs!
+author: Matt McCray
+url: http://www.mysite.com
+
+gumdrop:
+  js:
+    compress: true
+  css:
+    compress: true

data/examples/simple/data/posts.yamldb

@@ -0,0 +1,28 @@
+---
+__proto__: true
+title: String
+slug: String
+date: Date
+filter: String
+content: Text
+tags: String
+
+---
+title: Testing
+slug: testing
+date: 2011-09-09
+filter: markdown
+content: |
+  This is just a *test*.
+  
+  Enjoy!
+
+---
+title: The Second
+slug: the-second
+date: 2011-09-10
+filter: markdown
+content: |
+  This is just another *test*.
+
+  Enjoy! ReallY!

data/examples/simple/lib/site.rb

@@ -0,0 +1,24 @@
+# Any specialized code for your site goes here...
+
+puts "Building: #{Gumdrop.data.config.title}"
+
+new_posts= Gumdrop.data.posts.map do |post|
+  mdt= Tilt['markdown'].new { post.content }
+  post.body = mdt.render
+  post
+end
+
+Gumdrop.data.set :blog, new_posts, :persist=>true
+
+
+generate do
+  
+  page "my-root-page.html", :template=>'test', :info=>"FROM SITE.RB"
+  
+  pager= Gumdrop.data.pager_for :blog, :base_path=>'posts/page', :page_size=>1
+  
+  pager.each do |pageset|
+    page "#{pageset.uri}.html", :template=>'post_page', :posts=>pageset.items, :pager=>pager, :current_page=>pager.current_page
+  end
+  
+end

data/examples/simple/source/.htaccess

@@ -0,0 +1,16 @@
+# For clean urls
+DirectoryIndex index.html
+
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteBase /
+
+    # Do not do anything for already existing files and folders
+    RewriteCond %{REQUEST_FILENAME} -f [OR]
+    RewriteCond %{REQUEST_FILENAME} -d
+    RewriteRule .+ - [L]
+
+    # add .html file extension (if such file does exist)
+    RewriteCond %{DOCUMENT_ROOT}/$1\.html -f
+    RewriteRule ^(.+[^/])/?$ $1.html [L,QSA]
+</IfModule>

data/examples/simple/source/_pager_control.html.erb

@@ -0,0 +1,14 @@
+<%
+  previous_page = [(current_page - 1), 1].max
+  next_page = [(current_page + 1), pager.length].min
+%>
+<div class="page">
+  <a href="<%= uri pager[previous_page - 1].uri %>">&larr;</a>
+<%
+  pager.each do |pager_page| 
+    class_name= pager_page.page == current_page ? 'current' : ''
+%>
+    <a href="<%= uri pager_page.uri %>" class="<%= class_name %>"><%= pager_page.page %></a>
+<% end %>
+  <a href="<%= uri pager[next_page - 1].uri %>">&rarr;</a>
+</div>

data/examples/simple/source/_sidebar.html.haml

@@ -0,0 +1,2 @@
+:markdown
+  I'm the sidebar.

data/examples/simple/source/feed.xml.builder

@@ -0,0 +1,23 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  xml.title data.config.title
+  xml.subtitle data.config.tagline
+  xml.id data.config.url
+  xml.link "href" => data.config.url
+  xml.link "href" => "#{data.config.url}/feed.xml", "rel" => "self"
+  xml.updated data.blog.first.date.to_time.iso8601
+  xml.author { xml.name data.config.author }
+
+  data.blog.each do |post|
+    xml.entry do
+      url= "#{data.config.url}/posts/#{post.slug}"
+      xml.title post.title
+      xml.link "rel" => "alternate", "href" => url
+      xml.id url
+      xml.published post.date.to_time.iso8601
+      xml.updated post.date.to_time.iso8601
+      xml.author { xml.name data.config.author }
+      xml.content post.body, "type" => "html"
+    end
+  end
+end

data/examples/simple/source/index.html.erb

@@ -1 +1,4 @@
-<p>Welcome to <%= data.config.title %></p>
+<p>Welcome to <%= data.config.title %></p>
+
+
+<p>POSTS: <%= data.blog.length %></p>

data/examples/simple/source/posts.generator.rb

@@ -0,0 +1,11 @@
+
+set :template, "post"
+
+data.blog.each do |post|
+  # mdt= Tilt['markdown'].new { post.content }
+  # post.body = mdt.render 
+
+  page "#{post.slug}.html", :template=>'post', :post=>post
+end
+
+#page "index.html"

data/examples/simple/source/posts/index.html.erb

@@ -0,0 +1,6 @@
+<h2>Post Archive</h2>
+<ul>
+<% data.blog.each do |post| %>
+  <li><a href="<%= uri "/posts/#{post.slug}" %>"><%= post.title %></a></li>
+<% end %>
+</ul>

data/examples/simple/source/theme/templates/post.template.haml

@@ -0,0 +1,3 @@
+%div.post
+  %div.title= post.title
+  %div.content= post.body

data/examples/simple/source/theme/templates/post_page.template.haml

@@ -0,0 +1,6 @@
+%ul
+  - posts.each do |post|
+    %li= post.title
+
+= render 'pager_control'
+

data/examples/simple/source/theme/templates/site.template.haml

@@ -30,4 +30,4 @@
       .row
         .col.span-12
           %footer
-            = copyright_years 2011
+            = copyright_years 2010

data/examples/simple/source/theme/templates/test.template.erb

@@ -0,0 +1 @@
+<p>A Message: <%= info %></p>

data/lib/gumdrop.rb

@@ -6,6 +6,7 @@ DEFAULT_OPTIONS= {
   :cache_data => false,
   :relative_paths => true,
   :auto_run => false,
+  :force_reload => false,
   :root => "."
 }
 
@@ -13,8 +14,12 @@ module Gumdrop
   
   autoload :Context, "gumdrop/context"
   autoload :Content, "gumdrop/content"
+  autoload :DeferredLoader, "gumdrop/deferred_loader"
   autoload :Generator, "gumdrop/generator"
+  autoload :GeneratedrContent, "gumdrop/generator"
+  autoload :GenerationDSL, "gumdrop/generator"
   autoload :HashObject, "gumdrop/hash_object"
+  autoload :Pager, "gumdrop/pager"
   autoload :Server, "gumdrop/server"
   autoload :Utils, "gumdrop/utils"
   autoload :VERSION, "gumdrop/version"
@@ -22,7 +27,7 @@ module Gumdrop
   
   class << self
     
-    attr_accessor :root_path, :source_path, :site, :layouts, :generators, :partials, :config
+    attr_accessor :root_path, :source_path, :site, :layouts, :generators, :partials, :config, :data
     
     def run(opts={})
       # Opts
@@ -30,8 +35,8 @@ module Gumdrop
       
       root= File.expand_path Gumdrop.config.root
       src= File.join root, 'source'
+      $: << "#{root}/lib"
       if File.exists? "#{root}/lib/view_helpers.rb"
-        $: << "#{root}/lib"
         require 'view_helpers'
       end
 
@@ -41,6 +46,17 @@ module Gumdrop
       @partials    = Hash.new {|h,k| h[k]= nil }
       @root_path   = root.split '/'
       @source_path = src.split '/'
+      @data        = Gumdrop::DeferredLoader.new()
+
+      if File.exists? "#{root}/lib/site.rb"
+        # In server mode, we want to reload it every time... right?
+        source= IO.readlines("#{root}/lib/site.rb").join('')
+        
+        GenerationDSL.class_eval source
+        
+        #load "#{root}/lib/site.rb" 
+        # require 'site' 
+      end
       
       # Scan
       #puts "Running in: #{root}"
@@ -58,7 +74,7 @@ module Gumdrop
           @layouts[File.basename(path)]= @site.delete(path)
 
         elsif File.extname(path) == ".generator"
-          @generators[File.basename(path)]= @site.delete(path)
+          @generators[File.basename(path)]= Generator.new( @site.delete(path) )
 
         elsif File.basename(path).starts_with?("_")
           partial_name= File.basename(path)[1..-1].gsub(File.extname(File.basename(path)), '')
@@ -67,16 +83,22 @@ module Gumdrop
         end
       end
       
-      # Render
-      site.keys.each do |path|
-        node= site[path]
-        output_path= "output/#{node.to_s}"
-        FileUtils.mkdir_p File.dirname(output_path)
-        node.renderTo output_path
+      @generators.each_pair do |path, generator|
+        generator.execute()
       end
       
-      puts "Done."
+      # Render
+      unless opts[:dry_run]
+        site.keys.sort.each do |path|
+          node= site[path]
+          output_path= "output/#{node.to_s}"
+          FileUtils.mkdir_p File.dirname(output_path)
+          node.renderTo output_path
+        end
+        puts "Done."
+      end
     end
+
   end
 
   Gumdrop.config= Gumdrop::HashObject.new(DEFAULT_OPTIONS)

data/lib/gumdrop/content.rb

@@ -3,9 +3,10 @@ module Gumdrop
   
   class Content
     
-    attr_accessor :path, :level, :filename, :source_filename, :type, :ext, :uri, :slug, :template
+    attr_accessor :path, :level, :filename, :source_filename, :type, :ext, :uri, :slug, :template, :params
     
-    def initialize(path)
+    def initialize(path, params={})
+      @params= HashObject.new params
       @path= path
       @level= (@path.split('/').length - 2)
       @source_filename= File.basename path
@@ -26,16 +27,17 @@ module Gumdrop
       end
     end
     
-    def render(ignore_layout=false, reset_context=true)
+    def render(ignore_layout=false, reset_context=true, locals={})
       if reset_context
         default_layout= (@ext == '.css' or @ext == '.js' or @ext == '.xml') ? nil : 'site'
-        Context.reset_data 'current_depth'=>@level, 'current_slug'=>@slug, 'page'=>self, 'layout'=>default_layout
+        Context.reset_data 'current_depth'=>@level, 'current_slug'=>@slug, 'page'=>self, 'layout'=>default_layout, 'params'=>self.params
       end
-      content= @template.render(Context)
+      Context.set_content self, locals
+      content= @template.render(Context) 
       return content if ignore_layout
       layout= Context.get_template()
       while !layout.nil?
-        content = layout.template.render(Context, :content=>content)
+        content = layout.template.render(Context, :content=>content) { content }
         layout= Context.get_template()
       end
       content

data/lib/gumdrop/context.rb

@@ -1,85 +1,27 @@
-require 'yaml'
-require 'ostruct'
-
-def hashes2ostruct(object)
-  return case object
-  when Hash
-    object = object.clone
-    object.each do |key, value|
-      object[key] = hashes2ostruct(value)
-    end
-    OpenStruct.new(object)
-  when Array
-    object = object.clone
-    object.map! { |i| hashes2ostruct(i) }
-  else
-    object
-  end
-end
 
 module Gumdrop
   
-  class DeferredLoader
-    attr_reader :cache
-    
-    # def initialize
-    #   puts "@!@"
-    # end
-        
-    def method_missing(key, value=nil)
-      @cache= Hash.new {|h,k| h[k]= load_data(k) } if @cache.nil?
-      @cache[key]
-    end
-    
-  private
-  
-    def load_data(key)
-      path=get_filename(key)
-      if File.extname(path) == ".yamldb"
-        docs=[]
-        File.open(path, 'r') do |f|
-          YAML.load_documents(f) do |doc|
-            docs << hashes2ostruct( doc )
-          end
-        end
-        docs
-      else
-        hashes2ostruct( YAML.load_file(path)  )
-      end
-    end
-  
-    # TODO: Support './data/collection_name/*.(yaml|json)' data loading?
-  
-    def get_filename(path)
-      if File.exists? "data/#{path}.json"
-        "data/#{path}.json"
-      elsif File.exists? "data/#{path}.yml"
-        "data/#{path}.yml"
-      elsif File.exists? "data/#{path}.yaml"
-        "data/#{path}.yaml"
-      elsif File.exists? "data/#{path}.yamldb"
-        "data/#{path}.yamldb"
-      else
-        raise "No data found for #{path}"
-      end
-    end
-  end
-  
   module Context
     class << self
       
       include ::Gumdrop::ViewHelpers
       
       attr_accessor :state
-      attr_reader :data
+      #attr_reader :data
       
       def uri(path)
+        path= path[1..-1] if path.starts_with?('/')
         if Gumdrop.config.relative_paths
           "#{'../'*@state['current_depth']}#{path}"
         else
           "/#{path}"
         end
       end
+      
+      def url(path)
+        path= path[1..-1] if path.starts_with?('/')
+        "#{data.config.url}/#{path}"
+      end
     
       def slug
         @state['current_slug']
@@ -99,34 +41,67 @@ module Gumdrop
         @state['layout']= name
       end
       
-      def render(path)
+      def render(path, opts={})
         page= get_page path
         unless page.nil?
           #TODO: nested state for an inline rendered page?
           old_layout= @state['layout']
-          content= page.render(true, false)
+          content= page.render(true, false, opts)
           old_layout= @state['layout']
           content
         else
           ""
         end
       end
+      
+      def data
+        Gumdrop.data
+      end
     
       def reset_data(preset={})
         # TODO: Add a setting for reloading data on every request/page
-        @data= DeferredLoader.new if @data.nil? or !Gumdrop.config.cache_data
+        #@data= DeferredLoader.new if @data.nil? or !Gumdrop.config.cache_data
+        Gumdrop.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]= value
+          @state[name.to_s]= value
+        else
+          @state[name.to_s]
+        end
+      end
+      
+      def params
+        @content.params
+      end
+      
+      def set_content(content, locals)
+        @content= content
+        @state= @state.reverse_merge(content.params).merge(locals)
+      end
+      
+      def content_for(key, &block)
+        keyname= "_content_#{key}"
+        if block_given?
+          @state[keyname]= block
         else
-          @state[name]
+          if @state.has_key?(keyname)
+            @state[keyname].call
+          else
+            nil
+          end
         end
       end
       
+      def content_for?(key)
+        keyname= "_content_#{key}"
+        @state.has_key?(keyname)
+      end
+      
     protected
       
       def get_page(path)

data/lib/gumdrop/deferred_loader.rb

@@ -0,0 +1,97 @@
+require 'yaml'
+require 'ostruct'
+
+def hashes2ostruct(object)
+  return case object
+  when Hash
+    object = object.clone
+    object.each do |key, value|
+      object[key] = hashes2ostruct(value)
+    end
+    OpenStruct.new(object)
+  when Array
+    object = object.clone
+    object.map! { |i| hashes2ostruct(i) }
+  else
+    object
+  end
+end
+
+module Gumdrop
+  
+  class DeferredLoader
+    attr_reader :cache
+  
+    def initialize
+      #puts "@!@"
+      @cache= {}
+      @persisted= {}
+    end
+  
+    def method_missing(key, value=nil)
+      cache_or_load_data(key)
+      @cache[key]
+    end
+  
+    def set(key, value, opts={})
+      @cache[key]= value
+      @persisted[key]= value if opts[:persist]
+    end
+  
+    def reset
+      @cache= @persisted.clone #Hash.new(@persisted)  #{|h,k| h[k]= load_data(k) }
+    end
+    
+    def pager_for(key, opts={})
+      base_path= opts.fetch(:base_path, 'page')
+      page_size= opts.fetch(:page_size, 5)
+      data= if key.is_a? Symbol
+        cache_or_load_data(key)
+        @cache[key]
+      else
+        key
+      end
+      Pager.new( data, base_path, page_size )
+    end
+  
+  
+  private
+  
+    def cache_or_load_data(key)
+      @cache[key]= load_data(key) unless @cache.has_key? key
+    end
+
+    def load_data(key)
+      path=get_filename(key)
+      return nil if path.nil?
+      if File.extname(path) == ".yamldb"
+        docs=[]
+        File.open(path, 'r') do |f|
+          YAML.load_documents(f) do |doc|
+            docs << hashes2ostruct( doc ) unless doc.has_key?("__proto__")
+          end
+        end
+        docs
+      else
+        hashes2ostruct( YAML.load_file(path)  )
+      end
+    end
+
+    # TODO: Support './data/collection_name/*.(yaml|json)' data loading?
+
+    def get_filename(path)
+      if File.exists? "data/#{path}.json"
+        "data/#{path}.json"
+      elsif File.exists? "data/#{path}.yml"
+        "data/#{path}.yml"
+      elsif File.exists? "data/#{path}.yaml"
+        "data/#{path}.yaml"
+      elsif File.exists? "data/#{path}.yamldb"
+        "data/#{path}.yamldb"
+      else
+        raise "No data found for #{path}"
+        #nil #TODO: Should it die if it can't find data?
+      end
+    end
+  end
+end

data/lib/gumdrop/generator.rb

@@ -1,6 +1,81 @@
 module Gumdrop
 
   class Generator
+    attr_reader :filename, :base_path, :params, :pages
+    
+    def initialize(content, opts={})
+      @content= content
+      if @content.is_a? Proc
+        @filename= ""
+        @base_path= ""
+      else
+        @filename= content.filename || ""
+        @base_path= content.slug || ""
+      end
+      @params= HashObject.new
+      @pages= []
+    end
+    
+    def execute
+      if @content.is_a? Proc
+        run_dsl_from_proc @content
+      else
+        run_dsl_from_source IO.readlines(@content.path).join('')
+      end
+    end
+    
+    def data
+      Gumdrop.data
+    end
+    
+    def set(var_name, value)
+      params[var_name]= value
+    end
+    
+    def page(name, opts={}, &block)
+      opts= params.reverse_merge(opts)
+      filepath= if @base_path.empty?
+        "/#{name}"
+      else
+        "/#{@base_path}/#{name}"
+      end
+      content= GeneratedContent.new(filepath, opts)
+      content.template = if Gumdrop.layouts.has_key?( opts[:template] )
+        Gumdrop.layouts[ opts[:template] ]
+      else
+        Gumdrop.layouts[ "#{opts[:template]}.template" ]
+      end.template
+      
+      Gumdrop.site[content.uri]= content
+    end
+    
+    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
+  
+  class GeneratedContent < Content
+    # Nothing special, per se...
+  end
+  
+  module GenerationDSL
+    
+    # attr_accessor :generators
+    # @generators=[]
+    
+    def self.generate(&block)
+      
+      # Auto-generated, numerical, key for a site-level generator
+      Gumdrop.generators[Gumdrop.generators.keys.length] = Generator.new(block)
+    end
+    
   end
 
 end

data/lib/gumdrop/pager.rb

@@ -0,0 +1,49 @@
+module Gumdrop
+  class Pager
+    attr_reader :all, :pages, :base_url, :current_page, :page_sets
+
+    def initialize(articles, base_path="/page", page_size=5)
+      @all= articles
+      @page_size= page_size
+      @base_path= base_path
+      @page_sets= @all.in_groups_of(page_size, false)
+      @pages= []
+      @current_page=1
+      @page_sets.each do |art_ary|
+        @pages << HashObject.new({
+          'items' => art_ary,
+          'page' => @current_page,
+          'uri' => "#{base_path}/#{current_page}",
+          'pager' => self
+        })
+        @current_page += 1
+      end
+      @current_page= nil
+    end
+
+    def length
+      @pages.length
+    end
+
+    def first
+      @pages.first
+    end
+
+    def last
+      @pages.last
+    end
+
+    def each
+      @current_page=1
+      @pages.each do |page_set|
+        yield page_set
+        @current_page += 1
+      end
+      @current_page= nil
+    end
+
+    def [](key)
+      @pages[key]
+    end
+  end
+end

data/lib/gumdrop/server.rb

@@ -8,26 +8,25 @@ module Gumdrop
 
     set :port, Gumdrop.config.port if Gumdrop.config.port
     
-    get '/' do
-      redirect '/index.html'
-    end
-    
+    # get '/' do
+    #   redirect '/index.html'
+    # end
+
     get '/*' do
-      file_path= params[:splat].join('/')
-      matches= Dir["source/#{file_path}*"] 
-      if matches.length > 0
-        
-        Gumdrop.site= Gumdrop.layouts= Gumdrop.generators= Utils.content_hash("source/**/")
-        Gumdrop.partials= Utils.content_hash("source/**/_")
-                    
-        content= Content.new matches[0]
+      
+      Gumdrop.run :dry_run=>true if Gumdrop.config.force_reload
+      
+      file_path= get_content_path params[:splat].join('/')
+      
+      if Gumdrop.site.has_key? file_path
+        content= Gumdrop.site[file_path]
         if content.useLayout?
           content_type :css if content.ext == '.css' # Meh?
           content_type :js if content.ext == '.js' # Meh?
           content_type :xml if content.ext == '.xml' # Meh?
           content.render
         else
-          send_file matches[0]
+          send_file "source/#{file_path}"
         end
       else
         puts "NOT FOUND: #{file_path}"
@@ -35,7 +34,22 @@ module Gumdrop
       end
     end
     
+
+    def get_content_path(file_path)
+      keys= [
+        file_path,
+        "#{file_path}.html",
+        "#{file_path}/index.html"
+      ]
+      if file_path == ""
+        "index.html"
+      else
+        keys.detect {|k| Gumdrop.site.has_key?(k) }
+      end
+    end
+    
     if Gumdrop.config.auto_run
+      Gumdrop.run :dry_run=>true 
       run!
     end    
 
@@ -43,6 +57,7 @@ module Gumdrop
       # Options
       opts.reverse_merge! :auto_run => true, :cache_data => false
       Gumdrop.config.merge! opts
+      Gumdrop.run :dry_run=>true 
       ::Gumdrop::Server
     end
 

data/lib/gumdrop/template/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
+gem "i18n"
 gem "sinatra"
 gem "active_support"
-gem "i18n"
 gem "rake"
 gem "gumdrop"
 
@@ -11,7 +11,12 @@ gem "gumdrop"
 gem "sass"
 gem "coffee-script"
 
+# For markdown support, a couple of options:
 # gem "rdiscount"
+# gem 'maruku'
+
+# For template support:
 # gem "less"
 # gem "haml"
-
+# gem "slim"
+# gem 'builder'

data/lib/gumdrop/template/Rakefile

@@ -8,16 +8,11 @@ SERVER='server.com'
 FOLDER="~/#{SERVER}"
 
 
-task :default  do
-  sh 'rake -T'
-end
-
 desc "Build source files into output"
 task :build do
   Gumdrop.run()
 end
 
-
 desc "Run development server"
 task :serve do
   Gumdrop.config.auto_run= true

data/lib/gumdrop/template/config.ru

@@ -11,5 +11,6 @@ end
 require 'gumdrop'
 
 Gumdrop.config.auto_run= false
+Gumdrop.run :dry_run=>true 
 
 run Gumdrop::Server

data/lib/gumdrop/template/data/config.yml

@@ -1,2 +1,4 @@
 title: My Site
 tagline: My home on thar intarwebs!
+author: Matt McCray
+url: http://www.mysite.com

data/lib/gumdrop/template/lib/site.rb

@@ -0,0 +1,14 @@
+# Any specialized code for your site goes here...
+
+# Example site-level generator
+# generate do
+#
+#   page "about.html", :template=>'about', :passthru=>'Available in the template' # requires a about.template.XX file
+#   
+#   # Maybe for a tumblr-like pager
+#   pager= Gumdrop.data.pager_for :posts, :base_path=>'posts/page', :page_size=>5
+#   pager.each do |page|
+#     page "#{page.uri}.html", :template=>'post_page', :posts=>page.items, :pager=>pager, :current_page=>pager.current_page
+#   end
+#   
+# end

data/lib/gumdrop/template/source/feed.xml.builder.txt

@@ -0,0 +1,23 @@
+xml.instruct!
+xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
+  xml.title data.config.title
+  xml.subtitle data.config.tagline
+  xml.id data.config.url
+  xml.link "href" => data.config.url
+  xml.link "href" => "#{data.config.url}/feed.xml", "rel" => "self"
+  xml.updated data.blog.first.date.to_time.iso8601
+  xml.author { xml.name data.config.author }
+
+  data.blog.each do |post|
+    xml.entry do
+      url= "#{data.config.url}/posts/#{post.slug}"
+      xml.title post.title
+      xml.link "rel" => "alternate", "href" => url
+      xml.id url
+      xml.published post.date.to_time.iso8601
+      xml.updated post.date.to_time.iso8601
+      xml.author { xml.name data.config.author }
+      xml.content post.body, "type" => "html"
+    end
+  end
+end

data/lib/gumdrop/template/source/theme/scripts/app.js.coffee

@@ -0,0 +1,4 @@
+
+@App=
+  init: ->
+    # Do something cool here

data/lib/gumdrop/version.rb

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

data/lib/gumdrop/view_helpers.rb

@@ -2,10 +2,15 @@ module Gumdrop
   
   module ViewHelpers
     
-    # Handy for hiding a block of unfinished code
-    # def hidden(&block)
-    #   #no-op
-    # end
+    def hidden(&block)
+      #no-op
+    end
+    
+    def markdown(source)
+      m= Tilt['markdown'].new { source }
+      m.render
+    end
+    
     
     def gumdrop_version
       ::Gumdrop::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70163031231440 !ruby/object:Gem::Requirement
+  requirement: &70267787964340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163031231440
+  version_requirements: *70267787964340
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70163031231020 !ruby/object:Gem::Requirement
+  requirement: &70267787963900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163031231020
+  version_requirements: *70267787963900
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70163031230600 !ruby/object:Gem::Requirement
+  requirement: &70267787963400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163031230600
+  version_requirements: *70267787963400
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70163031230180 !ruby/object:Gem::Requirement
+  requirement: &70267787962920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163031230180
+  version_requirements: *70267787962920
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70163031229760 !ruby/object:Gem::Requirement
+  requirement: &70267787962460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163031229760
+  version_requirements: *70267787962460
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70163031229340 !ruby/object:Gem::Requirement
+  requirement: &70267787962000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163031229340
+  version_requirements: *70267787962000
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables:
@@ -96,28 +96,43 @@ files:
 - examples/simple/Rakefile
 - examples/simple/config.ru
 - examples/simple/data/config.yml
+- examples/simple/data/posts.yamldb
+- examples/simple/lib/site.rb
 - examples/simple/lib/view_helpers.rb
+- examples/simple/source/.htaccess
+- examples/simple/source/_pager_control.html.erb
+- examples/simple/source/_sidebar.html.haml
 - examples/simple/source/favicon.ico
+- examples/simple/source/feed.xml.builder
 - examples/simple/source/index.html.erb
+- examples/simple/source/posts.generator.rb
+- examples/simple/source/posts/index.html.erb
 - examples/simple/source/theme/screen.css.scss
 - examples/simple/source/theme/scripts/app.js.coffee
 - examples/simple/source/theme/styles/_tools.scss
+- examples/simple/source/theme/templates/post.template.haml
+- examples/simple/source/theme/templates/post_page.template.haml
 - examples/simple/source/theme/templates/site.template.haml
+- examples/simple/source/theme/templates/test.template.erb
 - gumdrop.gemspec
 - lib/gumdrop.rb
 - lib/gumdrop/cli.rb
 - lib/gumdrop/content.rb
 - lib/gumdrop/context.rb
+- lib/gumdrop/deferred_loader.rb
 - lib/gumdrop/generator.rb
 - lib/gumdrop/hash_object.rb
+- lib/gumdrop/pager.rb
 - lib/gumdrop/server.rb
 - lib/gumdrop/template/.htaccess
 - lib/gumdrop/template/Gemfile
 - lib/gumdrop/template/Rakefile
 - lib/gumdrop/template/config.ru
 - lib/gumdrop/template/data/config.yml
+- lib/gumdrop/template/lib/site.rb
 - lib/gumdrop/template/lib/view_helpers.rb
 - lib/gumdrop/template/source/favicon.ico
+- lib/gumdrop/template/source/feed.xml.builder.txt
 - lib/gumdrop/template/source/index.html.erb
 - lib/gumdrop/template/source/theme/screen.css.scss
 - lib/gumdrop/template/source/theme/scripts/app.js.coffee