cartoonist 0.0.15 → 0.0.16

data/app/controllers/admin/omniauth_callbacks_controller.rb

@@ -0,0 +1,37 @@
+class Admin::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  include Devise::Controllers::Rememberable
+  skip_before_filter :verify_authenticity_token
+
+  def failure
+    if current_user
+      set_flash_message(:message, :failure, :kind => "GMail", :reason => "association failed") if is_navigational_format?
+      redirect_to "/admin/accounts/#{current_user.id}"
+    else
+      set_flash_message(:notice, :failure, :kind => "GMail", :reason => "login failed") if is_navigational_format?
+      redirect_to "/admin"
+    end
+  end
+
+  def google
+    auth = request.env["omniauth.auth"]
+    user = User.from_auth auth
+
+    if current_user
+      if !user
+        current_user.save_auth! auth
+        set_flash_message(:message, :success, :kind => "GMail") if is_navigational_format?
+        return redirect_to "/admin/accounts/#{current_user.id}"
+      end
+    end
+
+    if user
+      sign_in user, :event => :authentication
+      remember_me user
+      set_flash_message(:message, :success, :kind => "GMail") if is_navigational_format?
+    else
+      set_flash_message(:notice, :failure, :kind => "GMail", :reason => "login failed") if is_navigational_format?
+    end
+
+    redirect_to "/admin"
+  end
+end

data/app/models/user.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :omniauthable
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me, :name
@@ -8,6 +8,12 @@ class User < ActiveRecord::Base
     name
   end
 
+  def save_auth!(auth)
+    self.provider = auth.provider
+    self.uid = auth.uid
+    save!
+  end
+
   class << self
     def create_user(params)
       create :email => params[:email], :name => params[:name], :password => params[:password], :password_confirmation => params[:confirm_password]
@@ -30,5 +36,9 @@ class User < ActiveRecord::Base
       user.save!
       user
     end
+
+    def from_auth(auth)
+      where(:provider => auth.provider, :uid => auth.uid).first
+    end
   end
 end

data/app/views/admin/accounts/show.html.erb

@@ -1,3 +1,30 @@
+<% if @user == current_user %>
+  <% if current_user.provider %>
+    <p>
+      <%= t "accounts.show.associated.prefix" %>
+      <strong><%= current_user.provider %></strong>
+      <%= t "accounts.show.associated.suffix" %>
+    </p>
+
+    <p>
+      <a href="/users/auth/google">
+        <%= t "accounts.show.reassociate", :provider => "GMail" %>
+      </a>
+
+      <br />
+      <small>
+        <%= t "accounts.show.reassociation_warning", :provider => "GMail" %>
+      </small>
+    </p>
+  <% else %>
+    <p>
+      <a href="/users/auth/google">
+        <%= t "accounts.show.associate", :provider => "GMail" %>
+      </a>
+    </p>
+  <% end %>
+<% end %>
+
 <p>
   <a href="/admin/accounts/<%= @user.id %>/edit"><%= t "accounts.show.edit" %></a>
 </p>

data/cartoonist.gemspec

@@ -11,9 +11,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.homepage      = "http://reasonnumber.com/cartoonist"
   s.add_dependency "devise", "~> 2.1.2"
-  s.add_dependency "jquery-rails", "~> 2.1.3"
-  s.add_dependency "railties", "~> 3.2.8"
+  s.add_dependency "jquery-rails", "~> 2.1.4"
+  s.add_dependency "omniauth-openid", "~> 1.0.1"
+  s.add_dependency "railties", "~> 3.2.9"
   s.add_dependency "redcarpet", "~> 2.2.2"
   s.add_dependency "rubyzip", "~> 0.9.9"
-  s.add_dependency "minitar", "~> 0.5.3"
+  s.add_dependency "minitar", "~> 0.5.4"
 end

data/config/locales/en.yml

@@ -23,9 +23,15 @@ en:
       save: Save
       subtitle: New Account
     show:
+      associate: Associate with %{provider}
+      associated:
+        prefix: This user associated with
+        suffix: ""
       edit: edit
       email: "Email:"
       name: "Name:"
+      reassociate: Change %{provider} association
+      reassociation_warning: (Only a GMail account not yet associated will work)
   admin:
     accounts:
       layout:

data/db/migrate/20121205091909_add_omniautable_to_users.rb

@@ -0,0 +1,10 @@
+class AddOmniautableToUsers < ActiveRecord::Migration
+  def change
+    change_table :users do |t|
+      t.string :provider
+      t.string :uid
+    end
+
+    add_index :users, [:provider, :uid], :unique => true
+  end
+end

data/lib/cartoonist.rb

@@ -1,4 +1,6 @@
 require "devise"
+require "omniauth-openid"
+require "openid/store/filesystem"
 require "jquery-rails"
 require "redcarpet"
 require "zlib"

data/lib/cartoonist/engine.rb

@@ -217,6 +217,8 @@ module Cartoonist
       #   manager.intercept_401 = false
       #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
       # end
+
+      devise_config.omniauth :openid, :name => "google", :identifier => "https://www.google.com/accounts/o8/id", :store => OpenID::Store::Filesystem.new("/tmp")
     end
 
     config.before_initialize do
@@ -231,6 +233,9 @@ module Cartoonist
       else
         Rails.application.config.exceptions_app = ActionDispatch::PublicExceptions.new(File.join File.dirname(__FILE__), "../../public/errors")
       end
+
+      # Public expire headers causes our action to not be called until cache expires
+      Rails.application.config.action_dispatch.rack_cache = nil
     end
 
     config.to_prepare do
@@ -328,7 +333,7 @@ module Cartoonist
         end
       end
 
-      devise_for :users
+      devise_for :users, :controllers => { :omniauth_callbacks => "admin/omniauth_callbacks" }
 
       namespace :admin do
         resources :accounts, :only => [:create, :destroy, :edit, :index, :show, :update]

data/lib/cartoonist/version.rb

@@ -2,7 +2,7 @@ module Cartoonist
   class Version
     class << self
       def to_s
-        "0.0.15"
+        "0.0.16"
       end
     end
   end

metadata

@@ -1,92 +1,108 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cartoonist
-version: !ruby/object:Gem::Version
-  version: 0.0.15
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.16
 platform: ruby
-authors:
+authors: 
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: devise
-  requirement: &7553340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.1.2
   type: :runtime
-  prerelease: false
-  version_requirements: *7553340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: jquery-rails
-  requirement: &7552780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.3
+      - !ruby/object:Gem::Version 
+        version: 2.1.4
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: omniauth-openid
   prerelease: false
-  version_requirements: *7552780
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: &7552140 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.8
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: railties
   prerelease: false
-  version_requirements: *7552140
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.2.9
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: redcarpet
-  requirement: &7551060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.2.2
   type: :runtime
-  prerelease: false
-  version_requirements: *7551060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rubyzip
-  requirement: &7550120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.9.9
   type: :runtime
-  prerelease: false
-  version_requirements: *7550120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: minitar
-  requirement: &7549260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+      - !ruby/object:Gem::Version 
+        version: 0.5.4
   type: :runtime
-  prerelease: false
-  version_requirements: *7549260
+  version_requirements: *id007
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/assets/javascripts/cartoonist.js.erb
 - app/assets/stylesheets/admin.css.scss
 - app/controllers/admin/accounts_controller.rb
 - app/controllers/admin/cache_controller.rb
+- app/controllers/admin/omniauth_callbacks_controller.rb
 - app/controllers/admin/search_controller.rb
 - app/controllers/admin/settings_controller.rb
 - app/controllers/admin/static_cache_controller.rb
@@ -137,6 +153,7 @@ files:
 - db/migrate/20120401014029_create_settings.rb
 - db/migrate/20120417075756_devise_create_users.rb
 - db/migrate/20120524032959_add_extension_to_database_files.rb
+- db/migrate/20121205091909_add_omniautable_to_users.rb
 - lib/cartoonist.rb
 - lib/cartoonist/engine.rb
 - lib/cartoonist/version.rb
@@ -145,26 +162,30 @@ files:
 - public/errors/500.html
 homepage: http://reasonnumber.com/cartoonist
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cartoonist Core
 test_files: []
+