contour 0.7.2 → 0.8.0

data/app/controllers/contour/authentications_controller.rb

@@ -4,7 +4,7 @@ class Contour::AuthenticationsController < ApplicationController
   end
 
   def passthru
-    render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false
+    render :file => "#{Rails.root}/public/404", :formats => [:html], :status => 404, :layout => false
   end
 
   def failure

data/contour.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |s|
   
   s.platform = Gem::Platform::RUBY
   
-  s.add_dependency 'rails',         '~> 3.1.3'
+  s.add_dependency 'rails',         '~> 3.2.0.pre'
   s.add_dependency 'devise',        '~> 1.4.9'
   s.add_dependency 'omniauth',      '=0.2.6'
-  s.add_dependency 'jquery-rails',  '~> 1.0.17'
+  s.add_dependency 'jquery-rails',  '~> 2.0.0'
   
   s.files = Dir["{app,config,db,lib}/**/*"] + ["CHANGELOG.rdoc", "contour.gemspec", "LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]

data/lib/contour/version.rb

@@ -1,8 +1,8 @@
 module Contour
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 7
-    TINY = 2
+    MINOR = 8
+    TINY = 0
     BUILD = nil # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')

data/lib/generators/templates/omniauth.rb

@@ -1,6 +1,6 @@
 require 'openid/store/filesystem'
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :google_apps, OpenID::Store::Filesystem.new('/tmp')
+  provider :open_id, OpenID::Store::Filesystem.new('/tmp'), :name => 'google_apps', :identifier => 'https://www.google.com/accounts/o8/id'
   provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
   provider :facebook, 'APP_ID', 'APP_SECRET'
   provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'

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

@@ -1,6 +1,6 @@
 require 'openid/store/filesystem'
 Rails.application.config.middleware.use OmniAuth::Builder do
-  # provider :google_apps, OpenID::Store::Filesystem.new('/tmp')
+  # provider :open_id, OpenID::Store::Filesystem.new('/tmp'), :name => 'google_apps', :identifier => 'https://www.google.com/accounts/o8/id'
   # provider :twitter, 'CONSUMER_KEY', 'CONSUMER_SECRET'
   # provider :facebook, 'APP_ID', 'APP_SECRET'
   # provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2012-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70107175234700 !ruby/object:Gem::Requirement
+  requirement: &70282187482860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.0.pre
   type: :runtime
   prerelease: false
-  version_requirements: *70107175234700
+  version_requirements: *70282187482860
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70107175231840 !ruby/object:Gem::Requirement
+  requirement: &70282187481940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *70107175231840
+  version_requirements: *70282187481940
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70107175225980 !ruby/object:Gem::Requirement
+  requirement: &70282187480860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,18 +43,18 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70107175225980
+  version_requirements: *70282187480860
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70107175223800 !ruby/object:Gem::Requirement
+  requirement: &70282187480020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.17
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70107175223800
+  version_requirements: *70282187480020
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -78,6 +78,123 @@ files:
 - app/assets/images/contour/favorite_no.png
 - app/assets/images/contour/favorite_yes.png
 - app/assets/images/contour/feed.png
+- app/assets/images/contour/gentleface/app_window_16.png
+- app/assets/images/contour/gentleface/app_window_16_g1.png
+- app/assets/images/contour/gentleface/app_window_32.png
+- app/assets/images/contour/gentleface/app_window_32_g1.png
+- app/assets/images/contour/gentleface/chart_line_16.png
+- app/assets/images/contour/gentleface/chart_line_16_g1.png
+- app/assets/images/contour/gentleface/chart_line_32.png
+- app/assets/images/contour/gentleface/chart_line_32_g1.png
+- app/assets/images/contour/gentleface/checkbox_checked_16.png
+- app/assets/images/contour/gentleface/checkbox_checked_16_g1.png
+- app/assets/images/contour/gentleface/checkbox_checked_32.png
+- app/assets/images/contour/gentleface/checkbox_checked_32_g1.png
+- app/assets/images/contour/gentleface/checkbox_unchecked_16.png
+- app/assets/images/contour/gentleface/checkbox_unchecked_16_g1.png
+- app/assets/images/contour/gentleface/checkbox_unchecked_32.png
+- app/assets/images/contour/gentleface/checkbox_unchecked_32_g1.png
+- app/assets/images/contour/gentleface/clipboard_copy_16.png
+- app/assets/images/contour/gentleface/clipboard_copy_16_g1.png
+- app/assets/images/contour/gentleface/clipboard_copy_32.png
+- app/assets/images/contour/gentleface/clipboard_copy_32_g1.png
+- app/assets/images/contour/gentleface/cog_16.png
+- app/assets/images/contour/gentleface/cog_16_g1.png
+- app/assets/images/contour/gentleface/cog_32.png
+- app/assets/images/contour/gentleface/cog_32_g1.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_16.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_16_g1.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_2_16.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_2_16_g1.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_2_32.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_2_32_g1.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_32.png
+- app/assets/images/contour/gentleface/cursor_drag_arrow_32_g1.png
+- app/assets/images/contour/gentleface/cursor_H_split_16.png
+- app/assets/images/contour/gentleface/cursor_H_split_16_g1.png
+- app/assets/images/contour/gentleface/cursor_H_split_32.png
+- app/assets/images/contour/gentleface/cursor_H_split_32_g1.png
+- app/assets/images/contour/gentleface/doc_edit_16.png
+- app/assets/images/contour/gentleface/doc_edit_16_g1.png
+- app/assets/images/contour/gentleface/doc_edit_32.png
+- app/assets/images/contour/gentleface/doc_edit_32_g1.png
+- app/assets/images/contour/gentleface/doc_new_16.png
+- app/assets/images/contour/gentleface/doc_new_16_g1.png
+- app/assets/images/contour/gentleface/doc_new_32.png
+- app/assets/images/contour/gentleface/doc_new_32_g1.png
+- app/assets/images/contour/gentleface/expand_16.png
+- app/assets/images/contour/gentleface/expand_16_g1.png
+- app/assets/images/contour/gentleface/expand_32.png
+- app/assets/images/contour/gentleface/expand_32_g1.png
+- app/assets/images/contour/gentleface/home_16.png
+- app/assets/images/contour/gentleface/home_16_g1.png
+- app/assets/images/contour/gentleface/home_32.png
+- app/assets/images/contour/gentleface/home_32_g1.png
+- app/assets/images/contour/gentleface/indent_decrease_16.png
+- app/assets/images/contour/gentleface/indent_decrease_16_g1.png
+- app/assets/images/contour/gentleface/indent_decrease_32.png
+- app/assets/images/contour/gentleface/indent_decrease_32_g1.png
+- app/assets/images/contour/gentleface/indent_increase_16.png
+- app/assets/images/contour/gentleface/indent_increase_16_g1.png
+- app/assets/images/contour/gentleface/indent_increase_32.png
+- app/assets/images/contour/gentleface/indent_increase_32_g1.png
+- app/assets/images/contour/gentleface/LICENSE
+- app/assets/images/contour/gentleface/lightbulb_16.png
+- app/assets/images/contour/gentleface/lightbulb_16_g1.png
+- app/assets/images/contour/gentleface/lightbulb_32.png
+- app/assets/images/contour/gentleface/lightbulb_32_g1.png
+- app/assets/images/contour/gentleface/list_bullets_16.png
+- app/assets/images/contour/gentleface/list_bullets_16_g1.png
+- app/assets/images/contour/gentleface/list_bullets_32.png
+- app/assets/images/contour/gentleface/list_bullets_32_g1.png
+- app/assets/images/contour/gentleface/playback_ff_16.png
+- app/assets/images/contour/gentleface/playback_ff_16_g1.png
+- app/assets/images/contour/gentleface/playback_ff_32.png
+- app/assets/images/contour/gentleface/playback_ff_32_g1.png
+- app/assets/images/contour/gentleface/playback_next_16.png
+- app/assets/images/contour/gentleface/playback_next_16_g1.png
+- app/assets/images/contour/gentleface/playback_next_32.png
+- app/assets/images/contour/gentleface/playback_next_32_g1.png
+- app/assets/images/contour/gentleface/playback_pause_16.png
+- app/assets/images/contour/gentleface/playback_pause_16_g1.png
+- app/assets/images/contour/gentleface/playback_pause_32.png
+- app/assets/images/contour/gentleface/playback_pause_32_g1.png
+- app/assets/images/contour/gentleface/playback_play_16.png
+- app/assets/images/contour/gentleface/playback_play_16_g1.png
+- app/assets/images/contour/gentleface/playback_play_32.png
+- app/assets/images/contour/gentleface/playback_play_32_g1.png
+- app/assets/images/contour/gentleface/playback_prev_16.png
+- app/assets/images/contour/gentleface/playback_prev_16_g1.png
+- app/assets/images/contour/gentleface/playback_prev_32.png
+- app/assets/images/contour/gentleface/playback_prev_32_g1.png
+- app/assets/images/contour/gentleface/playback_rew_16.png
+- app/assets/images/contour/gentleface/playback_rew_16_g1.png
+- app/assets/images/contour/gentleface/playback_rew_32.png
+- app/assets/images/contour/gentleface/playback_rew_32_g1.png
+- app/assets/images/contour/gentleface/redo_16.png
+- app/assets/images/contour/gentleface/redo_16_g1.png
+- app/assets/images/contour/gentleface/redo_16_q.png
+- app/assets/images/contour/gentleface/redo_16_q_g1.png
+- app/assets/images/contour/gentleface/redo_32.png
+- app/assets/images/contour/gentleface/redo_32_g1.png
+- app/assets/images/contour/gentleface/sq_minus_16.png
+- app/assets/images/contour/gentleface/sq_minus_16_g1.png
+- app/assets/images/contour/gentleface/sq_minus_32.png
+- app/assets/images/contour/gentleface/sq_minus_32_g1.png
+- app/assets/images/contour/gentleface/sq_plus_16.png
+- app/assets/images/contour/gentleface/sq_plus_16_g1.png
+- app/assets/images/contour/gentleface/sq_plus_32.png
+- app/assets/images/contour/gentleface/sq_plus_32_g1.png
+- app/assets/images/contour/gentleface/trash_16.png
+- app/assets/images/contour/gentleface/trash_16_g1.png
+- app/assets/images/contour/gentleface/trash_32.png
+- app/assets/images/contour/gentleface/trash_32_g1.png
+- app/assets/images/contour/gentleface/undo_16.png
+- app/assets/images/contour/gentleface/undo_16_g1.png
+- app/assets/images/contour/gentleface/undo_16_q.png
+- app/assets/images/contour/gentleface/undo_16_q_g1.png
+- app/assets/images/contour/gentleface/undo_32.png
+- app/assets/images/contour/gentleface/undo_32_g1.png
 - app/assets/images/contour/google_apps_32.png
 - app/assets/images/contour/google_apps_64.png
 - app/assets/images/contour/im.png
@@ -127,6 +244,7 @@ files:
 - app/assets/javascripts/external/exporting-2.1.9.src.js
 - app/assets/javascripts/external/highcharts-2.1.9.src.js
 - app/assets/javascripts/external/jquery-ui-1.8.10.custom.min.js
+- app/assets/javascripts/external/jquery.qtip.min.js
 - app/assets/javascripts/external/waypoints.js
 - app/assets/stylesheets/bluetrip-screen.css
 - app/assets/stylesheets/contour/authentication.css
@@ -137,6 +255,7 @@ files:
 - app/assets/stylesheets/contour/popup.css
 - app/assets/stylesheets/contour.css
 - app/assets/stylesheets/jquery-ui-1.8.10.custom.css
+- app/assets/stylesheets/jquery.qtip.css
 - app/controllers/contour/authentications_controller.rb
 - app/controllers/contour/passwords_controller.rb
 - app/controllers/contour/registrations_controller.rb