link2 0.1.7 → 0.1.8

data/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+.*~
+*.log
+*.sqlite3
+**/*/log/*
+**/*/tmp/*
+rdoc
+pkg

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# See: link2.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,73 @@
+PATH
+  remote: .
+  specs:
+    link2 (0.1.8)
+      actionpack (>= 2.3.0)
+      activesupport (>= 2.3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.1)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    hoe (2.6.2)
+      rake (>= 0.8.7)
+      rubyforge (>= 2.0.4)
+    i18n (0.4.1)
+    json_pure (1.4.6)
+    leftright (0.9.0)
+    mocha (0.9.8)
+      rake
+    nokogiri (1.4.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rake (0.8.7)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+    tzinfo (0.3.23)
+    webrat (0.7.1)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (>= 2.3.0)
+  activerecord (>= 2.3.0)
+  activesupport (>= 2.3.0)
+  leftright (>= 0.0.3)
+  link2!
+  mocha (>= 0.9.8)
+  test-unit (= 1.2.3)
+  webrat (>= 0.7.0)

data/Rakefile

@@ -1,56 +1,15 @@
-# encoding: utf-8
-require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require File.join(File.dirname(__FILE__), 'lib', 'link2', 'version')
 
 # Gem managment tasks.
 #
-# == Generate gemspec, build & install locally:
-#
-#   rake gemspec
-#   rake build
-#   sudo rake install
-#
 # == Git tag & push to origin/master and push gem to Rubygems.org:
 #
-#   rake release
-#
-# == Release to Rubygems.org:
+#   $ rake release
 #
-#   rake gemcutter:release
-#
-begin
-  gem 'jeweler'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |spec|
-    spec.name         = "link2"
-    spec.version      = ::Link2::VERSION
-    spec.summary      = %{Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty.}
-    spec.description  = spec.summary
-    spec.homepage     = "http://github.com/grimen/#{spec.name}"
-    spec.authors      = ["Jonas Grimfelt"]
-    spec.email        = "grimen@gmail.com"
-
-    spec.files = FileList["[A-Z]*", File.join(*%w[{generators,lib,rails} ** *]).to_s]
-
-    spec.add_dependency 'activesupport', '>= 2.3.0'
-    spec.add_dependency 'actionpack', '>= 2.3.0'
-
-    spec.add_development_dependency 'test-unit', '= 1.2.3'
-    spec.add_development_dependency 'mocha', '>= 0.9.8'
-    spec.add_development_dependency 'webrat', '>= 0.7.0'
-    spec.add_development_dependency 'leftright', '>= 0.0.3'
-    spec.add_development_dependency 'activerecord', '>= 2.3.0'
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler - or one of its dependencies - is not available. " <<
-  "Install it with: sudo gem install jeweler -s http://gemcutter.org"
-end
 
 desc 'Default: run unit tests.'
 task :default => :test

data/TODO

@@ -1,19 +1,21 @@
 TODO
 
+* [COMPAT:] Check Rails 3 compatibility.
+
+* [BUG:] link "+", @post failed
+
+* [BUG:] XSS-issue with labels. (NOTE: Needs more details when this happen, could not reproduce in integration test)
+
 * [FEATURE:] Fix action mapping procs to handle named scopes. Should work, but do not for some reason. =/
 
 * [FEATURE:] Fix action mapping procs to receive session, params, etc in a options hash. My mocking/stubbing don't want to work. ='(
 
 * [TEST:] Integration tests for namespaced controllers/models
 
-* [DESIGN:] Link2::Brain#link_to_args MUST be refactored when the DSL is 100% settled. Not far from it, but feedback first.
+* [DESIGN:] Link2::Brain#link_to_args should maybe be split into multiple methods when API is settled.
 
 * [DESIGN:] Merge #label_and_url_for_resource and #url_for_args
 
-* [TEST:] ORM-tests: DataMapper, MongoMapper
-
-* [COMPAT:] Check Rails 3 compatibility.
-
 * [ENHANCEMENT:] Check with Rails routes (RouteSet) if current action is a :member or :collection:
 
     link(:show)   =>  link(:show, @post)
@@ -21,18 +23,14 @@ TODO
 
 NOT SURE:
 
+* [TEST:] ORM-tests: DataMapper, MongoMapper
+
 * Make Link2 parse label and title-attribute for the link based on configuration: Link2.label_method = :to_s, Link2.attr_methods = {:title => :description}
 
 * This works:
     link_to x, :terms   =>  link_to x, terms_path
 
   So maybe this should work the same?:
-    link :terms, :terms  <=>  link :terms   =>  link :terms, terms_path
-
-  The middle part (auto-detect route for :fraggle before resource :fraggle) maybe too abstract DSL, not sure.
-
-* Add support for: #link_to_remote + #button_to_remote in Rails 2.x, with:
-
-    link(..., :remote => true)
+   link :terms   =>  link :terms, terms_pat  ( <=>  link :terms, :terms )
 
-  ...or not: Maybe only support in Rails 3.
+  The middle part (auto-detect route for :fraggle before resource :fraggle) maybe too abstract DSL, not sure.

data/lib/link2/brain.rb

@@ -292,9 +292,9 @@ module Link2
 
         if ::Link2::Support.record_object?(resource)
           # Skip any ugly default to_s-value:
-          custom_name = resource.to_s =~ CLASS_INSTANCE_STRING ? resource_class.human_name.downcase : resource.to_s
+          custom_name = resource.to_s =~ CLASS_INSTANCE_STRING ? (resource_class.model_name.human rescue resource_class.human_name).downcase : resource.to_s
         end
-        custom_name = resource_class.human_name.downcase if custom_name.blank?
+        custom_name = (resource_class.model_name.human rescue resource_class.human_name).downcase if custom_name.blank?
         custom_name
       end
 

data/lib/link2/locales/en.yml

@@ -2,8 +2,8 @@ en:
   links:
     home: "Home"
     back: "Back"
-    new: "New {{resource}}"
-    edit: "Edit {{resource}}"
-    delete: "Delete {{resource}}"
-    show: "Show {{resource}}"
-    index: "Index of {{resources}}"
+    new: "New %{resource}"
+    edit: "Edit %{resource}"
+    delete: "Delete %{resource}"
+    show: "Show %{resource}"
+    index: "Index of %{resources}"

data/lib/link2/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Link2
-  VERSION = '0.1.7'.freeze
+  VERSION = "0.1.8".freeze
 end

data/link2.gemspec

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "link2/version"
+
+Gem::Specification.new do |s|
+  s.name        = "link2"
+  s.version     = Link2::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jonas Grimfelt"]
+  s.email       = ["grimen@gmail.com"]
+  s.homepage    = "http://github.com/grimen/#{s.name}"
+  s.summary     = %{Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty.}
+  s.description = s.summary
+
+  s.add_dependency 'activesupport', '>= 2.3.0'
+  s.add_dependency 'actionpack', '>= 2.3.0'
+
+  s.add_development_dependency 'test-unit', '= 1.2.3'
+  s.add_development_dependency 'mocha', '>= 0.9.8'
+  s.add_development_dependency 'webrat', '>= 0.7.0'
+  s.add_development_dependency 'leftright', '>= 0.0.3'
+  s.add_development_dependency 'activerecord', '>= 2.3.0'
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/test/brain_test.rb

@@ -87,13 +87,13 @@ class BrainTest < ActionView::TestCase
   end
 
   test "#label_and_url_for_resource: should parse a label and url from a object (e.g. @post)" do
-    store_translations :en, {:links => {:show => "Show {{resource}}"}} do
+    store_translations :en, {:links => {:show => "Show %{resource}"}} do
       assert_equal ["Show fraggle", fraggle_path(@mookey)], label_and_url_for_resource(@mookey)
     end
   end
 
   test "#label_and_url_for_resource: should parse a label and url from a object (e.g. @post) with respect to to_s-value" do
-    store_translations :en, {:links => {:show => "Show {{name}}"}} do
+    store_translations :en, {:links => {:show => "Show %{name}"}} do
       @mookey.class_eval do
         def to_s
           ""
@@ -113,7 +113,7 @@ class BrainTest < ActionView::TestCase
   test "#label_and_url_for_resource: should parse correct label and url from a polymorphic args (e.g. [@user, :blog, @post])" do
     @mookeys_cool_aid = ::CoolAid.create(:name => 'Super-tasty')
 
-    store_translations :en, {:links => {:show => "Show {{name}}"}} do
+    store_translations :en, {:links => {:show => "Show %{name}"}} do
       @mookeys_cool_aid.class_eval do
         def to_s
           self.name

data/test/i18n_test.rb

@@ -47,9 +47,9 @@ class I18nTest < ActiveSupport::TestCase
     end
   end
 
-  test "i18n: should be able to translate action with respect to any valid extra interpolation arguments" do
+  test "i18n: should be able to translate action with respect to any valid " do
     swap ::Link2, :i18n_scopes => ['links.{{action}}'] do
-      store_translations :en, {:links => {:shout => 'Hello {{nick}}!'}} do
+      store_translations :en, {:links => {:shout => 'Hello %{nick}!'}} do
         i18n_options = {:scope => 'links', :nick => 'Mokey'}
 
         assert_equal ::I18n.t(:shout, i18n_options), ::Link2::I18n.t(:shout, ::Fraggle.new, :nick => 'Mokey')
@@ -59,7 +59,7 @@ class I18nTest < ActiveSupport::TestCase
 
   test "i18n: should not interpolate values for any reserved interpolation keys" do
     swap ::Link2, :i18n_scopes => ['links.{{action}}'] do
-      store_translations :en, {:links => {:shout => 'Hello {{scope}}!'}} do
+      store_translations :en, {:links => {:shout => 'Hello %{scope}!'}} do
         i18n_options = {:scope => 'links', :name => 'Mokey'}
 
         assert_raise(I18n::ReservedInterpolationKey) { ::Link2::I18n.t(:shout, ::Fraggle.new, :scope => 'Mokey') }

data/test/integration/helpers_integration_test.rb

@@ -8,6 +8,8 @@ class HelpersIntegrationTest < ActionController::IntegrationTest
     assert_response :success
     assert_template 'home/index'
 
+    # puts response.body.inspect
+
     assert_contain "WIN"
   end
 

data/test/integration/rails_app/app/views/home/index.html.erb

@@ -0,0 +1,49 @@
+<h1><%= "Link2 + Rails = ♥" %></h1>
+
+<%= link "WIN" %>
+
+<%= link2 "WIN x 2" %>
+
+<%= button "WIN x 3" %>
+
+<%= button2 "WIN x 4" %>
+
+<%= link "http://rubygems.org" %>
+
+<%= link "Ruby + Gems = ♥", "http://rubygems.org" %>
+
+<%= link :home, "/about" %>
+
+<%= link :home %>
+
+<%= link :back %>
+
+<%= link @blue_pony %>
+
+<%= link [@blue_pony, @pink_pony] %>
+
+<%= link "Home", :home %>
+
+<%= link "Back", :back %>
+
+<%= link :new, Pony %>
+
+<%= link :new, :pony %>
+
+<%= link :new, Pony %>
+
+<%= link :new, Pony.new %>
+
+<%= link :edit, @blue_pony %>
+
+<% # TODO: link :edit, [Pony.create, Pony.create] %>
+
+<%= link :shut_up, @blue_pony %>
+
+<%= link "New Pony!", :new, Pony, {:color => 'white'}, :class => 'smaller' %>
+
+<%= link(:new, Pony) { 'Purple Pony!' } %>
+
+<% link :new, Pony do %>
+  Magenta!
+<% end %>

data/test/integration/rails_app/app/views/layouts/application.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>Link2 Integration Test App</title>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/test/integration/rails_app/app/views/ponies/index.html.erb

@@ -0,0 +1,3 @@
+<%= link :new %>
+
+<%= link :index %>

data/test/integration/rails_app/app/views/ponies/new.html.erb

@@ -0,0 +1,3 @@
+<%= link :new %>
+
+<%= link :index %>

data/test/integration/rails_app/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter: sqlite3
+  database: :memory:

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

@@ -1,7 +1,7 @@
 # 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
+RAILS_GEM_VERSION = '2.3.9' unless defined? RAILS_GEM_VERSION
 TEST_ORM = :active_record unless defined? TEST_ORM
 
 # Bootstrap the Rails environment, frameworks, and default configuration

data/test/test_helper.rb

@@ -2,7 +2,7 @@
 require 'rubygems'
 
 ENV['RAILS_ENV'] = 'test'
-TEST_ORM = (ENV['ORM'] || :active_record).to_sym
+TEST_ORM = (ENV['ORM'] || :active_record).to_sym unless defined?(TEST_ORM)
 
 # ORM / Schema.
 require File.join(File.dirname(__FILE__), 'orm', TEST_ORM.to_s)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: link2
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 +01:00
+date: 2010-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: actionpack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
@@ -49,9 +54,11 @@ dependencies:
   name: test-unit
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 2
@@ -63,9 +70,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -77,9 +86,11 @@ dependencies:
   name: webrat
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 7
@@ -91,9 +102,11 @@ dependencies:
   name: leftright
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 0
@@ -105,9 +118,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 3
@@ -116,15 +131,18 @@ dependencies:
   type: :development
   version_requirements: *id007
 description: "Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty."
-email: grimen@gmail.com
+email: 
+- grimen@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
-- TODO
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.textile
 - Rakefile
@@ -138,34 +156,70 @@ files:
 - lib/link2/locales/en.yml
 - lib/link2/support.rb
 - lib/link2/version.rb
+- link2.gemspec
 - rails/init.rb
+- 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/app/views/home/index.html.erb
+- test/integration/rails_app/app/views/layouts/application.html.erb
+- test/integration/rails_app/app/views/ponies/index.html.erb
+- test/integration/rails_app/app/views/ponies/new.html.erb
+- test/integration/rails_app/config/boot.rb
+- test/integration/rails_app/config/database.yml
+- 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/integration/rails_app/public/javascripts/application.js
+- test/link2_test.rb
+- test/orm/active_record.rb
+- test/support/assertions_helper.rb
+- test/support/debug_helper.rb
+- test/support/substitutions_helper.rb
+- test/support/webrat_setup.rb
+- test/support_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/grimen/link2
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+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: "Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty."
@@ -179,7 +233,12 @@ test_files:
 - 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/app/views/home/index.html.erb
+- test/integration/rails_app/app/views/layouts/application.html.erb
+- test/integration/rails_app/app/views/ponies/index.html.erb
+- test/integration/rails_app/app/views/ponies/new.html.erb
 - test/integration/rails_app/config/boot.rb
+- test/integration/rails_app/config/database.yml
 - test/integration/rails_app/config/environment.rb
 - test/integration/rails_app/config/environments/test.rb
 - test/integration/rails_app/config/initializers/inflections.rb
@@ -187,6 +246,7 @@ test_files:
 - 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/integration/rails_app/public/javascripts/application.js
 - test/link2_test.rb
 - test/orm/active_record.rb
 - test/support/assertions_helper.rb