gumdrop 1.0.3 → 1.1.0

data/ChangeLog.md

@@ -1,3 +1,18 @@
+# v1.1.0
+- Added `Gumdrop.prepare(&block)`, it's a good time to apply data transformations.
+- Added Content#dirname.
+- Fixed `base_path` for file based generators.
+- Updated site templates.
+- Optionally prepare yaml data from content.
+- Lock version numbers of deps in gemspec
+- No longer do a binary check on files when running `uris` command.
+- Added support for caching partials (good for static partials used in layouts).
+- Fixed dev server bug where it would rescan on every request.
+- Fixed relativing urls in partials.
+- Re-enabled support for `content_for` and `content_for?` to rendering context (known to work for ERb).
+- Re-enabled support for `Gumdrop::Util::Pager`.
+- Re-enabled support for `page` in rendering context.
+ 
 # v1.0.3
 - Fixed markdown and textile view_helpers.
 - `Dir.chdir` to `site.root`. (should be able to run gumdrop in any folder of a Gumdrop project)

data/Notes.md

@@ -0,0 +1,5 @@
+## Notes and Todos
+
+- Flesh out the test/specs
+- Adde support for marking a partial 'cacheable' in the partial
+    <%= set :cache=>true %>

data/Rakefile

@@ -22,8 +22,8 @@ end
 
 desc "generates fixture site then tests output against expected fixture data"
 task :test_output => :test_output_clear do
-  sh "cd specs/fixtures/source && bundle exec gumdrop build -f"
-  diff_results= `diff -w -r -y -N -q --suppress-common-lines specs/fixtures/output specs/fixtures/expected`
+  sh "cd specs/fixtures/source && bundle exec gumdrop build -q -f"
+  diff_results= `diff -w -r -y -N -q -B -b --suppress-common-lines specs/fixtures/output specs/fixtures/expected`
   if diff_results.empty?
     puts "\n\nPASS: All files matched!"
     puts "#{ diff_results }"
@@ -34,7 +34,7 @@ task :test_output => :test_output_clear do
     matcher= Regexp.new('Files (.*) and', 'i')
     diff_results.scan(matcher).flatten.each do |fname|
       puts "\n\n"
-      puts `diff -w -C 3 #{fname} #{fname.gsub('fixtures/output', 'fixtures/expected')}`
+      puts `diff -w -B -b -C 3 #{fname} #{fname.gsub('fixtures/output', 'fixtures/expected')}`
     end
   end
   puts ""

data/Readme.md

@@ -85,12 +85,13 @@ open source projects (in alphabetical order):
 
 And will, optionally, leverage these in building your site:
 
+* coffee-script
+* erb
+* haml/sass
+* jsmin
+* slim
 * sqlite3
 * sprockets
 * stitch
-* jsmin
-* slim
-* haml/sass
-* coffee-script
 * and many, many more! (todo: gotta document 'em all!)
 

data/gumdrop.gemspec

@@ -24,19 +24,20 @@ Gem::Specification.new do |s|
    s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
    s.require_paths = ["lib"]
    
-   s.add_dependency 'thor'
-   s.add_dependency 'tilt'
-   s.add_dependency 'active_support'
-   s.add_dependency 'onfire'
-   s.add_dependency 'sinatra'
-   s.add_dependency 'i18n'
-   s.add_dependency 'launchy'
-   s.add_dependency 'bundle'
-
-   s.add_development_dependency 'minitest'
-   s.add_development_dependency 'sqlite3'
-   s.add_development_dependency 'sprockets'
-   s.add_development_dependency 'stitch'
-   s.add_development_dependency 'jsmin'
+   s.add_dependency 'thor', '0.15.4'
+   s.add_dependency 'tilt', '1.3.3'
+   s.add_dependency 'active_support', '3.0.0'
+   s.add_dependency 'onfire', '0.2.0'
+   s.add_dependency 'sinatra', '1.3.2'
+   s.add_dependency 'i18n', '0.6.0'
+   s.add_dependency 'launchy', '0.4.0'
+   # s.add_dependency 'bundler', ''
+   s.add_dependency 'sprockets', '2.4.3'
+   s.add_dependency 'stitch', '0.1.6'
+   s.add_dependency 'jsmin', '1.0.1'
+   s.add_dependency 'json', '~> 1.7.7'
 
+   s.add_development_dependency 'minitest', '3.2.0'
+   s.add_development_dependency 'sqlite3', '1.3.6'
+   
 end

data/lib/gumdrop/builder.rb

@@ -78,7 +78,7 @@ module Gumdrop
             _ensure_path to
             FileUtils.cp_r from, to
           else
-            log.info " unchanged: #{ _rel_path to }"
+            log.debug " unchanged: #{ _rel_path to }"
           end
         end
       end
@@ -94,7 +94,7 @@ module Gumdrop
               f.write rendered_content
             end
           else
-            log.info " unchanged: #{ _rel_path to }"
+            log.debug " unchanged: #{ _rel_path to }"
           end
         end
       end

data/lib/gumdrop/cli/internal.rb

@@ -68,14 +68,15 @@ module Gumdrop::CLI
         content= Gumdrop.site.contents[uri]
         blackout= Gumdrop.site.in_blacklist?(uri) ? 'X' : ' '
         generated= content.generated? ? '*' : ' '
-        binary= content.binary? ? '!' : ' '
-        say " #{blackout + generated + binary} #{content.uri}"
+        # binary= content.binary? ? '!' : ' '
+        # say " #{blackout + generated + binary} #{content.uri}"
+        say " #{blackout + generated } #{content.uri}"
       end
       say ""
       say "Legend:"
-      say "  X = On on the blacklist"
+      say "  X = On the blacklist"
       say "  * = Generated (not on fs)"
-      say "  ! = Binary file"
+      # say "  ! = Binary file"
     end
 
     desc "version", "Displays Gumdrop version"

data/lib/gumdrop/content.rb

@@ -1,9 +1,12 @@
 module Gumdrop
 
+
   # All content (layouts, partials, images, html, js css, etc) found in
   # the source directory are represented as a Content object in memory
   class Content
     include Util::SiteAccess
+  
+    KNOWN_BINARY= %w(.jpe .jpeg .jpg .png .tiff .gif)
 
     attr_reader :source_path, :params
     
@@ -25,6 +28,7 @@ module Gumdrop
 
     def slug
       @slug ||= uri.gsub('/', '-').gsub(ext, '')
+      @params.slug || @slug
     end
 
     def path
@@ -43,6 +47,10 @@ module Gumdrop
       @filename ||= _target_filename
     end
 
+    def dirname
+      @dirname ||= File.dirname source_path
+    end
+
     def type
       @type ||= File.extname source_filename
     end
@@ -55,10 +63,20 @@ module Gumdrop
       @uri ||= _uri
     end
 
+    def uripath
+      @uripath ||= File.dirname uri
+    end 
+
+    def clean_uri
+      @clean_uri ||= uri.gsub(ext, '')
+    end
+
     def binary?
       @is_binary ||= begin
         if generated? or has_block? or missing?
           false
+        elsif KNOWN_BINARY.include? ext
+          true
         else
           # from ptools
           s = (File.read(source_path, File.stat(source_path).blksize) || "").split(//)
@@ -109,7 +127,7 @@ module Gumdrop
 
     def mtime
       @mtime ||= if exists? and !generated?
-          File.new(@source_path).mtime
+          File.mtime @source_path
         else
           Time.now
         end

data/lib/gumdrop/generator.rb

@@ -8,7 +8,7 @@ module Gumdrop
       @dsl= DSL.new self
       @pages= []
       @filename= content.nil? ? (opts[:filename] || '') : content.filename
-      @base_path= content.nil? ? (opts[:base_path] || '') : content.slug 
+      @base_path= content.nil? ? (opts[:base_path] || '') : content.dirname 
     end
 
     def unload
@@ -66,6 +66,7 @@ module Gumdrop
     def _render_inline_content(opts)
       Proc.new {
         renderer= site.active_renderer || Renderer.new
+        raise "Generator: page :render=>'partial' param is missing!" unless opts[:render]
         content= site.resolve(opts[:render], opts)
         opts[:inline_render]= true
         renderer.draw content, opts

data/lib/gumdrop/renderer.rb

@@ -6,12 +6,13 @@ module Gumdrop
     SPECIAL_OPTS= %w(layout force_partial)
     MUNGABLE_RE= Regexp.new(%Q<(href|data|src)([\s]*)=([\s]*)('|"|&quot;|&#34;|&#39;)?\\/([\\/]?)>, 'i')
 
-    attr_reader :context
+    attr_reader :context, :cache
 
     def initialize
       site.active_renderer= self
       @context, @content, @opts= nil, nil, nil
       @stack= []
+      @cache= {}
     end
 
     def draw(content, opts={})
@@ -22,9 +23,12 @@ module Gumdrop
           log.warn "Missing content body for: #{ content.uri }"
           nil
         else
+          opts[:calling_page]= @context unless opts.has_key? :calling_page
           _in_context(content, opts) do
             data[:context]= @context
             data[:output]= _render_content!
+            @cache[content.source_path]= data[:output] if @context.cache
+            data[:output]
           end
         end
       end
@@ -103,6 +107,7 @@ module Gumdrop
     def _relativize?
       return false if !site.config.relative_paths
       return false if @context.force_absolute
+      return false if @content.partial?
       return true if site.config.relative_paths_exts == :all
       site.config.relative_paths_exts.include?(@content.ext)
     end
@@ -216,7 +221,15 @@ module Gumdrop
       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
+      opts[:calling_page]= self
+      return @renderer.draw content, opts if opts[:cache] == false
+      if @renderer.cache.has_key? content.source_path
+        @renderer.cache[content.source_path]
+      else  
+        output= @renderer.draw content, opts
+        @renderer.cache[content.source_path]= output if opts[:cache]
+        output
+      end
     end
 
     def get(key)
@@ -233,6 +246,50 @@ module Gumdrop
       end
     end
 
+    def page
+      @content_page ||= begin
+        parent= self
+        while !parent.nil? and !parent.calling_page.nil? do
+          parent= parent.calling_page
+        end 
+        parent
+      end
+    end
+
+    def content_for(key, &block)
+      keyname= "_content_#{key}"
+      if block_given?
+        content= capture &block
+        @state[keyname]= content #block
+        nil
+      else
+        if @state.has_key?(keyname)
+          # @state[keyname].call
+          @state[keyname]
+        else
+          nil
+        end
+      end
+    end
+
+    def capture(&block)
+      erbout = eval('_erbout', block.binding) rescue nil
+      unless erbout.nil?
+        erbout_length = erbout.length
+        block.call
+        content = erbout[erbout_length..-1]
+        erbout[erbout_length..-1] = ''
+      else
+        content= block.call
+      end
+      content
+    end
+    
+    def content_for?(key)
+      keyname= "_content_#{key}"
+      @state.has_key?(keyname)
+    end
+
     def method_missing(sym, *args, &block)
       if sym.to_s.ends_with? '='
         key= sym.to_s.chop

data/lib/gumdrop/server.rb

@@ -11,9 +11,12 @@ module Gumdrop
     include Util::Loggable
 
     site= Gumdrop.site
+    scan_count= 0
 
     unless site.nil?
       site.scan true
+      scan_count += 1
+      last_scan= Time.now.to_i
 
       set :port, site.config.server_port if site.config.server_port
       
@@ -35,11 +38,17 @@ module Gumdrop
         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
+          since_last_build= Time.now.to_i - last_scan
           # site.report "!>!>>>>> since_last_build: #{since_last_build}"
           if since_last_build > site.config.server_timeout
             log.info "[#{$$}] Rebuilding from Source (#{since_last_build} > #{site.config.server_timeout})"
             site.scan true
+            scan_count += 1
+            last_scan= Time.now.to_i
+            if scan_count % 50 == 0
+              log.info "<* Initiating Garbage Collection *>"
+              GC.start
+            end
           end
         end
         

data/lib/gumdrop/site.rb

@@ -44,6 +44,7 @@ module Gumdrop
       _options_updated!
       @root= File.dirname @sitefile
       @last_run= 0
+      @_preparations= []
       clear
     end
 
@@ -84,6 +85,7 @@ module Gumdrop
     end
 
     def generate
+      _execute_preparations
       _execute_generators
       self
     end
@@ -131,6 +133,10 @@ module Gumdrop
       end
     end
 
+    def prepare(&block)
+      @_preparations << block
+    end
+
     # Events stop bubbling here.
     def parent
       nil
@@ -196,6 +202,18 @@ module Gumdrop
       false
     end
 
+    def _execute_preparations
+      log.debug "[Executing Preparations]"
+      dsl= Generator::DSL.new nil
+      @_preparations.each do |block|
+        if block.arity == 1
+          block.call dsl
+        else
+          dsl.instance_eval &block
+        end
+      end
+    end
+
     def _execute_generators
       log.debug "[Executing Generators]"
       event_block :generate do
@@ -284,12 +302,16 @@ module Gumdrop
       site.configure &block
     end
 
+    def prepare(&block)
+      site.prepare &block
+    end
+
     # Short cut to the current Site config object.
     def config
       site.config
     end
 
-    # The env Gumdrop is run in -- You can set this in the congig
+    # The env Gumdrop is run in -- You can set this in the config
     # or, better, via command line: `gumdrop build -e test`
     def env
       site.env

data/lib/gumdrop/util/pager.rb

@@ -1,7 +1,7 @@
 module Gumdrop::Util
 
   class Pager
-    attr_reader :all, :pages, :base_url, :current_page, :page_sets
+    attr_reader :all, :pages, :base_path, :current_page, :page_sets
 
     def initialize(articles, base_path="/page", page_size=5)
       @all= articles

data/lib/gumdrop/util/view_helpers.rb

@@ -6,6 +6,11 @@ module Gumdrop
       def hidden(&block)
         #no-op
       end
+
+      def urlencode(string)
+        require "erb" unless defined? ERB
+        ERB::Util.url_encode(string)
+      end
       
       def markdown(source)
         eng_class= Gumdrop::Renderer.for 'markdown'

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION= "1.0.3"
+  VERSION= "1.1.0"
 
 end

data/lib/gumdrop.rb

@@ -25,6 +25,7 @@ module Gumdrop
     autoload :Eventable, 'gumdrop/util/eventable'
     autoload :HashObject, 'gumdrop/util/hash_object'
     autoload :Loggable, 'gumdrop/util/loggable'
+    autoload :Pager, 'gumdrop/util/pager'
     autoload :Scanner, 'gumdrop/util/scanner'
     autoload :SiteAccess, 'gumdrop/util/site_access'
     autoload :ViewHelpers, 'gumdrop/util/view_helpers'

data/specs/fixtures/expected/index.html

@@ -34,6 +34,8 @@
   <li><a href="js/test-coffee.js">js/test-coffee.js</a></li>
   <li><a href="pages/docs/force-abs.html">pages/docs/force-abs.html</a></li>
   <li><a href="pages/docs/index.html">pages/docs/index.html</a></li>
+  <li><a href="partials/cached-internally.html">partials/cached-internally.html</a></li>
+  <li><a href="partials/cached.html">partials/cached.html</a></li>
   <li><a href="partials/hoisted-data.html">partials/hoisted-data.html</a></li>
   <li><a href="partials/nested.html">partials/nested.html</a></li>
   <li><a href="partials/params.html">partials/params.html</a></li>

data/specs/fixtures/expected/partials/cached-internally.html

@@ -0,0 +1,5 @@
+<body class="site">  <div>Matt</div>
+  <div>Matt</div>
+  <div>Matt</div>
+  <div>Other</div>
+</body>

data/specs/fixtures/expected/partials/cached.html

@@ -0,0 +1,5 @@
+<body class="site">  <div>Matt</div>
+  <div>Matt</div>
+  <div>Matt</div>
+  <div>Other</div>
+</body>

data/specs/fixtures/source/Gemfile

@@ -34,4 +34,4 @@ gem 'redcarpet'
 # For xml generation support:
 # gem 'builder'
 
-
+gem 'json', '~> 1.7.7'

data/specs/fixtures/source/partials/_params-internally-cached.html.erb

@@ -0,0 +1 @@
+<% set :cache=>true %><div><%= name %></div>

data/specs/fixtures/source/partials/_params.html.erb

@@ -0,0 +1 @@
+<div><%= name %></div>

data/specs/fixtures/source/partials/cached-internally.html.erb

@@ -0,0 +1,4 @@
+  <%= render 'params-internally-cached', name:'Matt' %>
+  <%= render 'params-internally-cached', name:'Dan' %>
+  <%= render 'params-internally-cached', name:'Sam' %>
+  <%= render 'params-internally-cached', name:'Other', :cache=>false %>

data/specs/fixtures/source/partials/cached.html.erb

@@ -0,0 +1,4 @@
+  <%= render 'params', name:'Matt', :cache=>true %>
+  <%= render 'params', name:'Dan' %>
+  <%= render 'params', name:'Sam' %>
+  <%= render 'params', name:'Other', :cache=>false %>

data/templates/blank/Gumdrop

@@ -3,10 +3,12 @@ Gumdrop.configure do|config|
 
   # You can add whatever custom config options you'd like:
 
-  # config.site_title=   "My Site"
-  # config.site_tagline= "My home on thar intarwebs!"
-  # config.site_author=  "Me"
-  # config.site_url=     "http://www.mysite.com"
+  # config.site= {
+  #   title:   'My Site',
+  #   tagline: 'My home on thar intarwebs!',
+  #   author:  'Me',
+  #   url:     'http://www.mysite.com'
+  # }
 
   # config.redirects= [
   #   { from:"old-path.html", to:"new-path.html" }
@@ -37,13 +39,11 @@ Gumdrop.configure do|config|
   # config.blacklist= []
 
   # Optional, if you want to use the example 'sync' command below.
-
-  # You can call config.set and pass a hash, if you prefer that format:
-  # config.set({
-  #   server: 'example-server.com',
-  #   server_user: 'example-username',
-  #   server_path: '~/example-server.com'
-  # })
+  # config.remote= {
+  #   host: 'example-server.com',
+  #   user: 'example-username',
+  #   path: '~/example-server.com'
+  # }
 
 end
 
@@ -181,22 +181,23 @@ end
 # For more, see: https://github.com/wycats/thor/wiki
 # Gumdrop.cli do
   
-#   desc 'sync', "Syncs with public server using rsync (if configured)"  
-#   method_option :build, :aliases => '-b', :desc => 'Build content before syncing'
-#   method_option :dry_run, :aliases => '-d', :desc => 'Dry run'
-#   def sync
-#     Gumdrop.site.build if options[:build]
-#     config= Gumdrop.site.config
-#     output= Gumdrop.site.output_path
-#     dry_run= options[:dry_run] ? 'n' : ''
-#     unless config.server.nil? or config.server == 'example-server.com'
-#       cmd= "rsync -avz#{ dry_run } --delete #{ output } #{ config.server_user }@#{ config.server }:#{ config.server_path }"
-#       say "Running:\n#{ cmd }\n"
-#       system(cmd)
-#     else
-#       say "To use this command, please configure your server info in the Gumdrop file!"
-#     end
-#   end
+  # desc 'sync', "Syncs with public server using rsync (if configured)"  
+  # method_option :build, :aliases => '-b', :desc => 'Build content before syncing'
+  # method_option :dry_run, :aliases => '-d', :desc => 'Dry run'
+  # def sync
+  #   config= Gumdrop.site.config
+  #   output= Gumdrop.site.output_path
+  #   remote= config.remote
+  #   dry_run= options[:dry_run] ? 'n' : ''
+  #   unless remote.nil? or remote.host.nil? or remote.host == 'example-server.com'
+  #     Gumdrop.build if options[:build]
+  #     cmd= "rsync -avz#{ dry_run } --delete #{ output } #{ remote.user }@#{ remote.host }:#{ remote.path }"
+  #     say "Running:\n#{ cmd }\n"
+  #     system(cmd)
+  #   else
+  #     say "To use this command, please configure your server info in the Gumdrop file!"
+  #   end
+  # end
 
   # desc 'watch', "Watches the filesystem and recompiles whenever a source file changes."
   # method_option :quiet, default:false, aliases:'-q', type: :boolean

data/templates/default/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gem "gumdrop"
-
 # for the watch command
 # gem "listen"
 
@@ -31,3 +29,4 @@ gem "kramdown" #, :git => "git://github.com/darthapo/kramdown.git" #(github code
 # For xml generation support:
 gem 'builder'
 
+gem 'json', '~> 1.7.7'

data/templates/default/Gumdrop

@@ -2,12 +2,14 @@
 Gumdrop.configure do|config|
 
   # You can add whatever custom config options you'd like:
-
-  config.site_title=   "My Site"
-  config.site_tagline= "My home on thar intarwebs!"
-  config.site_author=  "Me"
-  config.site_url=     "http://www.mysite.com"
-
+  config.site= {
+    title:   'My Site',
+    tagline: 'My home on thar intarwebs!',
+    author:  'Me',
+    url:     'http://www.mysite.com'
+  }
+
+  # See the "Apache Stuff" generator below on how to use custom config info
   config.redirects= [
     { from:"old-path.html", to:"new-path.html" }
   ]
@@ -37,13 +39,11 @@ Gumdrop.configure do|config|
   # config.blacklist= []
 
   # Optional, if you want to use the example 'sync' command below.
-
-  # You can call config.set and pass a hash, if you prefer that format:
-  config.set({
-    server: 'example-server.com',
-    server_user: 'example-username',
-    server_path: '~/example-server.com'
-  })
+  config.remote= {
+    host: 'example-server.com',
+    user: 'example-username',
+    path: '~/example-server.com'
+  }
 
 end
 
@@ -90,7 +90,10 @@ DirectoryIndex index.html
 </IfModule>
 # END Gzip
 
-<% config.redirects.each do |opts| %>
+<% 
+   # It's the custom config setting! We have access to all config info here:
+   config.redirects.each do |opts|
+%>
 Redirect <%= opts[:from] %> <%= opts[:to] %>
 <% end %>
     EOF
@@ -184,12 +187,13 @@ Gumdrop.cli do
   method_option :build, :aliases => '-b', :desc => 'Build content before syncing'
   method_option :dry_run, :aliases => '-d', :desc => 'Dry run'
   def sync
-    Gumdrop.site.build if options[:build]
     config= Gumdrop.site.config
     output= Gumdrop.site.output_path
+    remote= config.remote
     dry_run= options[:dry_run] ? 'n' : ''
-    unless config.server.nil? or config.server == 'example-server.com'
-      cmd= "rsync -avz#{ dry_run } --delete #{ output } #{ config.server_user }@#{ config.server }:#{ config.server_path }"
+    unless remote.nil? or remote.host.nil? or remote.host == 'example-server.com'
+      Gumdrop.build if options[:build]
+      cmd= "rsync -avz#{ dry_run } --delete #{ output } #{ remote.user }@#{ remote.host }:#{ remote.path }"
       say "Running:\n#{ cmd }\n"
       system(cmd)
     else

data/templates/default/source/feed.xml.builder

@@ -1,22 +1,22 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-  xml.title config.site_title
-  xml.subtitle config.site_tagline
-  xml.id config.site_url
-  xml.link "href" => config.site_url
-  xml.link "href" => "#{config.site_url}/feed.xml", "rel" => "self"
+  xml.title config.site.title
+  xml.subtitle config.site.tagline
+  xml.id config.site.url
+  xml.link "href" => config.site.url
+  xml.link "href" => "#{config.site.url}/feed.xml", "rel" => "self"
   xml.updated data.news.first.date.to_time.iso8601
-  xml.author { xml.name config.site_author }
+  xml.author { xml.name config.site.author }
 
   site.contents.find("news/**/*").each do |post|
     xml.entry do
-      url= "#{config.site_url}/news/#{post._id}-#{post.slug}.html"
+      url= "#{config.site.url}/news/#{post._id}-#{post.slug}.html"
       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 config.site_author }
+      xml.author { xml.name config.site.author }
       xml.content render(post), "type" => "html"
     end
   end

data/templates/default/source/index.html.erb

@@ -1,4 +1,4 @@
-<p>Welcome to <%= config.site_title %></p>
+<p>Welcome to <%= config.site.title %></p>
 <h4>News</h4>
 <ul>
 <%

data/templates/default/source/theme/layout/site.layout.slim

@@ -2,7 +2,7 @@ doctype html
 html lang="en" 
   head
     meta charset="utf-8" 
-    title= config.site_title
+    title= config.site.title
     /[if le IE 9]
       script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"
     link rel="stylesheet" href='/theme/screen.css' type="text/css" media="screen" charset="utf-8"
@@ -11,8 +11,8 @@ html lang="en"
     div.row
       div.col.span-12
         header
-          h1= config.site_title
-          h4= config.site_tagline
+          h1= config.site.title
+          h4= config.site.tagline
     div.row
       div.col.span-12
         nav

metadata

@@ -1,204 +1,237 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gumdrop
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matt McCray
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-04 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tilt
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.15.4
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: active_support
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: active_support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: onfire
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: onfire
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
   name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.3
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundle
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+- !ruby/object:Gem::Dependency
+  name: stitch
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: jsmin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sprockets
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+  type: :runtime
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: stitch
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: jsmin
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
-description: The sweet 'n simple cms and prototyping tool for creating static html websites and webapps.
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+description: The sweet 'n simple cms and prototyping tool for creating static html
+  websites and webapps.
 email: matt@elucidata.net
-executables: 
+executables:
 - gumdrop
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - ChangeLog.md
 - Gemfile
 - License
+- Notes.md
 - Rakefile
 - Readme.md
 - bin/gumdrop
@@ -272,6 +305,8 @@ files:
 - specs/fixtures/expected/js/test-coffee.js
 - specs/fixtures/expected/pages/docs/force-abs.html
 - specs/fixtures/expected/pages/docs/index.html
+- specs/fixtures/expected/partials/cached-internally.html
+- specs/fixtures/expected/partials/cached.html
 - specs/fixtures/expected/partials/hoisted-data.html
 - specs/fixtures/expected/partials/nested.html
 - specs/fixtures/expected/partials/params.html
@@ -298,7 +333,7 @@ files:
 - specs/fixtures/source/data/yaml_db.yamldb
 - specs/fixtures/source/data/yaml_items.yaml
 - specs/fixtures/source/data/yamldoc.yamldoc
-- specs/fixtures/source/gen-with-inline-render.generator
+- specs/fixtures/source/gen-with-inline-render/gen-with-inline-render.generator
 - specs/fixtures/source/goodbye.html.erb
 - specs/fixtures/source/hello.html
 - specs/fixtures/source/image.png
@@ -315,11 +350,15 @@ files:
 - specs/fixtures/source/pages/_users-nested.html.erb
 - specs/fixtures/source/pages/docs/force-abs.html.erb
 - specs/fixtures/source/pages/docs/index.html.erb
+- specs/fixtures/source/partials/_params-internally-cached.html.erb
+- specs/fixtures/source/partials/_params.html.erb
 - specs/fixtures/source/partials/_post_entry.html.erb
 - specs/fixtures/source/partials/_provides_name.html.erb
 - specs/fixtures/source/partials/_user-params.html.erb
 - specs/fixtures/source/partials/_user.html.erb
 - specs/fixtures/source/partials/_user_sets_layout.html.erb
+- specs/fixtures/source/partials/cached-internally.html.erb
+- specs/fixtures/source/partials/cached.html.erb
 - specs/fixtures/source/partials/hoisted-data.html.erb
 - specs/fixtures/source/partials/nested.html.erb
 - specs/fixtures/source/partials/params.html.erb
@@ -349,37 +388,28 @@ files:
 - templates/default/source/theme/screen.css.sass
 - templates/default/source/theme/scripts/app.js.coffee
 - templates/default/source/theme/styles/_tools.scss
-has_rdoc: true
 homepage: https://github.com/darthapo/gumdrop
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gumdrop
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The sweet 'n simple cms and prototyping tool.
 test_files: []
-