gumdrop 0.3.7 → 0.3.8

data/ChangeLog.md

@@ -1,3 +1,6 @@
+# v0.3.8
+- Bugfix: Filenames won't break if the have extra '.' in them.
+
 # v0.3.7
 - Added lib_dir and source_dir to config for more customization possibilities
 - Added blacklisting example to templates

data/lib/gumdrop/build.rb

@@ -34,9 +34,10 @@ module Gumdrop
 
           elsif File.basename(path).starts_with?("_")
             partial_name= File.basename(path)[1..-1].gsub(File.extname(File.basename(path)), '')
+            partial_node_path= File.join File.dirname(path), partial_name
             # puts "Creating partial #{partial_name} from #{path}"
             Gumdrop.partials[partial_name]= node
-          
+            Gumdrop.partials[partial_node_path]= node
           else
             Gumdrop.site[path]= node
           end

data/lib/gumdrop/content.rb

@@ -2,6 +2,8 @@
 module Gumdrop
   
   class Content
+
+    
     
     attr_accessor :path, :level, :filename, :source_filename, :type, :ext, :uri, :slug, :template, :params
     
@@ -10,13 +12,20 @@ module Gumdrop
       @path= path
       @level= (@path.split('/').length - 2)
       @source_filename= File.basename path
+
       filename_parts= @source_filename.split('.')
-      @filename= filename_parts[0..1].join('.') # TODO: Fix this! breaks on files like jquery-1.7.1.min.js ...  becomes jquery-1
+      ext= filename_parts.pop
+      while !Tilt[ext].nil?
+        ext= filename_parts.pop
+      end
+      @filename= filename_parts.join('.')
+
       path_parts= @path.split('/')
       path_parts.shift
       path_parts.pop
       path_parts.push @filename
-      @type= filename_parts.last
+
+      @type= File.extname @source_filename
       @ext= File.extname @filename
       @uri= path_parts.join('/')
       @slug=@uri.gsub('/', '-').gsub(@ext, '')
@@ -29,6 +38,7 @@ module Gumdrop
     
     def render(ignore_layout=false, reset_context=true, locals={})
       if reset_context
+
         default_layout= (@ext == '.css' or @ext == '.js' or @ext == '.xml') ? nil : 'site'
         Context.reset_data 'current_depth'=>@level, 'current_slug'=>@slug, 'page'=>self, 'layout'=>default_layout, 'params'=>self.params
       end

data/lib/gumdrop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70326608344860 !ruby/object:Gem::Requirement
+  requirement: &70155543582300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608344860
+  version_requirements: *70155543582300
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70326608344040 !ruby/object:Gem::Requirement
+  requirement: &70155543581560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608344040
+  version_requirements: *70155543581560
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70326608342600 !ruby/object:Gem::Requirement
+  requirement: &70155543580940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608342600
+  version_requirements: *70155543580940
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70326608341700 !ruby/object:Gem::Requirement
+  requirement: &70155543580140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608341700
+  version_requirements: *70155543580140
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70326608340560 !ruby/object:Gem::Requirement
+  requirement: &70155543579360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608340560
+  version_requirements: *70155543579360
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70326608339560 !ruby/object:Gem::Requirement
+  requirement: &70155543578760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608339560
+  version_requirements: *70155543578760
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70326608338420 !ruby/object:Gem::Requirement
+  requirement: &70155543578200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608338420
+  version_requirements: *70155543578200
 - !ruby/object:Gem::Dependency
   name: bundle
-  requirement: &70326608336800 !ruby/object:Gem::Requirement
+  requirement: &70155543577440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326608336800
+  version_requirements: *70155543577440
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables: