cellect-client 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +2 -1
- data/.travis.yml +1 -5
- data/LICENSE +201 -0
- data/README.md +42 -4
- data/cellect-client.gemspec +7 -7
- data/cellect.gemspec +1 -0
- data/lib/cellect/client/connection.rb +11 -0
- data/lib/cellect/client/node_set.rb +4 -0
- data/lib/cellect/client/railtie.rb +5 -0
- data/lib/cellect/client.rb +3 -0
- data/lib/cellect/node_set.rb +3 -1
- data/lib/cellect/version.rb +1 -1
- data/spec/client/connection_spec.rb +5 -2
- data/spec/spec_helper.rb +3 -0
- metadata +10 -9
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0d18d3658bb52800a79bd803aefafff0263d2ce8
|
|
4
|
+
data.tar.gz: cc4dce1522594061908ef7cd649e0156c04be786
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8917a3f2a0371147d7d0a77cad67b95d29c53d3d0dc08c2ca35532b2a350fcd967ac2a3e1347dfd8c2ee3e812eb869efb6286038ebae0a774a286b900eb3d109
|
|
7
|
+
data.tar.gz: ccae5ce575a0e831efd936d7699ef54a8b6cfb180761bf8c4c7497afd018f4baebb1d2d2855466bdfc9bd247727df85a8dcb4603622fd72ee1a742cfc0159ad9
|
data/.gitignore
CHANGED
data/.travis.yml
CHANGED
data/LICENSE
ADDED
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright [2014-2015] by [The Zooniverse]
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
data/README.md
CHANGED
|
@@ -1,19 +1,57 @@
|
|
|
1
|
-
# Cellect
|
|
1
|
+
# Cellect
|
|
2
|
+
|
|
3
|
+
A scalable subject selector for [Panoptes](https://github.com/zooniverse/panoptes)
|
|
4
|
+
|
|
5
|
+
[](https://travis-ci.org/zooniverse/Cellect)
|
|
6
|
+
[](https://codeclimate.com/github/zooniverse/Cellect)
|
|
7
|
+
[](https://codeclimate.com/github/zooniverse/Cellect)
|
|
8
|
+
[](https://rubygems.org/gems/cellect)
|
|
9
|
+
|
|
10
|
+
Available as
|
|
11
|
+
- [cellect-server](https://rubygems.org/gems/cellect-server)
|
|
12
|
+
- [cellect-client](https://rubygems.org/gems/cellect-client)
|
|
13
|
+
- [cellect](https://rubygems.org/gems/cellect)(combined)
|
|
14
|
+
|
|
15
|
+
## Cellect::Server
|
|
16
|
+
|
|
17
|
+
An actor based system that provides an API around subject selection actions. Server nodes are discovered via [ZooKeeper](http://zookeeper.apache.org/).
|
|
18
|
+
|
|
19
|
+
### Cellect::Server::Adapters
|
|
20
|
+
|
|
21
|
+
[An adapter](lib/cellect/server/adapters/default.rb) provides an API for defining the data to be used with the system.
|
|
22
|
+
|
|
23
|
+
We're overriding the default adapter with a customization in [cellect_panoptes](https://github.com/zooniverse/cellect_panoptes).
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
## Cellect::Client
|
|
27
|
+
|
|
28
|
+
Provides a mix of asynchronous and synchronous operations for server awareness and API communication.
|
|
2
29
|
|
|
3
|
-
This is a work in progress
|
|
4
30
|
|
|
5
31
|
## Building
|
|
6
32
|
|
|
7
|
-
1. Install [Boost V1.55](http://www.boost.org/): OS X: `brew update && brew install boost`, Ubuntu: `sudo apt-get update && sudo apt-get install libboost-all-dev`
|
|
33
|
+
1. Install [Boost V1.55+](http://www.boost.org/): OS X: `brew update && brew install boost`, Ubuntu: `sudo apt-get update && sudo apt-get install libboost-all-dev`
|
|
8
34
|
2. Install gem dependencies: `bundle` (See Note)
|
|
9
35
|
|
|
10
36
|
|
|
11
37
|
### Note
|
|
12
|
-
To install rice your Ruby must be compiled with shared libraries enabled, from the rice docs:
|
|
38
|
+
To install rice your Ruby must be compiled with shared libraries enabled, from the rice docs:
|
|
13
39
|
* rvm: `rvm reinstall [version] -- --enable-shared`
|
|
14
40
|
* rbenv: `CONFIGURE_OPTS="--enable-shared" rbenv install [version]`
|
|
15
41
|
|
|
16
42
|
|
|
17
43
|
## Testing
|
|
18
44
|
|
|
45
|
+
* You'll need a local Zookeeper server to run the specs (they will auto start / stop the server for you).
|
|
46
|
+
* `brew install zookeeper`
|
|
47
|
+
* Note: this may require a Java Runtime (JRE) install, `brew cask install java`
|
|
48
|
+
|
|
19
49
|
Run the specs with `rake`
|
|
50
|
+
|
|
51
|
+
## Start server:
|
|
52
|
+
|
|
53
|
+
`rackup # uses config.ru file`
|
|
54
|
+
|
|
55
|
+
## Versions
|
|
56
|
+
|
|
57
|
+
See .travis.yml for supported ruby versions
|
data/cellect-client.gemspec
CHANGED
|
@@ -12,25 +12,25 @@ Gem::Specification.new do |spec|
|
|
|
12
12
|
spec.description = ''
|
|
13
13
|
spec.homepage = 'https://github.com/parrish/Cellect'
|
|
14
14
|
spec.license = 'MIT'
|
|
15
|
-
|
|
15
|
+
|
|
16
16
|
ignored_paths = %w(config data log script tmp).collect{ |path| Dir["#{ path }/**/*"] }.flatten
|
|
17
17
|
ignored_files = %w(Dockerfile Vagrantfile Gemfile.lock config.ru) + ignored_paths
|
|
18
|
-
|
|
18
|
+
|
|
19
19
|
spec.files = `git ls-files -z`.split("\x0").reject{ |f| f =~ /server/ } - ignored_files
|
|
20
20
|
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
|
|
21
21
|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
|
|
22
22
|
spec.require_paths = ['lib']
|
|
23
|
-
|
|
24
|
-
spec.add_development_dependency 'bundler', '~> 1.
|
|
23
|
+
|
|
24
|
+
spec.add_development_dependency 'bundler', '~> 1.10'
|
|
25
25
|
spec.add_development_dependency 'rake'
|
|
26
26
|
spec.add_development_dependency 'oj'
|
|
27
27
|
spec.add_development_dependency 'rspec'
|
|
28
28
|
spec.add_development_dependency 'rack-test'
|
|
29
29
|
spec.add_development_dependency 'pry'
|
|
30
|
-
|
|
30
|
+
|
|
31
31
|
spec.add_runtime_dependency 'celluloid', '0.16.0'
|
|
32
32
|
spec.add_runtime_dependency 'celluloid-io', '0.16.0'
|
|
33
|
-
spec.add_runtime_dependency 'http', '~> 0.
|
|
33
|
+
spec.add_runtime_dependency 'http', '~> 0.9'
|
|
34
34
|
spec.add_runtime_dependency 'zk', '~> 1.9'
|
|
35
|
-
spec.add_runtime_dependency 'multi_json', '~> 1.
|
|
35
|
+
spec.add_runtime_dependency 'multi_json', '~> 1.11'
|
|
36
36
|
end
|
data/cellect.gemspec
CHANGED
|
@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
|
|
|
27
27
|
spec.add_development_dependency 'puma', '~> 2.8'
|
|
28
28
|
spec.add_development_dependency 'pg', '~> 0.17'
|
|
29
29
|
spec.add_development_dependency 'connection_pool', '~> 2.0'
|
|
30
|
+
spec.add_development_dependency 'codeclimate-test-reporter'
|
|
30
31
|
|
|
31
32
|
spec.add_runtime_dependency 'cellect-server', Cellect::VERSION
|
|
32
33
|
spec.add_runtime_dependency 'cellect-client', Cellect::VERSION
|
|
@@ -8,30 +8,37 @@ module Cellect
|
|
|
8
8
|
include Celluloid
|
|
9
9
|
include Celluloid::IO
|
|
10
10
|
|
|
11
|
+
# Reload the data for a workflow on all servers
|
|
11
12
|
def reload_workflow(id)
|
|
12
13
|
broadcast :post, "/workflows/#{ id }/reload"
|
|
13
14
|
end
|
|
14
15
|
|
|
16
|
+
# Remove the workflow from all servers
|
|
15
17
|
def delete_workflow(id)
|
|
16
18
|
broadcast :delete, "/workflows/#{ id }"
|
|
17
19
|
end
|
|
18
20
|
|
|
21
|
+
# Adds or updates a subject on all servers
|
|
19
22
|
def add_subject(id, workflow_id:, group_id: nil, priority: nil)
|
|
20
23
|
broadcast :put, "/workflows/#{ workflow_id }/add", querystring(subject_id: id, group_id: group_id, priority: priority)
|
|
21
24
|
end
|
|
22
25
|
|
|
26
|
+
# Removes a subject on all servers
|
|
23
27
|
def remove_subject(id, workflow_id:, group_id: nil)
|
|
24
28
|
broadcast :put, "/workflows/#{ workflow_id }/remove", querystring(subject_id: id, group_id: group_id)
|
|
25
29
|
end
|
|
26
30
|
|
|
31
|
+
# Preload a user on a server
|
|
27
32
|
def load_user(user_id:, host:, workflow_id:)
|
|
28
33
|
send_http host, :post, "/workflows/#{ workflow_id }/users/#{ user_id }/load"
|
|
29
34
|
end
|
|
30
35
|
|
|
36
|
+
# Adds a subject to a users seen set
|
|
31
37
|
def add_seen(subject_id:, user_id:, host:, workflow_id:)
|
|
32
38
|
send_http host, :put, "/workflows/#{ workflow_id }/users/#{ user_id }/add_seen", querystring(subject_id: subject_id)
|
|
33
39
|
end
|
|
34
40
|
|
|
41
|
+
# Gets unseen subjects for a user
|
|
35
42
|
def get_subjects(user_id:, host:, workflow_id:, limit: nil, group_id: nil)
|
|
36
43
|
response = send_http host, :get, "/workflows/#{ workflow_id }", querystring(user_id: user_id, group_id: group_id, limit: limit)
|
|
37
44
|
ensure_valid_response response
|
|
@@ -40,12 +47,14 @@ module Cellect
|
|
|
40
47
|
|
|
41
48
|
protected
|
|
42
49
|
|
|
50
|
+
# Broadcast by iterating over each server
|
|
43
51
|
def broadcast(action, path, query = '')
|
|
44
52
|
Cellect::Client.node_set.nodes.each_pair do |node, host|
|
|
45
53
|
send_http host, action, path, query
|
|
46
54
|
end
|
|
47
55
|
end
|
|
48
56
|
|
|
57
|
+
# Makes an API call through an evented Celluloid Socket
|
|
49
58
|
def send_http(host, action, path, query = '')
|
|
50
59
|
params = { host: host, path: path }
|
|
51
60
|
params[:query] = query if query && !query.empty?
|
|
@@ -53,6 +62,7 @@ module Cellect
|
|
|
53
62
|
HTTP.send action, uri.to_s, socket_class: Celluloid::IO::TCPSocket
|
|
54
63
|
end
|
|
55
64
|
|
|
65
|
+
# Builds a querystring from a hash
|
|
56
66
|
def querystring(hash = { })
|
|
57
67
|
[].tap do |list|
|
|
58
68
|
hash.each_pair do |key, value|
|
|
@@ -62,6 +72,7 @@ module Cellect
|
|
|
62
72
|
end.join('&')
|
|
63
73
|
end
|
|
64
74
|
|
|
75
|
+
# Ensure the API response was OK
|
|
65
76
|
def ensure_valid_response(response)
|
|
66
77
|
unless response.code == 200
|
|
67
78
|
raise CellectServerError, "Server Responded #{ response.code }"
|
|
@@ -5,6 +5,7 @@ module Cellect
|
|
|
5
5
|
class NodeSet < Cellect::NodeSet
|
|
6
6
|
attr_accessor :nodes
|
|
7
7
|
|
|
8
|
+
# Sets up an empty node set
|
|
8
9
|
def initialize(zk_url = nil)
|
|
9
10
|
self.nodes = { }
|
|
10
11
|
super
|
|
@@ -12,6 +13,7 @@ module Cellect
|
|
|
12
13
|
|
|
13
14
|
protected
|
|
14
15
|
|
|
16
|
+
# Respond to a node coming online or timing out
|
|
15
17
|
def nodes_changed(nodes)
|
|
16
18
|
self.nodes = { }
|
|
17
19
|
nodes.each do |node|
|
|
@@ -19,12 +21,14 @@ module Cellect
|
|
|
19
21
|
end
|
|
20
22
|
end
|
|
21
23
|
|
|
24
|
+
# Register with ZooKeeper and get the list of nodes
|
|
22
25
|
def setup
|
|
23
26
|
watch_nodes
|
|
24
27
|
zk.mkdir_p '/nodes'
|
|
25
28
|
nodes_changed zk.children('/nodes', watch: true)
|
|
26
29
|
end
|
|
27
30
|
|
|
31
|
+
# Watch ZooKeeper for changes to the node set
|
|
28
32
|
def watch_nodes
|
|
29
33
|
zk.register('/nodes') do |event|
|
|
30
34
|
nodes_changed zk.children('/nodes', watch: true)
|
|
@@ -2,6 +2,11 @@ module Cellect
|
|
|
2
2
|
module Client
|
|
3
3
|
class ConfigurationError < StandardError; end;
|
|
4
4
|
|
|
5
|
+
# Allow YAML configuration from config/cellect.yml
|
|
6
|
+
#
|
|
7
|
+
# development:
|
|
8
|
+
# zk_url: localhost:2181
|
|
9
|
+
# pool_size: 50
|
|
5
10
|
class CellectRailtie < Rails::Railtie
|
|
6
11
|
initializer 'cellect.connect_to_zookeeper' do
|
|
7
12
|
ensure_config_file
|
data/lib/cellect/client.rb
CHANGED
|
@@ -9,6 +9,7 @@ module Cellect
|
|
|
9
9
|
attr_accessor :connection, :_node_set
|
|
10
10
|
end
|
|
11
11
|
|
|
12
|
+
# Sets up the set of server nodes
|
|
12
13
|
def self.node_set(zk_url=nil)
|
|
13
14
|
self._node_set ||= NodeSet.supervise(zk_url)
|
|
14
15
|
_node_set.actors.first
|
|
@@ -18,10 +19,12 @@ module Cellect
|
|
|
18
19
|
node_set.ready?
|
|
19
20
|
end
|
|
20
21
|
|
|
22
|
+
# Selects a server for a user
|
|
21
23
|
def self.choose_host
|
|
22
24
|
node_set.nodes.values.sample
|
|
23
25
|
end
|
|
24
26
|
|
|
27
|
+
# Ensure a previously selected server is still available
|
|
25
28
|
def self.host_exists?(ip)
|
|
26
29
|
node_set.nodes.values.include? ip
|
|
27
30
|
end
|
data/lib/cellect/node_set.rb
CHANGED
|
@@ -7,12 +7,14 @@ module Cellect
|
|
|
7
7
|
|
|
8
8
|
attr_accessor :zk, :state
|
|
9
9
|
|
|
10
|
+
# Sets up the node set and starts connecting to ZooKeeper
|
|
10
11
|
def initialize(zk_url = nil)
|
|
11
12
|
@zk_url = zk_url
|
|
12
13
|
self.state = :initializing
|
|
13
14
|
after(0.001){ async.initialize_zk } # don't block waiting for ZK to connect
|
|
14
15
|
end
|
|
15
16
|
|
|
17
|
+
# Connect to ZooKeeper, setup this node, and change state
|
|
16
18
|
def initialize_zk
|
|
17
19
|
# don't let ZK hang the thread, just retry connection on restart
|
|
18
20
|
Timeout::timeout(5) do
|
|
@@ -33,7 +35,7 @@ module Cellect
|
|
|
33
35
|
end
|
|
34
36
|
|
|
35
37
|
def setup
|
|
36
|
-
|
|
38
|
+
# Specialized in subclasses
|
|
37
39
|
end
|
|
38
40
|
end
|
|
39
41
|
end
|
data/lib/cellect/version.rb
CHANGED
|
@@ -62,12 +62,15 @@ module Cellect::Client
|
|
|
62
62
|
end
|
|
63
63
|
|
|
64
64
|
it 'should get subjects' do
|
|
65
|
-
should_send action: :get, url: 'workflows/random?user_id=1&group_id=1&limit=10', to: 1
|
|
66
|
-
connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
|
|
67
65
|
should_send action: :get, url: 'workflows/random?user_id=1', to: 1
|
|
68
66
|
connection.get_subjects host: '1', workflow_id: 'random', user_id: 1
|
|
69
67
|
end
|
|
70
68
|
|
|
69
|
+
it 'should get grouped subjects' do
|
|
70
|
+
should_send action: :get, url: 'workflows/random?user_id=1&group_id=1&limit=10', to: 1
|
|
71
|
+
connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
|
|
72
|
+
end
|
|
73
|
+
|
|
71
74
|
context 'getting subjects' do
|
|
72
75
|
def get_subjects
|
|
73
76
|
connection.get_subjects host: '1', workflow_id: 'random', user_id: 1, limit: 10, group_id: 1
|
data/spec/spec_helper.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cellect-client
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Michael Parrish
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-11-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: '1.
|
|
19
|
+
version: '1.10'
|
|
20
20
|
type: :development
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: '1.
|
|
26
|
+
version: '1.10'
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: rake
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -128,14 +128,14 @@ dependencies:
|
|
|
128
128
|
requirements:
|
|
129
129
|
- - "~>"
|
|
130
130
|
- !ruby/object:Gem::Version
|
|
131
|
-
version: '0.
|
|
131
|
+
version: '0.9'
|
|
132
132
|
type: :runtime
|
|
133
133
|
prerelease: false
|
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
|
135
135
|
requirements:
|
|
136
136
|
- - "~>"
|
|
137
137
|
- !ruby/object:Gem::Version
|
|
138
|
-
version: '0.
|
|
138
|
+
version: '0.9'
|
|
139
139
|
- !ruby/object:Gem::Dependency
|
|
140
140
|
name: zk
|
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -156,14 +156,14 @@ dependencies:
|
|
|
156
156
|
requirements:
|
|
157
157
|
- - "~>"
|
|
158
158
|
- !ruby/object:Gem::Version
|
|
159
|
-
version: 1.
|
|
159
|
+
version: '1.11'
|
|
160
160
|
type: :runtime
|
|
161
161
|
prerelease: false
|
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
|
163
163
|
requirements:
|
|
164
164
|
- - "~>"
|
|
165
165
|
- !ruby/object:Gem::Version
|
|
166
|
-
version: 1.
|
|
166
|
+
version: '1.11'
|
|
167
167
|
description: ''
|
|
168
168
|
email:
|
|
169
169
|
- michael@zooniverse.org
|
|
@@ -175,6 +175,7 @@ files:
|
|
|
175
175
|
- ".rspec"
|
|
176
176
|
- ".travis.yml"
|
|
177
177
|
- Gemfile
|
|
178
|
+
- LICENSE
|
|
178
179
|
- README.md
|
|
179
180
|
- Rakefile
|
|
180
181
|
- cellect-client.gemspec
|
|
@@ -231,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
231
232
|
version: '0'
|
|
232
233
|
requirements: []
|
|
233
234
|
rubyforge_project:
|
|
234
|
-
rubygems_version: 2.
|
|
235
|
+
rubygems_version: 2.5.0
|
|
235
236
|
signing_key:
|
|
236
237
|
specification_version: 4
|
|
237
238
|
summary: ''
|