gumdrop 0.4.0 → 0.5

data/lib/gumdrop/dsl.rb

@@ -11,14 +11,20 @@ module Gumdrop
     end
   
     def self.skip(path)
-      Gumdrop.report " blacklist: #{path}", :info
       Gumdrop.blacklist << path
     end
 
     def self.ignore(path)
-      Gumdrop.report "  greylist: #{path}", :info
       Gumdrop.greylist << path
     end
+
+    def self.view_helpers(&block)
+      Gumdrop::ViewHelpers.class_eval &block
+    end
+
+    def self.configure(&block)
+      Gumdrop::Configurator.instance_eval &block
+    end
   
   end
 end

data/lib/gumdrop/generator.rb

@@ -51,16 +51,55 @@ module Gumdrop
       
       Gumdrop.site[content.uri]= content
     end
+
+    # FIXME: Does redirect require abs-paths?
+    def redirect(from, opts={})
+      if opts[:to]
+        page from do
+          <<-EOF
+          <meta http-equiv="refresh" content="0;url=#{ opts[:to] }">
+          <script> window.location.href='#{ opts[:to] }'; </script>
+          EOF
+        end
+        opts[:from]= from
+        Gumdrop.redirects << opts
+      else
+        Gumdrop.report "You must specify :to in a redirect", :warning
+      end
+    end
     
     def stitch(name, opts)
       require 'gumdrop/stitch_ex'
       require 'gumdrop/stitch_compilers'
+      content= Stitch::Package.new(opts).compile
       page name do
-        content= Stitch::Package.new(opts).compile
-        if opts[:compress]
+        case opts[:compress]
+
+        when true, :jsmin
           require 'jsmin'
           JSMin.minify content
+
+        when :yuic
+          require "yui/compressor"
+          compressor = YUI::JavaScriptCompressor.new(:munge => opts[:obfuscate])
+          compressor.compress(content)
+
+        when :uglify
+          require "uglifier"
+          Uglifier.compile( content, :mangle=>opts[:obfuscate])
+
+        when false
+          content
+
         else
+          # UNKNOWN Compressor type!
+          Gumdrop.report "Unknown javascript compressor type! (#{ opts[:compressor] })", :warning
+          content
+        end
+      end
+      if opts[:keep_src] or opts[:keep_source]
+        ext= File.extname name
+        page name.gsub(ext, "#{opts.fetch(:source_postfix, '-src')}#{ext}") do
           content
         end
       end

data/lib/gumdrop/version.rb

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

data/{lib/gumdrop/template/default → templates/backbone}/Gemfile

@@ -9,10 +9,16 @@ gem "gumdrop"
 
 # Add your dependencies here:
 
+# For template support:
+# gem "less"
+# gem "haml"
 gem "slim"
 gem "sass"
 gem "coffee-script"
 
+# For JavaScript stitching and compressing:
+#gem 'uglifier'
+#gem 'yui-compressor'
 gem 'jsmin'
 gem 'stitch-rb'
 
@@ -20,10 +26,6 @@ gem 'stitch-rb'
 # gem "rdiscount"
 # gem 'maruku'
 
-# For template support:
-# gem "less"
-# gem "haml"
-
 # For xml generation support:
 # gem 'builder'
 

data/templates/backbone/Gumdrop

@@ -0,0 +1,119 @@
+puts "Gumdrop v#{Gumdrop::VERSION} building..."
+
+configure do
+
+  set :site_title,   "My Site"
+  set :site_tagline, "My home on thar intarwebs!"
+  set :site_author,  "Me"
+  set :site_url,     "http://www.mysite.com"
+  
+  #  All the supported build configuration settings and their defaults:
+
+  # set :output_dir, "./output"
+  # set :lib_dir, "./lib"
+  # set :source_dir, "./source"
+  # set :data_dir, './data'
+  # set :relative_paths, true
+  # set :proxy_enabled, true
+  # set :log_level, :info
+  # set :log, 'logs/build.log'
+
+end
+
+#  Skipping files entirely from build process... Like they don't exist.
+# skip 'file-to-ignore.html'
+# skip 'dont-show/'
+
+#  Ignores source file(s) from compilation, but does load the content into memory
+# ignore 'pages/'
+
+#  NOTE: Skipping and ignoring matches simply with starts_with?... So if a path, from the
+#  source directory, starts with the specified string, it'll skip or ignor it. (this
+#  doesn't work for files detected by stitch)
+
+
+# Example site-level generator
+generate do
+
+  stitch 'app.js',        # JavaScript to assemble
+    :identifier=>'app',   # variable name for the library
+    :paths=>['./app'],
+    :root=>'./app', 
+    :dependencies=>[],    # List of scripts to prepend to top of file (non moduled)
+    :prune=>false,        # If true, removes the source files from Gumdrop.site hash
+    :compress=>:jsmin,    # Options are :jsmin, :yuic, :uglify
+    :obfuscate=>false,    # For compressors that support munging/mangling
+    :keep_src=>true       # Creates another file, ex: app-src.js
+
+  stitch 'lib.js', 
+    :identifier=>'lib', 
+    :paths=>['./lib'], 
+    :root=>'./lib', 
+    :prune=>true, 
+    :compress=>false, 
+    :obfuscate=>false, 
+    :keep_src=>false
+
+
+  #  Requires a about.template.XX file
+  # page "about.html", 
+  #   :template=>'about', 
+  #   :passthru=>'Available in the template'
+
+  # page 'robots.txt' do
+  #   # And content returned will be put in the file
+  #   """
+  #   User-Agent: *
+  #   Disallow: /
+  #   """
+  # end
+
+  #  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
+
+#  Example of using a content filter to compress CSS output
+# require 'yui/compressor'
+# content_filter do |content, info|
+#   if info.ext == '.css'
+#     puts "  Compress: #{info.filename}"
+#     compressor= YUI::CssCompressor.new
+#     compressor.compress( content )
+#   else
+#     content
+#   end
+# end
+
+
+#  View helpers (available in rendering context):
+view_helpers do
+
+  # Calculate the years for a copyright
+  def copyright_years(start_year, divider="–")
+    end_year = Date.today.year
+    if start_year == end_year
+      "#{start_year}"
+    else
+      "#{start_year}#{divider}#{end_year}"
+    end
+  end
+  
+  #
+  # Your custom helpers go here!
+  #
+
+end
+
+# Any specialized code for your site goes here...
+
+require 'slim'
+Slim::Engine.set_default_options pretty:true

data/{lib/gumdrop/template/backbone/source/default.htaccess → templates/backbone/source/default.htaccess.erb}

@@ -20,3 +20,7 @@ DirectoryIndex index.html
   AddOutputFilterByType DEFLATE text/text text/html text/plain text/xml text/css application/x-javascript application/javascript
 </IfModule>
 # END Gzip
+
+<% Gumdrop.redirects.each do |opts| %>
+# Redirect <%= opts[:from] %> <%= opts[:to] %>
+<% end %>

data/{lib/gumdrop/template → templates}/backbone/source/feed.xml.builder.txt

@@ -1,22 +1,22 @@
 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.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.blog.first.date.to_time.iso8601
-  xml.author { xml.name data.config.author }
+  xml.author { xml.name config.site_author }
 
   data.blog.each do |post|
     xml.entry do
-      url= "#{data.config.url}/posts/#{post.slug}"
+      url= "#{config.site_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.author { xml.name config.site_author }
       xml.content post.body, "type" => "html"
     end
   end

data/{lib/gumdrop/template → templates}/backbone/source/theme/templates/app.template.slim

@@ -2,7 +2,7 @@ doctype html
 html lang="en" 
   head
     meta charset="utf-8" 
-    title= data.config.title
+    title= config.site_title
     /[if le IE 9]
       script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"
     /link rel="stylesheet" href==uri('theme/screen.css') type="text/css" media="screen" charset="utf-8"

data/{lib/gumdrop/template → templates}/backbone/source/theme/templates/site.template.slim

@@ -2,7 +2,7 @@ doctype html
 html lang="en" 
   head
     meta charset="utf-8" 
-    title= data.config.title
+    title= config.site_title
     /[if le IE 9]
       script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"
     link rel="stylesheet" href==uri('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= data.config.title
-          h4= data.config.tagline
+          h1= config.site_title
+          h4= config.site_tagline
     div.row
       div.col.span-12
         nav

data/{lib/gumdrop/template/backbone → templates/default}/Gemfile

@@ -9,10 +9,16 @@ gem "gumdrop"
 
 # Add your dependencies here:
 
+# For template support:
+# gem "less"
+# gem "haml"
 gem "slim"
 gem "sass"
 gem "coffee-script"
 
+# For JavaScript stitching and compressing:
+#gem 'uglifier'
+#gem 'yui-compressor'
 gem 'jsmin'
 gem 'stitch-rb'
 
@@ -20,10 +26,6 @@ gem 'stitch-rb'
 # gem "rdiscount"
 # gem 'maruku'
 
-# For template support:
-# gem "less"
-# gem "haml"
-
 # For xml generation support:
 # gem 'builder'
 

data/templates/default/Gumdrop

@@ -0,0 +1,109 @@
+puts "Gumdrop v#{Gumdrop::VERSION} building..."
+
+configure do
+
+  set :site_title,   "My Site"
+  set :site_tagline, "My home on thar intarwebs!"
+  set :site_author,  "Me"
+  set :site_url,     "http://www.mysite.com"
+  
+  #  All the supported build configuration settings and their defaults:
+  # set :output_dir, "./output"
+  # set :lib_dir, "./lib"
+  # set :source_dir, "./source"
+  # set :data_dir, './data'
+  # set :relative_paths, true
+  # set :proxy_enabled, true
+  # set :log_level, :info
+  # set :log, 'logs/build.log'
+end
+
+
+#  Skipping files entirely from build process... Like they don't exist.
+# skip 'file-to-ignore.html'
+# skip 'dont-show/'
+
+#  Ignores source file(s) from compilation, but does load the content into memory
+# ignore 'pages/'
+
+#  NOTE: Skipping and ignoring matches simply with starts_with?... So if a path, from the
+#  source directory, starts with the specified string, it'll skip or ignor it. (this
+#  doesn't work for files detected by stitch)
+
+
+# Example site-level generator
+generate do
+  
+  #  Requires a about.template.XX file
+  # page "about.html", 
+  #   :template=>'about', 
+  #   :passthru=>'Available in the template'
+
+  # page 'robots.txt' do
+  #   # And content returned will be put in the file
+  #   """
+  #   User-Agent: *
+  #   Disallow: /
+  #   """
+  # end
+
+  #  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
+
+  #  Assemble javscript files in a CommonJS-like way with stitch-rb
+  # stitch 'app.js',        # JavaScript to assemble
+  #   :identifier=>'app',   # variable name for the library
+  #   :paths=>['./app'],
+  #   :root=>'./app', 
+  #   :dependencies=>[],    # List of scripts to prepend to top of file (non moduled)
+  #   :prune=>false,        # If true, removes the source files from Gumdrop.site hash
+  #   :compress=>:jsmin,    # Options are :jsmin, :yuic, :uglify
+  #   :obfuscate=>false,    # For compressors that support munging/mangling
+  #   :keep_src=>true       # Creates another file, ex: app-src.js
+   
+end
+
+# Example of using a content filter to compress CSS output
+# require 'yui/compressor'
+# content_filter do |content, info|
+#   if info.ext == '.css'
+#     puts "  Compress: #{info.filename}"
+#     compressor= YUI::CssCompressor.new
+#     compressor.compress( content )
+#   else
+#     content
+#   end
+# end
+
+
+# View helpers (available in rendering context):
+view_helpers do
+
+  # Calculate the years for a copyright
+  def copyright_years(start_year, divider="–")
+    end_year = Date.today.year
+    if start_year == end_year
+      "#{start_year}"
+    else
+      "#{start_year}#{divider}#{end_year}"
+    end
+  end
+  
+  #
+  # Your custom helpers go here!
+  #
+
+end
+
+# Any specialized code for your site goes here...
+
+require 'slim'
+Slim::Engine.set_default_options pretty:true