contour 2.6.0.beta3 → 2.6.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5f5503ea5751cd282ecc3265ce24c5482eee1f8
-  data.tar.gz: 31aa59f1d59142cabac39556139e58860d8ef2d5
+  metadata.gz: 18876d4ce18a38706d99f36cdd14097e36c9b795
+  data.tar.gz: 7f6c13dfca24b37f6c09e685c7e04a83aa334faa
 SHA512:
-  metadata.gz: 9fa6be4b12ff3ae660c2da30c923d0646e6290501ec18a9fec9c850bc4513cee5a540b6eb1f1997044ca1d3b602720b3edc13e164a32a00a089f0203626ece6a
-  data.tar.gz: fc66dac1acc698eda5cf2dc70e32f4ce1f770224cd64b6358e32ff7f8d02e158f4cb2eb5b7162d8fb9582ea4cc292740c1c9d6e67ad22a9d37fe584d7cfd3c07
+  metadata.gz: 4dfa9470bc2cb281a7f15abb6b26215a983a81ca69017a29d16afb6279ceca7770eec1a90c4a07d08855a312029b04d2ae4697f15c77867b070ca88302268028
+  data.tar.gz: dc665791841ea184c72a59b5d1e5e39a42a06db286f7032dc2e2fddd92558a28c2ad0f0ca28ced35e64e278b8b48c1de4455bdc360d7e4b7a185e97313c394d3

data/CHANGELOG.md

@@ -8,7 +8,8 @@
   - This allows the app to be themed by including all or parts of a modified `variables.scss` in the application's `application.css.scss` file
 - Use of Ruby 2.1.2 is now recommended
 - **Gem Changes**
-  - Updated to rails ~> 4.1.5
+  - Updated to rails ~> 4.2.0.beta1
+  - Updated to devise github branch: 'lm-rails-4-2'
 
 ## 2.5.0 (May 8, 2014)
 

data/contour.gemspec

@@ -24,19 +24,17 @@ Gem::Specification.new do |s|
   s.files = Dir['{app,config,db,lib}/**/*'] + ['CHANGELOG.md', 'contour.gemspec', 'LICENSE', 'Rakefile', 'README.md']
   s.test_files = Dir['test/**/*'] - Dir['test/dummy/{tmp,log}/**/*']
 
-  s.add_dependency 'rails',                   '~> 4.1.5'
+  s.add_dependency 'rails',                   '~> 4.2.0.beta1' # '~> 4.1.5'
   s.add_dependency 'jquery-rails',            '>= 3.0.4'
   s.add_dependency 'coffee-rails',            '~> 4.0.1'
-  s.add_dependency 'devise',                  '~> 3.2.4'
+
+  # s.add_dependency 'devise',                  '~> 3.3.0' # Currently need to add github branch to Gemfile
+
   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 'bootstrap-sass',          '~> 3.2.0'
-  s.add_dependency 'sass-rails',              '~> 4.0.3'
+  s.add_dependency 'sass-rails',              '~> 5.0.0.beta1' # '~> 4.0.3'
   s.add_dependency 'autoprefixer-rails'
 
 

data/lib/contour/fixes.rb

@@ -1,4 +1,5 @@
 require 'contour/fixes/devise.rb'
+require 'contour/fixes/devise-with-rails-4-2.rb'
 require 'contour/fixes/omniauth.rb'
 require 'contour/fixes/rack.rb'
 require 'contour/fixes/sass-rails.rb'

data/lib/contour/fixes/devise-with-rails-4-2.rb

@@ -0,0 +1,17 @@
+module ActionDispatch::Routing
+  class Mapper
+
+    protected
+      def with_devise_exclusive_scope(new_path, new_as, options) #:nodoc:
+        current_scope = @scope.dup
+
+        exclusive = { as: new_as, path: new_path, module: nil }
+        exclusive.merge!(options.slice(:constraints, :defaults, :options))
+
+        exclusive.each_pair { |key, value| @scope[key] = value }
+        yield
+      ensure
+        @scope = current_scope
+      end
+  end
+end

data/lib/contour/version.rb

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

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require 'minitest/autorun'
 require 'minitest/reporters'
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
@@ -39,7 +39,7 @@ class ActionDispatch::IntegrationTest
     user.save!
     user.update_column :status, user_template.status
     user.update_column :deleted, user_template.deleted?
-    post_via_redirect 'users/login', user: { email: email, password: password }
+    post_via_redirect '/users/login', user: { email: email, password: password }
     user
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.6.0.beta3
+  version: 2.6.0.beta4
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.4
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 5.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +258,7 @@ files:
 - lib/contour.rb
 - lib/contour/engine.rb
 - lib/contour/fixes.rb
+- lib/contour/fixes/devise-with-rails-4-2.rb
 - lib/contour/fixes/devise.rb
 - lib/contour/fixes/omniauth.rb
 - lib/contour/fixes/rack.rb