aavkontakte-rails3 0.1.3 → 0.1.4

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 2.3.11"
-gem "authlogic", "~> 2.1.6"
+gem "rails"
+gem "authlogic"
 
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  gem "jeweler"
+  gem "simplecov"
 end

data/Gemfile.lock

@@ -1,40 +1,102 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.11)
-      actionpack (= 2.3.11)
-    actionpack (2.3.11)
-      activesupport (= 2.3.11)
-      rack (~> 1.1.0)
-    activerecord (2.3.11)
-      activesupport (= 2.3.11)
-    activeresource (2.3.11)
-      activesupport (= 2.3.11)
-    activesupport (2.3.11)
-    authlogic (2.1.6)
-      activesupport
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    authlogic (3.1.0)
+      activerecord (>= 3.0.7)
+      activerecord (>= 3.0.7)
+    builder (3.0.0)
+    erubis (2.7.0)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rack (1.1.2)
-    rails (2.3.11)
-      actionmailer (= 2.3.11)
-      actionpack (= 2.3.11)
-      activerecord (= 2.3.11)
-      activeresource (= 2.3.11)
-      activesupport (= 2.3.11)
-      rake (>= 0.8.3)
-    rake (0.8.7)
-    rcov (0.9.9)
+      rdoc
+    journey (1.0.3)
+    json (1.7.1)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
+      bundler (~> 1.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  authlogic (~> 2.1.6)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rails (~> 2.3.11)
-  rcov
+  authlogic
+  bundler
+  jeweler
+  rails
+  simplecov

data/Rakefile

@@ -18,12 +18,16 @@ Jeweler::Tasks.new do |gem|
   gem.license = "MIT"
   gem.summary = %Q{Yet Another Authlogic Vkontakte Authorization}
   gem.description = %Q{Vkontakte authorization for authlogic with ruby 1.9 and rails 3.0}
-  gem.email = "mydeeptown@gmail.com"
-  gem.authors = ["Dmitry Vorotilin"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.email = "nowhere@gmail.com"
+  gem.authors = ["blimp666"]
+
+  gem.files.include 'lib/aavkontakte-rails3.rb'
+  gem.files.include 'lib/vkontakte.js'
+  gem.files.include 'lib/vkontakte/authentication.rb'
+  gem.files.include 'lib/vkontakte/session.rb'
+  gem.files.include 'lib/vkontakte/helper.rb'
+  gem.files.include 'lib/vkontakte/auth_success.rb'
+
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -34,16 +38,16 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+# require 'rcov/rcovtask'
+# Rcov::RcovTask.new do |test|
+#   test.libs << 'test'
+#   test.pattern = 'test/**/test_*.rb'
+#   test.verbose = true
+# end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/aavkontakte-rails3.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{aavkontakte-rails3}
-  s.version = "0.1.3"
+  s.name = "aavkontakte-rails3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dmitry Vorotilin"]
-  s.date = %q{2011-05-18}
-  s.description = %q{Vkontakte authorization for authlogic}
-  s.email = %q{mydeeptown@gmail.com}
+  s.authors = ["blimp666"]
+  s.date = "2012-05-12"
+  s.description = "Vkontakte authorization for authlogic with ruby 1.9 and rails 3.0"
+  s.email = "nowhere@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -28,41 +28,40 @@ Gem::Specification.new do |s|
     "init.rb",
     "lib/aavkontakte-rails3.rb",
     "lib/vkontakte.js",
+    "lib/vkontakte/auth_success.rb",
     "lib/vkontakte/authentication.rb",
     "lib/vkontakte/helper.rb",
-    "lib/vkontakte/session.rb",
-    "lib/vkontakte/auth_success.rb"
+    "lib/vkontakte/session.rb"
   ]
-  s.homepage = %q{http://github.com/blimp666/aavkontakte-rails3}
+  s.homepage = "http://github.com/blimp666/aavkontakte-rails3"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{aavkontakte-rails3}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Yet Another Authlogic Vkontakte Authorization for Rails3}
+  s.rubyforge_project = "aavkontakte-rails3"
+  s.rubygems_version = "1.8.16"
+  s.summary = "Yet Another Authlogic Vkontakte Authorization"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<authlogic>, [">= 3.0.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
+      s.add_runtime_dependency(%q<authlogic>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<authlogic>, [">= 3.0.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<authlogic>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<authlogic>, [">= 3.0.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<authlogic>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/lib/vkontakte/session.rb

@@ -24,13 +24,20 @@ module VkontakteAuthentication
       def authenticating_with_vkontakte?
         record_class.vkontakte_enabled_value && controller.cookies[record_class.vk_app_cookie].present?
       end
-      
-      
+
+
       def validate_by_vk_cookie
-        @vkontakte_data  = controller.params[:user_session] if controller.params[:user_session]
+        p 'AA_VK DEBUG'
+        p 'params'
+        p controller.params
+        p 'cookies'
+        p controller.cookies
+        @vkontakte_data  = controller.params[:user_session] if controller.params and controller.params[:user_session]
+        p 'vk_data'
+        p @vkontakte_data
         if VkontakteAuthentication.auth_success?(record_class.vk_app_password,
-                                                 controller.cookies[record_class.vk_app_cookie], 
-                                                 @vkontakte_data[:mid]) 
+                                                 controller.cookies[record_class.vk_app_cookie],
+                                                 @vkontakte_data[:mid])
           raise(NotInitializedError, "You must define vk_id column in your User model") unless record_class.attribute_names.include?(vk_id_field.to_s)
           if @vkontakte_data
             self.attempted_record = klass.where(vk_id_field => @vkontakte_data[:mid].to_i).first

metadata

@@ -1,63 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: aavkontakte-rails3
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
-- Dmitry Vorotilin
+- blimp666
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-18 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &74084560 !ruby/object:Gem::Requirement
+  requirement: &80486550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74084560
+  version_requirements: *80486550
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &74084140 !ruby/object:Gem::Requirement
+  requirement: &80485730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74084140
+  version_requirements: *80485730
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74083680 !ruby/object:Gem::Requirement
+  requirement: &80485160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74083680
+  version_requirements: *80485160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74083210 !ruby/object:Gem::Requirement
+  requirement: &80484690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74083210
+  version_requirements: *80484690
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &74082940 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &80499950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,9 +65,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74082940
-description: Vkontakte authorization for authlogic
-email: mydeeptown@gmail.com
+  version_requirements: *80499950
+description: Vkontakte authorization for authlogic with ruby 1.9 and rails 3.0
+email: nowhere@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -85,10 +85,10 @@ files:
 - init.rb
 - lib/aavkontakte-rails3.rb
 - lib/vkontakte.js
+- lib/vkontakte/auth_success.rb
 - lib/vkontakte/authentication.rb
 - lib/vkontakte/helper.rb
 - lib/vkontakte/session.rb
-- lib/vkontakte/auth_success.rb
 homepage: http://github.com/blimp666/aavkontakte-rails3
 licenses:
 - MIT
@@ -102,6 +102,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -423403843
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,5 +116,5 @@ rubyforge_project: aavkontakte-rails3
 rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: Yet Another Authlogic Vkontakte Authorization for Rails3
+summary: Yet Another Authlogic Vkontakte Authorization
 test_files: []