gumdrop 0.6.0 → 0.6.1

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v0.6.1
+- Content filters are run for dev server requests now too.
+- Added config.env, defaults to 'production' (override from cli with -e)
+
 # v0.6
 - Extracted Gumdrop::Build into Gumdrop::Site. Removed static Gumdrop#site.
 

data/Notes.md

@@ -5,14 +5,7 @@
   - `set :source_dir, ['./source/a', './source/b']
   - What would happen with conflicts, last one in wins?
 - Multiple data_dir too?
-- Refactor code to not use Gumdrop as a singleton (static really)
 - Add YamlDoc support for nodes? (Tilt compiler? or in Content)
-
-
-- `Gumdrop.mode` :build, :serve (other?)
-- `Gumdrop.env` (specified via -e on cli, default: production)
-  - Easy access to ENV in RenderingContext (MODE as well)
-
 - configure block for each env/mode?
 
 # TODO:

data/Readme.md

@@ -6,7 +6,7 @@ Gumdrop is a small and sweet cms/prototype tool. It can generate static html wit
 
     gem install gumdrop
 
-# Quick Ref
+# CLI Quick Ref
 
 ### Create New Site
 
@@ -49,49 +49,126 @@ You can then create new sites based on your local template:
 Local templates are stored under `~/.gumdrop/templates/`.
 
 
-# Gumdrop Site Structure
-
-*NOTE:* The following is based on the `default` template, the structure is configurable based on your needs.
-
-This is the file structure that is generated when you run `gumdrop --create site_root`. You can change whatever you'd like under `source/`, this is just a starting point.
-
-    site_root/
-       source/
-        favicon.ico
-        index.html.erb
-        theme/
-          screen.css.scss
-          scripts/
-            app.js.coffee
-          styles/
-            _tools.css.scss
-          templates/
-            site.template.erb
-      Gemfile
-      Gumdrop
-      config.ru
-      Rakefile
+
+# Gumdrop File
+
+Gumdrop looks for a file named `Gumdrop` to indicate the root folder of your project. It'll walk up the directory structure looking for one, so you can run Gumdrop commands from sub-folders.
+
+The `Gumdrop` file is where you configure your site, generate dynamic content, assign view_helpers and more.
+
+Here's the `Gumdrop` file created by the default template:
+
+    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 :relative_paths, true
+      # set :proxy_enabled, true
+      # set :output_dir, "./output"
+      # set :source_dir, "./source"
+      # set :data_dir, './data'
+      # set :log, './logs/build.log'
+      # set :ignore, %w(.DS_Store .gitignore .git .svn .sass-cache)
+      # set :server_timeout, 15
+      # set :server_port, 4567
 
-When you run `gumdrop --build` or `rake build` it will generate an `output/` folder.
+    end
 
-    site_root/
-      output/    (** GENERATED CONTENT **)
-        index.html
-        theme/
-          screen.css
-          scripts/
-            app.js
 
-You'll notice the templates and partials aren't included in the output.
+    #  Skipping files entirely from build process... Like they don't exist.
+    # skip 'file-to-ignore.html'
+    # skip 'dont-show/**/*'
 
-# Gumdrop File
+    #  Ignores source file(s) from compilation, but does load the content into memory
+    # ignore 'pages/**/*.*'
 
-Gumdrop looks for a file named `Gumdrop` to indicate the root project folder. It'll walk up the directory structure looking for one, so you can run Gumdrop commands from sub-folders.
+    #  NOTE: Skipping and ignoring matches like a file glob (it use File.fnmatch in fact)
+    #       (this doesn't work for files detected by stitch)
 
-The `Gumdrop` file is where you configure your site, generate dynamic content, assign view_helpers and more.
 
-Have a look at the file here: https://github.com/darthapo/gumdrop/blob/master/templates/default/Gumdrop
+    # 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
+
 
 # Need To Document:
 

data/lib/gumdrop/cli.rb

@@ -28,6 +28,7 @@ Examples:
 Options:
 EOS
     opt :build,  "Build HTML output"
+      opt :environment, "Specify config.env", :type=>String, :default=>'production'
     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
@@ -56,6 +57,7 @@ unless opts[:create_given] or opts[:build_given] or opts[:server_given] or opts[
   Trollop::die "No commands specified"
 end
 
+Gumdrop::DEFAULT_OPTIONS[:env]= opts[:environment] || 'production'
 
 # BUILD
 

data/lib/gumdrop/server.rb

@@ -43,7 +43,9 @@ module Gumdrop
             content_type :css if content.ext == '.css' # Meh?
             content_type :js if content.ext == '.js' # Meh?
             content_type :xml if content.ext == '.xml' # Meh?
-            content.render 
+            output= content.render 
+            site.content_filters.each {|f| output= f.call(output, self) }
+            output
           else
             site.report "[#{$$}]  *Static: #{file_path}"
             send_file File.join( site.src_path, file_path)

data/lib/gumdrop/site.rb

@@ -13,13 +13,8 @@ module Gumdrop
     log: './logs/build.log',
     ignore: %w(.DS_Store .gitignore .git .svn .sass-cache),
     server_timeout: 15,
-    # server_port: 4567
-  }
-
-  LOG_LEVELS = {
-    info: 0,
-    warning: 1,
-    error: 2
+    # server_port: 4567,
+    env: 'production'
   }
 
   class Site

data/lib/gumdrop/version.rb

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

data/lib/gumdrop.rb

@@ -13,7 +13,7 @@ module Gumdrop
   autoload :HashObject, "gumdrop/hash_object"
   autoload :Pager, "gumdrop/data_manager"
   autoload :Server, "gumdrop/server"
-  autoload :Site, "gumdrop/site"
+  # autoload :Site, "gumdrop/site"
   autoload :VERSION, "gumdrop/version"
   autoload :ViewHelpers, "gumdrop/view_helpers"
   
@@ -57,3 +57,5 @@ module Gumdrop
   end
   
 end
+
+require 'gumdrop/site'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matt McCray