hdo-storting-importer 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af832dfe75f36ebe57837c1765372a3006db7ce
-  data.tar.gz: 188fc6fa520a69fa71e3fc062bcfdc35942e8dc8
+  metadata.gz: caec1b7f38dd610a7482f789ef4957f3d94e00c7
+  data.tar.gz: f4e44a467ad3c43852b15f2a691c6d2f0300898a
 SHA512:
-  metadata.gz: 9f0014cc7fc871d881a6bd035d346a340cc475dc856e93690f925726f365041943072f9e01fd49e1a2f0a4e774b9f16fe008e47aae0f4006c09f0125e1074163
-  data.tar.gz: c05a862e059dfa37ac2e6d7a2b95b144e156429c17427d850877ede306996b56c680adefec25e93cfb952c912d398941c6e1c9e2cf4541ad41a9ad506748f256
+  metadata.gz: c2d4698c08db85f21d58a8986e477f5478caaa1582ec2f057d4f6788950ab1181d00c6f5a78cdb54ab6be3e94361431541629ee133f04f8afd636e29f0a9ac6f
+  data.tar.gz: c59796448cefa43002fc12efc881aaae4e8e6e889c41c003cb8e7a54a7e4374f68ce552bc4018b33f3500546c9e9e279027fff9d3f44d7a75606172e5f2fc6af

data/features/convert.feature

@@ -110,97 +110,97 @@ Feature: Import data
       [
         {
           "kind": "hdo#district",
-          "externalId": "AA",
+          "external_id": "AA",
           "name": "Aust-Agder"
         },
         {
           "kind": "hdo#district",
-          "externalId": "VA",
+          "external_id": "VA",
           "name": "Vest-Agder"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Ak",
+          "external_id": "Ak",
           "name": "Akershus"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Bu",
+          "external_id": "Bu",
           "name": "Buskerud"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Fi",
+          "external_id": "Fi",
           "name": "Finnmark"
         },
         {
           "kind": "hdo#district",
-          "externalId": "He",
+          "external_id": "He",
           "name": "Hedmark"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Ho",
+          "external_id": "Ho",
           "name": "Hordaland"
         },
         {
           "kind": "hdo#district",
-          "externalId": "MR",
+          "external_id": "MR",
           "name": "Møre og Romsdal"
         },
         {
           "kind": "hdo#district",
-          "externalId": "No",
+          "external_id": "No",
           "name": "Nordland"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Op",
+          "external_id": "Op",
           "name": "Oppland"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Os",
+          "external_id": "Os",
           "name": "Oslo"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Ro",
+          "external_id": "Ro",
           "name": "Rogaland"
         },
         {
           "kind": "hdo#district",
-          "externalId": "SF",
+          "external_id": "SF",
           "name": "Sogn og Fjordane"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Te",
+          "external_id": "Te",
           "name": "Telemark"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Tr",
+          "external_id": "Tr",
           "name": "Troms"
         },
         {
           "kind": "hdo#district",
-          "externalId": "NT",
+          "external_id": "NT",
           "name": "Nord-Trøndelag"
         },
         {
           "kind": "hdo#district",
-          "externalId": "ST",
+          "external_id": "ST",
           "name": "Sør-Trøndelag"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Ve",
+          "external_id": "Ve",
           "name": "Vestfold"
         },
         {
           "kind": "hdo#district",
-          "externalId": "Øs",
+          "external_id": "Øs",
           "name": "Østfold"
         }
       ]

data/lib/hdo/storting_importer/category.rb

@@ -49,8 +49,8 @@ module Hdo
       end
 
       def self.from_hash(data)
-        obj = new data['externalId'], data['name']
-        obj.children = Array(data['subCategories']).map { |e| from_hash(e) }
+        obj = new data['external_id'], data['name']
+        obj.children = Array(data['sub_categories']).map { |e| from_hash(e) }
 
         obj
       end
@@ -67,12 +67,12 @@ module Hdo
 
       def to_hash
         h = {
-          'kind'       => self.class.kind,
-          'externalId' => @external_id,
-          'name'       => @name
+          'kind'        => self.class.kind,
+          'external_id' => @external_id,
+          'name'        => @name
         }
 
-        h['subCategories'] = @children.map { |e| e.to_hash } if @children.any?
+        h['sub_categories'] = @children.map { |e| e.to_hash } if @children.any?
 
         h
       end

data/lib/hdo/storting_importer/committee.rb

@@ -31,7 +31,7 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        new hash['externalId'], hash['name']
+        new hash['external_id'], hash['name']
       end
 
       def initialize(external_id, name)
@@ -41,9 +41,9 @@ module Hdo
 
       def to_hash
         {
-          'kind'       => self.class.kind,
-          'externalId' => @external_id,
-          'name'       => @name
+          'kind'        => self.class.kind,
+          'external_id' => @external_id,
+          'name'        => @name
         }
       end
 

data/lib/hdo/storting_importer/committee_membership.rb

@@ -20,9 +20,9 @@ module Hdo
       def self.from_hash(hash)
         binding.pry unless Hash === hash
 
-        new hash['externalId'],
-            (Date.parse(hash['startDate']) if hash['startDate']),
-            (Date.parse(hash['endDate']) if hash['endDate'])
+        new hash['external_id'],
+            (Date.parse(hash['start_date']) if hash['start_date']),
+            (Date.parse(hash['end_date']) if hash['end_date'])
       end
 
       attr_reader :external_id, :start_date, :end_date
@@ -35,10 +35,10 @@ module Hdo
 
       def to_hash
         {
-          'kind'       => self.class.kind,
-          'externalId' => external_id,
-          'startDate'  => (start_date.strftime("%Y-%m-%d") if start_date),
-          'endDate'    => (end_date.strftime("%Y-%m-%d") if end_date)
+          'kind'        => self.class.kind,
+          'external_id' => external_id,
+          'start_date'  => (start_date.strftime("%Y-%m-%d") if start_date),
+          'end_date'    => (end_date.strftime("%Y-%m-%d") if end_date)
         }
       end
 

data/lib/hdo/storting_importer/district.rb

@@ -31,7 +31,7 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        new hash['externalId'], hash['name']
+        new hash['external_id'], hash['name']
       end
 
       def initialize(external_id, name)
@@ -41,9 +41,9 @@ module Hdo
 
       def to_hash
         {
-          'kind'       => self.class.kind,
-          'externalId' => @external_id,
-          'name'       => @name
+          'kind'        => self.class.kind,
+          'external_id' => @external_id,
+          'name'        => @name
         }
       end
 

data/lib/hdo/storting_importer/governing_period.rb

@@ -32,7 +32,7 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        new hash['startDate'], hash['endDate']
+        new hash['start_date'], hash['end_date']
       end
 
       def initialize(start_date, end_date = nil)
@@ -42,9 +42,9 @@ module Hdo
 
       def to_hash
         {
-          'kind'      => self.class.kind,
-          'startDate' => @start_date && @start_date.iso8601,
-          'endDate'   => @end_date && @end_date.iso8601
+          'kind'       => self.class.kind,
+          'start_date' => @start_date && @start_date.iso8601,
+          'end_date'   => @end_date && @end_date.iso8601
         }
       end
 

data/lib/hdo/storting_importer/parliament_issue.rb

@@ -67,14 +67,14 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        new hash['externalId'],
+        new hash['external_id'],
             hash['summary'],
             hash['description'],
             hash['type'],
             hash['status'],
-            hash['lastUpdate'],
+            hash['last_update'],
             hash['reference'],
-            hash['documentGroup'],
+            hash['document_group'],
             hash['committee'],
             hash['categories']
       end
@@ -100,14 +100,14 @@ module Hdo
       def to_hash
         {
           'kind'           => self.class.kind,
-          'externalId'     => @external_id,
+          'external_id'    => @external_id,
           'summary'        => @summary,
           'description'    => @description,
           'type'           => @type,
           'status'         => @status,
-          'lastUpdate'     => @last_update,
+          'last_update'    => @last_update,
           'reference'      => @reference,
-          'documentGroup'  => @document_group,
+          'document_group' => @document_group,
           'committee'      => @committee,
           'categories'     => @categories
         }

data/lib/hdo/storting_importer/parliament_period.rb

@@ -23,9 +23,9 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        new hash['externalId'],
-            hash['startDate'] && Date.parse(hash['startDate']),
-            hash['endDate'] && Date.parse(hash['endDate'])
+        new hash['external_id'],
+            hash['start_date'] && Date.parse(hash['start_date']),
+            hash['end_date'] && Date.parse(hash['end_date'])
       end
 
       def self.example(overrides = nil)
@@ -47,9 +47,9 @@ module Hdo
       def to_hash
         {
           'kind'       => self.class.kind,
-          'externalId' => @external_id,
-          'startDate'  => @start_date && @start_date.iso8601,
-          'endDate'    => @end_date && @end_date.iso8601
+          'external_id' => @external_id,
+          'start_date'  => @start_date && @start_date.iso8601,
+          'end_date'    => @end_date && @end_date.iso8601
         }
       end
 

data/lib/hdo/storting_importer/parliament_session.rb

@@ -23,9 +23,9 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        new hash['externalId'],
-            hash['startDate'] && Date.parse(hash['startDate']),
-            hash['endDate'] && Date.parse(hash['endDate'])
+        new hash['external_id'],
+            hash['start_date'] && Date.parse(hash['start_date']),
+            hash['end_date'] && Date.parse(hash['end_date'])
       end
 
       def self.example(overrides = nil)
@@ -46,10 +46,10 @@ module Hdo
 
       def to_hash
         {
-          'kind'       => self.class.kind,
-          'externalId' => @external_id,
-          'startDate'  => @start_date && @start_date.iso8601,
-          'endDate'    => @end_date && @end_date.iso8601
+          'kind'        => self.class.kind,
+          'external_id' => @external_id,
+          'start_date'  => @start_date && @start_date.iso8601,
+          'end_date'    => @end_date && @end_date.iso8601
         }
       end
 

data/lib/hdo/storting_importer/party.rb

@@ -33,10 +33,10 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        obj = new hash['externalId'],
+        obj = new hash['external_id'],
                   hash['name']
 
-        obj.governing_periods = Array(hash['governingPeriods']).map do |gp|
+        obj.governing_periods = Array(hash['governing_periods']).map do |gp|
           GoverningPeriod.from_hash gp
         end
 
@@ -55,13 +55,13 @@ module Hdo
 
       def to_hash
         h = {
-          'kind'       => self.class.kind,
-          'externalId' => @external_id,
-          'name'       => @name,
+          'kind'        => self.class.kind,
+          'external_id' => @external_id,
+          'name'        => @name,
         }
 
         if @governing_periods
-          h['governingPeriods'] = @governing_periods.map { |e| e.to_hash }
+          h['governing_periods'] = @governing_periods.map { |e| e.to_hash }
         end
 
         h

data/lib/hdo/storting_importer/party_membership.rb

@@ -18,9 +18,9 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        new hash['externalId'],
-            (Date.parse(hash['startDate']) if hash['startDate']),
-            (Date.parse(hash['endDate']) if hash['endDate'])
+        new hash['external_id'],
+            (Date.parse(hash['start_date']) if hash['start_date']),
+            (Date.parse(hash['end_date']) if hash['end_date'])
       end
 
       attr_reader :external_id, :start_date, :end_date
@@ -34,9 +34,9 @@ module Hdo
       def to_hash
         {
           'kind'       => self.class.kind,
-          'externalId' => external_id,
-          'startDate'  => (start_date.strftime("%Y-%m-%d") if start_date),
-          'endDate'    => (end_date.strftime("%Y-%m-%d") if end_date)
+          'external_id' => external_id,
+          'start_date'  => (start_date.strftime("%Y-%m-%d") if start_date),
+          'end_date'    => (end_date.strftime("%Y-%m-%d") if end_date)
         }
       end
 

data/lib/hdo/storting_importer/promise.rb

@@ -125,7 +125,7 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        pr = new hash['externalId'],
+        pr = new hash['external_id'],
                  hash['parties'],
                  hash['body'],
                  hash['general'],
@@ -150,15 +150,15 @@ module Hdo
 
       def to_hash
         {
-          'kind'       => self.class.kind,
-          'externalId' => @external_id,
-          'parties'    => @parties,
-          'general'    => @general,
-          'categories' => @categories,
-          'source'     => @source,
-          'page'       => @page,
-          'body'       => @body,
-          'period'     => @period
+          'kind'        => self.class.kind,
+          'external_id' => @external_id,
+          'parties'     => @parties,
+          'general'     => @general,
+          'categories'  => @categories,
+          'source'      => @source,
+          'page'        => @page,
+          'body'        => @body,
+          'period'      => @period
         }
       end
 

data/lib/hdo/storting_importer/proposition.rb

@@ -25,11 +25,11 @@ module Hdo
 
       def self.from_hash(hash)
         arr = [
-          hash['externalId'],
+          hash['external_id'],
           hash['description'],
-          hash['onBehalfOf'],
+          hash['on_behalf_of'],
           hash['body'],
-          hash['deliveredBy'] && Representative.from_hash(hash['deliveredBy']),
+          hash['delivered_by'] && Representative.from_hash(hash['delivered_by']),
         ]
 
         new(*arr)
@@ -67,14 +67,14 @@ module Hdo
 
       def to_hash
         h = {
-          'kind'        => self.class.kind,
-          'externalId'  => @external_id,
-          'description' => @description,
-          'onBehalfOf'  => @on_behalf_of,
-          'body'        => @body
+          'kind'         => self.class.kind,
+          'external_id'  => @external_id,
+          'description'  => @description,
+          'on_behalf_of' => @on_behalf_of,
+          'body'         => @body
         }
 
-        h['deliveredBy'] = @delivered_by.to_hash if @delivered_by
+        h['delivered_by'] = @delivered_by.to_hash if @delivered_by
 
         h
       end

data/lib/hdo/storting_importer/representative.rb

@@ -23,8 +23,8 @@ module Hdo
           '1975-07-07T00:00:00',
           '0001-01-01T00:00:00',
           'Akershus',
-          [PartyMembership.from_hash("externalId" => 'H', 'startDate' => '2011-10-01', 'endDate' => nil)],
-          [CommitteeMembership.from_hash('externalId' => 'JUSTIS', 'startDate' => '2011-10-01', 'endDate' => nil)]
+          [PartyMembership.from_hash("external_id" => 'H', 'start_date' => '2011-10-01', 'end_date' => nil)],
+          [CommitteeMembership.from_hash('external_id' => 'JUSTIS', 'start_date' => '2011-10-01', 'end_date' => nil)]
         )
 
         if overrides
@@ -85,18 +85,18 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        v = new hash['externalId'],
-                hash['firstName'],
-                hash['lastName'],
+        v = new hash['external_id'],
+                hash['first_name'],
+                hash['last_name'],
                 hash['gender'],
-                hash['dateOfBirth'],
-                hash['dateOfDeath'],
+                hash['date_of_birth'],
+                hash['date_of_death'],
                 hash['district'],
                 Array(hash['parties']).map { |e| PartyMembership.from_hash(e) },
                 Array(hash['committees']).map { |e| CommitteeMembership.from_hash(e) }
 
-        v.vote_result = hash['voteResult']
-        v.permanent_substitute_for = hash['permanentSubstituteFor']
+        v.vote_result = hash['vote_result']
+        v.permanent_substitute_for = hash['permanent_substitute_for']
 
         v
       end
@@ -126,20 +126,20 @@ module Hdo
 
       def to_hash
         h = {
-          'kind'        => self.class.kind,
-          'externalId'  => @external_id,
-          'firstName'   => @first_name,
-          'lastName'    => @last_name,
-          'gender'      => @gender,
-          'dateOfBirth' => @date_of_birth,
-          'dateOfDeath' => @date_of_death,
-          'district'    => @district,
-          'parties'     => @parties.map { |e| e.to_hash },
-          'committees'  => @committees.map { |e| e.to_hash }
+          'kind'          => self.class.kind,
+          'external_id'   => @external_id,
+          'first_name'    => @first_name,
+          'last_name'     => @last_name,
+          'gender'        => @gender,
+          'date_of_birth' => @date_of_birth,
+          'date_of_death' => @date_of_death,
+          'district'      => @district,
+          'parties'       => @parties.map { |e| e.to_hash },
+          'committees'    => @committees.map { |e| e.to_hash }
         }
 
-        h['voteResult'] = @vote_result if @vote_result
-        h['permanentSubstituteFor'] = @permanent_substitute_for if @permanent_substitute_for
+        h['vote_result'] = @vote_result if @vote_result
+        h['permanent_substitute_for'] = @permanent_substitute_for if @permanent_substitute_for
 
         h
       end

data/lib/hdo/storting_importer/schema/category.json

@@ -9,7 +9,7 @@
       "default": "hdo#category",
       "required": true
     },
-    "externalId": {
+    "external_id": {
       "type": "string",
       "description": "A unique identifier for the category.",
       "required": true
@@ -19,7 +19,7 @@
       "type": "string",
       "required": true
     },
-    "subCategories": {
+    "sub_categories": {
       "description": "A list of subcategories.",
       "type":"array",
       "items":{

data/lib/hdo/storting_importer/schema/committee.json

@@ -9,7 +9,7 @@
         "default": "hdo#committee",
         "required": true
     },
-    "externalId": {
+    "external_id": {
       "type": "string",
       "description": "A unique identifier for the committee.",
       "required": true

data/lib/hdo/storting_importer/schema/committee_membership.json

@@ -1,26 +1,26 @@
 {
-  "id": "hdo#committeeMembership",
+  "id": "hdo#committee_membership",
   "description": "a representative's committee associations for the given dates",
   "type":"object",
   "properties": {
     "kind": {
       "type": "string",
-      "description": "This is always 'hdo#committeeMembership'",
-      "default": "hdo#committeeMembership",
+      "description": "This is always 'hdo#committee_membership'",
+      "default": "hdo#committee_membership",
       "required": true
     },
-    "externalId": {
+    "external_id": {
       "type": "string",
       "description": "An ID uniquely identifying the committee (matching externalId of hdo#committee)",
       "required": true
     },
-    "startDate": {
+    "start_date": {
       "type": "string",
       "description": "The date the association started.",
       "format": "date",
       "required": true
     },
-    "endDate": {
+    "end_date": {
       "type": "string",
       "description": "The date the association ended. Can be null if the association is current.",
       "format": "date",

data/lib/hdo/storting_importer/schema/district.json

@@ -9,7 +9,7 @@
         "default": "hdo#district",
         "required": true
     },
-    "externalId": {
+    "external_id": {
       "type": "string",
       "description": "A unique identifier for the district.",
       "required": true

data/lib/hdo/storting_importer/schema/governing_period.json

@@ -1,21 +1,21 @@
 {
-  "id": "hdo#governingPeriod",
+  "id": "hdo#governing_period",
   "description": "a period where a party is in government",
   "type":"object",
   "properties": {
     "kind": {
       "type": "string",
-      "description": "This is always 'hdo#governingPeriod'",
-      "default": "hdo#governingPeriod",
+      "description": "This is always 'hdo#governing_period'",
+      "default": "hdo#governing_period",
       "required": true
     },
-    "startDate": {
+    "start_date": {
       "type": "string",
       "description": "The date the period started.",
       "format": "date",
       "required": true
     },
-    "endDate": {
+    "end_date": {
       "type": "string",
       "description": "The date the period ended. Can be null if the period is current.",
       "format": "date",