access_kit 0.02 → 0.03

data/lib/access_kit/core_ext/url_helper.rb

@@ -1,5 +1,3 @@
-require 'rails/all'
-
 raise "ActionView::Helpers::UrlHelper not loaded!" unless defined?(ActionView::Helpers::UrlHelper)
 raise "AccessKit::UrlHelperAdditions not loaded!" unless defined?(AccessKit::UrlHelperAdditions)
 
@@ -8,14 +6,16 @@ module ActionView
     module UrlHelper    
             
       def link_to_with_supplement(*args, &block)
-        if !block_given? && AccessKit::UrlHelperAdditions.args_for_link_to_with_supplement?(*args)
-          new_opts = AccessKit::UrlHelperAdditions.process_options_for_link_to_with_supplement(*args)
-          new_name = AccessKit::UrlHelperAdditions.add_supplement_to_text(args[0], new_opts)
-          args.shift
-
-          link_to_without_supplement(new_name, *args)
-        else
+        if block_given? || 
+           ( new_args = AccessKit::UrlHelperAdditions.process_options_for_link_to_with_supplement(*args) ).nil?
+          # either a block was passed or
+          # the arguments did not include options for suplementary text
+          # so just pass through to original link_to without modification
           link_to_without_supplement(*args, &block)
+        else 
+          # call original link_to with new args which contain 
+          # new name that includes supplementary text
+          link_to_without_supplement(*new_args)
         end
       end
 

data/lib/access_kit/url_helper_additions.rb

@@ -38,11 +38,22 @@ module AccessKit
         )
       end
       
+      # TODO: maybe rename to 'process_args'
       def process_options_for_link_to_with_supplement(*args)
-        [ DEFAULT_KEY_NAME_FOR_PRECEDING_TEXT, DEFAULT_KEY_NAME_FOR_FOLLOWING_TEXT, :auto_pad ].inject({}) do |memo, k|
-          value = args[2].delete(k)
-          value.blank? ? memo : memo.merge( k => value )
-        end          
+        if args_for_link_to_with_supplement?(*args)
+          # TODO: move to separate method: 'extract_supplement_opts'
+          supplement_opts = [ DEFAULT_KEY_NAME_FOR_PRECEDING_TEXT, DEFAULT_KEY_NAME_FOR_FOLLOWING_TEXT, :auto_pad ].inject({}) do |memo, k|
+            value = args[2].delete(k)
+            value.blank? ? memo : memo.merge( k => value )
+          end
+        
+          new_args = args.dup
+          # replace the name argument with new_name
+          new_args[0] = AccessKit::UrlHelperAdditions.add_supplement_to_text(args[0], supplement_opts)
+          new_args
+        else
+          nil
+        end
       end
 
       private 

data/lib/access_kit/version.rb

@@ -1,3 +1,3 @@
 module AccessKit
-  VERSION="0.02"
+  VERSION="0.03"
 end

data/spec/access_kit/url_helper_additions_spec.rb

@@ -13,8 +13,61 @@ module AccessKit
           :intro => "Click to learn about"
         ).should == "<a href=\"#unicorns\"><span>Click to learn about </span>unicorns</a>"
       end
+      
+      context "#args_for_link_to_with_supplement?" do
+        context "should return true if :intro or :outro options are passed" do
+          UrlHelperAdditions.args_for_link_to_with_supplement?(
+            "unicorns", 
+            '#unicorns', 
+            :intro => "Click to learn about"
+          ).should == true
+        end
+              
+        it "should return false if neither :intro nor :outro options are passed" do
+          UrlHelperAdditions.args_for_link_to_with_supplement?(
+            "unicorns", 
+            '#unicorns'
+          ).should == false
+        end
+        
+        it "should return false if a block is given" do
+          some_block = lambda{ 'link_name' }
+          UrlHelperAdditions.args_for_link_to_with_supplement?(
+            '#unicorns',
+            :intro => "Click to learn about",
+            &some_block
+          ).should == false          
+        end
+      end
+      
+      context "#process_options_for_link_to_with_supplement" do
+        context "args_for_link_to_with_supplement? is true" do
+          it "should return hash with new name" do
+            UrlHelperAdditions.process_options_for_link_to_with_supplement(
+              "unicorns", 
+              '#unicorns', 
+              :intro => "Click to learn about",
+              :class => 'mythical'              
+            ).should == ["<span>Click to learn about </span>unicorns",
+                          '#unicorns', 
+                          { :class => 'mythical' }
+            ]
+            
+          end
+        end
+        
+        context "args_for_link_to_with_supplement? is false" do
+          it "should return nil" do
+            UrlHelperAdditions.process_options_for_link_to_with_supplement(
+              "unicorns", 
+              '#unicorns'
+            ).should be_nil     
+          end
+        end
+        
+      end
     end
-    
+        
     context "#add_supplement_to_text" do
       it "should add before" do
         UrlHelperAdditions.add_supplement_to_text( 

data/spec/spec_helper.rb

@@ -12,4 +12,5 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
+  config.expect_with :rspec  
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: access_kit
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.02"
+  - 3
+  version: "0.03"
 platform: ruby
 authors: 
 - Mani Tadayon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency