contour 0.5.6 → 0.5.7

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2
+rvm 1.9.3

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+== 0.5.7
+
+* Enhancements
+  * Authentications link is now hidden by default if no additional providers have been specified for Omniauth
+
+* Bug Fix
+  * Dependency added for jquery-rails 1.0.0 to 1.0.16 since jquery-rails 1.0.17 switches to jQuery 1.7.0 which is incompatible with HighCharts 2.1.4 which requires jQuery 1.6.4
+
 == 0.5.6
 
 * Bug Fix

data/contour.gemspec

@@ -6,21 +6,24 @@
 # gem list -r contour
 # gem install contour
 
-$:.push File.expand_path("../lib", __FILE__)
-require "contour/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'contour/version'
 
 Gem::Specification.new do |s|
-  s.name = "contour"
+  s.name = 'contour'
   s.version = Contour::VERSION.dup
   s.platform = Gem::Platform::RUBY
-  s.summary = "Basic Rails framework files and assets for layout and authentication"
-  s.email = "remosm@gmail.com"
-  s.homepage = "https://github.com/remomueller"
-  s.authors = ["Remo Mueller"]
-  s.description = "Basic Rails Framework files and assets for layout and authentication"
+  s.summary = 'Basic Rails framework files and assets for layout and authentication'
+  s.email = 'remosm@gmail.com'
+  s.homepage = 'https://github.com/remomueller'
+  s.authors = ['Remo Mueller']
+  s.description = 'Basic Rails Framework files and assets for layout and authentication'
 
-  s.add_dependency("devise", "~> 1.4.4")
-  s.add_dependency("omniauth", "~> 0.2.6")
+  s.add_dependency('devise', '~> 1.4.9')
+  s.add_dependency('omniauth', '=0.2.6')
+  # jquery-rails 1.0.17 switches to jQuery 1.7.0
+  # HighCharts 2.1.4 requires jQuery 1.6.4
+  s.add_dependency('jquery-rails', '>= 1.0.0', '<= 1.0.16')
   
   s.files = `git ls-files`.split("\n")
 end

data/lib/contour.rb

@@ -34,8 +34,8 @@ module Contour
       :links => [{:name => 'Login', :path => 'new_user_session_path'}, {:html => "<hr>"}, {:name => 'Sign Up', :path => 'new_user_registration_path'}]
     },
     {
-      :name => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :position => 'right', :position_class => 'right',
-      :links => [{:html => '"<div style=\"white-space:nowrap\">"+(current_user.methods.include?(:name) ? current_user.name.to_s : "")+"</div>"', :eval => true}, {:html => '"<div class=\"small quiet\">"+current_user.email+"</div>"', :eval => true}, {:name => 'Authentications', :path => 'authentications_path'}, {:html => "<hr>"}, {:name => 'Logout', :path => 'destroy_user_session_path'}]
+      :name => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :position => 'right', :position_class => 'right', :condition => 'true',
+      :links => [{:html => '"<div style=\"white-space:nowrap\">"+(current_user.methods.include?(:name) ? current_user.name.to_s : "")+"</div>"', :eval => true}, {:html => '"<div class=\"small quiet\">"+current_user.email+"</div>"', :eval => true}, {:name => 'Authentications', :path => 'authentications_path', :condition => 'not PROVIDERS.blank?'}, {:html => "<hr>"}, {:name => 'Logout', :path => 'destroy_user_session_path'}]
     },
     {
       :name => 'Home', :id => 'home', :display => 'always', :position => 'left', :position_class => 'left',

data/lib/contour/version.rb

@@ -1,3 +1,3 @@
 module Contour
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/generators/templates/contour.rb

@@ -23,7 +23,7 @@ Contour.setup do |config|
   # },
   # {
   #   :name => 'current_user.name', :eval => true, :id => 'auth', :display => 'signed_in', :position => 'right', :position_class => 'right', :condition => 'true',
-  #   :links => [{:html => '"<div style=\"white-space:nowrap\">"+(current_user.methods.include?(:name) ? current_user.name.to_s : "")+"</div>"', :eval => true}, {:html => '"<div class=\"small quiet\">"+current_user.email+"</div>"', :eval => true}, {:name => 'Authentications', :path => 'authentications_path'}, {:html => "<hr>"}, {:name => 'Logout', :path => 'destroy_user_session_path'}]
+  #   :links => [{:html => '"<div style=\"white-space:nowrap\">"+(current_user.methods.include?(:name) ? current_user.name.to_s : "")+"</div>"', :eval => true}, {:html => '"<div class=\"small quiet\">"+current_user.email+"</div>"', :eval => true}, {:name => 'Authentications', :path => 'authentications_path', :condition => 'not PROVIDERS.blank?'}, {:html => "<hr>"}, {:name => 'Logout', :path => 'destroy_user_session_path'}]
   # },
   # {
   #   :name => 'Home', :id => 'home', :display => 'always', :position => 'left', :position_class => 'left', :condition => 'true', :image => '', :image_options => {},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70186493364100 !ruby/object:Gem::Requirement
+  requirement: &70251807767700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *70186493364100
+  version_requirements: *70251807767700
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70186493362960 !ruby/object:Gem::Requirement
+  requirement: &70251807782160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70186493362960
+  version_requirements: *70251807782160
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &70251807777800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.0.16
+  type: :runtime
+  prerelease: false
+  version_requirements: *70251807777800
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -177,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Basic Rails framework files and assets for layout and authentication