oa-vkontakte_alexandrov 0.1.0 → 0.2.0

data/Rakefile

@@ -1,48 +1,103 @@
+# require 'rubygems'
+# require 'rake'
+# 
+# begin
+#   require 'jeweler'
+#   Jeweler::Tasks.new do |gem|
+#     # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+#     gem.name = "oa-vkontakte_alexandrov"
+#     gem.homepage = "http://github.com/igor-alexandrov/oa-vkontakte"
+#     gem.license = "MIT"
+#     gem.summary = %Q{VKontakte OmniAuth module with view helpers}
+#     gem.description = %Q{Include this gem into your project with OmniAuth gem and you will get VKontakte login in one line of code.}
+#     gem.email = "igor.alexandrov@gmail.com"
+#     gem.authors = ["Igor Alexandrov"]
+#     gem.add_dependency 'oa-core', '>= 0.2.0.beta4'
+#     gem.add_development_dependency "rspec", ">= 1.2.9"
+#     gem.add_development_dependency "yard", ">= 0"
+#   end
+#   Jeweler::RubygemsDotOrgTasks.new
+# rescue LoadError
+#   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+# 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
+# end
+
+
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-    gem.name = "oa-vkontakte_alexandrov"
-    gem.homepage = "http://github.com/igor-alexandrov/oa-vkontakte"
-    gem.license = "MIT"
-    gem.summary = %Q{VKontakte OmniAuth module with view helpers}
-    gem.description = %Q{Include this gem into your project with OmniAuth gem and you will get VKontakte login in one line of code.}
-    gem.email = "igor.alexandrov@gmail.com"
-    gem.authors = ["Igor Alexandrov"]
-    gem.add_dependency 'oa-core', '~>0.1.4'
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "yard", ">= 0"
-  end
-  Jeweler::RubygemsDotOrgTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "oa-vkontakte_alexandrov"
+  gem.homepage = "http://github.com/igor-alexandrov/oa-vkontakte"
+  gem.license = "MIT"
+  gem.summary = %Q{VKontakte OmniAuth module with view helpers}
+  gem.description = %Q{Include this gem into your project with OmniAuth gem and you will get VKontakte login in one line of code.}
+  gem.email = "igor.alexandrov@gmail.com"
+  gem.authors = ["Igor Alexandrov"]
+  gem.add_dependency 'oa-core', '>= 0.2.0.beta4'
+  gem.add_development_dependency "rspec", ">= 1.2.9"
+  gem.add_development_dependency "yard", ">= 0"
 end
-  
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+  test.rcov_opts << '--exclude "gems/*"'
 end
 
-task :spec => :check_dependencies
+task :default => :test
 
-task :default => :spec
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-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
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "oa-vkontakte_alexandrov #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/omniauth/strategies/vkontakte.rb

@@ -1,44 +1,95 @@
+require 'omniauth/strategies/oauth'
+
 require 'omniauth/vkontakte'
 require 'omniauth/strategies/vkontakte/view_helper'
 
 module OmniAuth
   class Configuration
-    attr_accessor :vkontakte_app_id
-    attr_accessor :vkontakte_app_key
+    attr_accessor :vkontakte_app_id, :vkontakte_app_secret
   end
 end
 
 module OmniAuth
   module Strategies
-    class Vkontakte
-      include OmniAuth::Strategy
-      include ViewHelper::PageHelper
+    class Vkontakte < OmniAuth::Strategies::OAuth2
+      # include OmniAuth::Strategy
+      # include ViewHelper::PageHelper
 
-      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)
+      # 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
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+        OmniAuth.config.vkontakte_app_id = client_id
+        OmniAuth.config.vkontakte_app_secret = client_secret
+        
+        client_options = {
+          :site => 'http://api.vkontakte.ru',
+          :authorize_url => 'http://api.vkontakte.ru/oauth/authorize',
+          :access_token_url => 'https://api.vkontakte.ru/oauth/access_token'
+        }
+        super(app, :vkontakte, client_id, client_secret, client_options, options, &block)
+      end
+      
+      # attr_reader :app_id
+      
+      def user_data
+        @data ||= MultiJson.decode(@access_token.get('/me', {}, { "Accept-Language" => "en-us,en;"}))
       end
-
-      attr_reader :app_id
       
+      # def request_phase
+      #   Rack::Response.new(vkontakte_login_page).finish
+      # end
       def request_phase
-        Rack::Response.new(vkontakte_login_page).finish
+        options[:scope] ||= "offline"
+        super
       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
+        if request.params['error'] || request.params['error_reason']
+          raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
+        end
+        
+        verifier = request.params['code']
+        puts "!!!!!!!!!"
+        puts client.access_token_url
+        # @access_token = client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
+        response = client.request(:get, client.access_token_url, {'client_id' => OmniAuth.config.vkontakte_app_id, 'client_secret' => OmniAuth.config.vkontakte_app_secret, 'code' => verifier})
+        
+        puts "!!!!!"
+        puts  MultiJson.decode(response)
+        
+      #   if @access_token.expires? && @access_token.expires_in <= 0
+      #     client.request(:post, client.access_token_url, { 
+      #         'client_id' => client_id,
+      #         'grant_type' => 'refresh_token', 
+      #         'client_secret' => client_secret,
+      #         'refresh_token' => @access_token.refresh_token 
+      #       })
+      #     @access_token = client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
+      #   end
+      #   
+      #   super
+      # rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied, CallbackError => e
+      #   fail!(:invalid_credentials, e)
+      # rescue ::MultiJson::DecodeError => e
+      #   fail!(:invalid_response, e)
       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(), {

data/lib/omniauth/strategies/vkontakte/view_helper.rb

@@ -1,14 +1,12 @@
 # coding: utf-8
-module OmniAuth
-  module Strategies
-    class Vkontakte
-      class ViewHelper
-        module PageHelper
-          def vkontakte_login_page
-            vkontakte_header +
-            vkontakte_login_button +
-            vkontakte_footer
-          end
+class OmniAuth::Strategies::Vkontakte < OmniAuth::Strategies::OAuth2
+  class ViewHelper
+    module PageHelper
+      def vkontakte_login_page
+        vkontakte_header +
+        vkontakte_login_button +
+        vkontakte_footer
+      end
 
           def vkontakte_header
 <<-HEADER
@@ -123,8 +121,9 @@ BUTTON
   </body></html>
 FOOTER
           end
-        end
-      end
     end
   end
 end
+#     end
+#   end
+# end

data/oa-vkontakte.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/oruen/oa-vkontakte}
   s.rubyforge_project = %q{oa-vkontakte}
   
-  s.add_dependency(%q<oa-core>, [">= 0.1.6"])
+  s.add_dependency(%q<oa-core>, [">= 0.2.0.beta4"])
   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"])

data/oa-vkontakte_alexandrov.gemspec

@@ -0,0 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{oa-vkontakte_alexandrov}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Igor Alexandrov"]
+  s.date = %q{2011-07-22}
+  s.description = %q{Include this gem into your project with OmniAuth gem and you will get VKontakte login in one line of code.}
+  s.email = %q{igor.alexandrov@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/oa-vkontakte.rb",
+    "lib/omniauth/strategies/vkontakte.rb",
+    "lib/omniauth/strategies/vkontakte/view_helper.rb",
+    "lib/omniauth/vkontakte.rb",
+    "oa-vkontakte.gemspec",
+    "oa-vkontakte_alexandrov.gemspec",
+    "spec/oa-vkontakte_spec.rb",
+    "spec/omniauth/strategires/vkontakte_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/igor-alexandrov/oa-vkontakte}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{VKontakte OmniAuth module with view helpers}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<omniauth>, [">= 0.2.0.beta4"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<oa-core>, [">= 0.2.0.beta4"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+    else
+      s.add_dependency(%q<omniauth>, [">= 0.2.0.beta4"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<oa-core>, [">= 0.2.0.beta4"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<omniauth>, [">= 0.2.0.beta4"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<oa-core>, [">= 0.2.0.beta4"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-vkontakte_alexandrov
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Igor Alexandrov
@@ -15,29 +15,109 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 +03:00
+date: 2011-07-22 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oa-core
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196363
+        segments: 
+        - 0
+        - 2
+        - 0
+        - beta
+        - 4
+        version: 0.2.0.beta4
+  name: omniauth
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: shoulda
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
+        - 1
         - 0
+        - 0
+        version: 1.0.0
+  name: bundler
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
         - 1
+        - 6
         - 4
-        version: 0.1.4
+        version: 1.6.4
+  name: jeweler
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196363
+        segments: 
+        - 0
+        - 2
+        - 0
+        - beta
+        - 4
+        version: 0.2.0.beta4
+  name: oa-core
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +128,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :development
-  version_requirements: *id002
+  name: rspec
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,8 +142,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+  name: yard
+  version_requirements: *id008
 description: Include this gem into your project with OmniAuth gem and you will get VKontakte login in one line of code.
 email: igor.alexandrov@gmail.com
 executables: []
@@ -84,6 +164,7 @@ files:
 - lib/omniauth/strategies/vkontakte/view_helper.rb
 - lib/omniauth/vkontakte.rb
 - oa-vkontakte.gemspec
+- oa-vkontakte_alexandrov.gemspec
 - spec/oa-vkontakte_spec.rb
 - spec/omniauth/strategires/vkontakte_spec.rb
 - spec/spec_helper.rb
@@ -117,11 +198,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: VKontakte OmniAuth module with view helpers
-test_files: 
-- spec/oa-vkontakte_spec.rb
-- spec/omniauth/strategires/vkontakte_spec.rb
-- spec/spec_helper.rb
+test_files: []
+