ariane 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+## 0.0.2
+
+* FIX: HTML#link and HTMLLink#link return a non html safe string when return
+       crumb text
+* FIX: HTML#item and HTMLLink#item are using divider instead of
+       options[:divider]

data/lib/ariane/render/html.rb

@@ -43,7 +43,7 @@ module Ariane
 
       def item(crumb, active=false)
         out = link(crumb, active)
-        out << divider if divider && !active
+        out << options[:divider] if options[:divider] && !active
         out
       end
 
@@ -61,7 +61,7 @@ module Ariane
         else
           link = crumb.text
         end
-        link
+        link.html_safe
       end
     end
 

data/lib/ariane/render/html_list.rb

@@ -28,7 +28,7 @@ module Ariane
 
         content_tag(:li, class: classes) do
           out = link(crumb, active)
-          out << divider if divider && !active
+          out << options[:divider] if options[:divider] && !active
           out
         end
       end
@@ -40,7 +40,7 @@ module Ariane
         else
           link = crumb.text
         end
-        link
+        link.html_safe
       end
 
       def divider

data/lib/ariane/version.rb

@@ -1,3 +1,3 @@
 module Ariane
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/ariane/render/html_list_spec.rb

@@ -52,6 +52,11 @@ module Ariane
         it "does not append the divider if the crumb is active" do
           @html_list.item(@crumb, true).should_not =~ %r[<span class="divider">/</span></li>$]
         end
+
+        it "uses the divider from options, not the divider method" do
+          @html_list.options[:divider] = 'custom'
+          @html_list.item(@crumb).should =~ /custom/
+        end
       end
 
       describe "#link" do
@@ -86,6 +91,15 @@ module Ariane
         it "returns crumb's text if the crumb is active and link_active is false" do
           @html_list.link(@crumb, true).should == @crumb.text
         end
+
+        it "returns an html_safe string when it returns a link" do
+          @html_list.link(@crumb).html_safe?.should be_true
+        end
+
+        it "returns an html_safe string when it returns text" do
+          @crumb.url = nil
+          @html_list.link(@crumb).html_safe?.should be_true
+        end
       end
 
       describe "#divider" do

data/spec/ariane/render/html_spec.rb

@@ -82,6 +82,11 @@ module Ariane
         it "does not append the divider if the crumb is active" do
           @html.item(@crumb, true).should_not =~ %r[ / $]
         end
+
+        it "uses the divider from options, not the divider method" do
+          @html.options[:divider] = 'custom'
+          @html.item(@crumb).should =~ /custom/
+        end
       end
 
       describe "#link" do
@@ -121,6 +126,15 @@ module Ariane
         it "returns crumb's text if the crumb is active and link_active is false" do
           @html.link(@crumb, true).should == @crumb.text
         end
+
+        it "returns an html_safe string when it returns a link" do
+          @html.link(@crumb).html_safe?.should be_true
+        end
+
+        it "returns an html_safe string when it returns text" do
+          @crumb.url = nil
+          @html.link(@crumb).html_safe?.should be_true
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ariane
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70152268031300 !ruby/object:Gem::Requirement
+  requirement: &70206894458820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152268031300
+  version_requirements: *70206894458820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70152268059680 !ruby/object:Gem::Requirement
+  requirement: &70206894473580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152268059680
+  version_requirements: *70206894473580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70152268059280 !ruby/object:Gem::Requirement
+  requirement: &70206894472540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152268059280
+  version_requirements: *70206894472540
 description: Ariane is a flexible breadcrumb system for Rails. It is fully compatible
   with the Twitter Bootstrap and can be adapted to any kind of output.
 email:
@@ -53,6 +53,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - COPYING
 - Gemfile
 - README.md
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A flexible breadcrumb system for Rails, fully compatible with the Twitter