activo-rails 1.0 → 1.0.1

data/Gemfile.lock

@@ -1,50 +1,48 @@
 PATH
   remote: .
   specs:
-    activo-rails (0.0.1)
+    activo-rails (1.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.1)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.2)
-    nokogiri (1.4.3.1)
+    i18n (0.5.0)
+    nokogiri (1.4.4)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    tzinfo (0.3.23)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby

data/README.md

@@ -223,6 +223,16 @@ send me a pull request when your feature is ready.
 For the original (and beautiful) Activo web app theme: David Francisco (http://github.com/dmfrancisco/activo)
 Icons: FatCow (http://www.fatcow.com/free-icons)
 Fixing jQuery UI image paths: Mike Park (http://github.com/mikepinde/)
+Fixing link options, and breadcrumbs: Nirmit Patel (http://github.com/NeMO84/)
 
 And thanks to the people brave enough to use this before it was released, or even had a readme, for provoking me into
 actually releasing the damn thing.
+
+## License ##
+
+All original components of activo-rails are licensed under the MIT license:
+
+Copyright (c) 2011, Jon Wood
+
+That doesn't cover the Activo theme itself, the FatCow icon set, or jQuery, which remain under their original licenses 
+and the property of their original authors.

data/lib/activo-rails/helper.rb

@@ -149,7 +149,7 @@ module ActivoRails
                 link_to(item[:label], item[:href])
               end
             end
-          }.join("")
+          }.join("").html_safe
         end
       end
     end
@@ -172,9 +172,9 @@ module ActivoRails
         options[:class] << " first" if item_list.empty?
         options[:class] << " active" if options[:active]
                 
-        options[:link_options] = {}
-        options[:link_options][:method] = options[:method] if options[:method]
-
+        options[:link_options] ||= {}
+        options[:link_options].merge!(:method => options[:method]) if options[:method]
+        
         item_list << {
           :label => label,
           :href => path,

data/lib/activo-rails/version.rb

@@ -1,3 +1,3 @@
 module ActivoRails
-  VERSION = "1.0"
+  VERSION = "1.0.1"
 end

data/spec/navigation_builder_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path("../spec_helper", __FILE__)
+require 'activo-rails/helper'
 
 describe ActivoRails::Helper::NavigationBuilder do
   let(:builder) { ActivoRails::Helper::NavigationBuilder.new } 
@@ -46,6 +47,21 @@ describe ActivoRails::Helper::NavigationBuilder do
       builder.item("New Item", "", :method => :delete)
       builder.item_list[0][:link_options].should eq({ :method => :delete })
     end
+    
+    it "sets the method on link_options as it was provided (preserves it)" do
+      builder.item("Delete", "", :link_options => {:method => :delete})
+      builder.item_list[0][:link_options].should eq({ :method => :delete })
+    end
+    
+    it "sets the method on link_options as provided through link_options and method optiosn, giving priority to the method option" do
+      builder.item("Should Post", "", :link_options => {:method => :delete}, :method => :post)
+      builder.item_list[0][:link_options].should eq({ :method => :post })
+    end
+    
+    it "sets the method on link_options if provided as " do
+      builder.item("New Item", "", :method => :delete)
+      builder.item_list[0][:link_options].should eq({ :method => :delete })
+    end
 
     it "sets the icon if provided" do
       builder.item("New Item", "", :icon => "new")
@@ -71,6 +87,7 @@ describe ActivoRails::Helper::NavigationBuilder do
       builder.item("Delete", "")
       builder.item_list[0][:active].should be_false
     end
+ 
   end
 
   it { should respond_to(:item_list) }

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jon Wood
@@ -13,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +00:00
+date: 2011-02-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency