oa-vkontakte 0.1.3 → 0.1.4

data/.gitignore

@@ -19,3 +19,7 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+.bundle
+.rvmrc
+Gemfile
+Gemfile.lock

data/README.rdoc

@@ -9,7 +9,7 @@
 Добавить в config/initializers/omniauth.rb:
 
   Rails.application.config.middleware.use OmniAuth::Builder do
-    provider :vkontakte_open_api, <ID приложения>
+    provider :vkontakte_open_api, <ID приложения>, <Защищенный ключ приложения>
   end
 
 Если ещё не определен, добавить путь в config/routes.rb:
@@ -35,8 +35,8 @@
     'user_info' => {
       'name' => 'Nick Recobra',
       'nickname' => 'oruen',
-      'firstName' => 'Nick',
-      'lastName' => 'Recobra',
+      'first_name' => 'Nick',
+      'last_name' => 'Recobra',
       'image' => 'http://cs191.vkontakte.ru/u00001/e_375bc433.jpg', # путь до вконтактовского аватара
       'urls' => { 'Page' => 'http://vkontakte.ru/id1234567890' } 
     }

data/Rakefile

@@ -1,50 +1,12 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "oa-vkontakte"
-    gem.summary = %Q{OmniAuth extension for vkontakte.ru authentication}
-    gem.description = %Q{OmniAuth extension for vkontakte.ru authentication}
-    gem.email = "oruenu@gmail.com"
-    gem.homepage = "http://github.com/oruen/oa-vkontakte"
-    gem.authors = ["Nick Recobra"]
-    gem.rubyforge_project = "oa-vkontakte"
-    gem.add_dependency 'oa-core', '~>0.1.4'
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "yard", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "yardoc"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'rspec/core/rake_task'
+require 'rake/contrib/sshpublisher'
+RSpec::Core::RakeTask.new(:spec) do |t|
 end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
 task :default => :spec
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
 end

data/lib/oa-vkontakte.rb

@@ -1,4 +1,10 @@
 require 'omniauth/vkontakte'
+
+module Oa
+  module Vkontakte
+  end
+end
+
 if defined?(Rails)
   ActionController::Base.helper OmniAuth::Strategies::VkontakteOpenApi::ViewHelper::PageHelper
 end

data/lib/oa-vkontakte/version.rb

@@ -0,0 +1,5 @@
+module Oa
+  module Vkontakte
+    VERSION = "0.1.4"
+  end
+end

data/lib/omniauth/strategies/vkontakte_open_api.rb

@@ -4,6 +4,7 @@ require 'omniauth/strategies/vkontakte_open_api/view_helper'
 module OmniAuth
   class Configuration
     attr_accessor :vkontakte_app_id
+    attr_accessor :vkontakte_app_key
   end
 end
 
@@ -13,9 +14,10 @@ module OmniAuth
       include OmniAuth::Strategy
       include ViewHelper::PageHelper
 
-      def initialize(app, app_id, options = {})
+      def initialize(app, app_id, app_key, options = {})
         @options = options
         OmniAuth.config.vkontakte_app_id = app_id
+        OmniAuth.config.vkontakte_app_key = app_key
         super(app, :vkontakte)
       end
 
@@ -24,7 +26,20 @@ module OmniAuth
       def request_phase
         Rack::Response.new(vkontakte_login_page).finish
       end
-      
+
+      def callback_phase
+        app_cookie = request.cookies["vk_app_#{OmniAuth.config.vkontakte_app_id}"]
+        return fail!(:invalid_credentials) unless app_cookie
+        args = app_cookie.split("&")
+        sig_index = args.index { |arg| arg =~ /^sig=/ }
+        return fail!(:invalid_credentials) unless sig_index
+        sig = args.delete_at(sig_index)
+        puts Digest::MD5.new.hexdigest(args.sort.join('') + OmniAuth.config.vkontakte_app_key)
+        puts sig
+        return fail!(:invalid_credentials) unless Digest::MD5.new.hexdigest(args.sort.join('') + OmniAuth.config.vkontakte_app_key) == sig[4..-1]
+        super
+      end
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super(), {
           'uid' => request[:uid],

data/oa-vkontakte.gemspec

@@ -1,65 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "oa-vkontakte/version"
 
 Gem::Specification.new do |s|
   s.name = %q{oa-vkontakte}
-  s.version = "0.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = Oa::Vkontakte::VERSION
   s.authors = ["Nick Recobra"]
-  s.date = %q{2010-10-20}
+  s.summary = %q{OmniAuth extension for vkontakte.ru authentication}
   s.description = %q{OmniAuth extension for vkontakte.ru authentication}
   s.email = %q{oruenu@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/oa-vkontakte.rb",
-     "lib/omniauth/strategies/vkontakte_open_api.rb",
-     "lib/omniauth/strategies/vkontakte_open_api/view_helper.rb",
-     "lib/omniauth/vkontakte.rb",
-     "oa-vkontakte.gemspec",
-     "spec/oa-vkontakte_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
   s.homepage = %q{http://github.com/oruen/oa-vkontakte}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
   s.rubyforge_project = %q{oa-vkontakte}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{OmniAuth extension for vkontakte.ru authentication}
-  s.test_files = [
-    "spec/oa-vkontakte_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  
+  s.add_dependency(%q<oa-core>, ["~> 0.1.4"])
+  s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
+  s.add_development_dependency(%q<yard>, [">= 0"])
+  s.add_development_dependency(%q<rack-test>, ["~> 0.5.6"])
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oa-core>, ["~> 0.1.4"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-    else
-      s.add_dependency(%q<oa-core>, ["~> 0.1.4"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<oa-core>, ["~> 0.1.4"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
 

data/spec/omniauth/strategires/vkontakte_open_api_spec.rb

@@ -0,0 +1,74 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe OmniAuth::Strategies::VkontakteOpenApi, :type => :strategy do
+
+  include OmniAuth::Test::StrategyTestCase
+
+  def strategy
+    [OmniAuth::Strategies::VkontakteOpenApi, 1983892, '6FF1PUlZfEyutJxctvtd']
+  end
+
+  describe 'POST /auth/vkontakte_open_api/callback с логином и паролем' do
+    before(:each) do
+      @params = {
+        'nickname' => 'oruen',
+        'first_name' => 'Nick',
+        'last_name' => 'Recobra',
+        'photo' => 'http://cs191.vkontakte.ru/u00001/e_375bc433.jpg',
+        'uid' => '1234567890'
+      }
+    end
+
+    context "неуспешный запрос" do
+      it "не должен быть успешным при отсутствии куки vk_app_<APP_ID>" do
+        clear_cookies
+        post '/auth/vkontakte/callback', @params
+        last_response.should_not be_ok
+      end
+
+      it "не должен быть успешным при невалидной куке vk_app_<APP_ID>" do
+        set_cookie "vk_app_#{OmniAuth.config.vkontakte_app_id}=expire"
+        post '/auth/vkontakte/callback', @params
+        last_response.should_not be_ok
+      end
+    end
+
+    context "успешный запрос" do
+      before(:each) do
+        strategy = nil
+        string = "expire=1271238742&mid=100172&secret=97c1e8933e&sid=549b550f608e4a4d247734941debb5e68df50a66c58dc6ee2a4f60a2&sig=372df9795fe8dd29684a2f996872457c"
+        set_cookie "vk_app_#{OmniAuth.config.vkontakte_app_id}=#{Rack::Utils::escape string}"
+        post '/auth/vkontakte/callback', @params
+      end
+
+      it "должен устанавливаться защищенный ключ" do
+        OmniAuth.config.vkontakte_app_key.should == '6FF1PUlZfEyutJxctvtd'
+      end
+  
+      
+      it 'должен быть успешным' do
+        last_response.should be_ok
+      end
+
+      sets_an_auth_hash
+
+      sets_provider_to 'vkontakte'
+
+      it 'должен устанавливать параметры' do
+        hash = last_request.env['omniauth.auth']
+        hash.should == {
+          'uid' => '1234567890',
+          'provider' => 'vkontakte',
+          'user_info' => {
+            'name' => 'Nick Recobra',
+            'nickname' => 'oruen',
+            'first_name' => 'Nick',
+            'last_name' => 'Recobra',
+            'image' => 'http://cs191.vkontakte.ru/u00001/e_375bc433.jpg',
+            'urls' => { 'Page' => 'http://vkontakte.ru/id1234567890' } 
+          }
+        }
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,13 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
+require 'bundler'
+Bundler.setup
+require 'rspec'
+require 'omniauth/test'
+require 'rack/test'
 require 'oa-vkontakte'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+Rspec.configure do |c|
+  c.mock_with :rspec
+  c.include Rack::Test::Methods
+  c.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-vkontakte
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nick Recobra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +04:00
+date: 2010-11-27 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,14 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 1
+        - 0
+        version: 2.1.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -64,37 +64,52 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 5
+        - 6
+        version: 0.5.6
+  type: :development
+  version_requirements: *id004
 description: OmniAuth extension for vkontakte.ru authentication
 email: oruenu@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/oa-vkontakte.rb
+- lib/oa-vkontakte/version.rb
 - lib/omniauth/strategies/vkontakte_open_api.rb
 - lib/omniauth/strategies/vkontakte_open_api/view_helper.rb
 - lib/omniauth/vkontakte.rb
 - oa-vkontakte.gemspec
 - spec/oa-vkontakte_spec.rb
-- spec/spec.opts
+- spec/omniauth/strategires/vkontakte_open_api_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/oruen/oa-vkontakte
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -124,4 +139,5 @@ specification_version: 3
 summary: OmniAuth extension for vkontakte.ru authentication
 test_files: 
 - spec/oa-vkontakte_spec.rb
+- spec/omniauth/strategires/vkontakte_open_api_spec.rb
 - spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.3

data/spec/spec.opts

@@ -1 +0,0 @@
---color