gumdrop 0.2.11 → 0.2.12

data/ChangeLog.md

@@ -1,3 +1,9 @@
+# v0.2.12
+- Added textile view_helper
+- Allow paths prefixed with "/" in uri()
+- Context#render will now look for templates too
+- Fixed content_for(key, &block) in slim -- not tested in any other template engines -- be sure and use '=' tag: = content_for :sidebar do
+
 # v0.2.11
 - Updated server to reload on .css and .js file requests too.
 

data/lib/gumdrop/context.rb

@@ -10,7 +10,7 @@ module Gumdrop
       #attr_reader :data
       
       def uri(path, opts={})
-        path= path[1..-1] if path.starts_with?('/') and path != "/"
+        path= path[1..-1] if path.starts_with?('/') # and path != "/"
         uri_string= if !Gumdrop.config.relative_paths or Context.force_absolute
           "/#{path}"
         else
@@ -19,6 +19,7 @@ module Gumdrop
         if opts[:fresh] and Gumdrop.site.has_key?(path)
           uri_string += "?v=#{ Gumdrop.site[path].mtime.to_i }"
         end
+        uri_string = "/" if uri_string == ""
         uri_string
       end
       
@@ -92,6 +93,7 @@ module Gumdrop
         keyname= "_content_#{key}"
         if block_given?
           @state[keyname]= block
+          nil
         else
           if @state.has_key?(keyname)
             @state[keyname].call
@@ -112,6 +114,7 @@ module Gumdrop
         page= Gumdrop.site[path]
         page= Gumdrop.site["#{path}.html"] if page.nil? # Bit of a hack...
         page= Gumdrop.partials[path] if page.nil?
+        page= Gumdrop.templates[path] if page.nil? # ???
         page
       end
       

data/lib/gumdrop/generator.rb

@@ -33,6 +33,7 @@ module Gumdrop
     end
     
     def page(name, opts={}, &block)
+      name= name[1..-1] if name.starts_with?('/')
       opts= params.reverse_merge(opts)
       filepath= if @base_path.empty?
         "/#{name}"

data/lib/gumdrop/version.rb

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

data/lib/gumdrop/view_helpers.rb

@@ -11,6 +11,10 @@ module Gumdrop
       m.render
     end
     
+    def textile(source)
+      m= Tilt['textile'].new { source }
+      m.render
+    end
     
     def gumdrop_version
       ::Gumdrop::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70227519269640 !ruby/object:Gem::Requirement
+  requirement: &70231259406440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227519269640
+  version_requirements: *70231259406440
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70227519269160 !ruby/object:Gem::Requirement
+  requirement: &70231259405980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227519269160
+  version_requirements: *70231259405980
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70227519268700 !ruby/object:Gem::Requirement
+  requirement: &70231259405380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227519268700
+  version_requirements: *70231259405380
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70227519268180 !ruby/object:Gem::Requirement
+  requirement: &70231259404800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227519268180
+  version_requirements: *70231259404800
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70227519267680 !ruby/object:Gem::Requirement
+  requirement: &70231259404200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227519267680
+  version_requirements: *70231259404200
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70227519267200 !ruby/object:Gem::Requirement
+  requirement: &70231259403580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70227519267200
+  version_requirements: *70231259403580
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables: