facemock-oauth 0.0.3 → 0.0.4

data/facemock-oauth.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "facemock"
+  spec.add_dependency "facemock", "~> 0.0.8"
   spec.add_dependency "rack"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/facemock/oauth/authentication.rb

@@ -13,9 +13,9 @@ module Facemock
           email    = body["email"]
           password = body["pass"]
 
-          user = Facemock::Database::User.find_by_email(email)
+          user = Facemock::User.find_by_email(email)
           if user && user.password == password
-            code = Facemock::Database::AuthorizationCode.create!(user_id: user.id)
+            code = Facemock::AuthorizationCode.create!(user_id: user.id)
             location = location(env, CallbackHook.path, { code: code.string })
           else
             location = location(env, "/facemock/sign_in")

data/lib/facemock/oauth/callback_hook.rb

@@ -19,9 +19,9 @@ module Facemock
       private
 
       def get_access_token(code)
-        authorization_code = Facemock::Database::AuthorizationCode.find_by_string(code)
+        authorization_code = Facemock::AuthorizationCode.find_by_string(code)
         if authorization_code
-          user = Facemock::Database::User.find_by_id(authorization_code.user_id)
+          user = Facemock::User.find_by_id(authorization_code.user_id)
           user ? user.access_token : nil
         else
           nil

data/lib/facemock/oauth/version.rb

@@ -1,5 +1,5 @@
 module Facemock
   module OAuth
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/facemock/oauth/authentication_spec.rb

@@ -66,10 +66,10 @@ describe Facemock::OAuth::Authentication do
 
     context 'when user found', assert: :RedirectToOAuthCallback do
       before do
-        @user = Facemock::Database::User.new({id: 1, email: email, password: password})
-        allow(Facemock::Database::User).to receive(:find_by_email) { @user }
-        @authorization_code = Facemock::Database::AuthorizationCode.new(user_id: @user.id)
-        allow(Facemock::Database::AuthorizationCode).to receive(:create!) { @authorization_code }
+        @user = Facemock::User.new({id: 1, email: email, password: password})
+        allow(Facemock::User).to receive(:find_by_email) { @user }
+        @authorization_code = Facemock::AuthorizationCode.new(user_id: @user.id)
+        allow(Facemock::AuthorizationCode).to receive(:create!) { @authorization_code }
         @path = path
       end
     end
@@ -81,10 +81,10 @@ describe Facemock::OAuth::Authentication do
         @path = "/test"
         Facemock::OAuth::Authentication.path = @path
 
-        @user = Facemock::Database::User.new({id: 1, email: email, password: password})
-        allow(Facemock::Database::User).to receive(:find_by_email) { @user }
-        @authorization_code = Facemock::Database::AuthorizationCode.new(user_id: @user.id)
-        allow(Facemock::Database::AuthorizationCode).to receive(:create!) { @authorization_code }
+        @user = Facemock::User.new({id: 1, email: email, password: password})
+        allow(Facemock::User).to receive(:find_by_email) { @user }
+        @authorization_code = Facemock::AuthorizationCode.new(user_id: @user.id)
+        allow(Facemock::AuthorizationCode).to receive(:create!) { @authorization_code }
       end
       after  { Facemock::OAuth::Authentication.path = path }
     end

data/spec/facemock/oauth/callback_hook_spec.rb

@@ -43,30 +43,30 @@ describe Facemock::OAuth::CallbackHook do
 
     context 'with code parameter' do
       before do
-        @user = Facemock::Database::User.new({ id: 1, access_token: "test_token" })
-        @authorization_code = Facemock::Database::AuthorizationCode.new(user_id: @user.id)
+        @user = Facemock::User.new({ id: 1, access_token: "test_token" })
+        @authorization_code = Facemock::AuthorizationCode.new(user_id: @user.id)
       end
 
       context 'when authorization code does not found', assert: :RequestSuccess do
         before do
-          allow(Facemock::Database::AuthorizationCode).to receive(:find_by_string) { nil }
+          allow(Facemock::AuthorizationCode).to receive(:find_by_string) { nil }
           @path = path + "?code=#{@authorization_code.string}"
         end
       end
 
       context 'when authorization code found but user does not found', assert: :RequestSuccess do
         before do
-          allow(Facemock::Database::AuthorizationCode).to receive(:find_by_string) { @authorization_code }
-          allow(Facemock::Database::User).to receive(:find_by_id) { nil }
+          allow(Facemock::AuthorizationCode).to receive(:find_by_string) { @authorization_code }
+          allow(Facemock::User).to receive(:find_by_id) { nil }
           @path = path + "?code=#{@authorization_code.string}"
         end
       end
 
       context 'when authorization code found by code parameter', assert: :SetAuthHash do
         before do
-          allow(Facemock::Database::AuthorizationCode).to receive(:find_by_string) { @authorization_code }
-          allow(Facemock::Database::User).to receive(:find_by_id) { @user }
-          allow(Facemock::Database::User).to receive(:find_by_access_token) { @user }
+          allow(Facemock::AuthorizationCode).to receive(:find_by_string) { @authorization_code }
+          allow(Facemock::User).to receive(:find_by_id) { @user }
+          allow(Facemock::User).to receive(:find_by_access_token) { @user }
           @path = path
         end
       end
@@ -79,11 +79,11 @@ describe Facemock::OAuth::CallbackHook do
         @path = "/test"
         Facemock::OAuth::CallbackHook.path = @path
 
-        @user = Facemock::Database::User.new({ id: 1, access_token: "test_token" })
-        @authorization_code = Facemock::Database::AuthorizationCode.new(user_id: @user.id)
-        allow(Facemock::Database::AuthorizationCode).to receive(:find_by_string) { @authorization_code }
-        allow(Facemock::Database::User).to receive(:find_by_id) { @user }
-        allow(Facemock::Database::User).to receive(:find_by_access_token) { @user }
+        @user = Facemock::User.new({ id: 1, access_token: "test_token" })
+        @authorization_code = Facemock::AuthorizationCode.new(user_id: @user.id)
+        allow(Facemock::AuthorizationCode).to receive(:find_by_string) { @authorization_code }
+        allow(Facemock::User).to receive(:find_by_id) { @user }
+        allow(Facemock::User).to receive(:find_by_access_token) { @user }
       end
       after  { Facemock::OAuth::CallbackHook.path = path }
     end

data/spec/facemock/oauth_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Facemock::OAuth do
-  let(:version) { '0.0.3' }
+  let(:version) { '0.0.4' }
 
   it 'should have a version number' do
     expect(Facemock::OAuth::VERSION).to eq version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facemock-oauth
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facemock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2224620590061576830
+      hash: -2283618699220724282
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2224620590061576830
+      hash: -2283618699220724282
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25