current 1.0.4 → 1.0.5

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "stevendgarcia@gmail.com"
     gem.homepage = "http://github.com/activestylus/current"
     gem.authors = ["Steven Garcia"]
-    gem.version = "1.0.4"
+    gem.version = "1.0.5"
     gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "mocha", ">= 0"
     gem.add_development_dependency "rails", ">= 0"

data/current.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{current}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steven Garcia"]

data/lib/current.rb

@@ -1,28 +1,23 @@
 module Current
 
-  def controller_is(*attrs)
+  def controller_is?(*attrs)
     attrs.collect{|attr| attr.to_s}.include?(controller_name)
-    alias_method :controller_is?, :controller_is
   end
 
-  def action_is(*attrs)
+  def action_is?(*attrs)
     attrs.map{|attr| attr.to_s}.include?(action_name)
-    alias_method :action_is?, :action_is
   end
 
-  def partial_is(param)
+  def partial_is?(param)
     param == params[:partial]
-    alias_method :partial_is?, :partial_is
   end
 
-  def controller_action_is(c,a)
+  def controller_action_is?(c,a)
     controller_is(c) && action_is(a)
-    alias_method :controller_action_is?, :controller_action_is
   end
 
-  def active_if(condition)
+  def active_if?(condition)
     condition ? "active" : "inactive"
-    alias_method :active_if?, :active_if
   end                         
 
   def nav_link_to(text,path,condition, options={})

data/test/test_current.rb

@@ -28,61 +28,61 @@ class TestCurrent < ActionView::TestCase
       self.stubs(:action_name).returns('new')
     end
     
-    context "controller_is" do
+    context "controller_is?" do
       should "be true for users" do
-        assert controller_is('users')
+        assert controller_is?('users')
       end
 
       should "be true for users/new" do
-        assert controller_is('users', 'new')
+        assert controller_is?('users', 'new')
       end
 
       should "be false for jobs" do
-        assert !controller_is('jobs')
+        assert !controller_is?('jobs')
       end
     end
 
-    context "action_is" do
+    context "action_is?" do
       should "be true if current action is in the supplied list" do
-        assert action_is('new')
-        assert action_is('new', 'edit')
+        assert action_is?('new')
+        assert action_is?('new', 'edit')
       end
 
       should "be false if current action is not in the supplied list" do
-        assert !action_is('edit')
+        assert !action_is?('edit')
       end
     end
 
-    context "partial_is" do
+    context "partial_is?" do
       should "be true if params[:partial] is the specified value" do
         self.stubs(:params).returns({ :partial => 'boards' })
-        assert partial_is('boards')
+        assert partial_is?('boards')
       end
 
       should "be false if params[:partial] is not the specified value" do
         self.stubs(:params).returns({ :partial => 'askjfafew' })
-        assert !partial_is('boards')
+        assert !partial_is?('boards')
       end
     end
 
-    context "controller_action_is" do
+    context "controller_action_is?" do
       should "be true if for current controller/action combination" do
-        assert controller_action_is('users', 'new')
+        assert controller_action_is?('users', 'new')
       end
 
       should "be false for incorrect controller/action combination" do
-        assert !controller_action_is('accounts', 'edit')
-        assert !controller_action_is('jobs', 'new')
+        assert !controller_action_is?('accounts', 'edit')
+        assert !controller_action_is?('jobs', 'new')
       end
     end
 
-    context "active_if" do
+    context "active_if?" do
       should "return active if true" do
-        assert_equal 'active', active_if(true)
+        assert_equal 'active', active_if?(true)
       end
 
       should "return inactive if false" do
-        assert_equal 'inactive', active_if(false)
+        assert_equal 'inactive', active_if?(false)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: current
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Steven Garcia