gumdrop 0.5.2 → 0.6.0

data/lib/gumdrop.rb

@@ -4,119 +4,31 @@ require 'tilt'
 require 'fileutils'
 require 'active_support/all'
 
-DEFAULT_OPTIONS= {
-  cache_data: false,
-  relative_paths: true,
-  auto_run: false,
-  force_reload: false,
-  proxy_enabled: true,
-  output_dir: "./output",
-  lib_dir: "./lib",
-  source_dir: "./source",
-  data_dir: './data',
-  log_level: :info,
-  log: 'logs/build.log'
-}
-
-LOG_LEVELS = {
-  info: 0,
-  warning: 1,
-  error: 2
-}
-
 module Gumdrop
-  
-  autoload :Build, "gumdrop/build"
+
   autoload :Context, "gumdrop/context"
   autoload :Content, "gumdrop/content"
   autoload :DataManager, "gumdrop/data_manager"
-  autoload :DSL, "gumdrop/dsl"
   autoload :Generator, "gumdrop/generator"
-  autoload :GeneratedrContent, "gumdrop/generator"
   autoload :HashObject, "gumdrop/hash_object"
-  autoload :Logging, "gumdrop/logging"
-  autoload :Pager, "gumdrop/pager"
+  autoload :Pager, "gumdrop/data_manager"
   autoload :Server, "gumdrop/server"
-  autoload :Utils, "gumdrop/utils"
+  autoload :Site, "gumdrop/site"
   autoload :VERSION, "gumdrop/version"
   autoload :ViewHelpers, "gumdrop/view_helpers"
   
   class << self
-    
-    attr_accessor :root_path, 
-                  :source_path, 
-                  :site, 
-                  :layouts, 
-                  :generators, 
-                  :partials, 
-                  :redirects,
-                  :config, 
-                  :data, 
-                  :content_filters, 
-                  :blacklist,
-                  :greylist,
-                  :log,
-                  :last_run
-    
+
     def run(opts={})
       site_file= Gumdrop.fetch_site_file
-
       unless site_file.nil?
-        @generators      = Hash.new {|h,k| h[k]= nil }
-        @content_filters = []
-        @blacklist       = []
-        @greylist        = []
-        @redirects       = []
-
-        # In server mode, we want to reload it every time... right?
-        load_site_file site_file
+        site= Site.new site_file, opts
 
-        Gumdrop.config.merge! opts # These beat those in the Gumdrop file?
-        
-        root= File.expand_path File.dirname(site_file)
-        Dir.chdir root
-
-        src= File.expand_path Gumdrop.config.source_dir #File.join root, 'source'      
-        lib_path= File.expand_path Gumdrop.config.lib_dir
-
-        @root_path   = root.split '/'
-        @source_path = src.split '/'
-        @site        = Hash.new {|h,k| h[k]= nil }
-        @layouts     = Hash.new {|h,k| h[k]= nil }
-        @partials    = Hash.new {|h,k| h[k]= nil }
-        @data        = Gumdrop::DataManager.new( Gumdrop.config.data_dir )
-        @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
-
-        Build.run root, src, opts
+        site.build
         
         puts "Done."
-      
       else
         puts "Not in a valid Gumdrop site directory."
-
-      end
-    end
-
-    # levels: info, warning, error
-    def report(msg, level=:info)
-      ll= Gumdrop.config.log_level
-      case level
-      when :info
-        @log.info msg
-      when :warning
-        @log.warn msg
-      else
-        puts msg
-        @log.error msg
       end
     end
 
@@ -124,12 +36,6 @@ module Gumdrop
       !fetch_site_file(filename).nil?
     end
 
-    def load_site_file(site_file=nil)
-      site_file= fetch_site_file if site_file.nil?
-      source= IO.readlines( site_file ).join('')
-      DSL.class_eval source
-    end
-
     def fetch_site_file(filename="Gumdrop")
       here= Dir.pwd
       found= File.file? File.join( here, filename )
@@ -144,23 +50,10 @@ module Gumdrop
       end
     end
 
-    def site_folder(filename="Gumdrop")
+    def site_dirname(filename="Gumdrop")
       File.dirname( fetch_site_file( filename ) )
     end
 
   end
-
-
-  Gumdrop.config= Gumdrop::HashObject.new(DEFAULT_OPTIONS)
-
-
-  module Configurator
-    class << self
-      def set(key,value)
-        # puts "Setting Gumdrop.config.#{key} = #{value}"
-        Gumdrop.config[key.to_sym]= value
-      end
-    end
-  end
   
 end

data/templates/backbone/Gumdrop

@@ -8,24 +8,24 @@ configure do
   set :site_url,     "http://www.mysite.com"
   
   #  All the supported build configuration settings and their defaults:
-
+  # set :relative_paths, true
+  # set :proxy_enabled, true
   # 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'
+  # set :log, './logs/build.log'
+  # set :ignore, %w(.DS_Store .gitignore .git .svn .sass-cache)
+  # set :server_timeout, 15
+  # set :server_port, 4567
 
 end
 
 #  Skipping files entirely from build process... Like they don't exist.
 # skip 'file-to-ignore.html'
-# skip 'dont-show/'
+# skip 'dont-show/**/*'
 
 #  Ignores source file(s) from compilation, but does load the content into memory
-# ignore 'pages/'
+# ignore 'pages/**/*'
 
 #  NOTE: Skipping and ignoring matches like a file glob (it use File.fnmatch in fact)
 #       (this doesn't work for files detected by stitch)

data/templates/backbone/config.ru

@@ -10,12 +10,8 @@ end
 
 require 'gumdrop'
 
-Gumdrop.config.auto_run= false
-Gumdrop.config.force_reload= true
-
 #require 'rack/static'
 #use Rack::Static, :urls => ["/media"], :root => "source"
 #use Rack::Static, :urls => ["/theme/images"], :root => "source"
 
-
 run Gumdrop::Server

data/templates/backbone/source/default.htaccess.erb

@@ -1,3 +1,4 @@
+<% use_layout nil %>
 # For clean urls
 DirectoryIndex index.html
 
@@ -21,6 +22,6 @@ DirectoryIndex index.html
 </IfModule>
 # END Gzip
 
-<% Gumdrop.redirects.each do |opts| %>
+<% site.redirects.each do |opts| %>
 # Redirect <%= opts[:from] %> <%= opts[:to] %>
 <% end %>

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

@@ -1,2 +1,2 @@
-<% layout 'app' %>
+<% use_layout 'app' %>
 <article id="main"></article>

data/templates/backbone/source/theme/templates/site.template.slim

@@ -30,4 +30,4 @@ html lang="en"
       div.row
         div.col.span-12
           footer
-            = copyright_years 2011
+            == copyright_years 2011

data/templates/default/Gumdrop

@@ -8,14 +8,16 @@ configure do
   set :site_url,     "http://www.mysite.com"
   
   #  All the supported build configuration settings and their defaults:
+  # set :relative_paths, true
+  # set :proxy_enabled, true
   # 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'
+  # set :log, './logs/build.log'
+  # set :ignore, %w(.DS_Store .gitignore .git .svn .sass-cache)
+  # set :server_timeout, 15
+  # set :server_port, 4567
+
 end
 
 

data/templates/default/config.ru

@@ -10,9 +10,6 @@ end
 
 require 'gumdrop'
 
-Gumdrop.config.auto_run= false
-Gumdrop.config.force_reload= true
-
 #require 'rack/static'
 #use Rack::Static, :urls => ["/media"], :root => "source"
 #use Rack::Static, :urls => ["/theme/images"], :root => "source"

data/templates/default/source/default.htaccess.erb

@@ -1,3 +1,4 @@
+<% use_layout nil %>
 # For clean urls
 DirectoryIndex index.html
 
@@ -21,6 +22,6 @@ DirectoryIndex index.html
 </IfModule>
 # END Gzip
 
-<% Gumdrop.redirects.each do |opts| %>
+<% site.redirects.each do |opts| %>
 # Redirect <%= opts[:from] %> <%= opts[:to] %>
 <% end %>

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

@@ -30,4 +30,4 @@ html lang="en"
       div.row
         div.col.span-12
           footer
-            = copyright_years 2011
+            == copyright_years 2011

metadata

@@ -1,111 +1,109 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gumdrop
-version: !ruby/object:Gem::Version
-  version: 0.5.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
-authors:
+authors: 
 - Matt McCray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-07-22 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &70136900293340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70136900293340
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: &70136900292760 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: tilt
   prerelease: false
-  version_requirements: *70136900292760
-- !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: &70136900292200 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70136900292200
-- !ruby/object:Gem::Dependency
-  name: trollop
-  requirement: &70136900291500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: active_support
   prerelease: false
-  version_requirements: *70136900291500
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70136900291040 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: trollop
   prerelease: false
-  version_requirements: *70136900291040
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &70136900290620 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70136900290620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: i18n
-  requirement: &70136900290080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70136900290080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: bundle
-  requirement: &70136900289660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70136900289660
-description: A simple cms/prototyping tool.
+  version_requirements: *id006
+description: A sweet 'n simple cms/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
@@ -116,21 +114,17 @@ files:
 - bin/gumdrop
 - gumdrop.gemspec
 - lib/gumdrop.rb
-- lib/gumdrop/build.rb
 - lib/gumdrop/cli.rb
 - lib/gumdrop/content.rb
 - lib/gumdrop/context.rb
 - lib/gumdrop/data_manager.rb
-- lib/gumdrop/dsl.rb
 - lib/gumdrop/generator.rb
 - lib/gumdrop/hash_object.rb
-- lib/gumdrop/logging.rb
-- lib/gumdrop/pager.rb
 - lib/gumdrop/proxy_handler.rb
 - lib/gumdrop/server.rb
+- lib/gumdrop/site.rb
 - lib/gumdrop/stitch_compilers.rb
 - lib/gumdrop/stitch_ex.rb
-- lib/gumdrop/utils.rb
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb
 - specs/content_spec.rb
@@ -175,28 +169,37 @@ files:
 - templates/default/source/theme/scripts/app.js.coffee
 - templates/default/source/theme/styles/_tools.scss
 - templates/default/source/theme/templates/site.template.slim
+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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: gumdrop
-rubygems_version: 1.8.10
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A simple cms/prototyping tool.
+summary: A sweet 'n simple cms/prototyping tool.
 test_files: []
+

data/lib/gumdrop/build.rb

@@ -1,116 +0,0 @@
-
-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
-      Gumdrop.report "[Scanning from #{src}]", :info
-      # Report blacklists and greylists
-      Gumdrop.blacklist.each do |path|
-        Gumdrop.report " blacklist: #{path}", :info
-      end
-      Gumdrop.greylist.each do |path|
-        Gumdrop.report "  greylist: #{path}", :info
-      end
-
-      # 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[path]= node
-            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)), '')
-            partial_node_path= File.join File.dirname(path), partial_name
-            # puts "Creating partial #{partial_name} from #{path}"
-            Gumdrop.partials[partial_name]= node
-            Gumdrop.partials[partial_node_path]= node
-          else
-            Gumdrop.site[path]= node
-          end
-        end
-      end
-      
-    end
-
-    def run_generators
-      Gumdrop.report "[Executing Generators]", :info
-      Gumdrop.generators.each_pair do |path, generator|
-        generator.execute()
-      end
-    end
-
-    # Expunge blacklisted files
-    def filter_tree
-      Gumdrop.blacklist.each do |blacklist_pattern|
-        Gumdrop.site.keys.each do |source_path|
-          if path_match source_path, blacklist_pattern
-            Gumdrop.report "-excluding: #{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.report "[Compiling to #{output_base_path}]", :info
-        Gumdrop.site.keys.sort.each do |path|
-          unless Gumdrop.greylist.any? {|pattern| path_match path, pattern }
-            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
-          else
-            Gumdrop.report " -ignoring: #{path}", :info
-          end
-        end
-      end
-    end
-
-    def run
-      build_tree()
-      run_generators()
-      filter_tree()
-      render()
-      self
-    end
-
-    # Match a path using a glob-like file pattern
-    def path_match(path, pattern)
-      File.fnmatch pattern, path, File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_CASEFOLD
-    end
-
-
-    class << self
-      def run(root, src, opts={})
-        new(root, src, opts).run()
-      end
-    end
-  end
-
-end