fizzy-api 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/Gemfile +0 -3
- data/Gemfile.lock +74 -58
- data/fizzy_api.gemspec +5 -5
- data/lib/fizzy/api/calculate_outcome.rb +3 -3
- data/lib/fizzy/api/render_graph.rb +4 -4
- data/lib/fizzy/api/sessions/basic_auth_session.rb +3 -6
- data/lib/fizzy/api/version.rb +1 -1
- data/spec/fizzy/api/sessions/basic_auth_session_spec.rb +5 -5
- metadata +13 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5d75d7dffd7bc8759f6a7c7ebabee2bc4f07f627
|
|
4
|
+
data.tar.gz: 12624baae475ee3781ddbdb5a09a045da8a3a9cf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 32a0c55af9c9c4ed088bc13c0ef69c90651a9157ed5b25d0219e9fd3ead1a2b00cc19d10ea17204a534f03409ccd76b08fc03df7afaae4a94b3ebf9ecf17b9e6
|
|
7
|
+
data.tar.gz: e5903a48129d43bc72344a5551ff22fd6676c1d13e7a19591251a98997742f842ccfa0c3a9d95eac9649910f74f71b07b3a2d0399696b3603fd02d6450e709d5
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
|
@@ -1,37 +1,39 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: .
|
|
3
3
|
specs:
|
|
4
|
-
fizzy-api (0.0.
|
|
5
|
-
active_interaction (~>
|
|
4
|
+
fizzy-api (0.0.4)
|
|
5
|
+
active_interaction (~> 2.0)
|
|
6
6
|
httparty (~> 0.12)
|
|
7
7
|
virtus (~> 1.0)
|
|
8
8
|
|
|
9
9
|
GEM
|
|
10
10
|
remote: https://rubygems.org/
|
|
11
11
|
specs:
|
|
12
|
-
actionpack (4.1
|
|
13
|
-
actionview (= 4.1
|
|
14
|
-
activesupport (= 4.1
|
|
15
|
-
rack (~> 1.
|
|
12
|
+
actionpack (4.2.5.1)
|
|
13
|
+
actionview (= 4.2.5.1)
|
|
14
|
+
activesupport (= 4.2.5.1)
|
|
15
|
+
rack (~> 1.6)
|
|
16
16
|
rack-test (~> 0.6.2)
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
18
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
|
19
|
+
actionview (4.2.5.1)
|
|
20
|
+
activesupport (= 4.2.5.1)
|
|
19
21
|
builder (~> 3.1)
|
|
20
22
|
erubis (~> 2.7.0)
|
|
21
|
-
|
|
23
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
24
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
|
25
|
+
active_interaction (2.0.1)
|
|
22
26
|
activemodel (>= 3.2, < 5)
|
|
23
|
-
activemodel (4.1
|
|
24
|
-
activesupport (= 4.1
|
|
27
|
+
activemodel (4.2.5.1)
|
|
28
|
+
activesupport (= 4.2.5.1)
|
|
25
29
|
builder (~> 3.1)
|
|
26
|
-
activesupport (4.1
|
|
27
|
-
i18n (~> 0.
|
|
30
|
+
activesupport (4.2.5.1)
|
|
31
|
+
i18n (~> 0.7)
|
|
28
32
|
json (~> 1.7, >= 1.7.7)
|
|
29
33
|
minitest (~> 5.1)
|
|
30
|
-
thread_safe (~> 0.
|
|
34
|
+
thread_safe (~> 0.3, >= 0.3.4)
|
|
31
35
|
tzinfo (~> 1.1)
|
|
32
|
-
ast (2.
|
|
33
|
-
astrolabe (1.3.0)
|
|
34
|
-
parser (>= 2.2.0.pre.3, < 3.0)
|
|
36
|
+
ast (2.2.0)
|
|
35
37
|
axiom-types (0.1.1)
|
|
36
38
|
descendants_tracker (~> 0.0.4)
|
|
37
39
|
ice_nine (~> 0.11.0)
|
|
@@ -42,60 +44,73 @@ GEM
|
|
|
42
44
|
descendants_tracker (0.0.4)
|
|
43
45
|
thread_safe (~> 0.3, >= 0.3.1)
|
|
44
46
|
diff-lcs (1.2.5)
|
|
45
|
-
equalizer (0.0.
|
|
47
|
+
equalizer (0.0.11)
|
|
46
48
|
erubis (2.7.0)
|
|
47
49
|
factory_girl (4.5.0)
|
|
48
50
|
activesupport (>= 3.0.0)
|
|
49
|
-
factory_girl_rails (4.
|
|
51
|
+
factory_girl_rails (4.6.0)
|
|
50
52
|
factory_girl (~> 4.5.0)
|
|
51
53
|
railties (>= 3.0.0)
|
|
52
54
|
httparty (0.12.0)
|
|
53
55
|
json (~> 1.8)
|
|
54
56
|
multi_xml (>= 0.5.2)
|
|
55
|
-
i18n (0.
|
|
56
|
-
ice_nine (0.11.
|
|
57
|
-
json (1.8.
|
|
58
|
-
|
|
57
|
+
i18n (0.7.0)
|
|
58
|
+
ice_nine (0.11.2)
|
|
59
|
+
json (1.8.3)
|
|
60
|
+
loofah (2.0.3)
|
|
61
|
+
nokogiri (>= 1.5.9)
|
|
62
|
+
mini_portile2 (2.0.0)
|
|
63
|
+
minitest (5.8.4)
|
|
59
64
|
multi_xml (0.5.5)
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
rack
|
|
65
|
+
nokogiri (1.6.7.2)
|
|
66
|
+
mini_portile2 (~> 2.0.0.rc2)
|
|
67
|
+
parser (2.3.0.6)
|
|
68
|
+
ast (~> 2.2)
|
|
69
|
+
powerpack (0.1.1)
|
|
70
|
+
rack (1.6.4)
|
|
71
|
+
rack-test (0.6.3)
|
|
66
72
|
rack (>= 1.0)
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
73
|
+
rails-deprecated_sanitizer (1.0.3)
|
|
74
|
+
activesupport (>= 4.2.0.alpha)
|
|
75
|
+
rails-dom-testing (1.0.7)
|
|
76
|
+
activesupport (>= 4.2.0.beta, < 5.0)
|
|
77
|
+
nokogiri (~> 1.6.0)
|
|
78
|
+
rails-deprecated_sanitizer (>= 1.0.1)
|
|
79
|
+
rails-html-sanitizer (1.0.3)
|
|
80
|
+
loofah (~> 2.0)
|
|
81
|
+
railties (4.2.5.1)
|
|
82
|
+
actionpack (= 4.2.5.1)
|
|
83
|
+
activesupport (= 4.2.5.1)
|
|
70
84
|
rake (>= 0.8.7)
|
|
71
85
|
thor (>= 0.18.1, < 2.0)
|
|
72
|
-
rainbow (2.
|
|
73
|
-
rake (10.
|
|
74
|
-
rspec (3.
|
|
75
|
-
rspec-core (~> 3.
|
|
76
|
-
rspec-expectations (~> 3.
|
|
77
|
-
rspec-mocks (~> 3.
|
|
78
|
-
rspec-core (3.
|
|
79
|
-
rspec-support (~> 3.
|
|
80
|
-
rspec-expectations (3.
|
|
86
|
+
rainbow (2.1.0)
|
|
87
|
+
rake (10.5.0)
|
|
88
|
+
rspec (3.4.0)
|
|
89
|
+
rspec-core (~> 3.4.0)
|
|
90
|
+
rspec-expectations (~> 3.4.0)
|
|
91
|
+
rspec-mocks (~> 3.4.0)
|
|
92
|
+
rspec-core (3.4.3)
|
|
93
|
+
rspec-support (~> 3.4.0)
|
|
94
|
+
rspec-expectations (3.4.0)
|
|
95
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
96
|
+
rspec-support (~> 3.4.0)
|
|
97
|
+
rspec-mocks (3.4.1)
|
|
81
98
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
82
|
-
rspec-support (~> 3.
|
|
83
|
-
rspec-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
astrolabe (~> 1.3)
|
|
88
|
-
parser (>= 2.2.0.pre.7, < 3.0)
|
|
89
|
-
powerpack (~> 0.0.6)
|
|
99
|
+
rspec-support (~> 3.4.0)
|
|
100
|
+
rspec-support (3.4.1)
|
|
101
|
+
rubocop (0.37.2)
|
|
102
|
+
parser (>= 2.3.0.4, < 3.0)
|
|
103
|
+
powerpack (~> 0.1)
|
|
90
104
|
rainbow (>= 1.99.1, < 3.0)
|
|
91
|
-
ruby-progressbar (~> 1.
|
|
92
|
-
|
|
93
|
-
|
|
105
|
+
ruby-progressbar (~> 1.7)
|
|
106
|
+
unicode-display_width (~> 0.3)
|
|
107
|
+
ruby-progressbar (1.7.5)
|
|
94
108
|
thor (0.19.1)
|
|
95
|
-
thread_safe (0.3.
|
|
109
|
+
thread_safe (0.3.5)
|
|
96
110
|
tzinfo (1.2.2)
|
|
97
111
|
thread_safe (~> 0.1)
|
|
98
|
-
|
|
112
|
+
unicode-display_width (0.3.1)
|
|
113
|
+
virtus (1.0.5)
|
|
99
114
|
axiom-types (~> 0.1)
|
|
100
115
|
coercible (~> 1.0)
|
|
101
116
|
descendants_tracker (~> 0.0, >= 0.0.3)
|
|
@@ -105,11 +120,12 @@ PLATFORMS
|
|
|
105
120
|
ruby
|
|
106
121
|
|
|
107
122
|
DEPENDENCIES
|
|
108
|
-
|
|
109
|
-
bundler (~> 1.6)
|
|
123
|
+
bundler (~> 1.9)
|
|
110
124
|
factory_girl_rails
|
|
111
125
|
fizzy-api!
|
|
112
|
-
|
|
113
|
-
rake (~> 10.4)
|
|
126
|
+
rake (~> 10.5)
|
|
114
127
|
rspec
|
|
115
128
|
rubocop
|
|
129
|
+
|
|
130
|
+
BUNDLED WITH
|
|
131
|
+
1.11.2
|
data/fizzy_api.gemspec
CHANGED
|
@@ -17,11 +17,11 @@ Gem::Specification.new do |gem|
|
|
|
17
17
|
gem.require_paths = ['lib']
|
|
18
18
|
|
|
19
19
|
gem.add_dependency 'httparty', '~> 0.12'
|
|
20
|
-
gem.add_dependency 'active_interaction', '~>
|
|
20
|
+
gem.add_dependency 'active_interaction', '~> 2.0'
|
|
21
21
|
gem.add_dependency 'virtus', '~> 1.0'
|
|
22
22
|
|
|
23
|
-
gem.add_development_dependency 'bundler', '~> 1.
|
|
24
|
-
gem.add_development_dependency 'rake', '~> 10.
|
|
25
|
-
gem.add_development_dependency 'rspec', '~> 3.
|
|
26
|
-
gem.add_development_dependency 'factory_girl_rails', '~> 4.
|
|
23
|
+
gem.add_development_dependency 'bundler', '~> 1.9'
|
|
24
|
+
gem.add_development_dependency 'rake', '~> 10.5'
|
|
25
|
+
gem.add_development_dependency 'rspec', '~> 3.4'
|
|
26
|
+
gem.add_development_dependency 'factory_girl_rails', '~> 4.6'
|
|
27
27
|
end
|
|
@@ -18,11 +18,11 @@ module Fizzy
|
|
|
18
18
|
when 200
|
|
19
19
|
response
|
|
20
20
|
when 202
|
|
21
|
-
|
|
21
|
+
raise Errors::OutcomeNotAvailableError, 'The results are currently being calculated.'
|
|
22
22
|
when 404
|
|
23
|
-
|
|
23
|
+
raise Errors::GraphNotFoundError, 'Participant not found, or graph not supported.'
|
|
24
24
|
else
|
|
25
|
-
|
|
25
|
+
raise Errors::UnexpectedStatusError, "Status code #{response.code} not expected."
|
|
26
26
|
end
|
|
27
27
|
end
|
|
28
28
|
end
|
|
@@ -20,13 +20,13 @@ module Fizzy
|
|
|
20
20
|
when 200
|
|
21
21
|
response
|
|
22
22
|
when 202
|
|
23
|
-
|
|
23
|
+
raise Errors::OutcomeNotAvailableError, 'The results have not yet been calculated.'
|
|
24
24
|
when 204
|
|
25
|
-
|
|
25
|
+
raise Errors::TooFewMeasurementsError, 'Not enough measurements available.'
|
|
26
26
|
when 404
|
|
27
|
-
|
|
27
|
+
raise Errors::GraphNotFoundError, 'Graph not found.'
|
|
28
28
|
else
|
|
29
|
-
|
|
29
|
+
raise Errors::UnexpectedStatusError, "Status code #{response.code} not expected."
|
|
30
30
|
end
|
|
31
31
|
end
|
|
32
32
|
end
|
|
@@ -47,18 +47,15 @@ module Fizzy
|
|
|
47
47
|
when 401
|
|
48
48
|
access_denied(response)
|
|
49
49
|
when 500
|
|
50
|
-
|
|
50
|
+
raise response.parsed_response || "Received HTTP response code #{response.code}!"
|
|
51
51
|
else
|
|
52
52
|
response
|
|
53
53
|
end
|
|
54
54
|
end
|
|
55
55
|
|
|
56
56
|
def access_denied(response)
|
|
57
|
-
if response.headers['WWW-Authenticate']
|
|
58
|
-
|
|
59
|
-
else
|
|
60
|
-
fail Unauthorized
|
|
61
|
-
end
|
|
57
|
+
raise NoSession if response.headers['WWW-Authenticate']
|
|
58
|
+
raise Unauthorized
|
|
62
59
|
end
|
|
63
60
|
|
|
64
61
|
def full_url_for(path)
|
data/lib/fizzy/api/version.rb
CHANGED
|
@@ -52,32 +52,32 @@ describe BasicAuthSession do
|
|
|
52
52
|
query: { some: 'param' },
|
|
53
53
|
basic_auth: { username: 'some_username', password: 'some_password' })
|
|
54
54
|
.and_return(response)
|
|
55
|
-
session.get
|
|
55
|
+
session.get('/some_path', some: 'param')
|
|
56
56
|
end
|
|
57
57
|
|
|
58
58
|
it 'throws an error if the reponse is not within the 200 range' do
|
|
59
59
|
allow(response).to receive(:code).and_return(500)
|
|
60
60
|
allow(HTTParty).to receive(:get).and_return(response)
|
|
61
|
-
expect { session.get
|
|
61
|
+
expect { session.get('/some_path') }.to raise_error(RuntimeError, 'some_response')
|
|
62
62
|
end
|
|
63
63
|
|
|
64
64
|
it 'throws a NoSession error if the basic auth is incorrect' do
|
|
65
65
|
allow(response).to receive(:code).and_return(401)
|
|
66
66
|
allow(HTTParty).to receive(:get).and_return(response)
|
|
67
67
|
allow(response).to receive(:headers).and_return('WWW-Authenticate' => 'Basic realm="Application"')
|
|
68
|
-
expect { session.get
|
|
68
|
+
expect { session.get('/some_path') }.to raise_error(Fizzy::Api::NoSession)
|
|
69
69
|
end
|
|
70
70
|
|
|
71
71
|
it 'throws a Unauthorized error on 401 without www-authenticate header' do
|
|
72
72
|
allow(response).to receive(:code).and_return(401)
|
|
73
73
|
allow(HTTParty).to receive(:get).and_return(response)
|
|
74
74
|
allow(response).to receive(:headers).and_return('foo' => 'bar')
|
|
75
|
-
expect { session.get
|
|
75
|
+
expect { session.get('/some_path') }.to raise_error(Fizzy::Api::Unauthorized)
|
|
76
76
|
end
|
|
77
77
|
|
|
78
78
|
it 'returns the response' do
|
|
79
79
|
allow(HTTParty).to receive(:get).and_return(response)
|
|
80
|
-
expect(session.get
|
|
80
|
+
expect(session.get('/some_path')).to eq(response)
|
|
81
81
|
end
|
|
82
82
|
end
|
|
83
83
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fizzy-api
|
|
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
|
- Frank Blaauw
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date:
|
|
12
|
+
date: 2016-02-22 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: httparty
|
|
@@ -31,14 +31,14 @@ dependencies:
|
|
|
31
31
|
requirements:
|
|
32
32
|
- - "~>"
|
|
33
33
|
- !ruby/object:Gem::Version
|
|
34
|
-
version: '
|
|
34
|
+
version: '2.0'
|
|
35
35
|
type: :runtime
|
|
36
36
|
prerelease: false
|
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
|
38
38
|
requirements:
|
|
39
39
|
- - "~>"
|
|
40
40
|
- !ruby/object:Gem::Version
|
|
41
|
-
version: '
|
|
41
|
+
version: '2.0'
|
|
42
42
|
- !ruby/object:Gem::Dependency
|
|
43
43
|
name: virtus
|
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -59,56 +59,56 @@ dependencies:
|
|
|
59
59
|
requirements:
|
|
60
60
|
- - "~>"
|
|
61
61
|
- !ruby/object:Gem::Version
|
|
62
|
-
version: '1.
|
|
62
|
+
version: '1.9'
|
|
63
63
|
type: :development
|
|
64
64
|
prerelease: false
|
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
|
66
66
|
requirements:
|
|
67
67
|
- - "~>"
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
|
-
version: '1.
|
|
69
|
+
version: '1.9'
|
|
70
70
|
- !ruby/object:Gem::Dependency
|
|
71
71
|
name: rake
|
|
72
72
|
requirement: !ruby/object:Gem::Requirement
|
|
73
73
|
requirements:
|
|
74
74
|
- - "~>"
|
|
75
75
|
- !ruby/object:Gem::Version
|
|
76
|
-
version: '10.
|
|
76
|
+
version: '10.5'
|
|
77
77
|
type: :development
|
|
78
78
|
prerelease: false
|
|
79
79
|
version_requirements: !ruby/object:Gem::Requirement
|
|
80
80
|
requirements:
|
|
81
81
|
- - "~>"
|
|
82
82
|
- !ruby/object:Gem::Version
|
|
83
|
-
version: '10.
|
|
83
|
+
version: '10.5'
|
|
84
84
|
- !ruby/object:Gem::Dependency
|
|
85
85
|
name: rspec
|
|
86
86
|
requirement: !ruby/object:Gem::Requirement
|
|
87
87
|
requirements:
|
|
88
88
|
- - "~>"
|
|
89
89
|
- !ruby/object:Gem::Version
|
|
90
|
-
version: '3.
|
|
90
|
+
version: '3.4'
|
|
91
91
|
type: :development
|
|
92
92
|
prerelease: false
|
|
93
93
|
version_requirements: !ruby/object:Gem::Requirement
|
|
94
94
|
requirements:
|
|
95
95
|
- - "~>"
|
|
96
96
|
- !ruby/object:Gem::Version
|
|
97
|
-
version: '3.
|
|
97
|
+
version: '3.4'
|
|
98
98
|
- !ruby/object:Gem::Dependency
|
|
99
99
|
name: factory_girl_rails
|
|
100
100
|
requirement: !ruby/object:Gem::Requirement
|
|
101
101
|
requirements:
|
|
102
102
|
- - "~>"
|
|
103
103
|
- !ruby/object:Gem::Version
|
|
104
|
-
version: '4.
|
|
104
|
+
version: '4.6'
|
|
105
105
|
type: :development
|
|
106
106
|
prerelease: false
|
|
107
107
|
version_requirements: !ruby/object:Gem::Requirement
|
|
108
108
|
requirements:
|
|
109
109
|
- - "~>"
|
|
110
110
|
- !ruby/object:Gem::Version
|
|
111
|
-
version: '4.
|
|
111
|
+
version: '4.6'
|
|
112
112
|
description: Provides authenticated access to fizzy utilities
|
|
113
113
|
email:
|
|
114
114
|
- f.j.blaauw@umcg.nl
|
|
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
166
166
|
version: '0'
|
|
167
167
|
requirements: []
|
|
168
168
|
rubyforge_project:
|
|
169
|
-
rubygems_version: 2.
|
|
169
|
+
rubygems_version: 2.4.5.1
|
|
170
170
|
signing_key:
|
|
171
171
|
specification_version: 4
|
|
172
172
|
summary: API wrapper gem around Fizzy's Graph API
|