link2 0.1.0 → 0.1.1

data/README.textile

@@ -16,12 +16,6 @@ This is *not* a re-implementation of @link_to@/@button_to@-helpers; rather it wr
 * Full test-coverage for stability.
 * Well-documented code.
 
-h2. Dependencies
-
-* "rails 2.3.x":http://github.com/rails/rails only. Might as well work with Rails 3 already, but I didn't write that.
-
-For testing: test-unit, and "left-right":http://github.com/jordi/leftright.
-
 h2. Installation
 
 "Drop a *Gem* on 'em":http://open.spotify.com/track/2pqKuHtn8ZKMMMqbJrA2e7:
@@ -30,12 +24,19 @@ h2. Installation
   $ sudo gem install link2
 </pre>
 
+*Dependencies:*
+
+* *"rails 2.3.x":http://github.com/rails/rails* only. Might as well work with Rails 3 already, but I didn't write that.
+
+For testing: test-unit, "mocha":http://github.com/floehopper/mocha, and "webrat":http://github.com/brynary/webrat. Optional: "left-right":http://github.com/jordi/leftright
+
 h2. Setup
 
-Generate initializer (optional):
+Generate *initializer* (optional):
 
 <pre>
   $ ./script/generate link2
+    create    config/initializers/link2.rb
 </pre>
 
 h2. Usage

data/TODO

@@ -1,10 +1,8 @@
 TODO
 
-* Implement the problematic one: link(:action, [@parent, @resource])
+1) [BUG:] I18n lookup scope interpolations should not be same as I18n.t interpolations.
 
-* Write tests for options hashes as well: url_options vs. html_options
-
-* Generate proper DOM ID selectors, e.g. class="new post"
+2) Generate proper DOM ID selectors, e.g. class="new post"
 
   DOM Selectors
 
@@ -21,20 +19,23 @@ TODO
       # => <a class="back" ...>...<a/>
   </pre>
 
-* Fix action mapping procs to handle named scopes. Should work, but do not for some reason. =/
+3) Auto-detect current resource instance for member views (non-collection)
 
-* Fix action mapping procs to receive session, params, etc in a options hash. My mocking/stubbing don't want to work. ='(
+    link(:edit)   =>  link(:edit, @post)
+
+  Detect using "self.controller_name.singularize", or use "resource" if InheritedResources is used.
+
+* [ISSUE:] Implement the problematic one: link(:action, [@parent, @resource])
 
-* Allow customization of alternatives to Object#to_s for parsing object label, i.e. {{name}} interpolation.
 * Collections detection:
 
     link(:index)  =>  link(@posts)   =>  link(:index, @posts)   =>  link("Index", @posts)
 
-* Auto-detect current resource instance for member views (non-collection)
+* Allow customization of alternatives to Object#to_s for parsing object label, i.e. {{name}} interpolation.
 
-    link(:edit)   =>  link(:edit, @post)
+* Fix action mapping procs to handle named scopes. Should work, but do not for some reason. =/
 
-  Detect using "self.controller_name.singularize", or use "resource" if InheritedResources is used.
+* Fix action mapping procs to receive session, params, etc in a options hash. My mocking/stubbing don't want to work. ='(
 
 * Add support: #link_to_function + #button_to_function: I18n, more?
 
@@ -44,6 +45,8 @@ TODO
 
     ajax_link(...)
 
+* ORM-tests: DataMapper, MongoMapper
+
 Consider:
 
-* Possible parse TITLE-attribute from the model, say Object#link_title or similar.
+* Possible parse TITLE-attribute from the model, say Object#link_title or similar.

data/generators/link2/templates/initializer.rb

@@ -3,7 +3,7 @@
 if defined?(::Link2)
   ::Link2.setup do |config|
     # Configure how - and in what order - link labels should be looked up.
-    # config.i18n_scopes = ['links.{{action}}']
+    # config.i18n_scopes = ['{{model}}.links.{{action}}', 'links.{{action}}']
     #
     # Configure any custom action mappings.
     # config.action_mappings = {

data/lib/link2.rb

@@ -31,7 +31,7 @@ module Link2
 
   # Default I18n lookup scopes if none are set.
   DEFAULT_I18N_SCOPES = [
-    '{{resource}}.links.{{action}}',
+    '{{model}}.links.{{action}}',
     'links.{{action}}'
   ]
 

data/lib/link2/brain.rb

@@ -6,10 +6,9 @@ module Link2
     URL_PATH_REGEX = /\//
     CLASS_INSTANCE_STRING = /\#\<.*\:0x.*\>/
 
-    LINK2_OPTION_KEYS = [:scope, :strong].freeze
     LINK_TO_OPTION_KEYS = [:method, :confirm, :popup, :html_options].freeze
     BUTTON_TO_OPTION_KEYS = [:method, :confirm, :disabled].freeze
-    IGNORED_OPTION_KEYS = (LINK2_OPTION_KEYS + LINK_TO_OPTION_KEYS + BUTTON_TO_OPTION_KEYS).uniq
+    IGNORED_OPTION_KEYS = (LINK_TO_OPTION_KEYS + BUTTON_TO_OPTION_KEYS).uniq
 
     POLYMORPHIC_OPTION_KEYS = [:action, :routing_type]
 
@@ -23,10 +22,13 @@ module Link2
       # The comments give guidelines on what assumptions is being made in each case.
       #
       def link_to_args(*args)
-        html_options = args.extract_options!
-        url_options = args.extract_options!
         args.unshift(capture(&block)) if block_given?
 
+        html_options = args.pop if args.last.is_a?(Hash)
+        url_options = args.pop if args.last.is_a?(Hash)
+
+        #puts [url_options, html_options].compact.inspect
+
         case args.size
         when 0
           raise "No arguments specified. A least specify action or url."
@@ -71,7 +73,9 @@ module Link2
             end
           elsif args.first.is_a?(Symbol)
             # TODO: Implement this:
-            raise ::Link2::NotImplementedYetError, "case link(:action, [...]) not yet supported. Need to refactor some stuff." if args.second.is_a?(Array)
+            if args.second.is_a?(Array)
+              raise ::Link2::NotImplementedYetError, "case link(:action, [...]) not yet supported. Need to refactor some stuff."
+            end
             # TODO: Cleanup.
             if self.resource_identifier_class?(args.second)
               # link :new, Post  => link_to I18n.t(:new, ...), new_post_path
@@ -107,8 +111,8 @@ module Link2
         else
           raise "Invalid number of arguments: #{args.inspect}."
         end
-        #[label, url, *((args << options) << html_options)]
-        #puts url_options.inspect
+        args << url_options if url_options
+        args << html_options if html_options
         [label, url, *args]
       rescue => e
         raise ::ArgumentError, e
@@ -133,18 +137,17 @@ module Link2
       # See documentation on +polymorphic_url+ for available core options.
       #
       def label_and_url_for_resource(resource, options = {})
+        options ||= {}
         resource.compact! if resource.is_a?(Array)
         last_resource = [resource].flatten.last
-        url_for_options = options.slice!(*POLYMORPHIC_OPTION_KEYS).reverse_merge(:routing_type => :path)
-        i18n_options = options
+        url_for_options = options.slice(*POLYMORPHIC_OPTION_KEYS).reverse_merge(:routing_type => :path)
+        i18n_options = options.except(url_for_options.keys)
 
         # Skip any ugly default to_s-value.
         custom_name = last_resource.to_s =~ CLASS_INSTANCE_STRING ? last_resource.class.human_name.downcase : last_resource.to_s
         custom_name = last_resource.class.human_name.downcase if custom_name.blank?
 
-        i18n_options.merge!(:name => custom_name)
-
-        label = self.localized_label(:show, last_resource.class, i18n_options)
+        label = self.localized_label(:show, last_resource.class, i18n_options.merge(:name => custom_name))
         url = polymorphic_url(resource, url_for_options)
 
         [label, url]
@@ -171,7 +174,7 @@ module Link2
       # See documentation on +url_for+ for available core options.
       #
       def url_for_args(*args)
-        options = args.extract_options!
+        options = args.extract_options!.dup
         action, resource = args
 
         if resource.nil?
@@ -189,7 +192,7 @@ module Link2
           options[:action] = action
           options[:id] = resource.id if !resource.is_a?(Class) && self.record_class?(resource)
 
-          url_for(options.except(IGNORED_OPTION_KEYS))
+          url_for(options.except(*IGNORED_OPTION_KEYS))
         end
       end
 
@@ -197,8 +200,9 @@ module Link2
       # for the current template instance.
       #
       def localized_label(action, resource, options = {})
-        options.merge!(:controller => self.controller_name_for_resource(resource))
-        ::Link2::I18n.t(action, resource, options)
+        options ||= {}
+        i18n_options = options.merge(:controller => self.controller_name_for_resource(resource))
+        ::Link2::I18n.t(action, resource, i18n_options)
       end
 
       # Get controller name based for a specified resource.

data/lib/link2/i18n.rb

@@ -22,6 +22,12 @@ module Link2
       #   2. links.{{action}}
       #   ...
       #
+      # == Valid value interpolations:
+      #
+      # * +resource+    - resource humanized name (parsed with I18n if possible), e.g. CaptainMorgan / @captain_morgan => "captain morgan"
+      # * +resources+   - pluralized resource humanized name (parsed with I18n if possible), e.g. CaptainMorgan / @captain_morgan => "captain morgans"
+      # * +name+        - current resource name to_s-value, e.g. @captain_morgan.to_s => "Captain Morgan with Cola and lime #4"
+      #
       def translate_with_scoping(action, resource, options = {})
         raise ArgumentError, "At least action must be specified." unless action.present?
         resource_name = self.localized_resource_class_name(resource)
@@ -45,7 +51,7 @@ module Link2
         #
         # == Usage/Examples:
         #
-        #   ::Link2.i18n_scopes = ['{{resources}}.links.{{action}}', '{{controller}}.links.{{action}}', 'links.{{action}}']
+        #   ::Link2.i18n_scopes = ['{{models}}.links.{{action}}', '{{controller}}.links.{{action}}', 'links.{{action}}']
         #
         #   substituted_scopes_for(:new, Post.new)
         #     # => Link2::I18n::ScopeInterpolationError
@@ -53,12 +59,19 @@ module Link2
         #   substituted_scopes_for(:new, Post.new, :controller => 'admin')
         #     # => ['posts.links.new', 'admin.links.{new', 'links.new']
         #
+        # == Valid lookup scope interpolations:
+        #
+        # * +model+       - link model name, e.g. CaptainMorgan / @captain_morgan => "captain_morgan"
+        # * +models+      - pluralized link model name, e.g. CaptainMorgan / @captain_morgan => "captain_morgans"
+        # * +controller+  - current controller name
+        # * +action+      - the link action name
+        #
         def substituted_scopes_for(action, resource, options = {})
-          resource_name = self.localized_resource_class_name(resource) # TODO: Should not be localized. Maybe use "model"/"models" to avoid confusion?
+          model_name = self.localized_resource_class_name(resource) # TODO: Should not be localized. Maybe use "model"/"models" to avoid confusion?
           substitutions = options.merge(
             :action => action.to_s.underscore,
-            :resource => resource_name,
-            :resources => resource_name.pluralize
+            :model => model_name,
+            :models => model_name.pluralize
           )
 
           scopes = ::Link2::i18n_scopes.collect do |i18n_scope|

data/lib/link2/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Link2
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/test/brain_test.rb

@@ -95,14 +95,15 @@ class BrainTest < ActionView::TestCase
   test "#url_for_args: should generate a url based on action and resource" do
     # FIXME: stub(:session).returns({:return_to => '/'})
 
-    self.expects(:controller_name_for_resource).with(@mookey).returns('fraggles').twice
     self.expects(:controller_name_for_resource).with(::Fraggle).returns('fraggles')
     self.expects(:controller_name_for_resource).with(:fraggle).returns('fraggles')
 
-    assert_equal "/fraggles/new?id=#{@mookey.id}", url_for_args(:new, @mookey)
-    assert_equal '/fraggles/new', url_for_args(:new, ::Fraggle)
     assert_equal '/fraggles/new', url_for_args(:new, :fraggle)
+    assert_equal '/fraggles/new', url_for_args(:new, ::Fraggle)
 
+    self.expects(:controller_name_for_resource).with(@mookey).returns('fraggles').twice
+
+    assert_equal "/fraggles/new?id=#{@mookey.id}", url_for_args(:new, @mookey)
     assert_equal "/fraggles/#{@mookey.id}/edit", url_for_args(:edit, @mookey)
   end
 

data/test/helpers_test.rb

@@ -5,6 +5,9 @@ class HelpersTest < ActionView::TestCase
 
   include Link2::Helpers
 
+  ONE_HASH = {:confirm => 'Really?'}
+  TWO_HASHES = [{:confirm => 'Really?'}, {:class => 'funny'}]
+
   def setup
     ::I18n.locale = :en
 
@@ -22,7 +25,7 @@ class HelpersTest < ActionView::TestCase
 
   test "link(url) should render link_to(url, url)" do
     assert_equal link_to('http://example.com', 'http://example.com'), link('http://example.com')
-    assert_equal link_to('/posts?by=date', '/posts?by=date'), link('/posts?by=date')
+    assert_equal link_to('/posts?by=date', '/posts?by=date'),         link('/posts?by=date')
   end
 
   test "link(label) should render link_to(str_label, '#')" do
@@ -39,69 +42,95 @@ class HelpersTest < ActionView::TestCase
   test "link(:mapping) should render link_to(t(:mapping, ...), url_for_mapping(:mapping, ...)), auto-detecting resource" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
       assert_equal link_to("Home", '/'), link(:home)
+      assert_equal link_to("Home", '/', ONE_HASH), link(:home, ONE_HASH)
+      assert_equal link_to("Home", '/', *TWO_HASHES), link(:home, *TWO_HASHES)
 
       swap ::Link2, :action_mappings => {:secret => '/secret'} do
-        assert_equal link_to("Secret", '/secret'), link(:secret)
+        assert_equal link_to("Secret", '/secret'),              link(:secret)
+        assert_equal link_to("Secret", '/secret', ONE_HASH),    link(:secret, ONE_HASH)
+        assert_equal link_to("Secret", '/secret', *TWO_HASHES), link(:secret, *TWO_HASHES)
       end
     end
   end
 
   test "link(@resource) should render link_to(t(:show, ...), @object)" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
-      assert_equal link_to("Show", "/fraggles/#{@mookey.id}"), link(@mookey)
+      assert_equal link_to("Show", "/fraggles/#{@mookey.id}"),              link(@mookey)
+      assert_equal link_to("Show", "/fraggles/#{@mookey.id}", ONE_HASH),    link(@mookey, ONE_HASH)
+      assert_equal link_to("Show", "/fraggles/#{@mookey.id}", *TWO_HASHES), link(@mookey, *TWO_HASHES)
       # assert_equal link_to("Show", "?"), link(::Fraggle) # test this stupid case?
     end
   end
 
   test "link([@parent, @resource]) should render link_to(t(:show, ...), polymorphic_path([@parent, @resource]))" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
-      assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}"), link([@mookey, @mookeys_cool_aid])
+      assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}"),              link([@mookey, @mookeys_cool_aid])
+      assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", ONE_HASH),    link([@mookey, @mookeys_cool_aid], ONE_HASH)
+      assert_equal link_to("Show", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}", *TWO_HASHES), link([@mookey, @mookeys_cool_aid], *TWO_HASHES)
     end
   end
 
-  # FINALIZE: link(x, y, {}, {})
+  # link(x, y, {}, {})
 
   test "link(label, url) should render link_to(label, url)" do
-    assert_equal link_to('http://example.com', 'http://example.com'), link('http://example.com', 'http://example.com')
-    assert_equal link_to('New', '/posts/new'), link('New', '/posts/new')
+    assert_equal link_to('New', '/posts/new'),              link('New', '/posts/new')
+    assert_equal link_to('New', '/posts/new', ONE_HASH),    link('New', '/posts/new', ONE_HASH)
+    assert_equal link_to('New', '/posts/new', *TWO_HASHES), link('New', '/posts/new', *TWO_HASHES)
+
+    assert_equal link_to('http://example.com', 'http://example.com'),               link('http://example.com', 'http://example.com')
+    assert_equal link_to('http://example.com', 'http://example.com', ONE_HASH),     link('http://example.com', 'http://example.com', ONE_HASH)
+    assert_equal link_to('http://example.com', 'http://example.com', *TWO_HASHES),  link('http://example.com', 'http://example.com', *TWO_HASHES)
   end
 
   test "link(:action) should render link_to(label, url_for(:action => :action, ...)), auto-detecting resource" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
       # assert_equal link_to("New Fraggle!!"), link("New Fraggle!!", :new)
       assert_raise(::Link2::NotImplementedYetError) { link("New Fraggle!!", :new) }
+      assert_raise(::Link2::NotImplementedYetError) { link("New Fraggle!!", :new, ONE_HASH) }
+      assert_raise(::Link2::NotImplementedYetError) { link("New Fraggle!!", :new, *TWO_HASHES) }
     end
   end
 
   test "link(label, action) should render link_to(label, url_for_mapping(:mapping, ...)), auto-detecting resource" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
-      assert_equal link_to("Home!!", '/'), link("Home!!", :home)
+      assert_equal link_to("Home!!", '/'),              link("Home!!", :home)
+      assert_equal link_to("Home!!", '/', ONE_HASH),    link("Home!!", :home, ONE_HASH)
+      assert_equal link_to("Home!!", '/', *TWO_HASHES), link("Home!!", :home, *TWO_HASHES)
 
       swap ::Link2, :action_mappings => {:secret => '/secret'} do
-        assert_equal link_to("Damn you!!", '/secret'), link("Damn you!!", :secret)
+        assert_equal link_to("Damn you!!", '/secret'),              link("Damn you!!", :secret)
+        assert_equal link_to("Damn you!!", '/secret', ONE_HASH),    link("Damn you!!", :secret, ONE_HASH)
+        assert_equal link_to("Damn you!!", '/secret', *TWO_HASHES), link("Damn you!!", :secret, *TWO_HASHES)
       end
     end
   end
 
   test "link(:action, Resource) should render link_to(t(:action, ...), url_for(:action => :action, ...))" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
-      assert_equal link_to("New", "/fraggles/new"), link(:new, ::Fraggle)
+      assert_equal link_to("New", "/fraggles/new"),               link(:new, ::Fraggle)
+      assert_equal link_to("New", "/fraggles/new", ONE_HASH),     link(:new, ::Fraggle, ONE_HASH)
+      assert_equal link_to("New", "/fraggles/new", *TWO_HASHES),  link(:new, ::Fraggle, *TWO_HASHES)
     end
   end
 
-  test "link(:action, @resource) should render link_to(t(:action, ...), url_for(:action => :action, ...))" do
+  test "link(:action, @resource) should render link_to(t(:action, ...), url_for(:action => :action, ...)), non-RESTful vs. RESTful routes" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
-      # Non-RESTful-route, basic case.
-      assert_equal link_to("New", "/fraggles/new?id=#{@mookey.id}"), link(:new, @mookey)
-      # REST-case.
-      assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/edit"), link(:edit, @mookey)
+      assert_equal link_to("New", "/fraggles/new?id=#{@mookey.id}"),              link(:new, @mookey)
+      assert_equal link_to("New", "/fraggles/new?id=#{@mookey.id}", ONE_HASH),    link(:new, @mookey, ONE_HASH)
+      assert_equal link_to("New", "/fraggles/new?id=#{@mookey.id}", *TWO_HASHES), link(:new, @mookey, *TWO_HASHES)
+
+      assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/edit"),               link(:edit, @mookey)
+      assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/edit", ONE_HASH),     link(:edit, @mookey, ONE_HASH)
+      assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/edit", *TWO_HASHES),  link(:edit, @mookey, *TWO_HASHES)
     end
   end
 
   test "link(:action, [@parent, @resource]) should render link_to(t(:action, ...), polymorphic_path([@parent, @resource]), :action => :action)" do
     swap ::Link2, :i18n_scopes => ['link.{{action}}'] do
       # assert_equal link_to("Edit", "/fraggles/#{@mookey.id}/cool_aids/#{@mookeys_cool_aid.id}/edit"), link(:edit, [@mookey, @mookeys_cool_aid])
-      assert_raise(::Link2::NotImplementedYetError) {  link(:edit, [@mookey, @mookeys_cool_aid]) }
+      assert_raise(::Link2::NotImplementedYetError) { link(:edit, [@mookey, @mookeys_cool_aid]) }
+      assert_raise(::Link2::NotImplementedYetError) { link(:edit, [@mookey, @mookeys_cool_aid], ONE_HASH) }
+      assert_raise(::Link2::NotImplementedYetError) { link(:edit, [@mookey, @mookeys_cool_aid], *TWO_HASHES) }
     end
   end
 
@@ -109,7 +138,12 @@ class HelpersTest < ActionView::TestCase
 
   test "link(label, action, resource)" do
     assert_equal link_to("Newish", "/fraggles/new"), link("Newish", :new, ::Fraggle)
+    assert_equal link_to("Newish", "/fraggles/new", ONE_HASH), link("Newish", :new, ::Fraggle, ONE_HASH)
+    assert_equal link_to("Newish", "/fraggles/new", *TWO_HASHES), link("Newish", :new, ::Fraggle, *TWO_HASHES)
+
     assert_equal link_to("Editish", "/fraggles/#{@mookey.id}/edit"), link("Editish", :edit, @mookey)
+    assert_equal link_to("Editish", "/fraggles/#{@mookey.id}/edit", ONE_HASH), link("Editish", :edit, @mookey, ONE_HASH)
+    assert_equal link_to("Editish", "/fraggles/#{@mookey.id}/edit", *TWO_HASHES), link("Editish", :edit, @mookey, *TWO_HASHES)
   end
 
   test "js_link should not be implemented (yet)" do

data/test/i18n_test.rb

@@ -23,7 +23,7 @@ class I18nTest < ActiveSupport::TestCase
   end
 
   test "i18n: should substitute scopes with parsed values for: controller, action, resource, resources" do
-    dummie_scopes = ['{{controller}}.{{resources}}.{{resource}}.{{action}}.label', 'links.{{action}}']
+    dummie_scopes = ['{{controller}}.{{models}}.{{model}}.{{action}}.label', 'links.{{action}}']
     expected_substitution = [:'fraggles.fraggles.fraggle.new.label', :'links.new']
 
     swap ::Link2, :i18n_scopes => dummie_scopes do

data/test/integration/helpers_integration_test.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+require 'test/test_helper'
+
+class HelpersIntegrationTest < ActionController::IntegrationTest
+
+  test 'Link2 + Rails = ♥' do
+    visit '/'
+    assert_response :success
+    assert_template 'home/index'
+
+    assert_contain "WIN"
+  end
+
+end

data/test/integration/rails_app/app/controllers/application_controller.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+  protect_from_forgery # See ActionController::RequestForgeryProtection for details
+
+  # Scrub sensitive parameters from your log
+  filter_parameter_logging :password
+end

data/test/integration/rails_app/app/controllers/home_controller.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+class HomeController < ApplicationController
+
+  def index
+    @blue_pony = Pony.create
+    @pink_pony = Pony.create
+    @blue_pony.ponies << @pink_pony
+  end
+
+end

data/test/integration/rails_app/app/controllers/ponies_controller.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+class PoniesController < ApplicationController
+
+  def index
+  end
+
+  def shut_up
+    render :text => "Shut up Blue Pony; you are not as blue as you think!"
+  end
+
+end

data/test/integration/rails_app/app/helpers/application_helper.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+# Methods added to this helper will be available to all templates in the application.
+module ApplicationHelper
+end

data/test/integration/rails_app/app/models/active_record/pony.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+class Pony < ActiveRecord::Base
+  has_many :ponies # yea...
+end

data/test/integration/rails_app/config/boot.rb

@@ -0,0 +1,110 @@
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
+
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion rescue nil
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        min_version = '1.3.2'
+        require 'rubygems'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
+  end
+end
+
+# All that for this:
+Rails.boot!

data/test/integration/rails_app/config/environment.rb

@@ -0,0 +1,42 @@
+# Be sure to restart your server when you modify this file
+
+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+TEST_ORM = :active_record unless defined? TEST_ORM
+
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
+Rails::Initializer.run do |config|
+  # Settings in config/environments/* take precedence over those specified here.
+  # Application configuration should go into files in config/initializers
+  # -- all .rb files in that directory are automatically loaded.
+
+  # Add additional load paths for your own custom dirs
+  # config.load_paths += [ "#{RAILS_ROOT}/app/models/#{TEST_ORM}/" ]
+
+  # Specify gems that this application depends on and have them installed with rake gems:install
+  # config.gem "bj"
+  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+  # config.gem "sqlite3-ruby", :lib => "sqlite3"
+  # config.gem "aws-s3", :lib => "aws/s3"
+
+  # Only load the plugins named here, in the order given (default is alphabetical).
+  # :all can be used as a placeholder for all plugins not explicitly named
+  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+  # Skip frameworks you're not going to use. To use Rails without a database,
+  # you must remove the Active Record framework.
+  config.frameworks -= [ :active_record ] unless TEST_ORM == :active_record
+
+  # Activate observers that should always be running
+  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names.
+  config.time_zone = 'UTC'
+
+  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
+  # config.i18n.default_locale = :en
+end

data/test/integration/rails_app/config/environments/test.rb

@@ -0,0 +1,28 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
+# The test environment is used exclusively to run your application's
+# test suite.  You never need to work with it otherwise.  Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs.  Don't rely on the data there!
+config.cache_classes = true
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+config.action_view.cache_template_loading            = true
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+# Use SQL instead of Active Record's schema dumper when creating the test database.
+# This is necessary if your schema can't be completely dumped by the schema dumper,
+# like if you have constraints or database-specific column types
+# config.active_record.schema_format = :sql

data/test/integration/rails_app/config/initializers/inflections.rb

@@ -0,0 +1,2 @@
+ActiveSupport::Inflector.inflections do |inflect|
+end

data/test/integration/rails_app/config/initializers/link2.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+Link2.setup do |config|
+  # Configure how - and in what order - link labels should be looked up.
+  config.i18n_scopes = [
+    '{{model}}.links.{{action}}',
+    'links.{{action}}'
+  ]
+
+  # Configure any custom action mappings.
+  config.action_mappings = {
+    :home => lambda { '/' },
+    :back => lambda { |url| url || :back }
+  }
+  # TODO: Make procs containing routes work.
+  # config.action_mappings = {
+  #   :home => lambda { root_path },
+  #   :back => lambda { |url| url || session[:return_to] || :back }
+  # }
+end

data/test/integration/rails_app/config/initializers/new_rails_defaults.rb

@@ -0,0 +1,24 @@
+# Be sure to restart your server when you modify this file.
+
+# These settings change the behavior of Rails 2 apps and will be defaults
+# for Rails 3. You can remove this initializer when Rails 3 is released.
+
+if defined?(ActiveRecord)
+  # Include Active Record class name as root for JSON serialized output.
+  ActiveRecord::Base.include_root_in_json = true
+
+  # Store the full class name (including module namespace) in STI type column.
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+ActionController::Routing.generate_best_match = false
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false
+
+# Clean up silencers
+Rails.backtrace_cleaner.remove_silencers!

data/test/integration/rails_app/config/initializers/session_store.rb

@@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying cookie session data integrity.
+# If you change this key, all old sessions will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.session = {
+  :key         => '_rails_app_session',
+  :secret      => '73d6541260e27f6651d2a0e444468482151f867aa40f8306b1dbf1e468e27a434e8e072c74498757e6091c6b92aa962df1e64163cc12d318d7b59b41758db165'
+}
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# ActionController::Base.session_store = :active_record_store

data/test/integration/rails_app/config/routes.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+ActionController::Routing::Routes.draw do |map|
+
+  map.root :controller => 'home'
+
+  map.resources :ponies, :member => {:shut_up => :get} do |ponies|
+    ponies.resources :ponies
+  end
+
+  # WHY?: Tests fails when these are enabled.
+  # map.connect ':controller/:action/:id'
+  # map.connect ':controller/:action/:id.:format'
+
+end

data/test/orm/active_record.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'integration', 'rails_app', 'config', 'environment'))
+require 'test_help'
+
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.logger = Logger.new(nil)
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :fraggles do |t|
+    t.string  :name
+    t.integer :craziness
+    t.string  :hair_color
+  end
+
+  create_table :cool_aids do |t|
+    t.string  :name
+    t.decimal :strength
+  end
+
+  create_table :ponies do |t|
+    t.string  :color
+  end
+end
+
+class ActiveSupport::TestCase
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures  = false
+end

data/test/support/webrat_setup.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+Webrat.configure do |config|
+  config.mode = :rails
+  config.open_error_files = false
+end

data/test/test_helper.rb

@@ -1,13 +1,26 @@
 # encoding: utf-8
 require 'rubygems'
 
+ENV['RAILS_ENV'] = 'test'
+TEST_ORM = (ENV['ORM'] || :active_record).to_sym
+
+# ORM / Schema.
+require File.join(File.dirname(__FILE__), 'orm', TEST_ORM.to_s)
+
 gem 'test-unit', '1.2.3'
 require 'test/unit'
-require 'leftright'
 
-require 'active_support'
-require 'action_controller'
-require 'active_record'
+begin
+  require 'leftright'
+rescue LoadError
+end
+
+# require 'active_support'
+# require 'action_controller'
+# require 'active_record'
+
+require 'mocha'
+require 'webrat'
 
 require 'active_support/test_case'
 require 'action_view/test_case'
@@ -15,20 +28,6 @@ require 'action_view/test_case'
 # Support.
 Dir[File.join(File.dirname(__FILE__), *%w[support ** *.rb]).to_s].each { |f| require f }
 
-# Schema.
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :fraggles do |t|
-    t.string  :name
-    t.integer :craziness
-    t.string  :hair_color
-  end
-
-  create_table :cool_aids do |t|
-    t.string  :name
-    t.decimal :strength
-  end
-end
-
 # Models.
 class Fraggle < ActiveRecord::Base
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: link2
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +01:00
+date: 2010-02-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,10 +108,25 @@ test_files:
 - test/brain_test.rb
 - test/helpers_test.rb
 - test/i18n_test.rb
+- test/integration/helpers_integration_test.rb
+- test/integration/rails_app/app/controllers/application_controller.rb
+- test/integration/rails_app/app/controllers/home_controller.rb
+- test/integration/rails_app/app/controllers/ponies_controller.rb
+- test/integration/rails_app/app/helpers/application_helper.rb
+- test/integration/rails_app/app/models/active_record/pony.rb
+- test/integration/rails_app/config/boot.rb
+- test/integration/rails_app/config/environment.rb
+- test/integration/rails_app/config/environments/test.rb
+- test/integration/rails_app/config/initializers/inflections.rb
+- test/integration/rails_app/config/initializers/link2.rb
+- test/integration/rails_app/config/initializers/new_rails_defaults.rb
+- test/integration/rails_app/config/initializers/session_store.rb
+- test/integration/rails_app/config/routes.rb
 - test/link2_test.rb
+- test/orm/active_record.rb
 - test/support/assertions_helper.rb
-- test/support/db_setup.rb
 - test/support/debug_helper.rb
 - test/support/substitutions_helper.rb
+- test/support/webrat_setup.rb
 - test/support_test.rb
 - test/test_helper.rb

data/test/support/db_setup.rb

@@ -1,10 +0,0 @@
-# encoding: utf-8
-
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.logger = Logger.new(nil)
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
-ActiveSupport::TestCase.class_eval do
-  # self.use_transactional_fixtures = true
-  # self.use_instantiated_fixtures  = false
-end