gumdrop 0.7.2 → 0.7.3

data/ChangeLog.md

@@ -1,3 +1,6 @@
+# v0.7.3
+- Bugfix: Correctly runs content through multiple processors (when multiple are specified in the filename. ie: test.js.erb.coffee gets sent through CoffeeScript then erb)
+
 # v0.7.2
 - Now supports :packr as a type of compression for stitch/sprockets (be sure it's in your Gemfile)
 - Cleaned up generator internals

data/lib/gumdrop/content.rb

@@ -46,7 +46,7 @@ module Gumdrop
         context.reset_data 'current_depth'=>@level, 'current_slug'=>@slug, 'page'=>self, 'layout'=>default_layout, 'params'=>self.params
       end
       context.set_content self, locals
-      content= @template.render(context) 
+      content= render_all(context)
       return content if ignore_layout
       layout= context.get_template()
       while !layout.nil?
@@ -122,6 +122,25 @@ module Gumdrop
       filename_parts.join('.')
     end
 
+    def render_all(ctx)
+      if @generated or !File.exists?(@full_path)
+        content= @template.render(ctx)
+      else
+        content= File.read @full_path
+        exts= @source_filename.gsub @filename, ''
+        exts.split('.').reverse.each do |ext|
+          unless ext.blank?
+            templateClass= Tilt[".#{ext}"]
+            template= templateClass.new(@full_path) do
+              content
+            end
+            content= template.render(ctx)
+          end
+        end
+      end
+      content
+    end
+
     def get_uri
       uri= File.join File.dirname(@path), @filename
       if uri.starts_with? './'

data/lib/gumdrop/version.rb

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

data/specs/content_spec.rb

@@ -7,6 +7,26 @@ describe Gumdrop::Content do
   #   @ho= Gumdrop::HashObject.new one:"ONE", two:"TWO", three:'THREE'
   # end
 
+  it "should process the content through all the engines specified in the file ext" do
+    
+    path= File.join ".", "specs", "fixtures", 'Gumdrop'
+    site= Gumdrop::Site.new path
+
+    path= File.join ".", "specs", "fixtures", 'test.js.erb.coffee'
+    content= Gumdrop::Content.new( path, site )
+
+    path= File.join ".", "specs", "fixtures", 'expected-test.js'
+    expected= File.read path
+
+    content= content.render()
+
+    # puts content
+    # puts expected
+
+    content.must_equal expected
+
+  end
+
   # it "can be created with no arguments" do
   #   Gumdrop::HashObject.new.must_be_instance_of Gumdrop::HashObject
   # end

data/specs/fixtures/expected-test.js

@@ -0,0 +1,14 @@
+(function() {
+  var Test;
+
+  Test = (function() {
+
+    function Test() {}
+
+    Test.VERSION = "1.0";
+
+    return Test;
+
+  })();
+
+}).call(this);

data/specs/fixtures/test.js.coffee

@@ -0,0 +1,4 @@
+
+class Test
+  @VERSION= "1.0"
+

data/specs/fixtures/test.js.erb.coffee

@@ -0,0 +1,3 @@
+
+class Test
+  @VERSION= "<%= '1.0' %>"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Matt McCray
@@ -129,6 +129,10 @@ files:
 - lib/gumdrop/view_helpers.rb
 - specs/content_spec.rb
 - specs/deferred_loader_spec.rb
+- specs/fixtures/Gumdrop
+- specs/fixtures/expected-test.js
+- specs/fixtures/test.js.coffee
+- specs/fixtures/test.js.erb.coffee
 - specs/hash_object_spec.rb
 - templates/backbone/Gemfile
 - templates/backbone/Gumdrop