gumdrop 0.7.3.1 → 0.7.4

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# v0.7.4
+- All rendered content (including layouts) will relativize paths starting with / on href="" and src="" for html files. Can be set to array of file exts to process at `config.relative_paths_for= ['.html']` or sett to process all files `config.relative_paths_for= :all` or turned off entirely by `config.relative_paths= false`
+- Proxy server is disabled by default. Enable it `configure.proxy = true`
+
 # 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)
 

data/lib/gumdrop/content.rb

@@ -2,6 +2,8 @@
 module Gumdrop
   
   class Content
+
+    MUNGABLE_RE= Regexp.new(%Q<(href|data|src)([\s]*)=([\s]*)('|"|&quot;|&#34;|&#39;)?\\/([\\/]?)>, 'i')
     
     attr_accessor :path, 
                   :level, 
@@ -53,7 +55,7 @@ module Gumdrop
         content = layout.template.render(context, content:content) { content }
         layout= context.get_template()
       end
-      content
+      relativize content, context
     end
     
     def renderTo(context, output_path, filters=[], opts={})
@@ -149,6 +151,22 @@ module Gumdrop
         uri
       end
     end
+
+    def relativize(content, ctx)
+      if site.config.relative_paths
+        if site.config.relative_paths_for == :all or site.config.relative_paths_for.include?(@ext)
+          path_to_root= ctx.path_to_root
+          content = content.gsub MUNGABLE_RE do |match|
+            if $5 == '/'
+              "#{ $1 }#{ $2 }=#{ $3 }#{ $4 }/"
+            else
+              "#{ $1 }#{ $2 }=#{ $3 }#{ $4 }#{ path_to_root }"
+            end
+          end
+        end
+      end
+      content
+    end
     
   end
   

data/lib/gumdrop/context.rb

@@ -14,9 +14,9 @@ module Gumdrop
     def uri(path, opts={})
       path= path[1..-1] if path.starts_with?('/') # and path != "/"
       uri_string= if !@site.config.relative_paths or force_absolute
-        "/#{path}"
+        "/#{ path }"
       else
-        "#{'../'*@state['current_depth']}#{path}"
+        "#{ path_to_root }#{ path }"
       end
       if opts[:fresh] and @site.node_tree.has_key?(path)
         uri_string += "?v=#{ @site.node_tree[path].mtime.to_i }"
@@ -24,6 +24,10 @@ module Gumdrop
       uri_string = "/" if uri_string == ""
       uri_string
     end
+
+    def path_to_root
+      '../' * @state['current_depth']
+    end
     
     def url(path)
       path= path[1..-1] if path.starts_with?('/')

data/lib/gumdrop/site.rb

@@ -4,7 +4,8 @@ module Gumdrop
 
   DEFAULT_OPTIONS= {
     relative_paths: true,
-    proxy_enabled: true,
+    relative_paths_for: ['.html', '.htm', '.php'],
+    proxy_enabled: false,
     output_dir: "./output",
     source_dir: "./source",
     data_dir: './data',

data/lib/gumdrop/version.rb

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

data/specs/content_spec.rb

@@ -1,6 +1,20 @@
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'gumdrop'
+#require File.join File.dirname(__FILE__), 'diff.rb'
+
+fixture_src_path= File.join ".", "specs", "fixtures", "source"
+fixture_exp_path= File.join ".", "specs", "fixtures", "expected"
+
+def get_test_site
+  site= Gumdrop::Site.new File.join(".", "specs", "fixtures", "source", 'Gumdrop'), :quiet=>true
+  site.rescan
+end
+
+def get_expected(filename)
+  path= File.join ".", "specs", "fixtures", "expected", filename
+  File.read path
+end
 
 describe Gumdrop::Content do
   # before do
@@ -9,13 +23,15 @@ describe Gumdrop::Content do
 
   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 fixture_src_path, 'Gumdrop'
+    # site= Gumdrop::Site.new path, :quiet=>true
+    # site.rescan
+    site= get_test_site
 
-    path= File.join ".", "specs", "fixtures", 'test.js.erb.coffee'
+    path= File.join fixture_src_path, 'test.js.erb.coffee'
     content= Gumdrop::Content.new( path, site )
 
-    path= File.join ".", "specs", "fixtures", 'expected-test.js'
+    path= File.join fixture_exp_path, 'test.js'
     expected= File.read path
 
     content= content.render()
@@ -24,7 +40,32 @@ describe Gumdrop::Content do
     # puts expected
 
     content.must_equal expected
+  end
 
+  it "should relativize all absolute paths (when starts with /)" do
+    site= get_test_site
+    # puts site.node_tree.keys
+
+    page= site.contents('posts/post1.html').first
+    content= page.render
+    expected= get_expected('posts/post1.html')
+    # puts content
+    content.must_equal expected
+
+    page= site.contents('posts/post1.js').first
+    content= page.render
+    # puts content
+    content.must_equal get_expected('posts/post1.js')
+
+    page= site.contents('sub/sub/sub/test.html').first
+    content= page.render
+    # puts content
+    content.must_equal get_expected('sub/sub/sub/test.html')
+
+    page= site.contents('sub/sub/sub/test2.html').first
+    content= page.render
+    # puts content
+    content.must_equal get_expected('sub/sub/sub/test2.html')
   end
 
   # it "can be created with no arguments" do

data/specs/fixtures/expected/posts/post1.html

@@ -0,0 +1 @@
+<h1>My First Post</h1><img src="../media/crap.png" /><p>Go to <a href="../about/hell">Hell</a></p>

data/specs/fixtures/expected/posts/post1.js

@@ -0,0 +1,14 @@
+(function() {
+  var Test;
+
+  Test = (function() {
+
+    function Test() {
+      this.img = $('<img src="../media/my-images.png">');
+    }
+
+    return Test;
+
+  })();
+
+}).call(this);

data/specs/fixtures/expected/posts/post2.html

@@ -0,0 +1,5 @@
+<h1>My Second Post</h2>
+<div>
+  <a href="../about/site">About the site</a>
+  <a href="../about/site"><img src="../media/logo.png"/></a>
+</div>

data/specs/fixtures/expected/sub/sub/sub/test.html

@@ -0,0 +1,5 @@
+<h1>My Second Post</h2>
+<div>
+  <a href="../../../about/site">About the site</a>
+  <a href="../../../about/site"><img src="../../../media/logo.png"/></a>
+</div>

data/specs/fixtures/expected/sub/sub/sub/test2.html

@@ -0,0 +1,5 @@
+<h1>My Second Post</h2>
+<div>
+  <a href="../../../about/site">About the site</a>
+  <a href="../../../about/site"><img src="../../../media/logo.png"/></a>
+</div>

data/specs/fixtures/source/Gumdrop

@@ -0,0 +1,13 @@
+require 'slim'
+
+configure do
+  
+  set :site_title,   "Test"
+  set :site_tagline, "a test site"
+  
+  set :source_dir,   "./"
+
+  # set :relative_paths_for, ['.html']
+  # set :relative_paths_for, :all #default
+
+end

data/specs/fixtures/source/posts/post1.html.slim

@@ -0,0 +1,6 @@
+h1 My First Post
+
+img src="/media/crap.png"
+
+markdown:
+  Go to [Hell](/about/hell)

data/specs/fixtures/source/posts/post1.js.coffee

@@ -0,0 +1,3 @@
+class Test
+  constructor: ->
+    @img= $('<img src="/media/my-images.png">')

data/specs/fixtures/source/posts/post2.html.erb

@@ -0,0 +1,5 @@
+<h1>My Second Post</h2>
+<div>
+  <a href="/about/site">About the site</a>
+  <a href="/about/site"><img src="/media/logo.png"/></a>
+</div>

data/specs/fixtures/source/sub/sub/sub/test.html

@@ -0,0 +1,5 @@
+<h1>My Second Post</h2>
+<div>
+  <a href="/about/site">About the site</a>
+  <a href="/about/site"><img src="/media/logo.png"/></a>
+</div>

data/specs/fixtures/source/sub/sub/sub/test2.html.erb

@@ -0,0 +1,5 @@
+<h1>My Second Post</h2>
+<div>
+  <a href="/about/site">About the site</a>
+  <a href="/about/site"><img src="/media/logo.png"/></a>
+</div>

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  - 1
-  version: 0.7.3.1
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - Matt McCray
@@ -130,10 +129,20 @@ 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/fixtures/expected/posts/post1.html
+- specs/fixtures/expected/posts/post1.js
+- specs/fixtures/expected/posts/post2.html
+- specs/fixtures/expected/sub/sub/sub/test.html
+- specs/fixtures/expected/sub/sub/sub/test2.html
+- specs/fixtures/expected/test.js
+- specs/fixtures/source/Gumdrop
+- specs/fixtures/source/posts/post1.html.slim
+- specs/fixtures/source/posts/post1.js.coffee
+- specs/fixtures/source/posts/post2.html.erb
+- specs/fixtures/source/sub/sub/sub/test.html
+- specs/fixtures/source/sub/sub/sub/test2.html.erb
+- specs/fixtures/source/test.js.coffee
+- specs/fixtures/source/test.js.erb.coffee
 - specs/hash_object_spec.rb
 - templates/backbone/Gemfile
 - templates/backbone/Gumdrop