gumdrop 0.2.1 → 0.2.2

data/Readme.md

@@ -1,3 +1,62 @@
 # Gumdrop
 
 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
+
+    gumdrop -c my_new_site
+
+
+## Build Static HTML
+
+    gumdrop -b
+
+Or, you can use Rake:
+
+    rake build
+
+
+## Start Dev Server
+
+    gumdrop -s
+
+Or, using Rake again:
+
+    rake serve
+
+# Gumdrop Site Structure
+
+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/
+        favicon.ico
+        index.html.erb
+        theme/
+          screen.css.scss
+          scripts/
+            app.js.coffee
+          styles/
+            _tools.css.scss
+          templates/
+            site.template.erb
+      Gemfile
+      config.ru
+      Rakefile
+      
+
+When you run `gumdrop --build` or `rake build` it will generate an `output/` folder.
+
+    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.

data/lib/gumdrop/context.rb

@@ -100,7 +100,7 @@ module Gumdrop
       end
       
       def render(path)
-        page= Gumdrop.site[path]
+        page= get_page path
         unless page.nil?
           #TODO: nested state for an inline rendered page?
           old_layout= @state['layout']
@@ -126,6 +126,16 @@ module Gumdrop
           @state[name]
         end
       end
+      
+    protected
+      
+      def get_page(path)
+        page= Gumdrop.site[path]
+        page= Gumdrop.site["#{path}.html"] if page.nil? # Bit of a hack...
+        page= Gumdrop.partials[path] if page.nil?
+        page
+      end
+      
     end
   end
   

data/lib/gumdrop/server.rb

@@ -22,7 +22,7 @@ module Gumdrop
           matches= Dir["source/#{file_path}*"] 
           if matches.length > 0
             
-            Gumdrop.site = Gumdrop.layouts= Hash.new do |hash, key| 
+            Gumdrop.site= Gumdrop.layouts= Gumdrop.generators= Hash.new do |hash, key| 
               templates= Dir["source/**/#{key}*"]
               if templates.length > 0
                 Content.new( templates[0] )
@@ -31,10 +31,22 @@ module Gumdrop
                 nil
               end
             end
+            
+            Gumdrop.partials= Hash.new do |hash, key| 
+              templates= Dir["source/**/_#{key}*"]
+              if templates.length > 0
+                Content.new( templates[0] )
+              else
+                puts "NOT FOUND: #{key}"
+                nil
+              end
+            end
                         
             content= Content.new matches[0]
             if content.useLayout?
               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
             else
               send_file matches[0]

data/lib/gumdrop/template/Gemfile

@@ -4,15 +4,14 @@ gem "sinatra"
 gem "active_support"
 gem "i18n"
 gem "rake"
-gem "gumdrop", :git=>"git://github.com/darthapo/gumdrop.git"
+gem "gumdrop"
 
-#
 # Add your dependencies here:
 
 gem "sass"
-gem "haml"
 gem "coffee-script"
 
 # gem "rdiscount"
 # gem "less"
+# gem "haml"
 

data/lib/gumdrop/template/lib/view_helpers.rb

@@ -1,5 +1,15 @@
 module Gumdrop::ViewHelpers
   
+  # 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!
   #

data/lib/gumdrop/template/source/theme/screen.css.scss

@@ -1,3 +1,10 @@
 @import "styles/tools";
 
-@include css-reset();
+@include css-reset();
+@include grid();
+
+body {
+  font-family: Helvetica, Sans-Serif;
+  width: 960px;
+  margin: 0 auto;
+}

data/lib/gumdrop/template/source/theme/styles/_tools.scss

@@ -1,4 +1,4 @@
-// Layout Tools v 1.1
+// Layout Tools v 1.2
 
 // Sample Usage:
 // #container {
@@ -75,7 +75,7 @@
 
 // CSS RESET
 
-@mixin css-reset($boxmodel:'border-box') {
+@mixin css-clear($boxmodel:'border-box') {
   * {
     @include box-model($boxmodel); 
   }
@@ -115,6 +115,56 @@
   }
 }
 
+@mixin css-reset($size:14px, $boxmodel:'border-box') {
+  @include css-clear($boxmodel);
+  body {
+    font-size: $size;
+    line-height: 1.3em;
+  }
+  h1, h2, h3, h4, h5, h6 {
+    font-weight: bold;
+  }
+  h1 {
+    font-size: 175%;
+  }
+  h2 {
+    font-size: 155%;
+  }
+  h3 {
+    font-size: 135%;
+  }
+  h4 {
+    font-size: 120%;
+  }
+  h5 {
+    font-size: 105%;
+  }
+  h6 {
+    font-size: 100%;
+  }
+  p, blockquote, h1, h2, h3, h4, h5, h6, pre, ol, ul {
+    padding: 0.5em 0;
+  }
+  b, strong {
+    font-weight: bold;
+  }
+  i, em {
+    font-style: italic;
+  }
+  ul, ol {
+    padding-left: 2em;
+  }
+  ul {
+    list-style: circle;
+  }
+  ol {
+    list-style: decimal;
+  }
+  blockquote {
+    padding-left: 4em;
+  }
+}
+
 @mixin debug-hover($color:'red') {
   &:hover {
     outline: 1px solid $color;

data/lib/gumdrop/template/source/theme/templates/site.template.haml

@@ -0,0 +1,33 @@
+!!! 5
+%html( lang="en" )
+  %head
+    %meta( charset="utf-8" )
+    %title= data.config.title
+    /[if le IE 9]
+      %script( src="http://html5shiv.googlecode.com/svn/trunk/html5.js" )
+    %link( rel="stylesheet" href="#{uri 'theme/screen.css'}" type="text/css" media="screen" charset="utf-8")
+    %script( src="#{uri 'theme/scripts/app.js'}" )
+  %body
+    .row
+      .col.span-12
+        %header
+          %h1= data.config.title
+          %h4= data.config.tagline
+    .row
+      .col.span-12
+        %nav
+          %ul
+            %li
+              %a(href="#{uri 'index.html'}") Home
+    %article
+      .row
+        .col.span-8
+          %section
+            = content
+        .col.span-4
+          %aside
+            = render 'sidebar'
+      .row
+        .col.span-12
+          %footer
+            = copyright_years 2011

data/lib/gumdrop/version.rb

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

data/lib/gumdrop/view_helpers.rb

@@ -2,20 +2,10 @@ module Gumdrop
   
   module ViewHelpers
     
-    # 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
-
     # Handy for hiding a block of unfinished code
-    def hidden(&block)
-      #no-op
-    end
+    # def hidden(&block)
+    #   #no-op
+    # end
     
     def gumdrop_version
       ::Gumdrop::VERSION

data/lib/gumdrop.rb

@@ -42,14 +42,18 @@ module Gumdrop
         end
       end
       
-      # Layout
+      # 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)]= @site.delete(path)
+
         elsif File.basename(path).starts_with?("_")
-          @partials[File.basename(path)[1..-1]]= @site.delete(path)
+          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
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matt McCray
@@ -44,7 +44,7 @@ files:
 - lib/gumdrop/template/source/theme/screen.css.scss
 - lib/gumdrop/template/source/theme/scripts/app.js.coffee
 - lib/gumdrop/template/source/theme/styles/_tools.scss
-- lib/gumdrop/template/source/theme/templates/site.template.erb
+- lib/gumdrop/template/source/theme/templates/site.template.haml
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb
 - lib/gumdrop.rb

data/lib/gumdrop/template/source/theme/templates/site.template.erb

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title><%= data.config.title %></title>
-    <!--[if lt IE 9]>
-      <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-    <script type="text/javascript" src="<%= uri 'theme/scripts/app.js' %>"></script>
-  </head>
-  <body>
-     <header>
-      <h1><%= data.config.title %></h1>
-      <h4><%= data.config.tagline %></h4>
-     </header>
-      <nav></nav>
-      <article>
-        <section>
-          <%= content %>
-        </section>
-      </article>
-      <aside></aside>
-      <footer><%= copyright_years 2009 %></footer>
-  </body>
-</html>