gumdrop 0.5 → 0.5.1

data/ChangeLog.md

@@ -1,3 +1,6 @@
+# v0.5.1
+- Bugfix: dev server was rescanning source files multiple times per pages load if build time exceeded 2 seconds... Will now wait 10 seconds before rescanning source.
+
 # 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.

data/Notes.md

@@ -2,10 +2,14 @@
 - HTML Manifest generation??
 - Some kind of admin? What would that even do?
   - If you could specify a 'prototype' for data collections, could be cool.
-
+- Multiple source_dir?
+  - `set :source_dir, ['./source/a', './source/b']
+  - What would happen with conflicts, last one in wins?
+- Multiple data_dir too?
 
 # 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)
+- YamlDoc support (in data anyway)
+- Templates should be stored as short name/path and full path (like partials)

data/Readme.md

@@ -2,12 +2,26 @@
 
 Gumdrop is a small and sweet cms/prototype tool. It can generate static html with relative paths, and includes a dev server that can be run via any rack server (including POW!).
 
-## Create New Site
+## Install
+
+    gem install gumdrop
+
+# Quick Ref
+
+### Create New Site
+
+    gumdrop --create my_new_site
+
+Shorter syntax:
 
     gumdrop -c my_new_site
 
+### Create New Site From Template
 
-## Build Static HTML
+    gumdrop -c my_new_site -t backbone
+
+
+### Build Static HTML
 
     gumdrop -b
 
@@ -16,7 +30,7 @@ Or, you can use Rake:
     rake build
 
 
-## Start Dev Server
+### Start Dev Server
 
     gumdrop -s
 
@@ -24,16 +38,25 @@ Or, using Rake again:
 
     rake serve
 
+### Saving The Current Site As A Local Template
+
+    gumdrop -t my_template
+
+You can then create new sites based on your local template:
+
+    gumdrop -c my_new_from_my_template -t my_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/
-      data/
-        config.yml
-      lib/
-        view_helpers.rb
-      source/
+       source/
         favicon.ico
         index.html.erb
         theme/
@@ -45,6 +68,7 @@ This is the file structure that is generated when you run `gumdrop --create site
           templates/
             site.template.erb
       Gemfile
+      Gumdrop
       config.ru
       Rakefile
       
@@ -60,3 +84,22 @@ When you run `gumdrop --build` or `rake build` it will generate an `output/` fol
             app.js
 
 You'll notice the templates and partials aren't included in the output.
+
+# Gumdrop File
+
+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.
+
+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
+
+# Need To Document:
+
+- Proxy support
+- Stitch
+- "Dynamic" pages
+- Data support
+- Content filters
+- Partials
+- Config and using in pages
+- Project Templates

data/lib/gumdrop/server.rb

@@ -16,7 +16,7 @@ module Gumdrop
     #   redirect '/index.html'
     # end
     
-    Gumdrop.run dry_run:true, log:server_log
+    Gumdrop.run dry_run:true, log:server_log, auto_run:true
     
     if Gumdrop.config.proxy_enabled
       require 'gumdrop/proxy_handler'
@@ -61,11 +61,11 @@ module Gumdrop
     end
 
     get '/*' do
+      # Gumdrop.log.info "[#{$$}] !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
       file_path= get_content_path params[:splat].join('/')
-      
-      Gumdrop.log.info "[#{$$}] GET /#{params[:splat].join('/')}"
-      #Gumdrop.log.debug " last built: #{Gumdrop.last_run}"
-
+      Gumdrop.log.info "[#{$$}] GET /#{params[:splat].join('/')} -> #{file_path}"
+      # Gumdrop.log.info " last built: #{Gumdrop.last_run}"
+      # Gumdrop.log.info "#{Gumdrop.config.inspect}"
       
       if Gumdrop.site.has_key? file_path
         content= Gumdrop.site[file_path]
@@ -74,13 +74,14 @@ module Gumdrop
           if Gumdrop.config.force_reload
             unless %w(.jpg .jpe .jpeg .gif .ico .png).include? File.extname(file_path).to_s
               since_last_build= Time.now.to_i - Gumdrop.last_run.to_i
-              if since_last_build > 2
-                Gumdrop.log.debug "[#{$$}] !!> REBUILDING"
+              # Gumdrop.log.info "!>!>>>>> since_last_build: #{since_last_build}"
+              if since_last_build > 10
+                Gumdrop.log.info "[#{$$}] Rebuilding from Source"
                 Gumdrop.run dry_run:true, log:server_log
               end
             end
           end
-          Gumdrop.log.info "[#{$$}]  *Dynamic: #{file_path}"
+          Gumdrop.log.info "[#{$$}]  *Dynamic: #{file_path} (#{content.ext})"
           content_type :css if content.ext == '.css' # Meh?
           content_type :js if content.ext == '.js' # Meh?
           content_type :xml if content.ext == '.xml' # Meh?
@@ -91,26 +92,12 @@ module Gumdrop
           send_file File.join( source_base_path, file_path)
         end
       else
-        # uri_path= params[:splat].join('/')
-        # puts "LOOKING FOR: #{uri_path}"
-        # if uri_path =~ /^\-proxy\/(.*)$/
-        #   uri= URI.parse "http://#{$1}"
-        #   
-        #   puts "PROXY TO: #{uri}"
-        #   
-        #   http = Net::HTTP.new(uri.host, uri.port)
-        #   response = http.request(Net::HTTP::Get.new(uri.request_uri))
-        #   
-        #   #[response.code, response.body]
-        #    #halt response.code, {}, response.body.to_s
-        #    puts "Responded with: #{response.body.to_s}"
-        #    #response
-        #    [response.code.to_i, {}, response.body.to_s]
-        # else
-          Gumdrop.log.error "[#{$$}]  *Missing: #{file_path}"
-          puts "NOT FOUND: #{file_path}"
-          "#{file_path} Not Found"
-        # end
+        Gumdrop.log.error "[#{$$}]  *Missing: #{file_path}"
+        # Gumdrop.log.info "------------------------"
+        # Gumdrop.log.info Gumdrop.site.keys.join("\n")
+        # Gumdrop.log.info "------------------------"
+        puts "NOT FOUND: #{file_path}"
+        "#{file_path} Not Found"
       end
     end
     

data/lib/gumdrop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70122408702960 !ruby/object:Gem::Requirement
+  requirement: &70144022144960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408702960
+  version_requirements: *70144022144960
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70122408701180 !ruby/object:Gem::Requirement
+  requirement: &70144022143820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408701180
+  version_requirements: *70144022143820
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70122408699020 !ruby/object:Gem::Requirement
+  requirement: &70144022142220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408699020
+  version_requirements: *70144022142220
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70122408697560 !ruby/object:Gem::Requirement
+  requirement: &70144022140860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408697560
+  version_requirements: *70144022140860
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70122408696000 !ruby/object:Gem::Requirement
+  requirement: &70144022139160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408696000
+  version_requirements: *70144022139160
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70122408695440 !ruby/object:Gem::Requirement
+  requirement: &70144022138500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408695440
+  version_requirements: *70144022138500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70122408688080 !ruby/object:Gem::Requirement
+  requirement: &70144022137500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408688080
+  version_requirements: *70144022137500
 - !ruby/object:Gem::Dependency
   name: bundle
-  requirement: &70122408687000 !ruby/object:Gem::Requirement
+  requirement: &70144022136600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70122408687000
+  version_requirements: *70144022136600
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables: