tabnav 1.0.3 → 1.1.0

data/README.rdoc

@@ -121,6 +121,10 @@ On froobles/index the output will be:
 
 -----
 
+== Attributions
+
+The concept for this is based on the tabnav component from rails_widgets: http://github.com/paolodona/rails-widgets
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "github@unboxedconsulting.com"
     gem.homepage = "http://github.com/unboxed/tabnav"
     gem.authors = ["Unboxed"]
-    gem.add_dependency "actionpack", ">= 2.3.2"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "rspec-rails", ">= 1.2.9"
+    gem.add_dependency "actionpack", ">= 2.3.8"
+    gem.add_development_dependency "rspec", "~> 2.6.0"
+    gem.add_development_dependency "rspec-rails", "~> 2.6.1"
     gem.files.exclude "*.gemspec", '.gitignore', 'doc/*'
   end
   Jeweler::GemcutterTasks.new
@@ -20,17 +20,8 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 task :spec => :check_dependencies
 

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/lib/tabnav/navbar.rb

@@ -25,9 +25,9 @@ module Tabnav
     def render # :nodoc:
       return '' if @tabs.empty?
       @template.content_tag :ul, @html_options do
-        contents = ''
+        contents = ''.html_safe
         @tabs.each do |tab|
-          contents += tab.render
+          contents << tab.render
         end
         contents
       end

data/spec/spec_helper.rb

@@ -4,17 +4,7 @@ require 'rubygems'
 require 'action_controller'
 require 'tabnav'
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-# The parts of rspec-rails necessary to use helper example groups
-class ApplicationController < ActionController::Base
-end
-require 'active_support/test_case'
-require 'spec/test/unit'
-require 'spec/rails/example'
-require 'spec/rails/interop/testcase'
+require 'rspec/rails'
 
-Spec::Runner.configure do |config|
-
-end

data/spec/tabnav/helper_spec.rb

@@ -11,7 +11,7 @@ describe Tabnav::Helper, :type => :helper do
       helper.output_buffer = ''
     end
     it "should create a new navbar with the template and params and yield it to the block" do
-      params[:foo] = "bar"
+      controller.params["foo"] = "bar"
       Tabnav::Navbar.should_receive(:new).with(@template, {"foo" => "bar"}, {}).and_return(@navbar)
       helper.render_tabnav do |n|
         n.should == @navbar

data/spec/tabnav/integration_spec.rb

@@ -56,14 +56,14 @@ describe Tabnav::Helper, :type => :helper do
   describe "highlighting logic" do
     context "params based rules" do
       it "should highlight the tab if the rules match the params hash" do
-        params[:controller] = 'home'
-        params[:action] = 'index'
-        params[:foo] = 'bar'
+        controller.params["controller"] = 'home'
+        controller.params["action"] = 'index'
+        controller.params["foo"] = 'bar'
         helper.render_tabnav :id => "main_navigation", :class => "clearfix" do |n|
           n.add_tab :class => "home_tab" do |t|
             t.named "Home"
             t.links_to '/'
-            t.highlights_on :controller => :home, :action => :index
+            t.highlights_on :controller => 'home', :action => 'index'
           end
           n.add_tab :class => "heading" do |t|
             t.named "Froobles Heading"
@@ -81,9 +81,9 @@ describe Tabnav::Helper, :type => :helper do
       end
 
       it "should allow multiple tabs to be active at once" do
-        params[:controller] = 'froobles'
-        params[:action] = 'index'
-        params[:foo] = 'bar'
+        controller.params['controller'] = 'froobles'
+        controller.params['action'] = 'index'
+        controller.params['foo'] = 'bar'
         helper.render_tabnav do |n|
           n.add_tab :class => "home_tab" do |t|
             t.named "Home"
@@ -106,9 +106,9 @@ describe Tabnav::Helper, :type => :helper do
       end
 
       it "should highlight tabs where any of the highlighting rules match" do
-        params[:controller] = 'home'
-        params[:action] = 'froobles'
-        params[:foo] = 'bar'
+        controller.params['controller'] = 'home'
+        controller.params['action'] = 'froobles'
+        controller.params['foo'] = 'bar'
         helper.render_tabnav do |n|
           n.add_tab do |t|
             t.named "Home"
@@ -145,9 +145,9 @@ describe Tabnav::Helper, :type => :helper do
     end
 
     it "should allow a mixture of rule types" do
-      params[:controller] = 'home'
-      params[:action] = 'index'
-      params[:foo] = 'bar'
+      controller.params['controller'] = 'home'
+      controller.params['action'] = 'index'
+      controller.params['foo'] = 'bar'
       helper.render_tabnav do |n|
         n.add_tab :class => "home_tab" do |t|
           t.named "Home"
@@ -194,4 +194,4 @@ describe Tabnav::Helper, :type => :helper do
           '<li>Custom markup for Froobles</li></ul>'
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tabnav
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 3
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors: 
 - Unboxed
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-12 00:00:00 +01:00
+date: 2011-07-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 19
         segments: 
         - 2
         - 3
-        - 2
-        version: 2.3.2
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,14 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 23
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 6
+        - 0
+        version: 2.6.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,14 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 21
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 6
+        - 1
+        version: 2.6.1
   type: :development
   version_requirements: *id003
 description: Rails helper for generating navbars in a declarative manner
@@ -77,6 +77,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .rspec
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -85,7 +86,6 @@ files:
 - lib/tabnav/helper.rb
 - lib/tabnav/navbar.rb
 - lib/tabnav/tab.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/tabnav/helper_spec.rb
 - spec/tabnav/integration_spec.rb
@@ -96,8 +96,8 @@ homepage: http://github.com/unboxed/tabnav
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -121,13 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Rails helper for generating navbars
-test_files: 
-- spec/tabnav/tab_spec.rb
-- spec/tabnav/helper_spec.rb
-- spec/tabnav/navbar_spec.rb
-- spec/tabnav/integration_spec.rb
-- spec/spec_helper.rb
+test_files: []
+