contour 1.0.0.beta11 → 1.0.0.beta12

data/CHANGELOG.rdoc

@@ -18,7 +18,7 @@
   * All icons other than Gentleface 16x16 have been removed
   * User model no longer requires a name attribute or method
   * Authentication model is no longer required to be the user model
-  * Authentication model creation no longer assigns application specific variables
+  * Authentication model creation no longer assigns application specific variables, i.e. first_name, last_name
 
 == 0.10.2
 

data/README.rdoc

@@ -76,20 +76,12 @@ Create a root in your config/routes.rb
 
 Add the following to your app/models/user.rb
 
-  attr_accessible :first_name, :last_name
-
-  # Model Validation
-  validates_presence_of     :first_name
-  validates_presence_of     :last_name
-
   # Model Relationships
   has_many :authentications
 
   def apply_omniauth(omniauth)
     unless omniauth['info'].blank?
       self.email = omniauth['info']['email'] if email.blank?
-      self.first_name = omniauth['info']['first_name'] if first_name.blank?
-      self.last_name = omniauth['info']['last_name'] if last_name.blank?
     end
     authentications.build( provider: omniauth['provider'], uid: omniauth['uid'] )
   end

data/app/assets/stylesheets/bootstrap-base-overrides.css

@@ -12,6 +12,10 @@
   background-image: url(twitter-bootstrap/v2.0.3/glyphicons-halflings-white.png);
 }
 
+/* Line 3604 */
+.navbar .brand {
+  color: #ffffff;
+}
 
 
 body { padding-top: 60px; }

data/config/initializers/devise.rb

@@ -1,3 +1,32 @@
 Devise.setup do |config|
   config.router_name = :main_app
 end
+
+module Devise
+  class FailureApp < ActionController::Metal
+
+  protected
+
+    def scope_path
+      opts  = {}
+      route = :"new_#{scope}_session_path"
+      opts[:format] = request_format unless skip_format?
+      # The 2.1.0.rc of Devise has the following line.  I've commented it out since it
+      # breaks subdomain redirects when failing to login.
+      # Until 2.1.0.rc2 is out, use the following from:
+      # https://github.com/plataformatec/devise/commit/ad0aed3ba5ab58cbe2f54b1a5bd760642c1c689c
+      # Thanks @josevalim !
+      opts[:script_name] = Rails.application.config.relative_url_root
+
+      context = send(Devise.available_router_name)
+
+      if context.respond_to?(route)
+        context.send(route, opts)
+      elsif respond_to?(:root_path)
+        root_path(opts)
+      else
+        "/"
+      end
+    end
+  end
+end

data/contour.gemspec

@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rails',                   '~> 3.2.3'
   s.add_dependency 'jquery-rails',            '~> 2.0.2'
-  s.add_dependency 'devise',                  '~> 2.0.4'
-  s.add_dependency 'omniauth',                '~> 1.0.3'
+  s.add_dependency 'devise',                  '~> 2.1.0.rc'
+  s.add_dependency 'omniauth',                '~> 1.1.0'
   s.add_dependency 'omniauth-openid',         '~> 1.0.1'
   s.add_dependency 'omniauth-ldap',           '~> 1.0.2'
   s.add_dependency 'omniauth-twitter',        '~> 0.0.11'
-  s.add_dependency 'omniauth-facebook',       '~> 1.2.0'
+  s.add_dependency 'omniauth-facebook',       '~> 1.3.0'
   s.add_dependency 'omniauth-linkedin',       '~> 0.0.6'
-  s.add_dependency 'omniauth-cas',            '~> 0.0.6'
+  s.add_dependency 'omniauth-cas',            '~> 0.0.7'
 
   s.add_development_dependency "sqlite3"
 end

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta11" # nil, "pre", "rc", "rc2"
+    BUILD = "beta12" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end