aavkontakte-rails3 0.1.7 → 0.1.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/aavkontakte-rails3.gemspec +3 -3
  3. data/lib/vkontakte/session.rb +7 -2
  4. metadata +57 -32
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.7
1
+ 0.1.8
data/aavkontakte-rails3.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "aavkontakte-rails3"
8
- s.version = "0.1.7"
8
+ s.version = "0.1.8"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["blimp666"]
12
- s.date = "2012-05-12"
12
+ s.date = "2013-04-04"
13
13
  s.description = "Vkontakte authorization for authlogic with ruby 1.9 and rails 3.0"
14
14
  s.email = "nowhere@gmail.com"
15
15
  s.extra_rdoc_files = [
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
37
37
  s.licenses = ["MIT"]
38
38
  s.require_paths = ["lib"]
39
39
  s.rubyforge_project = "aavkontakte-rails3"
40
- s.rubygems_version = "1.8.16"
40
+ s.rubygems_version = "1.8.25"
41
41
  s.summary = "Yet Another Authlogic Vkontakte Authorization"
42
42
 
43
43
  if s.respond_to? :specification_version then
data/lib/vkontakte/session.rb CHANGED
@@ -45,14 +45,19 @@ module VkontakteAuthentication
45
45
  raise(NotInitializedError, "You must define vk_id column in your User model") unless record_class.attribute_names.include?(vk_id_field.to_s)
46
46
  if @vkontakte_data
47
47
  self.attempted_record = klass.where(vk_id_field => @vkontakte_data[:mid].to_i).first
48
+ # p self.attempted_record
49
+ # self.attempted_record = $current_session.user if self.attempted_record.blank? and $current_session
50
+ self.attempted_record = controller.saved_current_session.user if self.attempted_record.blank? and controller.saved_current_session
51
+ # p $current_session
48
52
  if self.attempted_record.blank?
49
53
  # creating a new account
50
54
  self.new_registration = true
51
55
  self.attempted_record = record_class.new
52
56
  self.attempted_record.send "#{vk_id_field}=", @vkontakte_data[:mid].to_i
53
57
  self.attempted_record.send :persistence_token=, Authlogic::Random.hex_token if self.attempted_record.respond_to? :persistence_token=
54
- map_vkontakte_data if record_class.vkontakte_merge_enabled_value
55
- self.attempted_record.save_without_session_maintenance
58
+ # map_vkontakte_data if record_class.vkontakte_merge_enabled_value
59
+ # self.attempted_record.save_without_session_maintenance
60
+ nil
56
61
  elsif !(record_class.vkontakte_auto_registration_value)
57
62
  self.attempted_record = record_class.new
58
63
  end
metadata CHANGED
@@ -1,71 +1,96 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aavkontakte-rails3
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.7
5
4
  prerelease:
5
+ version: 0.1.8
6
6
  platform: ruby
7
7
  authors:
8
8
  - blimp666
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-12 00:00:00.000000000 Z
12
+ date: 2013-04-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
- name: rails
16
- requirement: &76771700 !ruby/object:Gem::Requirement
17
- none: false
15
+ version_requirements: !ruby/object:Gem::Requirement
18
16
  requirements:
19
17
  - - ! '>='
20
18
  - !ruby/object:Gem::Version
21
19
  version: '0'
22
- type: :runtime
20
+ none: false
21
+ name: rails
23
22
  prerelease: false
24
- version_requirements: *76771700
25
- - !ruby/object:Gem::Dependency
26
- name: authlogic
27
- requirement: &76770780 !ruby/object:Gem::Requirement
23
+ type: :runtime
24
+ requirement: !ruby/object:Gem::Requirement
25
+ requirements:
26
+ - - ! '>='
27
+ - !ruby/object:Gem::Version
28
+ version: '0'
28
29
  none: false
30
+ - !ruby/object:Gem::Dependency
31
+ version_requirements: !ruby/object:Gem::Requirement
29
32
  requirements:
30
33
  - - ! '>='
31
34
  - !ruby/object:Gem::Version
32
35
  version: '0'
33
- type: :runtime
36
+ none: false
37
+ name: authlogic
34
38
  prerelease: false
35
- version_requirements: *76770780
36
- - !ruby/object:Gem::Dependency
37
- name: bundler
38
- requirement: &76769510 !ruby/object:Gem::Requirement
39
+ type: :runtime
40
+ requirement: !ruby/object:Gem::Requirement
41
+ requirements:
42
+ - - ! '>='
43
+ - !ruby/object:Gem::Version
44
+ version: '0'
39
45
  none: false
46
+ - !ruby/object:Gem::Dependency
47
+ version_requirements: !ruby/object:Gem::Requirement
40
48
  requirements:
41
49
  - - ! '>='
42
50
  - !ruby/object:Gem::Version
43
51
  version: '0'
44
- type: :development
52
+ none: false
53
+ name: bundler
45
54
  prerelease: false
46
- version_requirements: *76769510
47
- - !ruby/object:Gem::Dependency
48
- name: jeweler
49
- requirement: &76786100 !ruby/object:Gem::Requirement
55
+ type: :development
56
+ requirement: !ruby/object:Gem::Requirement
57
+ requirements:
58
+ - - ! '>='
59
+ - !ruby/object:Gem::Version
60
+ version: '0'
50
61
  none: false
62
+ - !ruby/object:Gem::Dependency
63
+ version_requirements: !ruby/object:Gem::Requirement
51
64
  requirements:
52
65
  - - ! '>='
53
66
  - !ruby/object:Gem::Version
54
67
  version: '0'
55
- type: :development
68
+ none: false
69
+ name: jeweler
56
70
  prerelease: false
57
- version_requirements: *76786100
58
- - !ruby/object:Gem::Dependency
59
- name: simplecov
60
- requirement: &76784660 !ruby/object:Gem::Requirement
71
+ type: :development
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - ! '>='
75
+ - !ruby/object:Gem::Version
76
+ version: '0'
61
77
  none: false
78
+ - !ruby/object:Gem::Dependency
79
+ version_requirements: !ruby/object:Gem::Requirement
62
80
  requirements:
63
81
  - - ! '>='
64
82
  - !ruby/object:Gem::Version
65
83
  version: '0'
66
- type: :development
84
+ none: false
85
+ name: simplecov
67
86
  prerelease: false
68
- version_requirements: *76784660
87
+ type: :development
88
+ requirement: !ruby/object:Gem::Requirement
89
+ requirements:
90
+ - - ! '>='
91
+ - !ruby/object:Gem::Version
92
+ version: '0'
93
+ none: false
69
94
  description: Vkontakte authorization for authlogic with ruby 1.9 and rails 3.0
70
95
  email: nowhere@gmail.com
71
96
  executables: []
@@ -97,23 +122,23 @@ rdoc_options: []
97
122
  require_paths:
98
123
  - lib
99
124
  required_ruby_version: !ruby/object:Gem::Requirement
100
- none: false
101
125
  requirements:
102
126
  - - ! '>='
103
127
  - !ruby/object:Gem::Version
104
- version: '0'
128
+ hash: 4456988578486245299
105
129
  segments:
106
130
  - 0
107
- hash: 202701037
108
- required_rubygems_version: !ruby/object:Gem::Requirement
131
+ version: '0'
109
132
  none: false
133
+ required_rubygems_version: !ruby/object:Gem::Requirement
110
134
  requirements:
111
135
  - - ! '>='
112
136
  - !ruby/object:Gem::Version
113
137
  version: '0'
138
+ none: false
114
139
  requirements: []
115
140
  rubyforge_project: aavkontakte-rails3
116
- rubygems_version: 1.8.16
141
+ rubygems_version: 1.8.25
117
142
  signing_key:
118
143
  specification_version: 3
119
144
  summary: Yet Another Authlogic Vkontakte Authorization