Skip to content

Commit

Permalink
Имя стратегии изменено с VkontakteOpenApi на Vkontakte.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Recobra committed Jan 26, 2011
1 parent ef6104a commit 0abe710
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.rdoc
Expand Up @@ -9,7 +9,7 @@
Добавить в config/initializers/omniauth.rb:

Rails.application.config.middleware.use OmniAuth::Builder do
provider :vkontakte_open_api, <ID приложения>, <Защищенный ключ приложения>
provider :vkontakte, <ID приложения>, <Защищенный ключ приложения>
end

Если ещё не определен, добавить путь в config/routes.rb:
Expand Down
2 changes: 1 addition & 1 deletion lib/oa-vkontakte.rb
Expand Up @@ -6,5 +6,5 @@ module Vkontakte
end

if defined?(Rails)
ActionController::Base.helper OmniAuth::Strategies::VkontakteOpenApi::ViewHelper::PageHelper
ActionController::Base.helper OmniAuth::Strategies::Vkontakte::ViewHelper::PageHelper
end
@@ -1,5 +1,5 @@
require 'omniauth/vkontakte'
require 'omniauth/strategies/vkontakte_open_api/view_helper'
require 'omniauth/strategies/vkontakte/view_helper'

module OmniAuth
class Configuration
Expand All @@ -10,7 +10,7 @@ class Configuration

module OmniAuth
module Strategies
class VkontakteOpenApi
class Vkontakte
include OmniAuth::Strategy
include ViewHelper::PageHelper

Expand Down
@@ -1,7 +1,7 @@
# coding: utf-8
module OmniAuth
module Strategies
class VkontakteOpenApi
class Vkontakte
class ViewHelper
module PageHelper
def vkontakte_login_page
Expand Down
2 changes: 1 addition & 1 deletion lib/omniauth/vkontakte.rb
Expand Up @@ -2,7 +2,7 @@

module OmniAuth
module Strategies
autoload :VkontakteOpenApi, 'omniauth/strategies/vkontakte_open_api'
autoload :Vkontakte, 'omniauth/strategies/vkontakte'
end
end

@@ -1,11 +1,11 @@
require File.dirname(__FILE__) + '/../../spec_helper'

describe OmniAuth::Strategies::VkontakteOpenApi, :type => :strategy do
describe OmniAuth::Strategies::Vkontakte, :type => :strategy do

include OmniAuth::Test::StrategyTestCase

def strategy
[OmniAuth::Strategies::VkontakteOpenApi, 1983892, '6FF1PUlZfEyutJxctvtd']
[OmniAuth::Strategies::Vkontakte, 1983892, '6FF1PUlZfEyutJxctvtd']
end

describe 'POST /auth/vkontakte_open_api/callback с логином и паролем' do
Expand Down

0 comments on commit 0abe710

Please sign in to comment.