restpack_user_service 0.0.3 → 0.0.4
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.
- checksums.yaml +4 -4
- data/README.md +2 -1
- data/lib/restpack_user_service/commands/user/get.rb +19 -17
- data/lib/restpack_user_service/commands/user/omni_authenticate.rb +25 -23
- data/lib/restpack_user_service/serializers/{user_serializer.rb → user.rb} +2 -2
- data/lib/restpack_user_service/{tasks.rb → tasks/tasks.rb} +0 -0
- data/lib/restpack_user_service/version.rb +1 -1
- data/lib/restpack_user_service.rb +2 -19
- data/restpack_user_service.gemspec +1 -6
- data/spec/commands/user/get_spec.rb +1 -1
- data/spec/commands/user/omni_authenticate_spec.rb +5 -6
- data/spec/factories/authentication_factory.rb +1 -1
- data/spec/factories/user_factory.rb +1 -1
- data/spec/models/authentication_spec.rb +1 -1
- data/spec/models/user_spec.rb +1 -1
- metadata +5 -75
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0fdd6e9e5ea385023ee95d8ca4fe6374255a4b20
|
4
|
+
data.tar.gz: dde09dfcf8e9b9e76673aeb8e984c17d5ee0a462
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 950120dce2af643bd5ec69d923d08edcbd20e9e74c255dbf78b1e9bb27aab07a92ea8a2fb154170585e6e129ce8d283e89a015422f5fee825f3c60323dc52462
|
7
|
+
data.tar.gz: 1f1462758a45abe54380a2abebc7033f4cf62e2944b712c2c24a39e4ca5383497d81372c6bcef867e6d29c1408355a4cdc131e36edec3421487f1569c01f9c4d
|
data/README.md
CHANGED
@@ -1,22 +1,24 @@
|
|
1
|
-
module RestPack::User::Service::Commands
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
1
|
+
module RestPack::User::Service::Commands
|
2
|
+
module User
|
3
|
+
class Get < RestPack::Service::Command
|
4
|
+
required do
|
5
|
+
integer :id
|
6
|
+
integer :application_id
|
7
|
+
end
|
7
8
|
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
9
|
+
def execute
|
10
|
+
#TODO: GJ: remove the :application_id scope when we can specify custom serializer filters
|
11
|
+
# https://github.com/RestPack/restpack_serializer/issues/42
|
12
|
+
result = Serializers::User.resource(
|
13
|
+
inputs,
|
14
|
+
Models::User.where(application_id: inputs[:application_id])
|
15
|
+
)
|
15
16
|
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
17
|
+
if result[:users].empty?
|
18
|
+
status :not_found
|
19
|
+
else
|
20
|
+
result
|
21
|
+
end
|
20
22
|
end
|
21
23
|
end
|
22
24
|
end
|
@@ -1,31 +1,33 @@
|
|
1
|
-
module RestPack::User::Service::Commands
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
1
|
+
module RestPack::User::Service::Commands
|
2
|
+
module User
|
3
|
+
class OmniAuthenticate < RestPack::Service::Command
|
4
|
+
required do
|
5
|
+
integer :application_id
|
6
|
+
hash :omniauth_response do
|
7
|
+
required do
|
8
|
+
string :provider
|
9
|
+
string :uid
|
10
|
+
hash :info
|
11
|
+
end
|
10
12
|
end
|
11
13
|
end
|
12
|
-
end
|
13
14
|
|
14
|
-
|
15
|
-
|
16
|
-
|
15
|
+
optional do
|
16
|
+
integer :user_id
|
17
|
+
end
|
17
18
|
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
19
|
+
def execute
|
20
|
+
user = Models::User.authenticate(
|
21
|
+
user_id,
|
22
|
+
application_id,
|
23
|
+
raw_inputs[:omniauth_response]
|
24
|
+
)
|
24
25
|
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
26
|
+
if user
|
27
|
+
return Serializers::User.resource(user)
|
28
|
+
else
|
29
|
+
status :unauthorized
|
30
|
+
end
|
29
31
|
end
|
30
32
|
end
|
31
33
|
end
|
@@ -1,8 +1,8 @@
|
|
1
1
|
module RestPack::User::Service::Serializers
|
2
|
-
class
|
2
|
+
class User
|
3
3
|
include RestPack::Serializer
|
4
4
|
|
5
|
-
self.model_class =
|
5
|
+
self.model_class = Models::User
|
6
6
|
self.key = :users
|
7
7
|
|
8
8
|
attributes :id, :application_id, :description, :email,
|
File without changes
|
@@ -1,19 +1,2 @@
|
|
1
|
-
require '
|
2
|
-
|
3
|
-
require "restpack_service"
|
4
|
-
require "restpack_serializer"
|
5
|
-
require "active_support/core_ext"
|
6
|
-
|
7
|
-
require "restpack_user_service/version"
|
8
|
-
require "restpack_user_service/configuration"
|
9
|
-
|
10
|
-
require_rel "restpack_user_service/models"
|
11
|
-
require_rel "restpack_user_service/serializers"
|
12
|
-
|
13
|
-
require "restpack_user_service/tasks"
|
14
|
-
|
15
|
-
module RestPack::User::Service::Commands
|
16
|
-
|
17
|
-
end
|
18
|
-
|
19
|
-
require_rel "restpack_user_service/commands"
|
1
|
+
require 'restpack_service'
|
2
|
+
RestPack::Service::Loader.load 'user', Dir.pwd
|
@@ -18,12 +18,7 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
19
19
|
spec.require_paths = ["lib"]
|
20
20
|
|
21
|
-
spec.add_dependency "restpack_service"
|
22
|
-
spec.add_dependency "restpack_serializer"#, "~> 0.4.1"
|
23
|
-
spec.add_dependency "restpack_gem"#, "~> 0.0.9"
|
24
|
-
spec.add_dependency "sinatra", "~> 1.4.3"
|
25
|
-
spec.add_dependency "pg", "~> 0.16"
|
26
|
-
spec.add_dependency "require_all", "~> 1.3.0"
|
21
|
+
spec.add_dependency "restpack_service"
|
27
22
|
|
28
23
|
spec.add_development_dependency "bundler", "~> 1.3"
|
29
24
|
spec.add_development_dependency "database_cleaner", "~> 1.0.1"
|
@@ -1,12 +1,11 @@
|
|
1
1
|
require_relative '../../spec_helper'
|
2
2
|
|
3
|
-
describe
|
3
|
+
describe Commands::User::OmniAuthenticate do
|
4
4
|
is_required :application_id, :omniauth_response
|
5
5
|
is_optional :user_id
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
Authentication = RestPack::User::Service::Models::Authentication
|
7
|
+
User = Models::User
|
8
|
+
Authentication = Models::Authentication
|
10
9
|
|
11
10
|
let(:response) { subject.class.run(params) }
|
12
11
|
|
@@ -24,7 +23,7 @@ describe RestPack::User::Service::Commands::User::OmniAuthenticate do
|
|
24
23
|
context 'existing authentication' do
|
25
24
|
it 'returns the existing user' do
|
26
25
|
response.success?.should == true
|
27
|
-
response.result.should ==
|
26
|
+
response.result.should == Serializers::User.resource(@authentication.user)
|
28
27
|
end
|
29
28
|
end
|
30
29
|
|
@@ -36,7 +35,7 @@ describe RestPack::User::Service::Commands::User::OmniAuthenticate do
|
|
36
35
|
|
37
36
|
it 'returns the existing user' do
|
38
37
|
response.success?.should == true
|
39
|
-
response.result.should ==
|
38
|
+
response.result.should == Serializers::User.resource(@authentication.user)
|
40
39
|
@authentication.user.authentications.length.should == 2
|
41
40
|
end
|
42
41
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe
|
3
|
+
describe Models::Authentication do
|
4
4
|
it { should validate_presence_of(:application_id) }
|
5
5
|
it { should validate_presence_of(:omniauth) }
|
6
6
|
it { should validate_presence_of(:provider) }
|
data/spec/models/user_spec.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe
|
3
|
+
describe Models::User do
|
4
4
|
it { should validate_presence_of(:application_id) }
|
5
5
|
it { should ensure_length_of(:name).is_at_most(128) }
|
6
6
|
it { should ensure_length_of(:nickname).is_at_most(128) }
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: restpack_user_service
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gavin Joyce
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-09-
|
11
|
+
date: 2013-09-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: restpack_service
|
@@ -24,76 +24,6 @@ dependencies:
|
|
24
24
|
- - '>='
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0'
|
27
|
-
- !ruby/object:Gem::Dependency
|
28
|
-
name: restpack_serializer
|
29
|
-
requirement: !ruby/object:Gem::Requirement
|
30
|
-
requirements:
|
31
|
-
- - '>='
|
32
|
-
- !ruby/object:Gem::Version
|
33
|
-
version: '0'
|
34
|
-
type: :runtime
|
35
|
-
prerelease: false
|
36
|
-
version_requirements: !ruby/object:Gem::Requirement
|
37
|
-
requirements:
|
38
|
-
- - '>='
|
39
|
-
- !ruby/object:Gem::Version
|
40
|
-
version: '0'
|
41
|
-
- !ruby/object:Gem::Dependency
|
42
|
-
name: restpack_gem
|
43
|
-
requirement: !ruby/object:Gem::Requirement
|
44
|
-
requirements:
|
45
|
-
- - '>='
|
46
|
-
- !ruby/object:Gem::Version
|
47
|
-
version: '0'
|
48
|
-
type: :runtime
|
49
|
-
prerelease: false
|
50
|
-
version_requirements: !ruby/object:Gem::Requirement
|
51
|
-
requirements:
|
52
|
-
- - '>='
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: '0'
|
55
|
-
- !ruby/object:Gem::Dependency
|
56
|
-
name: sinatra
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
58
|
-
requirements:
|
59
|
-
- - ~>
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
version: 1.4.3
|
62
|
-
type: :runtime
|
63
|
-
prerelease: false
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
65
|
-
requirements:
|
66
|
-
- - ~>
|
67
|
-
- !ruby/object:Gem::Version
|
68
|
-
version: 1.4.3
|
69
|
-
- !ruby/object:Gem::Dependency
|
70
|
-
name: pg
|
71
|
-
requirement: !ruby/object:Gem::Requirement
|
72
|
-
requirements:
|
73
|
-
- - ~>
|
74
|
-
- !ruby/object:Gem::Version
|
75
|
-
version: '0.16'
|
76
|
-
type: :runtime
|
77
|
-
prerelease: false
|
78
|
-
version_requirements: !ruby/object:Gem::Requirement
|
79
|
-
requirements:
|
80
|
-
- - ~>
|
81
|
-
- !ruby/object:Gem::Version
|
82
|
-
version: '0.16'
|
83
|
-
- !ruby/object:Gem::Dependency
|
84
|
-
name: require_all
|
85
|
-
requirement: !ruby/object:Gem::Requirement
|
86
|
-
requirements:
|
87
|
-
- - ~>
|
88
|
-
- !ruby/object:Gem::Version
|
89
|
-
version: 1.3.0
|
90
|
-
type: :runtime
|
91
|
-
prerelease: false
|
92
|
-
version_requirements: !ruby/object:Gem::Requirement
|
93
|
-
requirements:
|
94
|
-
- - ~>
|
95
|
-
- !ruby/object:Gem::Version
|
96
|
-
version: 1.3.0
|
97
27
|
- !ruby/object:Gem::Dependency
|
98
28
|
name: bundler
|
99
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -215,9 +145,9 @@ files:
|
|
215
145
|
- lib/restpack_user_service/configuration.rb
|
216
146
|
- lib/restpack_user_service/models/authentication.rb
|
217
147
|
- lib/restpack_user_service/models/user.rb
|
218
|
-
- lib/restpack_user_service/serializers/
|
219
|
-
- lib/restpack_user_service/tasks.rb
|
148
|
+
- lib/restpack_user_service/serializers/user.rb
|
220
149
|
- lib/restpack_user_service/tasks/db.rake
|
150
|
+
- lib/restpack_user_service/tasks/tasks.rb
|
221
151
|
- lib/restpack_user_service/version.rb
|
222
152
|
- restpack_user_service.gemspec
|
223
153
|
- spec/commands/user/get_spec.rb
|
@@ -247,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
247
177
|
version: '0'
|
248
178
|
requirements: []
|
249
179
|
rubyforge_project:
|
250
|
-
rubygems_version: 2.0.
|
180
|
+
rubygems_version: 2.0.5
|
251
181
|
signing_key:
|
252
182
|
specification_version: 4
|
253
183
|
summary: Users and Authentications
|