gumdrop 0.2.16 → 0.3

data/ChangeLog.md

@@ -1,3 +1,13 @@
+# v0.3
+- Better logging support
+- Removed twitter-bootstrap template
+- Initial support for stitch-rb via a `stitch` generator command.
+
+# v0.2.17
+- Updated syntax to Ruby 1.9
+- Tweaked template Rakefile(s)
+- Added some initial specs
+
 # v0.2.16
 - Added option to specify output folder, still defaults to "output"
 - Bugfix: content wasn't looking for layouts right, causing exception
@@ -55,4 +65,4 @@
 - Fixed bug where partials weren't rendered via the dev server.
 
 # v0.2.1
-- Initial release. Yay!
+- Initial release. Yay!

data/Rakefile

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require "gumdrop/version"
- 
+require 'rake/testtask'
+
 desc "builds gem"
 task :build do
   system "gem build gumdrop.gemspec"
@@ -20,3 +21,10 @@ desc "uninstalls gem"
 task :uninstall do
   system "gem uninstall gumdrop"
 end
+
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList['specs/*_spec.rb']
+  t.verbose = true
+end

data/bin/gumdrop

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
+
 #  Copyright (c) 2011 M@ McCray. All rights reserved.
 
 $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
@@ -8,4 +10,4 @@ require 'rubygems'
 # require 'bundler/setup'
 
 require "gumdrop"
-require "gumdrop/cli"
+require "gumdrop/cli"

data/lib/gumdrop.rb

@@ -1,31 +1,29 @@
+# coding: utf-8
+
 require 'tilt'
 require 'fileutils'
 require 'active_support/all'
 
 DEFAULT_OPTIONS= {
-  :cache_data => false,
-  :relative_paths => true,
-  :auto_run => false,
-  :force_reload => false,
-  :root => ".",
-  :log_level => :info,
-  :output_dir => "./output"
+  cache_data: false,
+  relative_paths: true,
+  auto_run: false,
+  force_reload: false,
+  root: ".",
+  log_level: :info,
+  output_dir: "./output",
+  log: 'logs/build.log'
 }
 
 LOG_LEVELS = {
-  :info => 0,
-  :warning => 1,
-  :error => 2
+  info: 0,
+  warning: 1,
+  error: 2
 }
 
-# LOG_LEVELS = {
-#   info: 0,
-#   warning: 1,
-#   error: 2
-# }
-
 module Gumdrop
   
+  autoload :Build, "gumdrop/build"
   autoload :Context, "gumdrop/context"
   autoload :Content, "gumdrop/content"
   autoload :DeferredLoader, "gumdrop/deferred_loader"
@@ -33,6 +31,7 @@ module Gumdrop
   autoload :Generator, "gumdrop/generator"
   autoload :GeneratedrContent, "gumdrop/generator"
   autoload :HashObject, "gumdrop/hash_object"
+  autoload :Logging, "gumdrop/logging"
   autoload :Pager, "gumdrop/pager"
   autoload :Server, "gumdrop/server"
   autoload :Utils, "gumdrop/utils"
@@ -41,7 +40,18 @@ module Gumdrop
   
   class << self
     
-    attr_accessor :root_path, :source_path, :site, :layouts, :generators, :partials, :config, :data, :content_filters, :blacklist
+    attr_accessor :root_path, 
+                  :source_path, 
+                  :site, 
+                  :layouts, 
+                  :generators, 
+                  :partials, 
+                  :config, 
+                  :data, 
+                  :content_filters, 
+                  :blacklist,
+                  :log,
+                  :last_run
     
     def run(opts={})
       # Opts
@@ -62,6 +72,16 @@ module Gumdrop
       @root_path   = root.split '/'
       @source_path = src.split '/'
       @data        = Gumdrop::DeferredLoader.new()
+      @last_run    = Time.now
+
+      begin
+        @log         = Logger.new Gumdrop.config.log, 'daily'
+      rescue
+        @log        = Logger.new STDOUT
+      end
+      @log.formatter = proc do |severity, datetime, progname, msg|
+        "#{datetime}: #{msg}\n"
+      end
 
       @content_filters= []
       @blacklist      = []
@@ -71,61 +91,10 @@ module Gumdrop
         source= IO.readlines("#{root}/lib/site.rb").join('')
         DSL.class_eval source
       end
-      
-      # Scan
-      #puts "Running in: #{root}"
-      Dir.glob("#{src}/**/*", File::FNM_DOTMATCH).each do |path|
-        unless File.directory? path or File.basename(path) == '.DS_Store' # should be smarter about this?
-          file_path = (path.split('/') - @root_path).join '/'
-          node= Content.new(file_path)
-          @site[node.to_s]= node
-        end
-      end
-      
-      # Layouts, Generators, and Partials
-      @site.keys.each do |path|
-        if File.extname(path) == ".template"
-          @layouts[File.basename(path)]= @site.delete(path)
 
-        elsif File.extname(path) == ".generator"
-          @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)), '')
-          # puts "Creating partial #{partial_name} from #{path}"
-          @partials[partial_name]= @site.delete(path)
-        end
-      end
-      
-      @generators.each_pair do |path, generator|
-        generator.execute()
-      end
-      
-      @blacklist.each do |skip_path|
-        @site.keys.each do |source_path|
-          if source_path.starts_with? skip_path
-            Gumdrop.report " -ignoring: #{source_path}", :info
-            @site.delete source_path
-          end
-        end
-      end
-      
-      # Render
-      unless opts[:dry_run]
-        output_base_path= File.expand_path(Gumdrop.config.output_dir)
-        site.keys.sort.each do |path|
-          #unless @blacklist.detect {|p| path.starts_with?(p) }
-            node= site[path]
-            output_path= File.join(output_base_path, node.to_s)
-            FileUtils.mkdir_p File.dirname(output_path)
-            node.renderTo output_path, @content_filters
-          # else
-          #   Gumdrop.report " -ignoring: #{path}", :info
-          # end
-        end
-        puts "Done."
-      end
+      Build.run root, src, opts
       
+      puts "Done."
     end
 
     # levels: info, warning, error
@@ -133,15 +102,18 @@ module Gumdrop
       ll= Gumdrop.config.log_level
       case level
       when :info
-        puts msg if ll == :info
+        #puts msg if ll == :info
+        @log.info msg
       when :warning
-        puts msg if ll == :info or ll == :warning
+        #puts msg if ll == :info or ll == :warning
+        @log.warn msg
       else
         puts msg
+        @log.error msg
       end
     end
   end
 
   Gumdrop.config= Gumdrop::HashObject.new(DEFAULT_OPTIONS)
   
-end
+end

data/lib/gumdrop/build.rb

@@ -0,0 +1,92 @@
+
+module Gumdrop
+
+  class Build
+    attr_reader :root, :src, :opts
+
+    SKIP= %w(.DS_Store .gitignore .git .svn .sass-cache)
+
+    def initialize(root, src, opts={})
+      @root= root
+      @root_path= root.split('/')
+      @src= src
+      @opts= opts
+      # if opts[:auto_run]
+      #   run()
+      # end
+    end
+
+    def build_tree
+      # Scan Filesystem
+      #puts "Running in: #{root}"
+      Dir.glob("#{src}/**/*", File::FNM_DOTMATCH).each do |path|
+        unless File.directory? path or Build::SKIP.include?( File.basename(path) )
+          file_path = (path.split('/') - @root_path).join '/'
+          node= Content.new(file_path)
+          path= node.to_s
+
+          # Sort out Layouts, Generators, and Partials
+          if File.extname(path) == ".template"
+            Gumdrop.layouts[File.basename(path)]= node
+
+          elsif File.extname(path) == ".generator"
+            Gumdrop.generators[File.basename(path)]= Generator.new( node )
+
+          elsif File.basename(path).starts_with?("_")
+            partial_name= File.basename(path)[1..-1].gsub(File.extname(File.basename(path)), '')
+            # puts "Creating partial #{partial_name} from #{path}"
+            Gumdrop.partials[partial_name]= node
+          
+          else
+            Gumdrop.site[path]= node
+          end
+        end
+      end
+      
+    end
+
+    def run_generators
+      Gumdrop.generators.each_pair do |path, generator|
+        generator.execute()
+      end
+    end
+
+    def filter_tree
+      Gumdrop.blacklist.each do |skip_path|
+        Gumdrop.site.keys.each do |source_path|
+          if source_path.starts_with? skip_path
+            Gumdrop.report " -ignoring: #{source_path}", :info
+            Gumdrop.site.delete source_path
+          end
+        end
+      end
+    end
+
+    def render
+      unless opts[:dry_run]
+        output_base_path= File.expand_path(Gumdrop.config.output_dir)
+        Gumdrop.site.keys.sort.each do |path|
+          node= Gumdrop.site[path]
+          output_path= File.join(output_base_path, node.to_s)
+          FileUtils.mkdir_p File.dirname(output_path)
+          node.renderTo output_path, Gumdrop.content_filters
+        end
+      end
+    end
+
+    def run
+      build_tree()
+      run_generators()
+      filter_tree()
+      render()
+      self
+    end
+
+    class << self
+      def run(root, src, opts={})
+        new(root, src, opts).run()
+      end
+    end
+  end
+
+end

data/lib/gumdrop/content.rb

@@ -37,7 +37,7 @@ module Gumdrop
       return content if ignore_layout
       layout= Context.get_template()
       while !layout.nil?
-        content = layout.template.render(Context, :content=>content) { content }
+        content = layout.template.render(Context, content:content) { content }
         layout= Context.get_template()
       end
       content
@@ -52,6 +52,7 @@ module Gumdrop
         f.write output
       end
     end
+          
     
     def copyTo(output, layout=nil, opts={})
       do_copy= if File.exists? output
@@ -85,4 +86,4 @@ module Gumdrop
     
   end
   
-end
+end

data/lib/gumdrop/generator.rb

@@ -1,3 +1,18 @@
+
+require 'stitch'
+require 'jsmin'
+
+class Stitch::Source
+  # Patch for gumdrop style filenames
+  def name
+    name = path.relative_path_from(root)
+    name = name.dirname + name.basename(".*")
+    name.to_s.gsub(".js", '')
+  end
+end
+
+
+
 module Gumdrop
 
   class Generator
@@ -40,16 +55,40 @@ module Gumdrop
       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
+      content= GeneratedContent.new(filepath, block, opts)
+      if opts.has_key? :template and !opts[:template].nil?
+        content.template = if Gumdrop.layouts.has_key?( opts[:template] )
+          Gumdrop.layouts[ opts[:template] ]
+        else
+          Gumdrop.layouts[ "#{opts[:template]}.template" ]
+        end.template
+      end
       
       Gumdrop.site[content.uri]= content
     end
     
+    def stitch(name, opts)
+      page name do
+        content= Stitch::Package.new(opts).compile
+        if opts[:compress]
+          JSMin.minify content
+        else
+          content
+        end
+      end
+      if opts[:prune] and opts[:root]
+        sp = File.expand_path('./source')
+        rp = File.expand_path(opts[:root])
+        relative_root = rp.gsub(sp, '')[1..-1]
+        rrlen= relative_root.length - 1
+        Gumdrop.site.keys.each do |path|
+          if path[0..rrlen] == relative_root and name != path
+            Gumdrop.site.delete path
+          end
+        end
+      end
+    end
+    
     def run_dsl_from_source(source)
       # puts source
       instance_eval source
@@ -64,6 +103,24 @@ module Gumdrop
   
   class GeneratedContent < Content
     # Nothing special, per se...
+
+    def initialize(path, block, params={})
+      @content_block= block
+      super(path, params)
+    end
+
+    def render(ignore_layout=false,  reset_context=true, locals={})
+      if @content_block.nil?
+        super(ignore_layout, reset_context, locals)
+      else
+        @content_block.call
+      end
+    end
+
+    def useLayout?
+      !@content_block.nil? or !@template.nil?
+    end
+
   end
   
-end
+end

data/lib/gumdrop/logging.rb

@@ -0,0 +1,35 @@
+# Logging support
+
+require 'logger'
+
+module Gumdrop
+
+  module Logging
+
+    class << self
+
+      def log
+
+      end
+
+      def info
+
+      end
+      
+      def warn
+
+      end
+
+      def error
+
+      end
+
+      def debug
+      
+      end
+        
+    end
+
+  end
+
+end