turbot-runner 0.2.27 → 0.2.28

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3f026988724c495022a7d43e93029c23cde4a549
4
- data.tar.gz: 5747e2d28d149c5c87089b9d1267d111f9ac6f70
3
+ metadata.gz: c0808c61aca38bd3948e02484be22965847a3103
4
+ data.tar.gz: ef95e425c7ba8a5579edc9c0887b3ceb807fad91
5
5
  SHA512:
6
- metadata.gz: bf6f0d2a37d2f66ac8a3eed9e3242eda3ef13580685d7b5b6f0bbff62b7bbdaa6bdc9bed36854d82e6245c70a6d64d96d35bbf18bfc1dcc20279d8d67c627bb1
7
- data.tar.gz: 9afaef54c01a7f967b32e4747b61c737ad3094e88347a79b10671de01f64cbd49b682b22a2b0e7dfd51ab5c3a6937321b943a08f11e1188c6c6695622caaae98
6
+ metadata.gz: 3dfc49858e45b9d4222304ddcf42c10e7db8f070ed0905a3985501a48f41595a59488026da681ee4b221a93644d1500f7bc95aeba497b6a9cadccaf9a8d73f59
7
+ data.tar.gz: 6429481d64987774824823a014f1083f7ab0918b7905994db64013da120d99046d0dd8d6e41bba0631e59eab569507de3759c1e749c65d7c086a062ed3bfa5d2
data/README.md CHANGED
@@ -4,7 +4,6 @@
4
4
  [![Build Status](https://secure.travis-ci.org/openc/turbot-runner.png)](https://travis-ci.org/openc/turbot-runner)
5
5
  [![Build Status](https://ci.appveyor.com/api/projects/status/8wvd4ygxhk6wj94s?svg=true)](https://ci.appveyor.com/project/jpmckinney/turbot-runner)
6
6
  [![Dependency Status](https://gemnasium.com/openc/turbot-runner.png)](https://gemnasium.com/openc/turbot-runner)
7
- [![Coverage Status](https://coveralls.io/repos/openc/turbot-runner/badge.png)](https://coveralls.io/r/openc/turbot-runner)
8
7
  [![Code Climate](https://codeclimate.com/github/openc/turbot-runner.png)](https://codeclimate.com/github/openc/turbot-runner)
9
8
 
10
9
  ## Getting started
@@ -1,3 +1,3 @@
1
1
  module TurbotRunner
2
- VERSION = '0.2.27'
2
+ VERSION = '0.2.28'
3
3
  end
@@ -0,0 +1,24 @@
1
+ {
2
+ "$schema": "http://json-schema.org/draft-04/schema#",
3
+ "description": "An address with a type",
4
+ "type": "object",
5
+ "properties": {
6
+ "address": {
7
+ "$ref": "address.json"
8
+ },
9
+ "type": {
10
+ "enum": [
11
+ "registered",
12
+ "headquarters",
13
+ "mailing",
14
+ "trading",
15
+ "unknown"
16
+ ]
17
+ }
18
+ },
19
+ "additionalProperties": false,
20
+ "required": [
21
+ "address",
22
+ "type"
23
+ ]
24
+ }
@@ -85,6 +85,12 @@
85
85
  "mailing_address": {
86
86
  "$ref": "address.json"
87
87
  },
88
+ "addresses": {
89
+ "type": "array",
90
+ "items": {
91
+ "$ref": "address-with-type.json"
92
+ }
93
+ },
88
94
  "officers": {
89
95
  "type": "array",
90
96
  "items": {
@@ -52,6 +52,12 @@
52
52
  "mailing_address": {
53
53
  "$ref": "address.json"
54
54
  },
55
+ "addresses": {
56
+ "type": "array",
57
+ "items": {
58
+ "$ref": "address-with-type.json"
59
+ }
60
+ },
55
61
  "identifiers": {
56
62
  "type": ["array", "null"],
57
63
  "items": {
@@ -0,0 +1,197 @@
1
+ {
2
+ "$schema": "http://json-schema.org/draft-04/schema#",
3
+ "description": "A Trademark is a recognizable sign, design, or expression which identifies products or services of a particular source from those of others. This schema is actually for the trademark registration, i.e. not just the mark details, but the record of when it was registered and who holds the trademark. See also http://www.wipo.int/standards/XMLSchema/HTML/ST96TechnicalSpecification/V0-11/TrademarkComponents.html",
4
+ "properties": {
5
+ "register": {
6
+ "description": "The register on which the trademark is listed",
7
+ "type": "string"
8
+ },
9
+ "holders": {
10
+ "type": "array",
11
+ "description": "Details of the holder(s) of the trademark (sometimes called the owners)",
12
+ "items": {
13
+ "$ref": "includes/entity.json"
14
+ }
15
+ },
16
+ "correspondent": {
17
+ "$ref": "includes/entity.json",
18
+ "description": "Details of the correspondent (i.e. contact person)"
19
+ },
20
+ "representative": {
21
+ "$ref": "includes/entity.json",
22
+ "description": "Details of the representative"
23
+ },
24
+ "mark_details": {
25
+ "description": "Details of the trademark itself (rather than the registration)",
26
+ "type": "object",
27
+ "properties": {
28
+ "mark_text": {
29
+ "description": "Text of the trademark",
30
+ "type": "string"
31
+ },
32
+ "mark_form": {
33
+ "description": "The form (i.e. category) of the mark. Sensory marks include smells and sounds",
34
+ "enum": [
35
+ "text",
36
+ "image",
37
+ "sensory_mark",
38
+ "three_d_mark"
39
+ ]
40
+ },
41
+ "mark_type": {
42
+ "description": "Free text description of mark type (as provided by register), e.g. 'Illustration', 'Typeset: Word(s)/letter(s)/number(s)'",
43
+ "type": "string"
44
+ },
45
+ "mark_image": {
46
+ "properties": {
47
+ "uid": {
48
+ "description": "A unique identifier",
49
+ "type": "string"
50
+ },
51
+ "format": {
52
+ "description": "Type of image format",
53
+ "type": "string"
54
+ },
55
+ "path": {
56
+ "description": "Path of image",
57
+ "type": "string"
58
+ },
59
+ "description": {
60
+ "description": "Description of image in words",
61
+ "type": "string"
62
+ }
63
+ },
64
+ "additionalProperties": false
65
+ },
66
+ "classification": {
67
+ "type": "array",
68
+ "description": "Classification of the trademark",
69
+ "items": {
70
+ "$ref": "#/definitions/nice_classification"
71
+ }
72
+ }
73
+ },
74
+ "additionalProperties": false
75
+ },
76
+ "status": {
77
+ "description": "Status of the trademark registration",
78
+ "type": "string"
79
+ },
80
+ "uid": {
81
+ "description": "Unique id/reference for the trademark registration",
82
+ "type": "string"
83
+ },
84
+ "url": {
85
+ "description": "URL of trademark registration",
86
+ "type": "string"
87
+ },
88
+ "source_url": {
89
+ "description": "Url of the source of the data (e.g. download URL), or if there is not persistent URL the page from which it can be found (e.g. search page). This field is required.",
90
+ "type": "string",
91
+ "minLength": 11
92
+ },
93
+ "confidence": {
94
+ "description": "Confidence in accuracy of data",
95
+ "enum": [
96
+ "HIGH",
97
+ "MEDIUM",
98
+ "LOW"
99
+ ]
100
+ },
101
+ "registration_date": {
102
+ "description": "Date on which the mark was registered",
103
+ "type": "string",
104
+ "format": "date"
105
+ },
106
+ "expiry_date": {
107
+ "description": "Date on which the registration ended, or is scheduled to expire",
108
+ "type": "string",
109
+ "format": "date"
110
+ },
111
+ "start_date": {
112
+ "description": "This should be the same as registration_date",
113
+ "type": "string",
114
+ "format": "date"
115
+ },
116
+ "start_date_type": {
117
+ "enum": [
118
+ "at",
119
+ "before",
120
+ "after"
121
+ ]
122
+ },
123
+ "retrieved_at": {
124
+ "description": "Date-time this was retrieved from the source",
125
+ "type": "string",
126
+ "format": "date-time"
127
+ },
128
+ "sample_date": {
129
+ "description": "Date on which we know this to be true (for example the date the trademark data was retrieved if there's no explicit registration date)",
130
+ "type": "string",
131
+ "format": "date"
132
+ },
133
+ "other_attributes": {
134
+ "description": "Use for other attributes for which we don't yet have curated schema attributes",
135
+ "type": "object"
136
+ }
137
+ },
138
+ "additionalProperties": false,
139
+ "required": [
140
+ "holders",
141
+ "mark_details",
142
+ "register",
143
+ "retrieved_at",
144
+ "source_url",
145
+ "sample_date",
146
+ "confidence"
147
+ ],
148
+ "definitions": {
149
+ "nice_classification": {
150
+ "$schema": "http://json-schema.org/draft-04/schema#",
151
+ "title": "NICE Trademark Classification",
152
+ "description": "A classification from a the WIPO Nice classification system for trademarks. See http://web2.wipo.int/classifications/nice/nicepub/en/fr/edition-20170101/classheadings/ and https://en.wikipedia.org/wiki/International_(Nice)_Classification_of_Goods_and_Services",
153
+ "type": "object",
154
+ "properties": {
155
+ "code_scheme_id": {
156
+ "description": "The scheme of the classification",
157
+ "enum": ["wipo_nice"]
158
+ },
159
+ "code": {
160
+ "description": "The classification code",
161
+ "type": "string"
162
+ },
163
+ "enhanced_descriptions": {
164
+ "description": "Enhanced descriptions of the classification (may enhance restrict, or otherwise alter standard classification)",
165
+ "type": "array",
166
+ "items": {
167
+ "$ref": "#/definitions/nice_enhanced_description"
168
+ }
169
+ }
170
+ },
171
+ "additionalProperties": false,
172
+ "required": [
173
+ "code",
174
+ "code_scheme_id"
175
+ ]
176
+ },
177
+ "nice_enhanced_description": {
178
+ "$schema": "http://json-schema.org/draft-04/schema#",
179
+ "title": "Enhanced description for NICE Trademark Classification",
180
+ "description": "NICE Trademark classifications are quite broad, and the specific areas being claimed for are often not for a complete classification but for an arbitrary set of areas, specified in freetext by the trademark owner.",
181
+ "type": "object",
182
+ "properties": {
183
+ "language": {
184
+ "description": "The language code as 2-letter ISO 639 language code",
185
+ "type": "string",
186
+ "minLength": 2,
187
+ "maxLength": 2
188
+ },
189
+ "description": {
190
+ "description": "The text of the description",
191
+ "type": "string"
192
+ }
193
+ },
194
+ "additionalProperties": false
195
+ }
196
+ }
197
+ }
data/spec/spec_helper.rb CHANGED
@@ -1,14 +1,4 @@
1
1
  require 'rubygems'
2
-
3
- unless RUBY_PLATFORM =~ /mswin32|mingw32/
4
- require 'simplecov'
5
- require 'coveralls'
6
- SimpleCov.formatter = Coveralls::SimpleCov::Formatter
7
- SimpleCov.start do
8
- add_filter 'spec'
9
- end
10
- end
11
-
12
2
  require 'rspec'
13
3
 
14
4
  Dir['./spec/support/**/*.rb'].sort.each { |f| require f}
@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
20
20
  gem.add_dependency "activesupport", "~> 4.1.4"
21
21
  gem.add_dependency "openc-json_schema"
22
22
 
23
- gem.add_development_dependency "coveralls"
24
23
  gem.add_development_dependency "rake"
25
24
  gem.add_development_dependency "rspec", "~> 3.4.0"
26
25
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: turbot-runner
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.27
4
+ version: 0.2.28
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenCorporates
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-30 00:00:00.000000000 Z
11
+ date: 2017-07-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -38,20 +38,6 @@ dependencies:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: coveralls
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ">="
46
- - !ruby/object:Gem::Version
47
- version: '0'
48
- type: :development
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: rake
57
43
  requirement: !ruby/object:Gem::Requirement
@@ -112,6 +98,7 @@ files:
112
98
  - schema/schemas/financial-payment-schema.json
113
99
  - schema/schemas/gazette-notice-schema.json
114
100
  - schema/schemas/includes/accounts_element.json
101
+ - schema/schemas/includes/address-with-type.json
115
102
  - schema/schemas/includes/address.json
116
103
  - schema/schemas/includes/alternative_name.json
117
104
  - schema/schemas/includes/base-statement.json
@@ -149,6 +136,7 @@ files:
149
136
  - schema/schemas/simple-licence-schema.json
150
137
  - schema/schemas/simple-subsidiary-schema.json
151
138
  - schema/schemas/subsidiary-relationship-schema.json
139
+ - schema/schemas/trademark-registration-schema.json
152
140
  - spec/bots/bot-that-crashes-immediately/manifest.json
153
141
  - spec/bots/bot-that-crashes-immediately/scraper.rb
154
142
  - spec/bots/bot-that-crashes-immediately/transformer1.rb