socialite 0.1.0.pre → 0.1.0.pre.2

data/spec/models/identity_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
-# module Socialite
-  describe Identity do
-    let!(:identity) { FactoryGirl.create(:identity) }
+describe Identity do
+  let!(:identity) { FactoryGirl.create(:identity) }
 
-    it_behaves_like 'identity'
-  end
-# end
+  it_behaves_like 'identity'
+end

data/spec/models/user_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
-# module Socialite
-  describe User do
-    let(:linked_user) { FactoryGirl.create(:linked_user) }
+describe User do
+  let(:linked_user) { FactoryGirl.create(:linked_user) }
 
-    it { should have_many(:identities).dependent(:destroy) }
-    # it { should have_one(:facebook_identity) }
-    # it { should have_one(:twitter_identity) }
+  it { should have_many(:identities).dependent(:destroy) }
 
-    context 'with associated identities' do
-      subject { linked_user }
+  it { should have_db_column(:name).of_type(:string) }
+  it { should have_db_column(:email).of_type(:string) }
+  it { should have_db_column(:password_digest).of_type(:string) }
 
-      before do
-        subject.identities.count.should eql(2)
-      end
+  it { should have_db_index(:email).unique(true) }
 
-      its('identities.count') { should eql(2) }
+  context 'with associated identities' do
+    subject { linked_user }
 
-      its(:facebook_identity) { should be_a(identity_class) }
-      # its(:facebook) { should be_a(Socialite::FacebookIdentity) }
-
-      its(:twitter_identity) { should be_a(identity_class) }
-      # its(:twitter) { should be_a(Socialite::TwitterIdentity) }
+    before do
+      subject.identities.count.should eql(2)
     end
+
+    its('identities.count') { should eql(2) }
+
+    its(:facebook_identity) { should be_a(identity_class) }
+
+    its(:twitter_identity) { should be_a(identity_class) }
   end
-# end
+end

data/spec/socialite_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper'
 
+class Account; end
+class Authentication; end
+
 class User; end
 class Identity; end
 
@@ -12,15 +15,37 @@ describe Socialite do
     end
 
     describe 'configuring classes' do
-      before do
-        Socialite.setup do |c|
-          c.user_class = 'User'
-          c.identity_class = 'Identity'
+
+      describe 'the default values' do
+        before do
+          Socialite.setup do |c|
+            c.user_class = nil
+            c.identity_class = nil
+          end
         end
+
+        its(:user_class) { should eql(User) }
+        its(:identity_class) { should eql(Identity) }
       end
 
-      its(:user_class) { should eql(User) }
-      its(:identity_class) { should eql(Identity) }
+      describe 'accessors that manipulate default values' do
+        before do
+          Socialite.setup do |c|
+            c.user_class = 'Account'
+            c.identity_class = 'Authentication'
+          end
+        end
+
+        its(:user_class) { should eql(Account) }
+        its(:identity_class) { should eql(Authentication) }
+
+        after do
+          Socialite.setup do |c|
+            c.user_class = nil
+            c.identity_class = nil
+          end
+        end
+      end
     end
 
     describe 'accepting provider information' do
@@ -47,7 +72,6 @@ describe Socialite do
           subject.last[1].should == ['abc', '789']
         end
       end
-
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,9 +3,11 @@ ENV["RAILS_ENV"] = "test"
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
+require 'rspec/autorun'
 
 # Testing Generators
 require 'ammeter/init'
+require 'ffaker'
 require 'factory_girl_rails'
 
 # Should matchers
@@ -21,7 +23,7 @@ ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__
 
 RSpec.configure do |config|
   config.include RSpec::Matchers
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
   config.infer_base_class_for_anonymous_controllers = false
   config.order = "random"
 
@@ -31,6 +33,7 @@ RSpec.configure do |config|
 
   # http://stackoverflow.com/a/12978795
   config.include Capybara::DSL, type: :request
+  config.include Socialite::Engine.routes.url_helpers
 end
 
 def identity_class

data/spec/support/capybara.rb

@@ -0,0 +1,3 @@
+require 'capybara/rails'
+require 'capybara/rspec'
+require 'launchy'

data/spec/support/database_cleaner.rb

@@ -0,0 +1,18 @@
+require 'database_cleaner'
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/identity_shared_example.rb

@@ -2,8 +2,8 @@ module Socialite
   shared_examples 'identity' do
     it { should belong_to(:user) }
 
-    it { should have_db_column(:uid) }
-    it { should have_db_column(:provider) }
+    it { should have_db_column(:uid).of_type(:string) }
+    it { should have_db_column(:provider).of_type(:string) }
     it { should have_db_column(:auth_hash) }
 
     it { should validate_presence_of(:uid) }
@@ -25,7 +25,7 @@ module Socialite
       end
 
       describe 'facebook' do
-        subject { identity_class.find_or_initialize_by_omniauth(auth_hash) }
+        subject { identity_class.find_or_create_from_omniauth(auth_hash) }
 
         it { should be_a(identity_class) }
         its(:persisted?) { should be_false }
@@ -35,7 +35,7 @@ module Socialite
           let(:identity) { user.identities.first }
           let(:auth_hash) { identity.auth_hash.merge('provider' => identity.provider, 'uid' => identity.uid) }
 
-          subject { identity_class.find_or_initialize_by_omniauth(auth_hash) }
+          subject { identity_class.find_or_create_from_omniauth(auth_hash) }
 
           before do
             user.identities.count.should > 0
@@ -47,25 +47,6 @@ module Socialite
           its(:user) { should eql(user) }
         end
       end
-
-      # describe 'twitter' do
-      #   let(:twitter_identity) { subject.find_or_initialize_by_oauth(auth_hash.merge('provider' => 'twitter')) }
-      #   subject { twitter_identity }
-
-      #   it { should be_a(Identity) }
-      #   its(:persisted?) { should be_true }
-      #   its(:user) { should be_a(User) }
-      # end
     end
   end
-
-  # shared_examples 'facebook api' do
-    # it { should respond_to(:account_url) }
-    # it { should respond_to(:api) }
-    # it { should respond_to(:api_connection) }
-    # it { should respond_to(:checkins) }
-    # it { should respond_to(:friends) }
-    # it { should respond_to(:picture) }
-    # it { should respond_to(:info) }
-  # end
 end

data/spec/support/omniauth.rb

@@ -0,0 +1,35 @@
+require 'omniauth'
+
+RSpec.configure do |config|
+  config.before(:each, :omniauth => true) do
+    OmniAuth.config.test_mode = true
+
+    # the symbol passed to mock_auth is the same as the name of the provider set up in the initializer
+    # OmniAuth.config.mock_auth[:google] = {
+    #     "provider"=>"google",
+    #     "uid"=>"http://xxxx.com/openid?id=118181138998978630963",
+    #     "user_info"=>{"email"=>"test@xxxx.com", "first_name"=>"Test", "last_name"=>"User", "name"=>"Test User"}
+    # }
+
+    OmniAuth.config.add_mock(:facebook, {
+      'uid' => '1234',
+      'extra' => {
+      'user_hash' => {
+        'email' => 'foobar@example.com',
+        'first_name' => 'John',
+        'last_name' => 'Doe',
+        'gender' => 'Male'
+        }
+      }
+    })
+
+    OmniAuth.config.add_mock(:twitter, {
+      :uid => '12345',
+      :nickname => 'zapnap'
+    })
+  end
+
+  config.after(:each, :omniauth => true) do
+    OmniAuth.config.test_mode = false
+  end
+end

metadata

@@ -2,14 +2,14 @@
 name: socialite
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 0.1.0.pre
+  version: 0.1.0.pre.2
 platform: ruby
 authors:
 - Justin Smestad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,17 +18,17 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.12
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.12
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: sass-rails
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,21 +44,53 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: haml
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: omniauth
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 1.1.0
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 1.1.0
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: simple_form
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,9 +106,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: omniauth-identity
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -90,25 +122,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: omniauth
+  name: omniauth-facebook
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: omniauth-twitter
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +156,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: sqlite3
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +172,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: yard
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +188,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec-rails
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +204,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: factory_girl_rails
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +220,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: ffaker
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +236,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: shoulda-matchers
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,23 +252,23 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: omniauth-identity
+  name: capybara
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: omniauth-facebook
+  name: database_cleaner
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -252,7 +284,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: omniauth-twitter
+  name: ammeter
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -273,29 +305,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/images/socialite/facebook_64.png
+- app/assets/images/socialite/twitter_64.png
 - app/assets/stylesheets/socialite/socialite.css
 - app/assets/stylesheets/socialite.css
 - app/controllers/socialite/application_controller.rb
-- app/controllers/socialite/identities_controller.rb
-- app/controllers/socialite/session_controller.rb
+- app/controllers/socialite/sessions_controller.rb
 - app/controllers/socialite/users_controller.rb
 - app/views/layouts/socialite/application.html.haml
 - app/views/socialite/identities/_identities.html.haml
 - app/views/socialite/identities/new.html.haml
-- app/views/socialite/session/new.html.haml
-- app/views/socialite/user/_form.html.haml
-- app/views/socialite/user/edit.html.haml
-- app/views/socialite/user/show.html.haml
+- app/views/socialite/sessions/new.html.haml
+- app/views/socialite/users/new.html.haml
 - config/routes.rb
 - lib/generators/socialite/install_generator.rb
 - lib/generators/socialite/migrations_generator.rb
 - lib/generators/socialite/templates/identity.rb.erb
 - lib/generators/socialite/templates/socialite.rb
 - lib/generators/socialite/templates/users.rb.erb
+- lib/generators/socialite/views_generator.rb
 - lib/socialite/controllers/helpers.rb
 - lib/socialite/engine.rb
-- lib/socialite/helpers/authentication.rb
-- lib/socialite/models/facebook_identity.rb
+- lib/socialite/ext/omniauth/identity/model.rb
 - lib/socialite/models/identity_concern.rb
 - lib/socialite/models/user_concern.rb
 - lib/socialite/version.rb
@@ -304,32 +335,19 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- features/authentication/facebook_signin.feature
-- features/authentication/twitter_signin.feature
-- features/identities/facebook_management.feature
-- features/identities/twitter_management.feature
-- features/registration/facebook_signup.feature
-- features/registration/twitter_signup.feature
-- features/step_definitions/authentication_steps.rb
-- features/step_definitions/common_steps.rb
-- features/step_definitions/identity_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/env.rb
-- features/support/hooks.rb
-- features/support/omniauth.rb
-- features/support/paths.rb
-- features/support/selectors.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/identity.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/pages/index.html.haml
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -341,14 +359,15 @@ files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/omniauth-identity.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/socialite.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20130206224516_create_socialite_users.rb
-- spec/dummy/db/migrate/20130206224517_create_socialite_identities.rb
+- spec/dummy/db/migrate/20130207223009_create_socialite_users.rb
+- spec/dummy/db/migrate/20130207223010_create_socialite_identities.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -357,21 +376,26 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/factories/facebook.rb
 - spec/factories/identity.rb
-- spec/factories/twitter.rb
 - spec/factories/user.rb
+- spec/features/.gitkeep
+- spec/features/facebook_registration_spec.rb
+- spec/features/identity_login_spec.rb
+- spec/features/identity_registration_spec.rb
 - spec/generators/socialite/install_generator_spec.rb
 - spec/generators/socialite/migrations_generator_spec.rb
-- spec/models/facebook_spec.rb
+- spec/generators/socialite/views_generator_spec.rb
 - spec/models/identity_spec.rb
 - spec/models/user_spec.rb
 - spec/socialite_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
+- spec/support/capybara.rb
+- spec/support/database_cleaner.rb
 - spec/support/database_loader.rb
 - spec/support/databases.yml
 - spec/support/identity_shared_example.rb
+- spec/support/omniauth.rb
 homepage: http://github.com/jsmestad/socialite
 licenses: []
 post_install_message: 
@@ -385,7 +409,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2817215725849609740
+      hash: -787279925387958713
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
@@ -400,32 +424,19 @@ signing_key:
 specification_version: 3
 summary: Rails engine supporting multiple auth providers per user.
 test_files:
-- features/authentication/facebook_signin.feature
-- features/authentication/twitter_signin.feature
-- features/identities/facebook_management.feature
-- features/identities/twitter_management.feature
-- features/registration/facebook_signup.feature
-- features/registration/twitter_signup.feature
-- features/step_definitions/authentication_steps.rb
-- features/step_definitions/common_steps.rb
-- features/step_definitions/identity_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/env.rb
-- features/support/hooks.rb
-- features/support/omniauth.rb
-- features/support/paths.rb
-- features/support/selectors.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/identity.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/pages/index.html.haml
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -437,14 +448,15 @@ test_files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/omniauth-identity.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/socialite.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20130206224516_create_socialite_users.rb
-- spec/dummy/db/migrate/20130206224517_create_socialite_identities.rb
+- spec/dummy/db/migrate/20130207223009_create_socialite_users.rb
+- spec/dummy/db/migrate/20130207223010_create_socialite_identities.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -453,19 +465,24 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/factories/facebook.rb
 - spec/factories/identity.rb
-- spec/factories/twitter.rb
 - spec/factories/user.rb
+- spec/features/.gitkeep
+- spec/features/facebook_registration_spec.rb
+- spec/features/identity_login_spec.rb
+- spec/features/identity_registration_spec.rb
 - spec/generators/socialite/install_generator_spec.rb
 - spec/generators/socialite/migrations_generator_spec.rb
-- spec/models/facebook_spec.rb
+- spec/generators/socialite/views_generator_spec.rb
 - spec/models/identity_spec.rb
 - spec/models/user_spec.rb
 - spec/socialite_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
+- spec/support/capybara.rb
+- spec/support/database_cleaner.rb
 - spec/support/database_loader.rb
 - spec/support/databases.yml
 - spec/support/identity_shared_example.rb
+- spec/support/omniauth.rb
 has_rdoc: