menu_builder 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/menu_builder.rb

@@ -1,5 +1,5 @@
 require 'menu_builder/controller'
 require 'menu_builder/helper'
 
-ActionController::Base.extend(MenuBuilder::Controller)
+ActionController::Base.send(:include, MenuBuilder::Controller)
 ActionView::Base.send(:include, MenuBuilder::ViewHelpers)

data/lib/menu_builder/controller.rb

@@ -1,9 +1,16 @@
 module MenuBuilder
   module Controller
+    extend ActiveSupport::Concern
 
     def menu_item(name, options = {})
-      before_filter(options) do |controller|
-        controller.instance_variable_set('@menu_item', name)
+      instance_variable_set('@menu_item', name)
+    end
+
+    module ClassMethods
+      def menu_item(name, options = {})
+        before_filter(options) do |controller|
+          controller.instance_variable_set('@menu_item', name)
+        end
       end
     end
 

data/menu_builder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{menu_builder}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Lopes"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-07-30}
   s.description = %q{ helper and controller macros to define current menu item and also create the menu in view. }
   s.email = %q{danielvlopes@gmail.com}
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/danielvlopes/menu_builder}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Killer solution for menus and tabs in Rails}
   s.test_files = [
     "test/controller_test.rb",
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/controller_test.rb

@@ -11,14 +11,22 @@ class BooksController < ApplicationController
 
   def index
   end
+  
+  def show
+    menu_item :show
+  end
 end
 
 class MenuBuilderTest < ActionController::TestCase
   tests BooksController
 
-  test "should assigns the current tab" do
+  test "should assigns the current tab in class level" do
     get :index
     assert_equal(:home, assigns(:menu_item))
   end
 
+  test "should assigns the current tab in action level" do
+    get :show
+    assert_equal(:show, assigns(:menu_item))
+  end
 end

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'test/unit'
 
-gem "actionpack", "3.0.0.beta4"
-gem "activemodel", "3.0.0.beta4"
+gem "actionpack", "3.0.0.rc"
+gem "activemodel", "3.0.0.rc"
 
 require 'action_controller'
 require 'action_view'
@@ -16,7 +16,7 @@ require 'menu_builder'
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each { |f| require f }
 
 MenuBuilder::Routes = ActionDispatch::Routing::RouteSet.new
-MenuBuilder::Routes.draw do |map|
+MenuBuilder::Routes.draw do
   match ':controller(/:action(/:id(.:format)))'
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: menu_builder
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Daniel Lopes
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -03:00
+date: 2010-07-30 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -53,23 +54,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Killer solution for menus and tabs in Rails