devise-basecamper 0.4.1 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
7
7
  gem.description = %q{Implement basecamp style subdomain authentication with support for multiple users under a single subdomain scoped account.}
8
8
  gem.summary = %q{Implement basecamp style subdomain authentication}
9
9
  gem.homepage = "https://github.com/digitalopera/devise-basecamper"
10
+ gem.license = 'MIT'
10
11
 
11
12
  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
12
13
  gem.files = `git ls-files`.split("\n")
@@ -16,5 +17,5 @@ Gem::Specification.new do |gem|
16
17
  gem.version = Devise::Basecamper::VERSION
17
18
 
18
19
  gem.add_dependency('orm_adapter', '~> 0.1')
19
- gem.add_dependency('devise', '~> 3.0.0')
20
+ gem.add_dependency('devise', '~> 3.1.0')
20
21
  end
@@ -61,6 +61,7 @@ module Devise
61
61
 
62
62
  ## Find our resource for sending the email
63
63
  if attributes[:login].present? && reset_password_keys.include?(:login)
64
+ attributes[scope_field] = subdomain_resource_id
64
65
  resource = find_with_login_instead_of_default(required_keys, attributes)
65
66
  else
66
67
  resource = find_or_initialize_with_errors(reset_password_keys,{
@@ -86,6 +87,7 @@ module Devise
86
87
 
87
88
  login_fields.each do |login_field|
88
89
  login_field = login_field.downcase.to_sym
90
+
89
91
  resource = to_adapter.find_first({
90
92
  login_field => attributes[:login],
91
93
  scope_field => attributes[scope_field]
@@ -137,4 +139,4 @@ module Devise
137
139
  end
138
140
  end
139
141
  end
140
- end
142
+ end
@@ -1,5 +1,5 @@
1
1
  module Devise
2
2
  module Basecamper
3
- VERSION = "0.4.1"
3
+ VERSION = "0.4.3"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: devise-basecamper
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-07-17 00:00:00.000000000 Z
13
+ date: 2013-11-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: orm_adapter
@@ -35,7 +35,7 @@ dependencies:
35
35
  requirements:
36
36
  - - ~>
37
37
  - !ruby/object:Gem::Version
38
- version: 3.0.0
38
+ version: 3.1.0
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
43
43
  requirements:
44
44
  - - ~>
45
45
  - !ruby/object:Gem::Version
46
- version: 3.0.0
46
+ version: 3.1.0
47
47
  description: Implement basecamp style subdomain authentication with support for multiple
48
48
  users under a single subdomain scoped account.
49
49
  email:
@@ -64,7 +64,8 @@ files:
64
64
  - lib/devise-basecamper/model.rb
65
65
  - lib/devise-basecamper/version.rb
66
66
  homepage: https://github.com/digitalopera/devise-basecamper
67
- licenses: []
67
+ licenses:
68
+ - MIT
68
69
  post_install_message:
69
70
  rdoc_options: []
70
71
  require_paths: