Skip to content
This repository was archived by the owner on Jul 24, 2023. It is now read-only.

Commit d804b92

Browse files
author
Tobias Haagen Michaelsen
committed
Merge remote-tracking branch 'upstream/master'
Conflicts: test/test_extras.rb
2 parents 8257284 + 05d202c commit d804b92

File tree

134 files changed

+8716
-2765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+8716
-2765
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
language: ruby
22
script: rake
33
rvm:
4-
- 1.8.7
5-
- 1.9.2
64
- 1.9.3
7-
- ree
8-
- jruby-18mode
5+
- 2.0.0
96
- jruby-19mode

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# Changelog
22

3+
## 2.6.0
4+
5+
* More safely build filenames - 1c4a90630b183e7572b8ab5f2e3a3e0c0fecd2c7
6+
See https://github.com/openid/ruby-openid/pull/80
7+
* The session serializer of Rails4.1 is json - b44a1eb511dec3be25a07930121bc80cacec0f1c
8+
* Handle boolean value to fix signature issue - d65076269b77754da7db6e4b189edeeb9201600d
9+
See https://github.com/openid/ruby-openid/pull/76
10+
11+
## 2.5.0
12+
13+
* Revert json serialization - 8dc60e553369df2300ebb4b83a29618aff643c2c
14+
See https://github.com/openid/ruby-openid/pull/73
15+
16+
## 2.4.0
17+
18+
* Allow expecting a parameter to be nil during return_to verification - 708e992ab3e6c26d478283fc11faa6a0a74bfec0
19+
* Serialize to objects that can be stored as json - db1d8f7b171a333dec4e861fe0fa53ac1d98b188
20+
* Fixed missing XRDS HTTP header in sample provider - dc15fa07fd59fdcf46d659cce34c6ef7a6768fde
21+
22+
## 2.3.0
23+
24+
* Deprecated Ruby 1.8 support - 0694bebc83de0313cfef73a5d0ffd9a293ae71a0
25+
* Fixed encoding errors in test suite - 7ac8e3978f9c733bd5ee8d6b742b515b5427ded2
26+
* Be aware when using Hash or Array as default value for unknown Hash keys - #58
27+
* Stop overwriting String#starts_with? and String#ends_with? if defined - #55
28+
* Ignore Associations For OpenID2 (Google's Security Bug Fix) - #53
29+
* Change "oauth" to "ui" in variable name in the UI extension - #52
30+
* Eliminating runtime warnings - #50 #56
31+
* Upgrade example Rails provider/consumer app to Rails 3 - #49
32+
333
## 2.2.3
434

535
* Fixed 'invalid byte sequence in UTF-8' error in parse_link_attrs - 0f46921a97677b83b106366c805063105c5e9f20

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ source 'https://rubygems.org'
44
gemspec
55

66
gem 'rake'
7-
gem 'test-unit', '>= 2.5.2'

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ Check the installation:
3333
irb> gem 'ruby-openid'
3434
=> true
3535

36-
The library is known to work with Ruby 1.8.4 on Unix, Max OSX and
37-
Win32. Examples have been tested with Rails 1 to 3.
36+
The library is known to work with Ruby 1.9.2 and above on Unix, Max OS X and Win32.
3837

3938
## Getting Started
4039

admin/runtests.rb

Lines changed: 0 additions & 45 deletions
This file was deleted.

examples/rails_openid/Gemfile

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'rails', '3.2.13'
4+
5+
# Bundle edge Rails instead:
6+
# gem 'rails', :git => 'git://github.com/rails/rails.git'
7+
8+
gem 'sqlite3'
9+
10+
gem 'json'
11+
12+
# Gems used only for assets and not required
13+
# in production environments by default.
14+
group :assets do
15+
gem 'sass-rails', '~> 3.2.3'
16+
gem 'coffee-rails', '~> 3.2.1'
17+
18+
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
19+
# gem 'therubyracer', :platforms => :ruby
20+
21+
gem 'uglifier', '>= 1.0.3'
22+
end
23+
24+
gem 'jquery-rails'
25+
26+
# To use ActiveModel has_secure_password
27+
# gem 'bcrypt-ruby', '~> 3.0.0'
28+
29+
# To use Jbuilder templates for JSON
30+
# gem 'jbuilder'
31+
32+
# Use unicorn as the app server
33+
# gem 'unicorn'
34+
35+
# Deploy with Capistrano
36+
# gem 'capistrano'
37+
38+
# To use debugger
39+
# gem 'ruby-debug'
40+
41+
gem 'ruby-openid'

0 commit comments

Comments
 (0)