gumdrop 0.4.0 → 0.5

data/.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
 *.gem
-*.lock
 examples/**/output
-.sass-cache
+.sass-cache
+old_examples

data/ChangeLog.md

@@ -1,3 +1,20 @@
+# v0.5
+- Gumdrop projects now require a `Gumdrop` file at the root -- contents are what you used to put in lib/site.rb.
+- Added new `configure` and `view_helpers` methods for use in `Gumdrop` site file.
+- Smarter CLI, knows when you're in a gumdrop site or not.
+- Local templates supported for new sites (looks under ~/.gumdrop/templates)
+- You can list installed templates using `gumdrop --list`
+- You can install the current site as a local template using `gumdrop -t new_template_name` in a site folder.
+- Data folder path is now configurable: `Gumdrop.config.data_dir` or `set :data_dir, "PATH"`
+- Added `data.site` and `data.site_all` to `DefferedLoader`. Useful for listing all non-grey-listed files or all files.
+- Data will now load from data/COLLECTION_NAME/*.(json | yaml | yml). Loads as an array array of all entries, adds a key '_id' that's the base filename.
+- Initial `redirect` options for use in generate blocks.
+- Extra stitch generator options:
+    - `compress` takes `:jsmin`, `:yuic`, or `:uglify` now. (`true` defaults to `:jsmin`)
+    - `obfuscate: true|false` -- Sets munging/mangling for compressors that support it.
+    - `keep_src: true|false` -- Creates a second filename with :source_postfix added to the end of the filename
+    - `source_postfix: "-src"` 
+
 # v0.4
 - Added support for special dev proxy at /-proxy/ENDPOINT_URL -- Useful for working with external (non-CORS) apis/websites. Enabled by default. To disable, set Gumdrop.config.proxy_enabled= false
 

data/Notes.md

@@ -1,4 +1,11 @@
 # Future Features/Changes
 - HTML Manifest generation??
 - Some kind of admin? What would that even do?
-- proxy support
+  - If you could specify a 'prototype' for data collections, could be cool.
+
+
+# TODO:
+- New/Update Doc Site
+- API for retrieving pages and pages under a path (simple query)
+- Cleanup api and verbiage around blacklisting and ignoring
+- YamlDoc support (in data anyway)

data/lib/gumdrop.rb

@@ -10,11 +10,11 @@ DEFAULT_OPTIONS= {
   auto_run: false,
   force_reload: false,
   proxy_enabled: true,
-  log_level: :info,
-  root: ".",
   output_dir: "./output",
   lib_dir: "./lib",
   source_dir: "./source",
+  data_dir: './data',
+  log_level: :info,
   log: 'logs/build.log'
 }
 
@@ -49,6 +49,7 @@ module Gumdrop
                   :layouts, 
                   :generators, 
                   :partials, 
+                  :redirects,
                   :config, 
                   :data, 
                   :content_filters, 
@@ -58,53 +59,51 @@ module Gumdrop
                   :last_run
     
     def run(opts={})
-      # Opts
-      Gumdrop.config.merge! opts
-      
-      root= File.expand_path Gumdrop.config.root
-      src= File.expand_path Gumdrop.config.source_dir #File.join root, 'source'      
-      lib_path= File.expand_path Gumdrop.config.lib_dir
-      $: << lib_path # "#{root}/lib"
-      if File.exists? File.join(lib_path,"view_helpers.rb")
-        # In server mode, we want to reload it every time... right?
-        load File.join(lib_path,"view_helpers.rb")
-      end
+      site_file= Gumdrop.fetch_site_file
 
-      @site        = Hash.new {|h,k| h[k]= nil }
-      @layouts     = Hash.new {|h,k| h[k]= nil }
-      @generators  = Hash.new {|h,k| h[k]= nil }
-      @partials    = Hash.new {|h,k| h[k]= nil }
-      @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
+      unless site_file.nil?
+        @generators      = Hash.new {|h,k| h[k]= nil }
+        @content_filters = []
+        @blacklist       = []
+        @greylist        = []
+        @redirects       = []
 
-      @content_filters= []
-      @blacklist      = []
-      @greylist       = []
-      
-      if File.exists? File.join(lib_path, "site.rb")  # "#{root}/lib/site.rb"
         # In server mode, we want to reload it every time... right?
-        source= IO.readlines( File.join(lib_path,"site.rb") ).join('')
-        DSL.class_eval source
-        # TODO: Find a good place to define where source folder should be defined.
-        # In case the source folder has changed.
+        load_site_file site_file
+
+        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'      
-        @source_path= src.split '/'
-      end
+        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::DeferredLoader.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
+        Build.run root, src, opts
+        
+        puts "Done."
       
-      puts "Done."
+      else
+        puts "Not in a valid Gumdrop site directory."
+
+      end
     end
 
     # levels: info, warning, error
@@ -112,18 +111,56 @@ module Gumdrop
       ll= Gumdrop.config.log_level
       case level
       when :info
-        #puts msg if ll == :info
         @log.info msg
       when :warning
-        #puts msg if ll == :info or ll == :warning
         @log.warn msg
       else
         puts msg
         @log.error msg
       end
     end
+
+    def in_site_folder?(filename="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 )
+      while !found and File.directory?(here) and File.dirname(here).length > 3
+        here= File.expand_path File.join(here, '../')
+        found= File.file? File.join( here, filename )
+      end
+      if found
+        File.expand_path File.join(here, filename)
+      else
+        nil
+      end
+    end
+
+    def site_folder(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/lib/gumdrop/build.rb

@@ -17,6 +17,15 @@ module Gumdrop
     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|
@@ -47,6 +56,7 @@ module Gumdrop
     end
 
     def run_generators
+      Gumdrop.report "[Executing Generators]", :info
       Gumdrop.generators.each_pair do |path, generator|
         generator.execute()
       end

data/lib/gumdrop/cli.rb

@@ -1,41 +1,102 @@
 
 require 'trollop'
 
-opts = Trollop::options do
-  banner ""
-  banner <<-EOS
-  Gumdrop v#{ Gumdrop::VERSION }
-  The simple, static, CMS.
-  
-  Examples:
-      gumdrop --create my_new_site --template backbone
-    Is the same as:
-      gumdrop -c my_new_site -t backbone
-  
-  Options:
+banner_text= <<-EOS
+
+Gumdrop v#{ Gumdrop::VERSION }
+The simple, sweet, static CMS.
+
 EOS
+
+opts = Trollop::options do
+  banner banner_text
+
   opt :verbose,"Verbose output"
   opt :debug,  "Enable debugging output"
-  opt :quiet,  "No output"
-  opt :create, "Create a gumdrop project", :type=>String
-    opt :template, "Specify template to use for new project (default || backbone)", :type=>String, :default=>'default'
-  opt :build,  "Build HTML output"
-  opt :server, "Runs development server"
-    opt :port, "Specifies port to run server on", :type=>:int
-    opt :reload, "Force reloading on dev server"
+  opt :quiet,  "No console output"
+
+  if Gumdrop.in_site_folder?
+    banner <<-EOS
+
+Examples:
+  gumdrop --build
+  gumdrop -b
+  gumdrop --new Post
+  gumdrop --server
+  gumdrop -s -p 8080 -r
+
+Options:
+EOS
+    opt :build,  "Build HTML output"
+    opt :new, "Create new data item (specify collection name)", :type=>String
+    opt :server, "Runs development server"
+      opt :port, "Specifies port to run server on", :type=>:int
+      opt :reload, "Force reloading on dev server"
+    opt :template, "Create local template from this site (specify template name)", :type=>String
+  else
+    banner <<-EOS
+
+Examples:
+  gumdrop --create my_site
+  gumdrop -c new_site --template backbone
+
+Options:
+EOS
+    opt :create, "Create a gumdrop project", :type=>String
+    opt :template, "Template to create new project from", :type=>String, :default=>'default'
+    opt :list, "List available templates"
+  end
+
 end
 
-# Trollop::die :volume, "must be non-negative" if opts[:volume] < 0
-# Trollop::die :file, "must exist" unless File.exist?(opts[:file]) if opts[:file]
 
-unless opts[:create_given] or opts[:build_given] or opts[:server_given]
-  Trollop::die "You must specify one of --create --build --server"
+unless opts[:create_given] or opts[:build_given] or opts[:server_given] or opts[:new_given] or opts[:template_given] or opts[:list_given]
+  puts banner_text
+  Trollop::die "No commands specified"
 end
 
 
-if opts[:create_given]
+
+if opts[:build_given]
+  puts banner_text unless opts[:quiet_given]
+  Gumdrop.run(opts)
+
+
+elsif opts[:server_given]
+  puts banner_text unless opts[:quiet_given]
+  Gumdrop.config.auto_run= true
+  Gumdrop.config.force_reload= opts[:reload_given]
+  Gumdrop::Server
+
+
+elsif opts[:list_given]
+  # List templates
+  puts banner_text unless opts[:quiet_given]
+  here= File.dirname(__FILE__)
+  lib_dir= File.expand_path File.join(here, '../../templates', '*')
+  user_dir=  File.expand_path File.join("~", ".gumdrop", "templates", "*")
+  puts "Gem Templates:"
+  Dir[lib_dir].each do |name|
+    puts "  #{File.basename name}" if File.directory?(name)
+  end
+  puts "Local Templates:"
+  Dir[user_dir].each do |name|
+    puts "  #{File.basename name}" if File.directory?(name)
+  end
+
+
+elsif opts[:new_given]
+  puts banner_text unless opts[:quiet_given]
+  puts "Not implemented yet..."
+
+
+elsif opts[:create_given]
+  puts banner_text unless opts[:quiet_given]
+
   require 'fileutils'
   here= File.dirname(__FILE__)
+  lib_root= File.expand_path File.join(here, '../../')
+  user_gumdrop_dir=  File.expand_path File.join("~", ".gumdrop")
   there= File.expand_path( opts[:create] )
   template_name = opts[:template]
   
@@ -45,24 +106,49 @@ if opts[:create_given]
     FileUtils.mkdir_p there
   end
   
-  if File.directory? File.join(here, 'template', template_name)
+  # from gem...
+  if File.directory? File.join(lib_root, 'templates', template_name)
+    # FileUtils.cp_r Dir[File.join(here, "template", template_name, "*")], there
+    puts "Creating gumdrop project (from template:#{template_name})"
+    puts "  #{there}"
+    FileUtils.cp_r File.join(lib_root, "templates", template_name, "."), there
+    puts "Done."
+
+  # local template...
+  elsif File.directory? File.join(user_gumdrop_dir, 'templates', template_name)
     # FileUtils.cp_r Dir[File.join(here, "template", template_name, "*")], there
-    puts "Creating gumdrop project based on #{template_name} template at #{there}"
-    FileUtils.cp_r File.join(here, "template", template_name, "."), there
+    puts "Creating gumdrop project (from local template:#{template_name})"
+    puts "  #{there}"
+    FileUtils.cp_r File.join(user_gumdrop_dir, "templates", template_name, "."), there
     puts "Done."
+
   else
     puts "Invalid template '#{template_name}'!"
   end
+
+
+elsif opts[:template_given]
+  # Save as template...
+  puts banner_text unless opts[:quiet_given]
+  template= opts[:template]
+  template_path = File.expand_path File.join('~', '.gumdrop', 'templates', template)
+  if File.exists? template_path
+    puts "A template named '#{template}' already exists!"
+  else
+    require 'fileutils'
+    puts "Creating template:  #{template}"
+    puts "  ~/.gumdrop/templates/#{template}"
+    site_root= Gumdrop.site_folder
+    FileUtils.mkdir_p File.dirname(template_path)
+    FileUtils.cp_r File.join(site_root, "."), template_path
+    puts "Done."
+  end
   
-elsif opts[:build_given]
-  Gumdrop.run(opts)
 
-elsif opts[:server_given]
-  Gumdrop.config.auto_run= true
-  Gumdrop.config.force_reload= opts[:reload_given]
-  Gumdrop::Server
+
 
 else
+  puts banner_text
   require 'pp'
   puts "Unknown options"
   pp opts

data/lib/gumdrop/context.rb

@@ -25,7 +25,7 @@ module Gumdrop
       
       def url(path)
         path= path[1..-1] if path.starts_with?('/')
-        "#{data.config.url}/#{path}"
+        "#{Gumdrop.config.site_url}/#{path}"
       end
     
       def slug
@@ -62,6 +62,11 @@ module Gumdrop
       def data
         Gumdrop.data
       end
+
+      # Access to settings from configure block
+      def config
+        Gumdrop.config
+      end
     
       def reset_data(preset={})
         # TODO: Add a setting for reloading data on every request/page

data/lib/gumdrop/deferred_loader.rb

@@ -22,8 +22,9 @@ module Gumdrop
   class DeferredLoader
     attr_reader :cache
   
-    def initialize
+    def initialize(data_dir="data")
       #puts "@!@"
+      @dir= data_dir
       @cache= {}
       @persisted= {}
     end
@@ -38,8 +39,28 @@ module Gumdrop
       @persisted[key]= value #unless opts[:persist] == false
     end
   
-    def reset
-      @cache= @persisted.clone #Hash.new(@persisted)  #{|h,k| h[k]= load_data(k) }
+    def reset(hard=false)
+      if hard
+        @cache={}
+        @persisted={}
+      else
+        @cache= @persisted.clone #Hash.new(@persisted)  #{|h,k| h[k]= load_data(k) }
+      end
+    end
+
+    def site
+      # TODO: This is not a great place for this!
+      site= Hash.new {|h,k| h[k]= nil }
+      Gumdrop.site.keys.sort.each do |path|
+        unless Gumdrop.greylist.any? {|p| path.starts_with?(p) }
+          site[path]= Gumdrop.site[path]    
+        end
+      end
+      site
+    end
+
+    def site_all
+      Gumdrop.site
     end
     
     def pager_for(key, opts={})
@@ -59,6 +80,7 @@ module Gumdrop
   
     def cache_or_load_data(key)
       @cache[key]= load_data(key) unless @cache.has_key? key
+      @persisted[key]= @cache[key] # New persist data loaded from file?
     end
 
     def load_data(key)
@@ -72,26 +94,43 @@ module Gumdrop
           end
         end
         docs
+      elsif File.extname(path) == ""
+        all=[]
+        Dir[ File.join( "#{path}", "{*.yaml,*.json,*.yml}" ) ].each do |filename|
+          # Gumdrop.report ">> Loading data file: #{filename}"
+          id= File.basename filename
+          raw_hash= YAML.load_file(filename) 
+          raw_hash['_id']= id
+          obj_hash= hashes2ostruct( raw_hash )
+          all << obj_hash
+        end
+        all
       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"
+      if File.exists? local_path_to("#{path}.json")
+        local_path_to "#{path}.json"
+      elsif File.exists? local_path_to("#{path}.yml")
+        local_path_to "#{path}.yml"
+      elsif File.exists? local_path_to("#{path}.yaml")
+        local_path_to  "#{path}.yaml"
+      elsif File.exists? local_path_to("#{path}.yamldb")
+        local_path_to "#{path}.yamldb"
+      elsif File.directory? local_path_to(path)
+        local_path_to(path)
       else
-        raise "No data found for #{path}"
-        #nil #TODO: Should it die if it can't find data?
+        #FIXME: Should it die if it can't find data?\
+        # raise "No data found for #{path}"
+        Gumdrop.report "No data found for #{path}", :warning
+        nil
       end
     end
+
+    def local_path_to(filename)
+      File.join(@dir.to_s, filename.to_s)
+    end
   end
 end