Extendable strategies interface (part of omniauth authenticator solution) #109

Closed
wants to merge 20 commits into
from
Commits
+361 −148
Split
View
@@ -2,6 +2,7 @@
config.yml
*.db
*.sqlite3
+*.sqlite
*.swp
*~
*.pidaproject
View
@@ -1,3 +1,2 @@
source "http://rubygems.org"
gemspec
-
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- rubycas-server (1.1.0)
+ rubycas-server (1.1.1)
activerecord (>= 2.3.12, < 3.1)
activesupport (>= 2.3.12, < 3.1)
crypt-isaac (~> 0.9.1)
@@ -46,7 +46,7 @@ GEM
multi_json (1.3.2)
net-ldap (0.1.1)
nokogiri (1.5.2)
- r18n-core (0.4.14)
+ r18n-core (1.0.1)
rack (1.4.1)
rack-protection (1.2.0)
rack
@@ -69,11 +69,11 @@ GEM
multi_json (~> 1.0)
rubyzip
sinatra (1.3.2)
- rack (>= 1.3.6, ~> 1.3)
+ rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
- tilt (>= 1.3.3, ~> 1.3)
- sinatra-r18n (0.4.14)
- r18n-core (= 0.4.14)
+ tilt (~> 1.3, >= 1.3.3)
+ sinatra-r18n (1.0.1)
+ r18n-core (= 1.0.1)
sinatra (>= 1.3)
sqlite3 (1.3.6)
tilt (1.3.3)
@@ -85,7 +85,7 @@ PLATFORMS
ruby
DEPENDENCIES
- activeresource (< 3.1, >= 2.3.12)
+ activeresource (>= 2.3.12, < 3.1)
capybara (= 1.1.2)
net-ldap (~> 0.1.1)
rack-test
View
@@ -4,6 +4,7 @@
$KCODE = 'u' if RUBY_VERSION < '1.9'
require 'rubygems'
+require 'bundler/setup'
$:.unshift File.dirname(__FILE__) + "/../lib"
@@ -5,8 +5,7 @@ module Localization
def self.included(mod)
mod.module_eval do
register Sinatra::R18n
- set :default_locale, 'en'
- set :translations, File.dirname(__FILE__) + "/../../locales"
+ ::R18n.default_places { File.dirname( File.dirname self.root ) + "/locales" }
end
end
end
Oops, something went wrong.