Skip to content

Commit 051b26c

Browse files
committed
Version up. Rails 4 ready.
1 parent 6b9ac04 commit 051b26c

File tree

5 files changed

+76
-75
lines changed

5 files changed

+76
-75
lines changed

CHANGELOG.rdoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
=== 1.1.0 / 2013-05-02
2+
3+
* Ready for Rails 4.
4+
15
=== 1.0.7 / 2012-04-27
26

37
* Added support for non-latin characters in autolinked urls

Gemfile.lock

Lines changed: 60 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,78 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.7)
5-
actionpack (= 3.2.7)
6-
mail (~> 2.4.4)
7-
actionpack (3.2.7)
8-
activemodel (= 3.2.7)
9-
activesupport (= 3.2.7)
10-
builder (~> 3.0.0)
4+
actionmailer (4.0.0.rc1)
5+
actionpack (= 4.0.0.rc1)
6+
mail (~> 2.5.3)
7+
actionpack (4.0.0.rc1)
8+
activesupport (= 4.0.0.rc1)
9+
builder (~> 3.1.0)
1110
erubis (~> 2.7.0)
12-
journey (~> 1.0.4)
13-
rack (~> 1.4.0)
14-
rack-cache (~> 1.2)
15-
rack-test (~> 0.6.1)
16-
sprockets (~> 2.1.3)
17-
activemodel (3.2.7)
18-
activesupport (= 3.2.7)
19-
builder (~> 3.0.0)
20-
activerecord (3.2.7)
21-
activemodel (= 3.2.7)
22-
activesupport (= 3.2.7)
23-
arel (~> 3.0.2)
24-
tzinfo (~> 0.3.29)
25-
activeresource (3.2.7)
26-
activemodel (= 3.2.7)
27-
activesupport (= 3.2.7)
28-
activesupport (3.2.7)
29-
i18n (~> 0.6)
30-
multi_json (~> 1.0)
31-
arel (3.0.2)
32-
builder (3.0.0)
11+
rack (~> 1.5.2)
12+
rack-test (~> 0.6.2)
13+
activemodel (4.0.0.rc1)
14+
activesupport (= 4.0.0.rc1)
15+
builder (~> 3.1.0)
16+
activerecord (4.0.0.rc1)
17+
activemodel (= 4.0.0.rc1)
18+
activerecord-deprecated_finders (~> 1.0.2)
19+
activesupport (= 4.0.0.rc1)
20+
arel (~> 4.0.0)
21+
activerecord-deprecated_finders (1.0.2)
22+
activesupport (4.0.0.rc1)
23+
i18n (~> 0.6, >= 0.6.4)
24+
minitest (~> 4.2)
25+
multi_json (~> 1.3)
26+
thread_safe (~> 0.1)
27+
tzinfo (~> 0.3.37)
28+
arel (4.0.0)
29+
atomic (1.1.8)
30+
builder (3.1.4)
3331
erubis (2.7.0)
34-
hike (1.2.1)
35-
i18n (0.6.0)
36-
journey (1.0.4)
37-
json (1.7.4)
38-
mail (2.4.4)
32+
hike (1.2.2)
33+
i18n (0.6.4)
34+
mail (2.5.3)
3935
i18n (>= 0.4.0)
4036
mime-types (~> 1.16)
4137
treetop (~> 1.4.8)
42-
mime-types (1.19)
43-
minitest (3.3.0)
44-
multi_json (1.3.6)
38+
mime-types (1.23)
39+
minitest (4.7.4)
40+
multi_json (1.7.2)
4541
polyglot (0.3.3)
46-
rack (1.4.1)
47-
rack-cache (1.2)
48-
rack (>= 0.4)
49-
rack-ssl (1.3.2)
50-
rack
51-
rack-test (0.6.1)
42+
rack (1.5.2)
43+
rack-test (0.6.2)
5244
rack (>= 1.0)
53-
rails (3.2.7)
54-
actionmailer (= 3.2.7)
55-
actionpack (= 3.2.7)
56-
activerecord (= 3.2.7)
57-
activeresource (= 3.2.7)
58-
activesupport (= 3.2.7)
59-
bundler (~> 1.0)
60-
railties (= 3.2.7)
61-
railties (3.2.7)
62-
actionpack (= 3.2.7)
63-
activesupport (= 3.2.7)
64-
rack-ssl (~> 1.3.2)
45+
rails (4.0.0.rc1)
46+
actionmailer (= 4.0.0.rc1)
47+
actionpack (= 4.0.0.rc1)
48+
activerecord (= 4.0.0.rc1)
49+
activesupport (= 4.0.0.rc1)
50+
bundler (>= 1.3.0, < 2.0)
51+
railties (= 4.0.0.rc1)
52+
sprockets-rails (~> 2.0.0.rc4)
53+
railties (4.0.0.rc1)
54+
actionpack (= 4.0.0.rc1)
55+
activesupport (= 4.0.0.rc1)
6556
rake (>= 0.8.7)
66-
rdoc (~> 3.4)
67-
thor (>= 0.14.6, < 2.0)
68-
rake (0.9.2.2)
69-
rdoc (3.12)
70-
json (~> 1.4)
71-
sprockets (2.1.3)
57+
thor (>= 0.18.1, < 2.0)
58+
rake (10.0.4)
59+
sprockets (2.9.3)
7260
hike (~> 1.2)
61+
multi_json (~> 1.0)
7362
rack (~> 1.0)
7463
tilt (~> 1.1, != 1.3.0)
75-
thor (0.15.4)
76-
tilt (1.3.3)
77-
treetop (1.4.10)
64+
sprockets-rails (2.0.0.rc4)
65+
actionpack (>= 3.0)
66+
activesupport (>= 3.0)
67+
sprockets (~> 2.8)
68+
thor (0.18.1)
69+
thread_safe (0.1.0)
70+
atomic
71+
tilt (1.4.0)
72+
treetop (1.4.12)
7873
polyglot
7974
polyglot (>= 0.3.1)
80-
tzinfo (0.3.33)
75+
tzinfo (0.3.37)
8176

8277
PLATFORMS
8378
ruby

README.rdoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ bridge the gap for people migrating.
1010

1111
== FEATURES:
1212

13-
By default auto_link returns sanitized html_safe strings.
14-
This behaviour can be overriden setting the <tt>:sanitize</tt> option to false
13+
By default auto_link returns sanitized html_safe strings.
14+
This behaviour can be overriden setting the <tt>:sanitize</tt> option to false
1515
(thus making it insecure if you don't have the content under control).
1616

1717
== SYNOPSIS:
@@ -21,20 +21,20 @@ This behaviour can be overriden setting the <tt>:sanitize</tt> option to false
2121
auto_link("Go to http://www.rubyonrails.org and say hello to [email protected]")
2222
# => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> and
2323
# say hello to <a href=\"mailto:[email protected]\">[email protected]</a>"
24-
24+
2525
auto_link("Visit http://www.loudthinking.com/ or e-mail [email protected]", :link => :urls)
2626
# => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a>
2727
# or e-mail [email protected]"
28-
28+
2929
auto_link("Visit http://www.loudthinking.com/ or e-mail [email protected]", :link => :email_addresses)
3030
# => "Visit http://www.loudthinking.com/ or e-mail <a href=\"mailto:[email protected]\">[email protected]</a>"
31-
31+
3232
auto_link("Go to http://www.rubyonrails.org <script>Malicious code!</script>")
3333
# => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> "
34-
34+
3535
auto_link("Go to http://www.rubyonrails.org <script>alert('Script!')</script>", :sanitize => false)
3636
# => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> <script>alert('Script!')</script>"
37-
37+
3838
post_body = "Welcome to my new blog at http://www.myblog.com/. Please e-mail me at [email protected]."
3939
auto_link(post_body, :html => { :target => '_blank' }) do |text|
4040
truncate(text, :length => 15)
@@ -43,7 +43,7 @@ This behaviour can be overriden setting the <tt>:sanitize</tt> option to false
4343

4444
== REQUIREMENTS:
4545

46-
* rails ~> 3.1
46+
* rails > 3.1
4747

4848
== INSTALL:
4949

lib/rails_autolink.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module RailsAutolink
2-
VERSION = '1.0.9'
2+
VERSION = '1.1.0'
33

44
class Railtie < ::Rails::Railtie
55
initializer 'rails_autolink' do |app|

rails_autolink.gemspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
Gem::Specification.new do |s|
22
s.name = 'rails_autolink'
3-
s.version = '1.0.10'
3+
s.version = '1.1.0'
44
s.authors = ['Aaron Patterson', 'Juanjo Bazan', 'Akira Matsuda']
55
s.email = '[email protected]'
6+
s.homepage = 'https://github.com/tenderlove/rails_autolink'
7+
s.summary = 'Automatic generation of html links in texts'
68
s.summary = 'This is an extraction of the `auto_link` method from rails. The `auto_link` method was removed from Rails in version Rails 3.1. This gem is meant to bridge the gap for people migrating.'
79

810
s.add_dependency 'rails', '> 3.1'

0 commit comments

Comments
 (0)