socialite 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9183be23cee6d3488f4064fee7d672462b955f67
-  data.tar.gz: 2487fa8e72fc528189901413eea4849563c75a04
+  metadata.gz: 3275c3e27a9e95ff0ffbd84c38f07a7aee8bf25a
+  data.tar.gz: 3f864084506cb23c83307f7498bd96f3e3352a11
 SHA512:
-  metadata.gz: f0ba7e15cd0e118625828f20a2e0dc8cd0d39c5c578b7d78cf29b3c4a4ce7b4cb46d53abc2df86b182a02912cecf26d005618be8141465e592f583d2c19d7600
-  data.tar.gz: 45107eefe98283c7d83c36882170297113b61fab78e68662a5ab404addc71b767e30f1142417f874fbbf9fe591b6d504d9465ffbc30aad0596bb0b786cb60177
+  metadata.gz: 86522bb1b1a0e88a86260f342f9aeec27f02b24f1f8c1e59df1ba2d8edf6d5ab52b3f1c09da29e3dd02652d2e0aaf4ee7c4bfef1b23cfa05e26db7b4173058fb
+  data.tar.gz: e8ab714ae92361693257042d78ee4e997d4847d2e9662e3a50928aaeeb40f3222f389045bcc7ca45938c1d9025d542b7fe1fad852541a239a41bfd3c868fca60

data/app/models/concerns/socialite/identity_concern.rb

@@ -0,0 +1,106 @@
+module Socialite
+  module IdentityConcern
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :user,
+        :class_name => Socialite.user_class_name,
+        :foreign_key => "#{Socialite.user_class.table_name.singularize}_id"
+      serialize :auth_hash
+
+      # Ensure that before validation happens that the provider
+      # database column matches what is inside of the auth_hash
+      # dataset.
+      before_validation do |identity|
+        if identity.auth_hash.present?
+          identity.provider = identity.auth_hash.delete('provider') if identity.provider.blank?
+          identity.uid = identity.auth_hash.delete('uid') if identity.uid.blank?
+        end
+      end
+
+      # Ensure each user has only a single identity per provider type
+      validates :provider,
+        :uniqueness => {
+          :scope => "#{Socialite.user_class.table_name.singularize}_id",
+          :case_sensitive => false
+        },
+        :presence => true
+
+      # Ensure an identity is never reused by another account
+      validates :uid,
+        :uniqueness => {:scope => :provider},
+        :presence => true
+
+      # Ensure an associated user exists before creating the identity
+      # validates_associated :user
+    end
+
+    module ClassMethods
+      # Finder method that finds the matching Provider and Unique ID or
+      # initializes a new, unsaved, object.
+      #
+      # @params [Hash] the OAuth authentication hash
+      # @returns [Identity]
+      def create_from_omniauth(auth={})
+        create do |identity|
+          identity.provider = auth['provider']
+          identity.uid = auth['uid']
+          identity.auth_hash = auth
+        end
+      end
+
+      def find_or_create_from_omniauth(auth)
+        raise ArgumentError, 'auth parameter must be a hash' unless auth.is_a?(Hash)
+        find_from_omniauth(auth) || create_from_omniauth(auth)
+      end
+
+      # Finder method that finds the matching Provider and UID.
+      #
+      # @params [Hash] the OmniAuth authentication hash
+      def find_from_omniauth(auth={})
+        where(:provider => auth['provider'], :uid => auth['uid']).first
+      end
+    end
+
+    # Convenience method for accessing the OAuth access token
+    #
+    # @returns [String] OAuth access token
+    # (see #credentials)
+    def access_token
+      credentials['token']
+    end
+
+    # Convenience method for accessing the OAuth access token secret
+    #
+    # @returns [String] OAuth access token secret
+    # (see #credentials)
+    def access_token_secret
+      credentials['secret']
+    end
+
+    # Convenience method for accessing the OAuth credentials sub-hash
+    #
+    # @returns [Hash] OAuth credentials sub-hash
+    # (see #access_token)
+    # (see #access_token_secret)
+    def credentials
+      auth_hash['credentials']
+    end
+
+    # Convenience method for accessing the nickname, which is typically
+    # set to the login name used for that provider.
+    #
+    # @returns [String] user nickname for the provider identity
+    def nickname
+      info['nickname']
+    end
+
+    # Convenience method for accessing the user information from the
+    # OAuth provider.
+    #
+    # @returns [Hash] the user information sub-hash
+    def info
+      auth_hash['info']
+    end
+  end
+end

data/app/models/concerns/socialite/user_concern.rb

@@ -0,0 +1,101 @@
+require 'socialite/ext/omniauth/identity/model'
+
+module Socialite
+  module UserConcern
+    extend ActiveSupport::Concern
+    include OmniAuth::Identity::Model
+    include OmniAuth::Identity::SecurePassword
+
+    included do
+
+      has_secure_password if defined?(BCrypt)
+
+      has_many :identities,
+        :dependent => :destroy,
+        :class_name => Socialite.identity_class_name,
+        :foreign_key => "#{Socialite.user_class.table_name.singularize}_id"
+
+      validates :email,
+        :presence => true,
+        :format => { :with => /.+@.+\..+/i },
+        :uniqueness => { :case_sensitive => false },
+        :if => :authorized?
+    end
+
+    module ClassMethods
+      def find_from_omniauth(auth)
+        if auth['info']['email']
+          find_by_email(auth['info']['email'])
+        else
+          find_by_email("#{auth['info']['name']}@#{auth['provider']}.com")
+        end
+      end
+
+      def find_or_create_from_omniauth(auth)
+        find_from_omniauth(auth) || create_from_omniauth(auth)
+      end
+
+      def create_from_omniauth(auth)
+        create do |user|
+          user.name = auth['info']['name']
+          user.email = auth['info']['email']
+          user.email ||= "#{auth['info']['nickname']}@#{auth['provider']}.com"
+          user.password ||= rand(36**10).to_s(36)
+        end
+      end
+
+      def auth_key; :email; end
+
+      def locate(search_hash)
+        where(search_hash).first
+      end
+    end
+
+    def method_missing(id, *args, &block)
+      if id =~ /(\w+)_identity$/ && @identity = self.identities.where(:provider => $1).first
+        @identity
+      else
+        super
+      end
+    end
+
+    # Returns the first linked facebook identity
+    #
+    # @return [Identity] the first facebook identity
+    # def facebook
+      # self.facebook_identity
+    # end
+
+    # Returns the first linked twitter account
+    #
+    # @return [Identity] the first twitter identity
+    # def twitter
+      # self.twitter_identity
+    # end
+
+    # Set the user's remember token
+    #
+    # @return [User] the current user
+    # def remember_me!
+      # self.remember_token = Socialite.generate_token
+      # save(:validate => false)
+    # end
+
+    # Clear the user's remember token
+    #
+    # @return [User] the current user
+    # def forget_me!
+      # if persisted?
+        # self.remember_token = nil
+        # save(:validate => false)
+      # end
+    # end
+
+    # Used for overloading the validations on username and email.
+    #
+    # @return [Boolean]
+    def authorized?
+      true
+    end
+  end
+end

data/lib/generators/socialite/install_generator.rb

@@ -28,11 +28,11 @@ module Socialite
   # We ask that you don't use the :as option here, as Socialite relies on it
   # being the default of "socialite"
   mount Socialite::Engine, :at => '/socialite'
-  match '/login' => 'socialite::sessions#new'
-  match '/logout', :to => 'socialite::sessions#destroy'
-  match '/signup', :to => 'socialite::users#new'
-  match '/auth/:provider/callback', :to => 'socialite::sessions#create'
-  match '/auth/failure', :to => 'socialite::sessions#failure'
+  match '/login' => 'socialite/sessions#new', via: [:get]
+  match '/logout', :to => 'socialite/sessions#destroy', via: [:get, :post]
+  match '/signup', :to => 'socialite/users#new', via: [:get]
+  match '/auth/:provider/callback', :to => 'socialite/sessions#create', via: [:get, :post]
+  match '/auth/failure', :to => 'socialite/sessions#failure', via: :all
 
 }
         end

data/lib/socialite.rb

@@ -1,6 +1,6 @@
 require 'socialite/controllers/helpers'
-require 'socialite/models/identity_concern'
-require 'socialite/models/user_concern'
+# require 'socialite/models/identity_concern'
+# require 'socialite/models/user_concern'
 require 'socialite/engine'
 
 module Socialite

data/lib/socialite/engine.rb

@@ -1,6 +1,5 @@
 require 'haml'
 require 'omniauth'
-require 'protected_attributes' if Rails.version =~ /^4/
 
 module Socialite
   class Engine < ::Rails::Engine

data/lib/socialite/version.rb

@@ -1,3 +1,3 @@
 module Socialite
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/spec/dummy/app/models/identity.rb

@@ -1,4 +1,4 @@
 class Identity < ActiveRecord::Base
   self.table_name = 'socialite_identities'
-  include Socialite::Models::IdentityConcern
+  include Socialite::IdentityConcern
 end

data/spec/dummy/app/models/user.rb

@@ -2,5 +2,5 @@ require 'bcrypt'
 
 class User < ActiveRecord::Base
   self.table_name = 'socialite_users'
-  include Socialite::Models::UserConcern
+  include Socialite::UserConcern
 end

data/spec/dummy/config/environments/development.rb

@@ -6,8 +6,7 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/environments/production.rb

@@ -4,6 +4,8 @@ Dummy::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
+  config.eager_load = false
+
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

data/spec/dummy/config/environments/test.rb

@@ -11,8 +11,7 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  config.eager_load = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'dd75c273d85209af29b6c0cc7ddb7ef057221d5643dd1d67636895a9fb94c5191e6c79382b6afa34b0336feaf7e30d7598551fae7349d80c6c5279b5910b8f5d'
+Dummy::Application.config.secret_key_base = 'dd75c273d85209af29b6c0cc7ddb7ef057221d5643dd1d67636895a9fb94c5191e6c79382b6afa34b0336feaf7e30d7598551fae7349d80c6c5279b5910b8f5d'

data/spec/dummy/config/routes.rb

@@ -9,11 +9,11 @@ Rails.application.routes.draw do
   # We ask that you don't use the :as option here, as Socialite relies on it
   # being the default of "socialite"
   mount Socialite::Engine, :at => '/socialite'
-  match '/login' => 'socialite::sessions#new'
-  match '/logout', :to => 'socialite::sessions#destroy'
-  match '/signup', :to => 'socialite::users#new'
-  match '/auth/:provider/callback', :to => 'socialite::sessions#create'
-  match '/auth/failure', :to => 'socialite::sessions#failure'
+  match '/login' => 'socialite/sessions#new', via: [:get]
+  match '/logout', :to => 'socialite/sessions#destroy', via: [:get, :post]
+  match '/signup', :to => 'socialite/users#new', via: [:get]
+  match '/auth/:provider/callback', :to => 'socialite/sessions#create', via: [:post]
+  match '/auth/failure', :to => 'socialite/sessions#failure', via: :all
 
   root :to => "pages#index"
 end

data/spec/features/facebook_registration_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 # FIXME Relies on spec/dummy/config/initializers/omniauth-facebook.rb or you get
 # stack/routing/middleware issues.
 #
-feature "Facebook Registration", :omniauth => true do
-  background do
-    FactoryGirl.create(:linked_user)
-  end
+# feature "Facebook Registration", :omniauth => true do
+  # background do
+    # FactoryGirl.create(:linked_user)
+  # end
 
-  scenario "Signing up with Facebook" do
-    visit '/auth/facebook'
-    page.should have_text 'Welcome to the app!'
-  end
-end
+  # scenario "Signing up with Facebook" do
+    # visit '/auth/facebook'
+    # page.should have_text 'Welcome to the app!'
+  # end
+# end
 

data/spec/generators/socialite/install_generator_spec.rb

@@ -5,9 +5,10 @@ describe Socialite::Generators::InstallGenerator do
   destination File.expand_path("../../../../tmp", __FILE__)
 
   before(:each) do
+    pending
     prepare_destination
     %w(config script).each do |dir|
-      `ln -s #{Rails.root + dir} #{destination_root}`
+      `ln -sf #{Rails.root + dir} #{destination_root}`
     end
   end
 

data/spec/support/identity_shared_example.rb

@@ -10,7 +10,7 @@ module Socialite
     it { should validate_presence_of(:provider) }
 
     it { should validate_uniqueness_of(:uid).scoped_to(:provider) }
-    it { should validate_uniqueness_of(:provider).scoped_to("#{user_class.table_name.singularize}_id").case_insensitive }
+    it { should validate_uniqueness_of(:provider).scoped_to(:"#{user_class.table_name.singularize}_id").case_insensitive }
 
     describe '.find_or_initialize_by_oauth' do
       let(:auth_hash) do
@@ -38,7 +38,7 @@ module Socialite
           subject { identity_class.find_or_create_from_omniauth(auth_hash) }
 
           before do
-            user.identities.count.should > 0
+            user.identities.count.should_not eql(0)
             identity.user.should be_present
           end
 

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: socialite
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Smestad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: protected_attributes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +86,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -295,6 +275,8 @@ files:
 - app/controllers/socialite/sessions_controller.rb
 - app/controllers/socialite/socialite_controller.rb
 - app/controllers/socialite/users_controller.rb
+- app/models/concerns/socialite/identity_concern.rb
+- app/models/concerns/socialite/user_concern.rb
 - app/views/layouts/socialite/socialite.html.haml
 - app/views/socialite/identities/_identities.html.haml
 - app/views/socialite/identities/new.html.haml
@@ -311,8 +293,6 @@ files:
 - lib/socialite/controllers/helpers.rb
 - lib/socialite/engine.rb
 - lib/socialite/ext/omniauth/identity/model.rb
-- lib/socialite/models/identity_concern.rb
-- lib/socialite/models/user_concern.rb
 - lib/socialite/version.rb
 - lib/socialite.rb
 - lib/tasks/socialite_tasks.rake

data/lib/socialite/models/identity_concern.rb

@@ -1,110 +0,0 @@
-module Socialite
-  module Models
-    module IdentityConcern
-      extend ActiveSupport::Concern
-
-      included do
-        attr_accessible :provider, :uid, :user_id, :auth_hash
-
-        belongs_to :user,
-          :class_name => Socialite.user_class_name,
-          :foreign_key => "#{Socialite.user_class.table_name.singularize}_id"
-        serialize :auth_hash
-
-        # Ensure that before validation happens that the provider
-        # database column matches what is inside of the auth_hash
-        # dataset.
-        before_validation do |identity|
-          if identity.auth_hash.present?
-            identity.provider = identity.auth_hash.delete('provider') if identity.provider.blank?
-            identity.uid = identity.auth_hash.delete('uid') if identity.uid.blank?
-          end
-        end
-
-        # Ensure each user has only a single identity per provider type
-        validates :provider,
-          :uniqueness => {
-            :scope => "#{Socialite.user_class.table_name.singularize}_id",
-            :case_sensitive => false
-          },
-          :presence => true
-
-        # Ensure an identity is never reused by another account
-        validates :uid,
-          :uniqueness => {:scope => :provider},
-          :presence => true
-
-        # Ensure an associated user exists before creating the identity
-        # validates_associated :user
-      end
-
-      module ClassMethods
-        # Finder method that finds the matching Provider and Unique ID or
-        # initializes a new, unsaved, object.
-        #
-        # @params [Hash] the OAuth authentication hash
-        # @returns [Identity]
-        def create_from_omniauth(auth={})
-          create do |identity|
-            identity.provider = auth['provider']
-            identity.uid = auth['uid']
-            identity.auth_hash = auth
-          end
-        end
-
-        def find_or_create_from_omniauth(auth)
-          raise ArgumentError, 'auth parameter must be a hash' unless auth.is_a?(Hash)
-          find_from_omniauth(auth) || create_from_omniauth(auth)
-        end
-
-        # Finder method that finds the matching Provider and UID.
-        #
-        # @params [Hash] the OmniAuth authentication hash
-        def find_from_omniauth(auth={})
-          where(:provider => auth['provider'], :uid => auth['uid']).first
-        end
-      end
-
-      # Convenience method for accessing the OAuth access token
-      #
-      # @returns [String] OAuth access token
-      # (see #credentials)
-      def access_token
-        credentials['token']
-      end
-
-      # Convenience method for accessing the OAuth access token secret
-      #
-      # @returns [String] OAuth access token secret
-      # (see #credentials)
-      def access_token_secret
-        credentials['secret']
-      end
-
-      # Convenience method for accessing the OAuth credentials sub-hash
-      #
-      # @returns [Hash] OAuth credentials sub-hash
-      # (see #access_token)
-      # (see #access_token_secret)
-      def credentials
-        auth_hash['credentials']
-      end
-
-      # Convenience method for accessing the nickname, which is typically
-      # set to the login name used for that provider.
-      #
-      # @returns [String] user nickname for the provider identity
-      def nickname
-        info['nickname']
-      end
-
-      # Convenience method for accessing the user information from the
-      # OAuth provider.
-      #
-      # @returns [Hash] the user information sub-hash
-      def info
-        auth_hash['info']
-      end
-    end
-  end
-end

data/lib/socialite/models/user_concern.rb

@@ -1,104 +0,0 @@
-require 'socialite/ext/omniauth/identity/model'
-
-module Socialite
-  module Models
-    module UserConcern
-      extend ActiveSupport::Concern
-      include OmniAuth::Identity::Model
-      include OmniAuth::Identity::SecurePassword
-
-      included do
-        attr_accessible :email, :name, :password, :password_confirmation
-
-        has_secure_password if defined?(BCrypt)
-
-        has_many :identities,
-          :dependent => :destroy,
-          :class_name => Socialite.identity_class_name,
-          :foreign_key => "#{Socialite.user_class.table_name.singularize}_id"
-
-        validates :email,
-          :presence => true,
-          :format => { :with => /.+@.+\..+/i },
-          :uniqueness => { :case_sensitive => false },
-          :if => :authorized?
-      end
-
-      module ClassMethods
-        def find_from_omniauth(auth)
-          if auth['info']['email']
-            find_by_email(auth['info']['email'])
-          else
-            find_by_email("#{auth['info']['name']}@#{auth['provider']}.com")
-          end
-        end
-
-        def find_or_create_from_omniauth(auth)
-          find_from_omniauth(auth) || create_from_omniauth(auth)
-        end
-
-        def create_from_omniauth(auth)
-          create do |user|
-            user.name = auth['info']['name']
-            user.email = auth['info']['email']
-            user.email ||= "#{auth['info']['nickname']}@#{auth['provider']}.com"
-            user.password ||= rand(36**10).to_s(36)
-          end
-        end
-
-        def auth_key; :email; end
-
-        def locate(search_hash)
-          where(search_hash).first
-        end
-      end
-
-      def method_missing(id, *args, &block)
-        if id =~ /(\w+)_identity$/ && @identity = self.identities.where(:provider => $1).first
-          @identity
-        else
-          super
-        end
-      end
-
-      # Returns the first linked facebook identity
-      #
-      # @return [Identity] the first facebook identity
-      def facebook
-        self.facebook_identity
-      end
-
-      # Returns the first linked twitter account
-      #
-      # @return [Identity] the first twitter identity
-      def twitter
-        self.twitter_identity
-      end
-
-      # Set the user's remember token
-      #
-      # @return [User] the current user
-      # def remember_me!
-        # self.remember_token = Socialite.generate_token
-        # save(:validate => false)
-      # end
-
-      # Clear the user's remember token
-      #
-      # @return [User] the current user
-      # def forget_me!
-        # if persisted?
-          # self.remember_token = nil
-          # save(:validate => false)
-        # end
-      # end
-
-      # Used for overloading the validations on username and email.
-      #
-      # @return [Boolean]
-      def authorized?
-        true
-      end
-    end
-  end
-end