Permalink
Browse files

Merge pull request #6 from yorch/master

Updated for Rails 3.2.6 and Omniauth 1.1.0 by yorch. Thanks!
  • Loading branch information...
markusproske committed Jul 13, 2012
2 parents 3b08e49 + 448b6ea commit be309b57727c44f8e841c5920bae07d2bfbe3a81
Showing with 341 additions and 9,445 deletions.
  1. +31 −19 Gemfile
  2. +136 −110 Gemfile.lock
  3. +5 −1 README
  4. BIN {public → app/assets}/images/aol_128.png
  5. BIN {public → app/assets}/images/aol_32.png
  6. BIN {public → app/assets}/images/aol_64.png
  7. BIN {public → app/assets}/images/facebook_128.png
  8. BIN {public → app/assets}/images/facebook_32.png
  9. BIN {public → app/assets}/images/facebook_64.png
  10. BIN {public → app/assets}/images/github_128.png
  11. BIN {public → app/assets}/images/github_32.png
  12. BIN {public → app/assets}/images/github_64.png
  13. BIN {public → app/assets}/images/google_128.png
  14. BIN {public → app/assets}/images/google_32.png
  15. BIN {public → app/assets}/images/google_64.png
  16. BIN {public → app/assets}/images/openid_128.png
  17. BIN {public → app/assets}/images/openid_32.png
  18. BIN {public → app/assets}/images/openid_64.png
  19. BIN {public → app/assets}/images/twitter_128.png
  20. BIN {public → app/assets}/images/twitter_32.png
  21. BIN {public → app/assets}/images/twitter_64.png
  22. BIN {public → app/assets}/images/yahoo_128.png
  23. BIN {public → app/assets}/images/yahoo_32.png
  24. BIN {public → app/assets}/images/yahoo_64.png
  25. +15 −0 app/assets/javascripts/application.js
  26. +3 −0 app/assets/javascripts/services.js.coffee
  27. +3 −0 app/assets/javascripts/users.js.coffee
  28. +13 −0 app/assets/stylesheets/application.css
  29. +5 −5 public/stylesheets/services.css → app/assets/stylesheets/services.css.scss
  30. +3 −0 app/assets/stylesheets/users.css.scss
  31. +9 −9 app/controllers/services_controller.rb
  32. 0 {public/stylesheets → app/mailers}/.gitkeep
  33. +3 −3 app/views/layouts/application.html.erb
  34. +1 −0 app/views/services/_services_list.html.erb
  35. +26 −6 config/application.rb
  36. +23 −12 config/environments/development.rb
  37. +31 −13 config/environments/production.rb
  38. +9 −7 config/environments/test.rb
  39. +5 −0 config/initializers/inflections.rb
  40. +5 −3 config/initializers/session_store.rb
  41. +14 −0 config/initializers/wrap_parameters.rb
  42. +1 −1 config/locales/en.yml
  43. +0 −2 public/javascripts/application.js
  44. +0 −965 public/javascripts/controls.js
  45. +0 −974 public/javascripts/dragdrop.js
  46. +0 −1,123 public/javascripts/effects.js
  47. +0 −6,001 public/javascripts/prototype.js
  48. +0 −191 public/javascripts/rails.js
View
50 Gemfile
@@ -1,32 +1,44 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
-gem 'rails', '3.0.5'
+gem 'rails', '3.2.6'
gem 'omniauth'
+gem 'omniauth-facebook'
+gem 'omniauth-github'
+gem 'omniauth-twitter'
+gem 'omniauth-openid'
+gem 'omniauth-google-apps'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
gem 'sqlite3'
-# Use unicorn as the web server
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+ gem 'sass-rails', '~> 3.2.3'
+ gem 'coffee-rails', '~> 3.2.1'
+
+ # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+ # gem 'therubyracer', :platforms => :ruby
+
+ gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
# gem 'unicorn'
# Deploy with Capistrano
# gem 'capistrano'
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-# gem 'webrat'
-# end
+# To use debugger
+# gem 'debugger'
View
@@ -1,131 +1,157 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.5)
- actionpack (= 3.0.5)
- mail (~> 2.2.15)
- actionpack (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.4)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- activesupport (3.0.5)
- addressable (2.2.4)
- arel (2.0.9)
- builder (2.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- faraday (0.5.7)
- addressable (~> 2.2.4)
- multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
- i18n (0.5.0)
- mail (2.2.15)
- activesupport (>= 2.3.6)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
+ mail (~> 2.4.4)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
+ builder (~> 3.0.0)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
+ arel (3.0.2)
+ builder (3.0.0)
+ coffee-rails (3.2.2)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.2.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.3.3)
+ erubis (2.7.0)
+ execjs (1.4.0)
+ multi_json (~> 1.0)
+ faraday (0.8.1)
+ multipart-post (~> 1.1)
+ hashie (1.2.0)
+ hike (1.2.1)
+ httpauth (0.1)
+ i18n (0.6.0)
+ journey (1.0.4)
+ jquery-rails (2.0.2)
+ railties (>= 3.2.0, < 5.0)
+ thor (~> 0.14)
+ json (1.7.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (0.0.5)
- multipart-post (1.1.0)
- net-ldap (0.1.1)
- nokogiri (1.4.4)
- oa-basic (0.2.0)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
- rest-client (~> 1.6.0)
- oa-core (0.2.0)
- rack (~> 1.1)
- oa-enterprise (0.2.0)
- net-ldap (~> 0.1.1)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
- pyu-ruby-sasl (~> 0.0.3.1)
- rubyntlm (~> 0.1.1)
- oa-more (0.2.0)
- multi_json (~> 0.0.2)
- oa-core (= 0.2.0)
- rest-client (~> 1.6.0)
- oa-oauth (0.2.0)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
- oauth (~> 0.4.0)
- oauth2 (~> 0.1.1)
- oa-openid (0.2.0)
- oa-core (= 0.2.0)
- rack-openid (~> 1.2.0)
- ruby-openid-apps-discovery
- oauth (0.4.4)
- oauth2 (0.1.1)
- faraday (~> 0.5.0)
- multi_json (~> 0.0.4)
- omniauth (0.2.0)
- oa-basic (= 0.2.0)
- oa-core (= 0.2.0)
- oa-enterprise (= 0.2.0)
- oa-more (= 0.2.0)
- oa-oauth (= 0.2.0)
- oa-openid (= 0.2.0)
- polyglot (0.3.1)
- pyu-ruby-sasl (0.0.3.2)
- rack (1.2.2)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-openid (1.2.0)
+ mime-types (1.19)
+ multi_json (1.3.6)
+ multipart-post (1.1.5)
+ oauth (0.4.6)
+ oauth2 (0.6.1)
+ faraday (~> 0.7)
+ httpauth (~> 0.1)
+ multi_json (~> 1.3)
+ omniauth (1.1.0)
+ hashie (~> 1.2)
+ rack
+ omniauth-facebook (1.3.0)
+ omniauth-oauth2 (~> 1.0.2)
+ omniauth-github (1.0.1)
+ omniauth (~> 1.0)
+ omniauth-oauth2 (~> 1.0)
+ omniauth-google-apps (0.0.2)
+ omniauth (~> 1.0)
+ omniauth-openid (~> 1.0)
+ ruby-openid-apps-discovery (~> 1.2.0)
+ omniauth-oauth (1.0.1)
+ oauth
+ omniauth (~> 1.0)
+ omniauth-oauth2 (1.0.2)
+ oauth2 (~> 0.6.0)
+ omniauth (~> 1.0)
+ omniauth-openid (1.0.1)
+ omniauth (~> 1.0)
+ rack-openid (~> 1.3.1)
+ omniauth-twitter (0.0.11)
+ multi_json (~> 1.3)
+ omniauth-oauth (~> 1.0)
+ polyglot (0.3.3)
+ rack (1.4.1)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
- rack-test (0.5.7)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.5)
- actionmailer (= 3.0.5)
- actionpack (= 3.0.5)
- activerecord (= 3.0.5)
- activeresource (= 3.0.5)
- activesupport (= 3.0.5)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.0.5)
- railties (3.0.5)
- actionpack (= 3.0.5)
- activesupport (= 3.0.5)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.8.7)
- rest-client (1.6.1)
- mime-types (>= 1.16)
+ rdoc (~> 3.4)
+ thor (>= 0.14.6, < 2.0)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
ruby-openid (2.1.8)
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
- rubyntlm (0.1.1)
- sqlite3 (1.3.3)
- thor (0.14.6)
- treetop (1.4.9)
+ sass (3.1.19)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ sprockets (2.1.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
+ thor (0.15.3)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.25)
+ tzinfo (0.3.33)
+ uglifier (1.2.5)
+ execjs (>= 0.3.0)
+ multi_json (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
+ coffee-rails (~> 3.2.1)
+ jquery-rails
omniauth
- rails (= 3.0.5)
+ omniauth-facebook
+ omniauth-github
+ omniauth-google-apps
+ omniauth-openid
+ omniauth-twitter
+ rails (= 3.2.6)
+ sass-rails (~> 3.2.3)
sqlite3
+ uglifier (>= 1.0.3)
View
6 README
@@ -21,4 +21,8 @@ If you want to use Omniauth pure as a starting point in one of your applications
* copy the code of the services_controller
* copy all views from services
* copy (parts of) the stylesheet
-* and refer to the article for details...
+* and refer to the article for details...
+
+-----------------------------
+June 2012 - Jorge Barnaby
+Updated for Rails 3.2.6 and Omniauth 1.1.0
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */
Oops, something went wrong.

0 comments on commit be309b5

Please sign in to comment.