contour 2.4.0.beta2 → 2.4.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 310fce2685f889fe7272d0164e812429bb03ce5e
-  data.tar.gz: b82b531a51e1b45ae6b3b7d2e914d9314da8d7d8
+  metadata.gz: 88abaa7dbe85ed7557f52cccf48aca8e88bb922f
+  data.tar.gz: 77bf8c54cc1bdba991ecfd0f6e8c3bc61460d312
 SHA512:
-  metadata.gz: 8b1f0ea2d95e77751a1fa0da7107751f41b96d9e6fd542240dbd4cfe61fa0d81b1b91d33e7768db58c59247957b9b6a794fd2238604a9b367e1a027aa86f2c59
-  data.tar.gz: c18c9dff02ed41227eee41d73c842bd44992a9cd15201ca2023a3259d0f1060b93f612075db46b30980be0e190a4bf8b9f9f4574ab79941eb22f675f3f1f1740
+  metadata.gz: 7fc16e70df4e7439cdbebaf34cdbcf6458c829699deb899e495c6f626588ee9f4fd054ae88c627526c1f64a2ffacd297ad562c134b075b991989edbb8c1ca5ca
+  data.tar.gz: 9e2c5ef67b83ab7506abab8017f156b5051c0c5a4519dfe912de3ce56fcbe159386ab1e04d433c380660aa008fffd42e25c58c68290ff2e4f030c0df8f2d47a7

data/CHANGELOG.md

@@ -11,6 +11,9 @@
 ### Breaking Changes
 - Removed pagination AJAX methods to reduce overall contour JavaScript footprint
 - `sort_field_helper` updated to work with turbolinks and no longer uses AJAX
+- Removed individual omniauth gem dependencies, and updated omniauth to ~> 1.2.1
+  - Removed: `omniauth-cas`, `omniauth-facebook`, `omniauth-linkedin`, and `omniauth-twitter`
+  - These now need to be individually specified in the apps `Gemfile` to be included
 
 ### Bug Fix
 - Fixed the per page links to no longer include starting and ending links when the max page is reached

data/contour.gemspec

@@ -28,13 +28,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-rails',            '>= 3.0.4'
   s.add_dependency 'coffee-rails',            '~> 4.0.1'
   s.add_dependency 'devise',                  '~> 3.2.2'
-  s.add_dependency 'omniauth',                '~> 1.1.4'
-  s.add_dependency 'omniauth-cas',            '~> 1.0.4'
-  s.add_dependency 'omniauth-facebook',       '~> 1.6.0'
-  s.add_dependency 'omniauth-ldap',           '~> 1.0.3'
-  s.add_dependency 'omniauth-linkedin',       '~> 0.1.0'
+  s.add_dependency 'omniauth',                '~> 1.2.1'
+  # s.add_dependency 'omniauth-cas',            '~> 1.0.4'
+  # s.add_dependency 'omniauth-facebook',       '~> 1.6.0'
+  s.add_dependency 'omniauth-ldap',           '~> 1.0.4'
+  # s.add_dependency 'omniauth-linkedin',       '~> 0.1.0'
   s.add_dependency 'omniauth-openid',         '~> 1.0.1'
-  s.add_dependency 'omniauth-twitter',        '~> 1.0.1'
+  # s.add_dependency 'omniauth-twitter',        '~> 1.0.1'
 
   s.add_development_dependency 'sqlite3'
 end

data/lib/contour/version.rb

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

data/lib/generators/contour/install/templates/omniauth.rb

@@ -1,21 +1,21 @@
 require 'omniauth-openid'
 require 'omniauth-ldap'
-require 'omniauth-twitter'
-require 'omniauth-facebook'
-require 'omniauth-linkedin'
-require 'omniauth-cas'
+# require 'omniauth-twitter'
+# require 'omniauth-facebook'
+# require 'omniauth-linkedin'
+# require 'omniauth-cas'
 
 require 'openid/store/filesystem'
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :open_id, store: OpenID::Store::Filesystem.new('/tmp'), name: 'google_apps', identifier: 'https://www.google.com/accounts/o8/id'
   provider :open_id, store: OpenID::Store::Filesystem.new('/tmp')
   provider :LDAP, host: 'ldap.example.com', port: 389, method: :plain, base: 'cn=users,dc=example,dc=com', uid: 'sAMAccountName', domain: '' #, try_sasl: true, sasl_mechanisms: "GSS-SPNEGO"
-  
-  provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  provider :facebook, 'APP_ID', 'APP_SECRET'
-  provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  provider :cas, host: 'cas.yourdomain.com', login_url: 'https://www.example.com/cas'
-  
+
+  # provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
+  # provider :facebook, 'APP_ID', 'APP_SECRET'
+  # provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
+  # provider :cas, host: 'cas.yourdomain.com', login_url: 'https://www.example.com/cas'
+
   # Other providers will need gems added in your Gemfile, and the provider configured in this block.
   #   https://github.com/intridea/omniauth/wiki/List-of-Strategies
 end
@@ -30,4 +30,4 @@ PROVIDERS = [:google_apps, :open_id, :LDAP, :twitter, :facebook, :linked_in, :ca
 # :uid (required) - The LDAP attribute name for the user name in the login form. Typically AD would be 'sAMAccountName' or 'UniquePersonalIdentifier', while OpenLDAP is 'uid'. You can also use 'dn' for the user to put in the dn in the login form (but usually is too long for user to remember or know).
 # :domain - Enter to keep users from having to enter the LDAP domain, usually in the form domain\username. Backslash will be appended automatically.
 # :try_sasl - Try to use SASL connection to server.
-# :sasl_mechanisms - Mechanisms supported are 'DIGEST-MD5' and 'GSS-SPNEGO'
+# :sasl_mechanisms - Mechanisms supported are 'DIGEST-MD5' and 'GSS-SPNEGO'

data/test/dummy/config/initializers/omniauth.rb

@@ -1,21 +1,21 @@
 require 'omniauth-openid'
 require 'omniauth-ldap'
-require 'omniauth-twitter'
-require 'omniauth-facebook'
-require 'omniauth-linkedin'
-require 'omniauth-cas'
+# require 'omniauth-twitter'
+# require 'omniauth-facebook'
+# require 'omniauth-linkedin'
+# require 'omniauth-cas'
 
 require 'openid/store/filesystem'
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :open_id, store: OpenID::Store::Filesystem.new('/tmp'), name: 'google_apps', identifier: 'https://www.google.com/accounts/o8/id'
   provider :open_id, store: OpenID::Store::Filesystem.new('/tmp')
   provider :LDAP, host: 'ldap.example.com', port: 389, method: :plain, base: 'cn=users,dc=example,dc=com', uid: 'sAMAccountName', domain: '' #, try_sasl: true, sasl_mechanisms: "GSS-SPNEGO"
-  
-  provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  provider :facebook, 'APP_ID', 'APP_SECRET'
-  provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
-  provider :cas, host: 'cas.yourdomain.com', login_url: 'https://www.example.com/cas'
-  
+
+  # provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
+  # provider :facebook, 'APP_ID', 'APP_SECRET'
+  # provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
+  # provider :cas, host: 'cas.yourdomain.com', login_url: 'https://www.example.com/cas'
+
   # Other providers will need gems added in your Gemfile, and the provider configured in this block.
   #   https://github.com/intridea/omniauth/wiki/List-of-Strategies
 end
@@ -30,4 +30,4 @@ PROVIDERS = [:google_apps, :open_id, :LDAP, :twitter, :facebook, :linked_in, :ca
 # :uid (required) - The LDAP attribute name for the user name in the login form. Typically AD would be 'sAMAccountName' or 'UniquePersonalIdentifier', while OpenLDAP is 'uid'. You can also use 'dn' for the user to put in the dn in the login form (but usually is too long for user to remember or know).
 # :domain - Enter to keep users from having to enter the LDAP domain, usually in the form domain\username. Backslash will be appended automatically.
 # :try_sasl - Try to use SASL connection to server.
-# :sasl_mechanisms - Mechanisms supported are 'DIGEST-MD5' and 'GSS-SPNEGO'
+# :sasl_mechanisms - Mechanisms supported are 'DIGEST-MD5' and 'GSS-SPNEGO'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.4.0.beta2
+  version: 2.4.0.beta3
 platform: ruby
 authors:
 - Remo Mueller
@@ -72,16 +72,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: omniauth-cas
+  name: omniauth-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -94,48 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: omniauth-facebook
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: omniauth-ldap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: omniauth-linkedin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: omniauth-twitter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement