turbot 0.0.48 → 0.0.49

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWU3YWMxMTE2MjcxZjZlZjczNmM5NDg3ZTZlMTEwZTY5MzcwM2Q4ZA==
-  data.tar.gz: !binary |-
-    Mzg1ZDM1OWQ5ODI2N2ExMzlkZTY5ZGFiZWViYzE5MGMyOTVkZTkxOA==
+SHA1:
+  metadata.gz: 062fc535e7b4045b599ac30e1dc5a1276cc082d3
+  data.tar.gz: 9b0b852c875e9ce9346f64d6f024fd3bef7dc5fc
 SHA512:
-  metadata.gz: !binary |-
-    MTY2MGJjYTQ0YWU2MzIwODE5MzJlYjUyNjVkNTcyZWNiNTY1MzNiNTczOGM0
-    NzkzNjEzMWI0ZDYyZjRiYWJlYjJiZjQwOWM2M2M4NDk1YTk3MmJhYzA4Yzky
-    ZTI4MTRjZmM2ZGU5YTJjMzcyMWQ3MWE2MmM1NDA5ODU5OWQ3N2Q=
-  data.tar.gz: !binary |-
-    NzViOTRlMThjZjIyMDY5MjlmODFhZDg3NWQ3ZjQ2YWY0YTMxMTE0MjVmYjZk
-    NjNmZTc1OTgwMGJhZWVlNzE3NmMzYTI4NDFkYWNkM2M2YzhlNWE2MTYwODEx
-    M2I4ZDZhYjdlZWIwMWY0Nzc2OGJhYWIxZDVmNzgxZTI5NGExYTc=
+  metadata.gz: b864c71e072b51c5556af5e1a4d821a583e58b8412ed6b59486d81403fc05bafbb549de97b3feebe4f12a479f13e7552bc8959fd2a9d4cecb49664e18611be54
+  data.tar.gz: 43d31aa20db363e1db25fb83d67fe94addfcec6864c75b640a7452ea24bcbf7c87ad2dd2515bd9b124aeb5abc6469debbca90dfe35cd132fd56193d0a2abaa03

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.48"
+  VERSION = "0.0.49"
 end

data/schema/schemas/company-schema.json

@@ -59,12 +59,24 @@
         "$ref": "includes/filing.json"
       }
     },
+    "industry_codes": {
+      "type": "array",
+      "items": {
+        "$ref": "includes/industry_code.json"
+      }
+    },
     "previous_names": {
       "type": "array",
       "items": {
         "$ref": "includes/previous_name.json"
       }
     },
+    "alternative_names": {
+      "type": "array",
+      "items": {
+        "$ref": "includes/alternative_name.json"
+      }
+    },
     "branch": {
       "type": ["string","null"],
       "description": "A flag to denote whether a company is a branch entity. This should only be set if the company is a type of branch (otherwise should be null). In general the only option here is 'F' for a 'Foreign' branch, i.e. an out-of-jurisdiction entity that has registered as having a presence in the jurisdiction. In the US this is sometimes called a Foreign Corporation",

data/schema/schemas/financial-payment-schema.json

@@ -0,0 +1,27 @@
+{
+  "title": "Financial-Payment",
+  "description": "A Financial-Payment is a payment from government to a recipient",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "source_jurisdiction": {
+      "description": "Jurisdiction of the source of the data",
+      "type": "string"
+    },
+    "company": {
+      "$ref": "includes/company.json"
+    },
+    "data": {
+      "type": "array",
+      "description": "This is an array of data objects, that is the objects which actually contain the data about the datum. Generally there will only be one element in this, although in for some types of data_types there may naturally be several releated to the same company, e.g. shareholders",
+      "items": {
+        "$ref": "includes/financial-payment-data-object.json"
+      },
+      "additionalItems": false
+    }
+  },
+  "required": [
+    "company",
+    "data"
+  ]
+}

data/schema/schemas/includes/alternative_name.json

@@ -0,0 +1,13 @@
+{
+  "name": "AlternativeName",
+  "description": "An alternative name of a company, e.g. abbreviation, trading (including dba or doing business as), legal. As well as trading names etc, it can be used for storing alternative language representations of the legal name, in which case the language should be represented as two-letter ISO-639 code",
+  "type": "object",
+  "properties": { "company_name": { "type": "string", "minLength": 1 },
+                  "start_date": { "type": "date" },
+                  "end_date": { "type": "date" },
+                  "language": { "type": "string", "minLength": 2, "maxLength": 2 },
+                  "type": { "type": "string", "enum": ["trading", "abbreviation", "legal"] }
+  },
+  "required": [ "company_name" ]
+}
+

data/schema/schemas/includes/company.json

@@ -5,8 +5,10 @@
   "properties": {
     "name": { "type": "string" },
     "jurisdiction": { "type": "string" },
+    "company_number": { "type": "string" },
     "identifier": {
       "type": "string",
+      "description": "An official identifier paired with a code for the issuer of the identifier, e.g sec/12345",
       "pattern": "^[^/]+/[^/]+$"
     }
   },

data/schema/schemas/includes/financial-payment-data-object.json

@@ -0,0 +1,60 @@
+{
+  "name": "Financial Payment Datum",
+  "type": "object",
+  "properties": {
+    "data_type": { "enum": [ "financial_payment" ] },
+    "source_url": {
+      "type": "string"},
+    "confidence": {
+      "type": "string"},
+    "properties": {
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "The regulating body that issued the licence",
+          "type": "string"},
+        "payee_name": {
+          "description": "The name of the payee (the entity that received the money)",
+          "type": "string"},
+        "currency": {
+          "description": "The currency of the payment (three letter symbol, e.g. USD, GBP, EUR)",
+          "type": "string"},
+        "date": {
+          "description": "The date on which the payment was made",
+          "type": "date"},
+        "transaction_number": {
+          "description": "The unique identifier for the transaction, scoped to this bot",
+          "type": "string"},
+        "jurisdiction": {
+          "description": "The jurisdiction of the body that made the payment, eg. UK, France, Delaware, Manchester",
+          "type": "string"},
+        "more_details_url": {
+          "description": "A url from which more details can be seen (may be the same as the source_url)",
+          "type": ["string",null]},
+        "description": {
+          "description": "The description of the transaction as given in the raw data",
+          "type": ["string",null]},
+        "expense_type": {
+          "description": "The type of expense -- can be either capital, revenue (i.e. current expenditure) or null",
+          "enum": ["capital","revenue",null]},
+        "expense_area": {
+          "description": "category (in words) of the expenditure",
+          "type": ["string",null]},
+        "entity_name": {
+          "description": "The name of the government entity that made the payment, e.g. Environment Agency",
+          "type": "string"},
+        "entity_uri": {
+          "description": "A unique URL (ideally a dereferencable URI) for the government entity",
+          "type": ["string",null]},
+        "department_name": {
+          "description": "The name of the government department which the entity belongs to (if relevant), e.g. Department of Health",
+          "type": ["string",null]},
+        "csv_line_number": {
+          "description": "If the source for the data is a CSV file, you can optionally include the line number of the CSV from which this data was retrieved",
+          "type": ["string",null]}
+      },
+      "required": [ "value", "payee_name", "date","currency" ]
+    }
+  },
+  "required": [ "data_type", "properties","source_url","confidence" ]
+}

data/schema/schemas/includes/industry_code.json

@@ -0,0 +1,13 @@
+{
+  "name": "IndustryCode",
+  "description": "An industry code from a standard code list (e.g. NAICS 2007 or NACE 2)",
+  "type": "object",
+  "properties": { "name": { "type": "string" },
+                  "code": { "type": "string" },
+                  "code_scheme_id": { "type": "string", "enum": ["eu_nace_2", "uk_sic_2003", "uk_sic_2007", "us_naics_2002", "us_naics_2007", "be_nace_2008"] },
+                  "start_date":  { "type": "date" },
+                  "end_date":  { "type": "date" }
+  },
+  "required": [ "code", "code_scheme_id" ]
+}
+

data/schema/schemas/includes/{licence-data.json → licence-data-object.json}

@@ -3,12 +3,19 @@
   "type": "object",
   "properties": {
     "data_type": { "enum": [ "licence" ] },
+    "source_url": {
+      "type": "string"},
+    "confidence": {
+      "type": "string"},
     "properties": {
       "type": "object",
       "properties": {
         "regulator": {
           "description": "The regulating body that issued the licence",
           "type": "string"},
+        "category": {
+          "description": "The category of licence. Current possible values are: 'Financial','Business'",
+          "enum": [ "Financial", "Business" ]},
         "jurisdiction_code": {
           "description": "The jurisdiction for which licence was issued",
           "type": "string"},
@@ -21,8 +28,8 @@
         "oc_classification": {
           "type": "array"}
       },
-      "required": [ "jurisdiction_code", "jurisdiction_classification" ]
+      "required": [ "jurisdiction_code", "jurisdiction_classification", "category" ]
     }
   },
-  "required": [ "data_type", "properties" ]
+  "required": [ "data_type", "properties","source_url","confidence" ]
 }

data/schema/schemas/includes/subsidiary-relationship-data.json

@@ -11,6 +11,9 @@
         "direct": {
           "description": "If the control is direct (if via an intermediary, this value should be false; if unknown, left blank)",
           "type": "boolean"},
+        "percentage_controlled": {
+          "description": "Percentage controlled, either directly or indirectly",
+          "type": "number"},
         "significant": {
           "description": "Does the source define the control as somehow significant?",
           "type": "boolean"},
@@ -33,15 +36,7 @@
               "type": "string"
             },
             "identifier": {
-              "description": "Unique identifier of person",
-              "type": "string"
-            },
-            "address": {
-              "description": "Address given for owner of parcel",
-              "type": "string"
-            },
-            "address_country": {
-              "description": "Country part of owner's address",
+              "description": "Unique identifier of company",
               "type": "string"
             }
           }

data/schema/schemas/licence-schema.json

@@ -1,21 +1,27 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Licence Schema",
+  "description": "A Licence is a permission for an entity to do something that would otherwise not be permitted. An example is a 'Financial' licence to operate as a bank, or an financial advisor, for example, or a 'Business' Licence to sell alcohol, or operate an amusement arcade. Future licence types (extractives, pollution) will be added later",
+  "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "allOf" : [
-    // The following is a basic statement with sample_date, etc
-    { "$ref": "includes/base-statement.json" },
-    // And this overrides it to provide data-type-specific information
-    {
-      "properties": {
-        "data": {
-          "items": {
-            "allOf": [
-              { "$ref": "includes/licence-data.json" }
-            ]
-          }
-        }
-      }
+  "properties": {
+    "source_jurisdiction": {
+      "description": "Jurisdiction of the source of the data",
+      "type": "string"
+    },
+    "company": {
+      "$ref": "includes/company.json"
+    },
+    "data": {
+      "type": "array",
+      "description": "This is an array of data objects, that is the objects which actually contain the data about the datum. Generally there will only be one element in this, although in for some types of data_types there may naturally be several releated to the same company, e.g. shareholders",
+      "items": {
+        "$ref": "includes/licence-data-object.json"
+      },
+      "additionalItems": false
     }
+  },
+  "required": [
+    "company",
+    "data"
   ]
 }

data/schema/schemas/subsidiary-relationship-schema.json

@@ -1,19 +1,27 @@
 {
+  "title": "Subsidiary Relationship",
+  "description": "A relationship of control between two companies",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Subsidiary Relationship Schema",
   "type": "object",
-  "allOf" : [
-    { "$ref": "includes/base-statement.json" },
-    {
-      "properties": {
-        "data": {
-          "items": {
-            "allOf": [
-              { "$ref": "includes/subsidiary-relationship-data.json" }
-            ]
-          }
-        }
-      }
+  "properties": {
+    "source_jurisdiction": {
+      "description": "Jurisdiction of the source of the data",
+      "type": "string"
+    },
+    "company": {
+      "$ref": "includes/company.json"
+    },
+    "data": {
+      "type": "array",
+      "description": "This is an array of data objects, that is the objects which actually contain the data about the datum. Generally there will only be one element in this, although in for some types of data_types there may naturally be several releated to the same company, e.g. shareholders",
+      "items": {
+        "$ref": "includes/subsidiary-relationship-data.json"
+      },
+      "additionalItems": false
     }
+  },
+  "required": [
+    "company",
+    "data"
   ]
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.49
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -42,42 +42,42 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -114,26 +114,26 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.15
+        version: 0.0.17
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library and command-line tool to deploy and manage apps on Turbot.
@@ -175,23 +175,6 @@ files:
 - lib/turbot/updater.rb
 - lib/turbot/version.rb
 - lib/vendor/turbot/okjson.rb
-- schema/schemas/company-schema.json
-- schema/schemas/includes/address.json
-- schema/schemas/includes/base-statement.json
-- schema/schemas/includes/company.json
-- schema/schemas/includes/filing.json
-- schema/schemas/includes/licence-data.json
-- schema/schemas/includes/officer.json
-- schema/schemas/includes/previous_name.json
-- schema/schemas/includes/share-parcel-data.json
-- schema/schemas/includes/share-parcel.json
-- schema/schemas/includes/subsidiary-relationship-data.json
-- schema/schemas/includes/total-shares.json
-- schema/schemas/licence-schema.json
-- schema/schemas/primary-data-schema.json
-- schema/schemas/share-parcel-schema.json
-- schema/schemas/simple-licence-schema.json
-- schema/schemas/subsidiary-relationship-schema.json
 - spec/helper/legacy_help.rb
 - spec/helper/pg_dump_restore_spec.rb
 - spec/schemas/dummy_schema.json
@@ -225,6 +208,26 @@ files:
 - templates/manifest.json
 - templates/python/scraper.py
 - templates/ruby/scraper.rb
+- schema/schemas/company-schema.json
+- schema/schemas/financial-payment-schema.json
+- schema/schemas/includes/address.json
+- schema/schemas/includes/alternative_name.json
+- schema/schemas/includes/company.json
+- schema/schemas/includes/filing.json
+- schema/schemas/includes/financial-payment-data-object.json
+- schema/schemas/includes/industry_code.json
+- schema/schemas/includes/licence-data-object.json
+- schema/schemas/includes/officer.json
+- schema/schemas/includes/previous_name.json
+- schema/schemas/includes/share-parcel-data.json
+- schema/schemas/includes/share-parcel.json
+- schema/schemas/includes/subsidiary-relationship-data.json
+- schema/schemas/includes/total-shares.json
+- schema/schemas/licence-schema.json
+- schema/schemas/primary-data-schema.json
+- schema/schemas/share-parcel-schema.json
+- schema/schemas/simple-licence-schema.json
+- schema/schemas/subsidiary-relationship-schema.json
 homepage: http://turbot.com/
 licenses:
 - MIT
@@ -235,19 +238,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Client library and CLI to deploy apps on Turbot.
 test_files: []
-has_rdoc: 

data/schema/schemas/includes/base-statement.json

@@ -1,27 +0,0 @@
-{
-  "name": "Base statement",
-  "description": "A base statement which must be extended by a schema to be used in OpenCorporates",
-  "type": "object",
-  "properties": {
-    "source_url": {
-      "description": "Place where this fact can be verified",
-      "type": "string"
-    },
-    "source_jurisdiction": {
-      "description": "Jurisdiction of the source of the data",
-      "type": "string"
-    },
-    "sample_date": {
-      "description": "Date on which this fact was known to be true",
-      "type": "string"
-    },
-    "company": {
-      "$ref" : "../includes/company.json"
-    },
-    "data": {
-      "type": "array",
-      "additionalItems": false
-    }
-  },
-  "required": ["source_url", "data", "sample_date", "company"]
-}