gumdrop 0.2.9 → 0.2.10

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v0.2.10
+- Update default template to use slim layouts
+- Fixed a bug in uri when creating a path to "/"
+
 # v0.2.9
 - Added ability to force absolute url's from uri helper. set force_absolute in template
 

data/lib/gumdrop/context.rb

@@ -10,7 +10,7 @@ module Gumdrop
       #attr_reader :data
       
       def uri(path)
-        path= path[1..-1] if path.starts_with?('/')
+        path= path[1..-1] if path.starts_with?('/') and path != "/"
         if !Gumdrop.config.relative_paths or Context.force_absolute
           "/#{path}"
         else

data/lib/gumdrop/template/Gemfile

@@ -8,9 +8,11 @@ gem "gumdrop"
 
 # Add your dependencies here:
 
+gem "slim"
 gem "sass"
 gem "coffee-script"
 
+
 # For markdown support, a couple of options:
 # gem "rdiscount"
 # gem 'maruku'
@@ -18,5 +20,6 @@ gem "coffee-script"
 # For template support:
 # gem "less"
 # gem "haml"
-# gem "slim"
+
+# For xml generation support:
 # gem 'builder'

data/lib/gumdrop/template/lib/site.rb

@@ -1,5 +1,16 @@
 # Any specialized code for your site goes here...
 
+puts "Build: #{Gumdrop.data.config.title} (gumdrop v#{Gumdrop::VERSION})"
+
+if defined? Encoding
+  Encoding.default_internal = Encoding.default_external = "UTF-8"
+else
+  $KCODE = "UTF-8"
+end
+
+require 'slim'
+Slim::Engine.set_default_options :pretty => true
+
 # Example site-level generator
 # generate do
 #

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

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

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

@@ -0,0 +1,33 @@
+doctype html
+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
+    div.row
+      div.col.span-12
+        header
+          h1= data.config.title
+          h4= data.config.tagline
+    div.row
+      div.col.span-12
+        nav
+          ul
+            li
+              a href==uri('/') Home
+    article
+      div.row
+        div.col.span-8
+          section
+            == yield
+        div.col.span-4
+          aside
+            == render 'sidebar'
+      div.row
+        div.col.span-12
+          footer
+            = copyright_years 2011

data/lib/gumdrop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70124108508740 !ruby/object:Gem::Requirement
+  requirement: &70197176293240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124108508740
+  version_requirements: *70197176293240
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70124108508220 !ruby/object:Gem::Requirement
+  requirement: &70197176292740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124108508220
+  version_requirements: *70197176292740
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70124108507760 !ruby/object:Gem::Requirement
+  requirement: &70197176292300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124108507760
+  version_requirements: *70197176292300
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70124108507240 !ruby/object:Gem::Requirement
+  requirement: &70197176291860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124108507240
+  version_requirements: *70197176291860
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70124108506800 !ruby/object:Gem::Requirement
+  requirement: &70197176291380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124108506800
+  version_requirements: *70197176291380
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70124108506300 !ruby/object:Gem::Requirement
+  requirement: &70197176290960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70124108506300
+  version_requirements: *70197176290960
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables:
@@ -134,10 +134,10 @@ files:
 - lib/gumdrop/template/source/favicon.ico
 - lib/gumdrop/template/source/feed.xml.builder.txt
 - lib/gumdrop/template/source/index.html.erb
-- lib/gumdrop/template/source/theme/screen.css.scss
+- lib/gumdrop/template/source/theme/screen.css.sass
 - 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.haml
+- lib/gumdrop/template/source/theme/templates/site.template.slim
 - lib/gumdrop/utils.rb
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb

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

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

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

@@ -1,33 +0,0 @@
-!!! 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