spree_social 1.0.2 → 1.1

data/README.md

@@ -79,6 +79,16 @@ OAuth Applications @ Facebook, Twitter and / or Github are supported out of the
 
 > Coming Soon
 
+### 37 Signals
+
+[37 Signals](https://integrate.37signals.com): [https://integrate.37signals.com](https://integrate.37signals.com)
+
+> This include Basecamp, HighRise, Campfire, and Backpack. It is referred to as Basecamp in the admin
+
+1. Name The Application, Your Company, and Your URL
+2. Check one or all of the 37 Signals apps you use
+3. Redirect URI (at the bottom of the page) http://your_computer.local:3000
+
 Setup for Development
 ---------------------
 

data/app/controllers/omniauth_callbacks_controller.rb

@@ -3,33 +3,40 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
   include SpreeBase
   helper :users, 'spree/base'
 
-  def facebook
-    social_setups("Facebook")
-  end
-
-  def twitter
-    social_setups("Twitter")
-  end
-
-  def github
-    social_setups("Github")
+  SpreeSocial::OAUTH_PROVIDERS.each do |provider|
+    method_name = (provider[1]).to_sym
+    send :define_method, method_name do 
+      social_setup(provider[1].capitalize)
+    end
   end
+  
+  #def facebook
+  #  social_setups("Facebook")
+  #end
+  #
+  #def twitter
+  #  social_setups("Twitter")
+  #end
+  #
+  #def github
+  #  social_setups("Github")
+  #end
 
   private
 
-  def social_setups(provider)
+  def social_setup(provider)
     omniauth = request.env["omniauth.auth"]
-    
+
     if request.env["omniauth.error"].present?
       flash[:error] = t("devise.omniauth_callbacks.failure", :kind => provider, :reason => "user was not valid")
       redirect_back_or_default(root_url)
       return
     end
-    
+
     existing_auth = UserAuthentication.where(:provider => omniauth['provider'], :uid => omniauth['uid'].to_s).first
-    
+
     #signing back in from a social source
-    if existing_auth 
+    if existing_auth
       user = existing_auth.user
     else # adding a social source
       user = current_user
@@ -43,10 +50,11 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
       current_order.associate_user!(user)
       session[:guest_token] = nil
     end
-    
+
     if user.anonymous?
-      sign_in(user, :event => :authentication) unless current_user
-      flash[:notice] = t("one_more_step", :kind => omniauth['provider'].capitalize)
+      session[:user_access_token] = user.token #set user access token so we can edit this user again later
+
+      flash.now[:notice] = t("one_more_step", :kind => omniauth['provider'].capitalize)
       render(:template => "user_registrations/social_edit", :locals => {:user => user, :omniauth => omniauth})
     elsif current_user
       flash[:error] = t("attach_error", :kind => omniauth['provider'].capitalize) if existing_auth && (existing_auth.user != current_user)
@@ -56,4 +64,4 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
     end
   end
 
-end
+end

data/app/controllers/user_authentications_controller.rb

@@ -1,20 +1,29 @@
 class UserAuthenticationsController < Spree::BaseController
-  
+
   def update
     @user = User.find(params[:id])
+
+    authorize! :edit, @user, session[:user_access_token]
+
+    session[:user_access_token] = nil
+
     @user.email = params[:user][:email]
     if @user.save
+      sign_in(@user, :event => :authentication) unless current_user
       redirect_back_or_default(products_path)
     else
       flash.now[:error] = "There is already an account with that email. Please sign in to associate these accounts."
       render(:template => 'users/merge')
     end
   end
-  
+
   def destroy
     @auth = current_user.user_authentications.find(params[:id])
+
+    authorize! :destroy, @auth
+
     @auth.destroy
     flash[:notice] = "Successfully deleted authentication source."
     redirect_to account_path
   end
-end
+end

data/app/controllers/user_registrations_controller_decorator.rb

@@ -1,17 +1,17 @@
 UserRegistrationsController.class_eval do
-  
+
   def create
-    super.tap do |u|
-      if @user && @user.new_record?
-        @omniauth = u.session[:session]
-        u.session[:omniauth] = nil unless @user.new_record?
+    super.tap do |resp|
+      if @user && @user.new_record? && resp.respond_to?(:session)
+        @omniauth = resp.session[:session]
+        resp.session[:omniauth] = nil unless @user.new_record?
       end
     end
   end
-  
+
   def delete
     session[:omniauth] = nil
     redirect_to signin_path
   end
- 
-end
+
+end

data/app/controllers/user_sessions_controller_decorator.rb

@@ -1,26 +1,24 @@
 UserSessionsController.class_eval do
-  
-  def merge 
-    # lets remove the old user here
-    sign_out(:user)
+
+  def merge
     # now sign in from the login form
     authenticate_user!
-    
+
     # prep for all the shifting and do it
     user = User.find(current_user.id)
     user.user_authentications << UserAuthentication.find(params[:user_authentication])
     user.save!
-    
+
     if current_order
       current_order.associate_user!(user)
       session[:guest_token] = nil
     end
     # trash the old anonymous that was created
     User.destroy(params[:user][:id])
-    
+
     # tell the truth now
     flash[:alert] = "Succesfully linked your accounts"
     sign_in_and_redirect(user, :event => :authentication)
   end
-  
-end
+
+end

data/app/models/social_ability.rb

@@ -0,0 +1,25 @@
+class SocialAbility
+# stuff like class AbilityDecorator goes here
+  include CanCan::Ability
+
+  def initialize(user)
+
+    can :create, UserAuthentication do
+      !user.new_record?
+    end
+
+    can :destroy, UserAuthentication do |user_authentication|
+      user_authentication.user == user
+    end
+
+    can :read, User do |resource, token|
+      resource == user || resource.token && token == resource.token
+    end
+
+    can :update, User do |resource, token|
+      resource == user || resource.token && token == resource.token
+    end
+  end
+end
+
+

data/app/models/user_decorator.rb

@@ -1,4 +1,6 @@
 User.class_eval do
+  token_resource
+
   has_many :user_authentications
 
   # Associates user to auth source
@@ -12,4 +14,4 @@ User.class_eval do
     (user_authentications.empty? || !password.blank?) && super
   end
 
-end
+end

data/app/views/admin/authentication_methods/_form.html.erb

@@ -18,7 +18,7 @@
 
       <p>
         <label><%= t('social_provider') %></label><br />
-        <%= f.select :preferred_provider, SpreeSocial::PROVIDERS, {:include_blank => true} %>
+        <%= f.select :preferred_provider, SpreeSocial::OAUTH_PROVIDERS, {:include_blank => true} %>
         <br/>
         <span class="info">
           <%= t("social_provider") %>

data/app/views/user_registrations/social_edit.html.erb

@@ -8,11 +8,11 @@
           <td><%=submit_tag t("update") %></td>
         <% end %>
       <% else %>
-      <td><%= t("email") %>:</td>
-      <td>
-        <%= user.email %>
-      </td>
-      <td><p><%= link_to t('edit'), edit_account_path %></p></td>
+        <td><%= t("email") %>:</td>
+        <td>
+          <%= user.email %>
+        </td>
+        <td><p><%= link_to t('edit'), edit_account_path %></p></td>
       <% end %>
     </tr>
-  </table>
+  </table>

data/app/views/users/merge.html.erb

@@ -2,7 +2,7 @@
 <div id="existing-customer">
   <h2><%= t("login_as_existing") %></h2>
   <%= form_for(:user, :url => merge_user_path) do |f| %>
-    <%= hidden_field_tag(:user_authentication, current_user.user_authentications.first.id) %>
+    <%= hidden_field_tag(:user_authentication, @user.user_authentications.first.id) %>
     <%= f.hidden_field(:id) %>
     <div id='password-credentials'>
       <p>
@@ -17,4 +17,4 @@
   <p><%= submit_tag t("log_in"), :class => 'button primary'%></p>
   <%= link_to t("forgot_password"), new_user_password_path %>
   <% end %>
-</div>
+</div>

data/lib/spree_social.rb

@@ -4,41 +4,46 @@ require 'omniauth/oauth'
 require "spree_social_hooks"
 
 module SpreeSocial
-  
-  PROVIDERS = [
-    "facebook",
-    "twitter",
-    "github"
+
+  OAUTH_PROVIDERS = [
+    ["Bit.ly", "bitly"], ["Evernote", "evernote"], ["Facebook", "facebook"], ["Foursquare", "foursquare"],
+    ["Github", "github"], ["Google", "google"] , ["Gowalla", "gowalla"], ["instagr.am", "instagram"],
+    ["Instapaper", "instapaper"], ["LinkedIn", "linked_in"], ["37Signals (Basecamp, Campfire, etc)", "thirty_seven_signals"],
+    ["Twitter", "twitter"], ["Vimeo", "vimeo"], ["Yahoo!", "yahoo"], ["YouTube", "you_tube"]
   ]
-  
+
+
+
   class Engine < Rails::Engine
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
         Rails.env.production? ? require(c) : load(c)
       end
+      Ability.register_ability(SocialAbility)
     end
     config.to_prepare &method(:activate).to_proc
   end
-  
+
   # We are setting these providers up regardless
   # This way we can update them when and where necessary
   def self.init_provider(provider)
     key, secret = nil
     AuthenticationMethod.where(:environment => ::Rails.env).each do |user|
-      if user.preferred_provider == provider
+      if user.preferred_provider == provider[1]
         key = user.preferred_api_key
         secret = user.preferred_api_secret
+        puts("Loaded #{user.preferred_provider.capitalize} as authentication source")
       end
     end if self.table_exists?("authentication_methods") # See Below for explanation
-    self.setup_key_for(provider.to_sym, key, secret)
+    self.setup_key_for(provider[1].to_sym, key, secret)
   end
-  
+
   def self.setup_key_for(provider, key, secret)
     Devise.setup do |oa|
       oa.omniauth provider.to_sym, key, secret
     end
   end
-  
+
   # Coming soon to a server near you: no restart to get new keys setup
   #def self.reset_key_for(provider, *args)
   #  puts "ARGS: #{args}"
@@ -47,11 +52,11 @@ module SpreeSocial
   #  #Devise.omniauth_configs.merge!(oa_updated_provider)
   #  puts "OmniAuth #{provider}: #{Devise.omniauth_configs[provider.to_sym].inspect}"
   #end
-  
+
   private
-  
+
   # Have to test for this cause Rails migrations and initial setups will fail
   def self.table_exists?(name)
     ActiveRecord::Base.connection.tables.include?(name)
   end
-end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spree_social
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 13
   prerelease: 
   segments: 
   - 1
-  - 0
-  - 2
-  version: 1.0.2
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - John Brien Dilts
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,35 +50,33 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: devise
+  name: oa-oauth
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7712074
+        hash: 19
         segments: 
-        - 1
+        - 0
+        - 2
         - 2
-        - rc
-        version: 1.2.rc
+        version: 0.2.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: oa-oauth
+  name: evernote
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 3
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        version: "0"
   type: :runtime
   version_requirements: *id004
 description: 
@@ -103,6 +100,7 @@ files:
 - app/controllers/user_registrations_controller_decorator.rb
 - app/controllers/user_sessions_controller_decorator.rb
 - app/models/authentication_method.rb
+- app/models/social_ability.rb
 - app/models/user_authentication.rb
 - app/models/user_decorator.rb
 - app/views/admin/authentication_methods/_form.html.erb
@@ -118,6 +116,14 @@ files:
 - app/views/users/merge.html.erb
 - db/migrate/20101117212408_create_user_authentications.rb
 - db/migrate/20101207152830_create_authentication_methods.rb
+- public/images/social/aol_128.png
+- public/images/social/aol_256.png
+- public/images/social/aol_32.png
+- public/images/social/aol_64.png
+- public/images/social/campfire_128.png
+- public/images/social/campfire_256.png
+- public/images/social/campfire_32.png
+- public/images/social/campfire_64.png
 - public/images/social/facebook_128.png
 - public/images/social/facebook_256.png
 - public/images/social/facebook_32.png
@@ -134,6 +140,22 @@ files:
 - public/images/social/linkedin_256.png
 - public/images/social/linkedin_32.png
 - public/images/social/linkedin_64.png
+- public/images/social/myspace_128.png
+- public/images/social/myspace_256.png
+- public/images/social/myspace_32.png
+- public/images/social/myspace_64.png
+- public/images/social/openid_128.png
+- public/images/social/openid_256.png
+- public/images/social/openid_32.png
+- public/images/social/openid_64.png
+- public/images/social/presently_128.png
+- public/images/social/presently_256.png
+- public/images/social/presently_32.png
+- public/images/social/presently_64.png
+- public/images/social/thirty_seven_signals_128.png
+- public/images/social/thirty_seven_signals_256.png
+- public/images/social/thirty_seven_signals_32.png
+- public/images/social/thirty_seven_signals_64.png
 - public/images/social/twitter_128.png
 - public/images/social/twitter_256.png
 - public/images/social/twitter_32.png
@@ -175,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Adds social network login services (OAuth) to Spree