hdo-storting-importer 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26642ade6747a6d4a227ea61654c0443f16b04c7
-  data.tar.gz: a6ea9cb8e7948b2cb632a735c43adecfcfd07b0a
+  metadata.gz: 650a82f767d7b1fa523e46f5fd4a149a079eb918
+  data.tar.gz: cf7ce7ee81fd72572d58ed36a91245399ec87e0c
 SHA512:
-  metadata.gz: bcc036048f7b3da58c364a41e34846cf3d76000242e163afb001e725040c4077774785fe268bc4c8eb755bd6414435ef8e47b5ad1db1dff7e28aa44c8f6911cc
-  data.tar.gz: 3e38dce611e3ffda4cfde125c968fbbbd21b459880ac5b556965e4318e8414b4e2163c744da31b1e4a1007f6823016d2969f424bb6eaf253e095ff41aec10061
+  metadata.gz: 7f993ba126ab83e66ab95f624b7ad26414d0508399bb9f37011a8a256a4caacfc83fd535c9fe18f2654d2ab111b1e2a9eef0b5ecf45aaed6cbbbce2b0112dba0
+  data.tar.gz: c116a14b075d5fd6d67074c8f4eae2351d766db58d3ede8b9af270e5774ae45f15b2200fe1394d68f3deeb7041619577a13c83cc8151e63cb79771aa66dde7c1

data/lib/hdo/storting_importer/promise.rb

@@ -8,7 +8,7 @@ module Hdo
       include HasJsonSchema
       include IvarEquality
 
-      attr_reader :external_id, :parties, :body, :general, :categories, :source, :page, :period
+      attr_reader :external_id, :promisor, :body, :general, :categories, :source, :page, :period
       alias_method :general?, :general
       alias_method :short_inspect, :inspect
 
@@ -17,7 +17,7 @@ module Hdo
       def self.example(overrides = nil)
         obj = new(
           "1",
-          ["H"],
+          "H",
           "Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen.",
           true,
           ["GRUNNSKOLE"],
@@ -58,7 +58,7 @@ module Hdo
 
           external_id = data.fetch(0).to_i.to_s
           period      = data.fetch(1)
-          parties     = data.fetch(2)
+          promisor    = data.fetch(2)
           body        = data.fetch(3)
           general     = data.fetch(4).to_s.strip.downcase
           categories  = data.fetch(5)
@@ -73,10 +73,12 @@ module Hdo
             errors << "row #{external_id}: unexpected value #{page.inspect} for page"
           end
 
-          if parties.nil? || parties.empty?
-            errors << "row #{external_id}: parties missing"
+          if promisor.nil? || promisor.empty?
+            errors << "row #{external_id}: promisor missing"
+          elsif promise.include?(",")
+            errors << "row #{external_id}: comma not allowed in promisor id/name"
           end
-
+          
           if categories.nil? || categories.empty?
             errors << "row #{external_id}: categories missing"
           end
@@ -99,7 +101,7 @@ module Hdo
           end
 
           promise = new external_id,
-                        parties.strip,
+                        promisor.strip,
                         clean_invalid_unicode.call(body.strip),
                         general.downcase == "ja",
                         clean_invalid_unicode.call(categories),
@@ -126,7 +128,7 @@ module Hdo
 
       def self.from_hash(hash)
         pr = new hash['external_id'],
-                 hash['parties'],
+                 hash['promisor'],
                  hash['body'],
                  hash['general'],
                  hash['categories'],
@@ -137,9 +139,9 @@ module Hdo
         pr
       end
 
-      def initialize(external_id, parties, body, general, categories, source, page, period)
+      def initialize(external_id, promisor, body, general, categories, source, page, period)
         @external_id = external_id
-        @parties     = clean_array(parties)
+        @promisor    = promisor
         @body        = strip_if_string(body)
         @general     = general
         @categories  = clean_array(categories).map { |e| UnicodeUtils.upcase(e) }
@@ -152,7 +154,7 @@ module Hdo
         {
           'kind'        => self.class.kind,
           'external_id' => @external_id,
-          'parties'     => @parties,
+          'promisor'    => @promisor,
           'general'     => @general,
           'categories'  => @categories,
           'source'      => @source,

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

@@ -14,13 +14,10 @@
       "description": "A unique identifier for this promise.",
       "required": true
     },
-    "parties": {
-      "type": "array",
-      "description": "List of parties (i.e. 'A', 'SV', 'Sp'). Usually a single party.",
-      "required": true,
-      "items": {
-        "type": "string"
-      }
+    "promisor": {
+      "type": "string",
+      "description": "A party id (i.e. 'A', 'SV', 'Sp') or government name (i.e. 'Stoltenberg II')",
+      "required": true
     },
     "general": {
       "type": "boolean",

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/hdo/storting_importer/promise_spec.rb

@@ -13,7 +13,7 @@ module Hdo
         {
           "kind": "hdo#promise",
           "external_id": "1",
-          "parties": ["H"],
+          "promisor": "H",
           "general": true,
           "categories": ["GRUNNSKOLE"],
           "source": "PP",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jari Bakken