herbie 0.1.3 → 0.1.5

data/lib/herbie.rb

@@ -3,5 +3,5 @@ require 'herbie/generic_helpers.rb'
 require 'herbie/html_helpers.rb'
 
 module Herbie
-  VERSION = '0.1.3'
+  VERSION = '0.1.5'
 end

data/lib/herbie/html_helpers.rb

@@ -2,7 +2,7 @@ module Herbie
   module Helpers
     def tag(name, attrs={}, &block)
       if block_given?
-        erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>#{capture_erb(&block)}</#{name}>"
+        erb_concat "<#{name}#{' ' + attributes(attrs) unless attrs.nil? || attrs.empty?}>\n#{capture_erb(&block)}\n</#{name}>"
       elsif !attrs[:content].nil?
         content = attrs.delete :content
         "<#{name}#{' ' + attributes(attrs) unless attrs.empty?}>#{content}</#{name}>"
@@ -44,7 +44,7 @@ module Herbie
       if block_given?
         erb_concat "#{tag :script, attrs}\n#{capture_erb(&block)}\n</script>"
       else
-        source = "/javascripts/#{source}" unless source.nil? || source.match(/^\//) || source.match(/^http/)
+        source = "/javascripts/#{source}" unless source.nil? || source.match(/^\/{1,2}|^http:\/\/|^https:\/\//)
         attrs = attrs.merge({:src => source})
         "#{tag :script, attrs}</script>"
       end
@@ -60,7 +60,7 @@ module Herbie
         default_attrs.delete :rel
         erb_concat "#{tag :style, default_attrs.merge(attrs)}\n#{capture_erb(&block)}\n</style>"
       else
-        href = "/stylesheets/#{href}" unless href.match(/^\//)
+        href = "/stylesheets/#{href}" unless href.match(/^\/{1,2}|^http:\/\/|^https:\/\//)
         attrs = default_attrs.merge({:href => href}.merge(attrs))
         "#{tag :link, attrs}"        
       end
@@ -75,5 +75,19 @@ module Herbie
       end
     end
     
+    def content_for(name, content=nil, &block)
+      @captured_content ||= {}
+      
+      if content || block_given?
+        if @captured_content.key? name
+          @capured_content[name] += content || capture_erb(&block)
+        else
+          @capured_content[name] = content || capture_erb(&block)
+        end
+      else
+        @captured_content[name]
+      end
+    end
+    
   end
 end

data/spec/herbie_spec.rb

@@ -58,7 +58,7 @@ HTML
 
     it "should output all nested tag method calls" do
       pending "Need a mechanism for capturing erb output within a passed block"
-      markup = "<div class=\"container\"><h1>Status Report</h1></div>"
+      markup = "<div class=\"container\">\n<h1>Status Report</h1>\n</div>"
       result = tag :div, :class => "container" do
         tag :h1, :content => "Status Report"
       end
@@ -115,8 +115,10 @@ MARKUP
       script("/path/to/script.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/path/to/script.js\"></script>"
     end
     
-    it "should output a script with an absolute path to the script if the path provided begins with http" do
-      script("http://code.jquery.com/jquery.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"http://code.jquery.com/jquery.js\"></script>"
+    it "should output a script with an absolute path to the script if the path provided begins with http://, https:// or //" do
+      script("http://code.jquery.com/jquery.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"http://code.jquery.com/jquery.js\"></script>" and
+      script("https://code.jquery.com/jquery.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"https://code.jquery.com/jquery.js\"></script>" and
+      script("//code.jquery.com/jquery.js").should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"//code.jquery.com/jquery.js\"></script>"
     end
     
     it "should output a script element with arbitrary javascript content provided by a block" do
@@ -124,6 +126,12 @@ MARKUP
       script_block = Proc.new { "function hello_world(){ console.log(\"hello world!\"); }" }
       script(&script_block).should == "<script type=\"text/javascript\" charset=\"utf-8\">\n#{capture_erb(&script_block)}\n</script>"
     end
+    
+    it "should output a jQuery script include with the specified options" do
+      pending "NYI"
+      
+      jquery(:version => "1.5.0", :min => false, :cdn => :google).should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"\"></script>"
+    end
   end
   
   describe "stylesheet helpers" do
@@ -135,6 +143,12 @@ MARKUP
       style("/style/foo.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style/foo.css\">"
     end
     
+    it "should output a link element with the absolute path to the stylesheet if the path provided starts with http://, https:// or //" do
+      style("http://foo.com/style/bar.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://foo.com/style/bar.css\">" and
+      style("https://foo.com/style/bar.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"https://foo.com/style/bar.css\">" and
+      style("//foo.com/style/bar.css").should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"//foo.com/style/bar.css\">"
+    end
+    
     it "should output a link element with appropriate media query attribute if provided" do
       media = "screen and (min-width:500px)"
       style("/style/foo.css", :media => media).should == "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style/foo.css\" media=\"#{media}\">"
@@ -181,4 +195,17 @@ MARKUP
       link_to(href, text, attrs, &markup_block).should == "<a href=\"#{href}\" class=\"#{attrs[:class]}\">#{capture_erb(&markup_block)}</a>"
     end
   end
+  
+  describe "content helpers" do
+    it "should accept a named block of content which can then be displayed elsewhere later" do
+      pending "Need a mechanism for capturing erb output within a passed block"
+
+      content_for :script do
+        "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/application.js\">"
+        # Tilt['erb'].new { "%><%= script 'application.js' %><%" }
+      end
+      
+      content_for(:script).should == "<script type=\"text/javascript\" charset=\"utf-8\" src=\"/application.js\">"
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: herbie
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ben Darlow
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-10 00:00:00 +01:00
+date: 2011-12-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency