link2 0.1.10 → 0.1.11

data/.gitignore

@@ -1,9 +1,13 @@
-.DS_Store
+*.gem
+*.rbc
 .*~
 *.log
-*.sqlite3
-**/*/log/*
-**/*/tmp/*
-rdoc
-pkg
-Gemfile.lock
+.DS_Store
+.bundle
+.rvmrc
+.yardoc
+Gemfile.lock
+coverage/*
+doc/*
+log/*
+pkg/*

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - ruby-head
+  - rbx
+  # - jruby
+env:
+  - ORM=activerecord

data/Gemfile

@@ -1,4 +1,8 @@
 source "http://rubygems.org"
 
 # See: link2.gemspec
-gemspec
+gemspec
+
+platforms :jruby do
+  gem 'jdbc-sqlite3', :require => 'sqlite3'
+end

data/Guardfile

@@ -0,0 +1,11 @@
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end
+
+guard 'test' do
+  watch(%r|^lib/(.*)\.rb|)                { |m| "test/lib/#{m[1]}_test.rb" }
+  watch(%r|^test/(.*)_test.rb|)
+  watch(%r|^test/integration/(.*)\.rb|)   { "test" }
+  watch(%r|^test/test_helper.rb|)         { "test" }
+end

data/README.textile

@@ -1,4 +1,4 @@
-h1. LINK²
+h1. LINK² "!https://secure.travis-ci.org/grimen/link2.png!":http://travis-ci.org/grimen/link2
 
 _Generation next *link_to*-helper for Rails: Spiced with intelligence, and semantic beauty._
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 # Gem managment tasks.
 #
@@ -23,10 +23,9 @@ end
 
 desc 'Generate documentation for the plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = ''
+  rdoc.rdoc_dir = 'doc'
+  rdoc.main = 'README.textile'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('init.rb')
+  rdoc.rdoc_files.include('README.textile')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/TODO

@@ -1,5 +1,11 @@
 TODO
 
+* [COMPAT:] Fix compatibility with rubinius and jruby:
+
+    RuntimeError: test_#link2_attrbutes_for:_should_generate_Link2-specific_DOM_classes_reflecting_on_action,_resource_class,_and_resource_id_-_if_given is already defined in BrainTest
+
+    Reason: link2 is symlinked from the bundled rails dummy project - tries to declare same methods twice.
+
 * [COMPAT:] Check Rails 3 compatibility.
 
 * [BUG:] link "+", @post failed

data/lib/link2.rb

@@ -1,17 +1,6 @@
 # encoding: utf-8
-begin
-  require 'active_support'
-rescue LoadError
-  gem 'activesupport'
-  require 'active_support'
-end
-
-begin
-  require 'action_view'
-rescue LoadError
-  gem 'actionpack'
-  require 'action_view'
-end
+require 'active_support'
+require 'action_view'
 
 module Link2
 

data/lib/link2/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Link2
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/link2.gemspec

@@ -14,13 +14,20 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport', '>= 2.3.0'
   s.add_dependency 'actionpack', '>= 2.3.0'
+  s.add_dependency 'erubis'
 
-  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.add_development_dependency 'bundler', '~> 1.0.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'test-unit', '1.2.3'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'webrat'
+  s.add_development_dependency 'leftright'
   s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'rails', '2.3.12'
+  s.add_development_dependency 'guard'
+  s.add_development_dependency 'guard-bundler'
+  s.add_development_dependency 'guard-test'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/test/integration/helpers_integration_test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'test/test_helper'
+require 'test_helper'
 
 class HelpersIntegrationTest < ActionController::IntegrationTest
 

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

@@ -1,12 +1,4 @@
-# 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
+  # helper :all
+  protect_from_forgery
 end

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class HomeController < ApplicationController
 
   def index

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class PoniesController < ApplicationController
 
   def index

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

@@ -1,5 +1,2 @@
-# 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/helpers/home_helper.rb

@@ -0,0 +1,2 @@
+module HomeHelper
+end

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

@@ -0,0 +1,2 @@
+module PoniesHelper
+end

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

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

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

@@ -1,4 +1,4 @@
-<h1><%= "Link2 + Rails = ♥" %></h1>
+<h1><%= "Link2 + Rails = &hearts;" %></h1>
 
 <%= link "WIN" %>
 
@@ -10,7 +10,7 @@
 
 <%= link "http://rubygems.org" %>
 
-<%= link "Ruby + Gems = ♥", "http://rubygems.org" %>
+<%= link "Ruby + Gems = &hearts;", "http://rubygems.org" %>
 
 <%= link :home, "/about" %>
 

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

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

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

@@ -1,42 +1,12 @@
 # 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.9' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.12' 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/initializers/link2.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Link2.setup do |config|
   # Configure how - and in what order - link labels should be looked up.
   config.i18n_scopes = [

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 ActionController::Routing::Routes.draw do |map|
 
   map.root :controller => 'home'
@@ -8,8 +6,4 @@ ActionController::Routing::Routes.draw do |map|
     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/test_helper.rb

@@ -1,5 +1,7 @@
-# encoding: utf-8
+# -*- encoding: utf-8 -*-
 require 'rubygems'
+require 'bundler'
+Bundler.require
 
 ENV['RAILS_ENV'] = 'test'
 TEST_ORM = (ENV['ORM'] || :active_record).to_sym unless defined?(TEST_ORM)
@@ -7,23 +9,15 @@ 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)
 
-gem 'test-unit', '1.2.3'
 require 'test/unit'
-
+require 'mocha'
+require 'webrat'
 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'
+require 'link2'
 
 # Support.
 Dir[File.join(File.dirname(__FILE__), *%w[support ** *.rb]).to_s].each { |f| require f }

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: link2
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 10
-  version: 0.1.10
+  prerelease: 
+  version: 0.1.11
 platform: ruby
 authors: 
 - Jonas Grimfelt
@@ -14,127 +10,174 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +01:00
+date: 2011-08-04 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 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: test-unit
-  prerelease: false
+  name: erubis
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
-  type: :development
+        version: "0"
+  type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
+  name: bundler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+        version: 1.0.0
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: webrat
-  prerelease: false
+  name: rake
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
+        version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: leftright
-  prerelease: false
+  name: rdoc
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
+        version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
+  name: test-unit
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
+        version: 1.2.3
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
+  name: mocha
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: leftright
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.3.12
+  type: :development
+  prerelease: false
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: guard
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: guard-bundler
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: guard-test
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id015
 description: "Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty."
 email: 
 - grimen@gmail.com
@@ -146,7 +189,9 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.textile
 - Rakefile
@@ -170,6 +215,8 @@ files:
 - 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/helpers/home_helper.rb
+- test/integration/rails_app/app/helpers/ponies_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
@@ -179,7 +226,6 @@ files:
 - 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
@@ -207,6 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 131754766650778189
       segments: 
       - 0
       version: "0"
@@ -215,13 +262,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 131754766650778189
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: "Generation next link_to-helper for Rails: Spiced with intelligence, and semantic beauty."
@@ -234,6 +282,8 @@ test_files:
 - 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/helpers/home_helper.rb
+- test/integration/rails_app/app/helpers/ponies_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
@@ -243,7 +293,6 @@ test_files:
 - 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

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

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