hdo-storting-importer 0.0.8 → 0.0.9

data/spec/hdo/storting_importer/district_spec.rb

@@ -34,35 +34,46 @@ module Hdo
         district.external_id.should == 'Ak'
       end
 
-      it 'can serialize as HDO XML' do
-        District.new("Ak", "Akershus").to_hdo_xml.should == <<-XML
-<district>
-  <externalId>Ak</externalId>
-  <name>Akershus</name>
-</district>
-        XML
+      it 'can serialize as JSON' do
+        expected = <<-JSON
+        {
+          "kind": "hdo#district",
+          "externalId": "Ak",
+          "name": "Akershus"
+        }
+        JSON
+
+        District.new("Ak", "Akershus").to_json.should be_json(expected)
       end
 
-      it 'can deserialize a HDO XML node' do
+      it 'can deserialize JSON' do
         orig = District.new("Ak", "Akershus")
-        District.from_hdo_node(parse(orig.to_hdo_xml)).should == orig
+        District.from_json(orig.to_json).should == orig
       end
 
-      it 'can deserialize a HDO XML doc' do
-        orig = District.new("Ak", "Akershus")
-        District.from_hdo_doc(parse("<districts>#{orig.to_hdo_xml}</districts>")).should == [orig]
+      it 'can deserialize a JSON array' do
+        orig = [ District.new("Ak", "Akershus") ]
+        District.from_json(orig.to_json).should == orig
       end
 
-      it 'has a type name' do
-        District.type_name.should == 'district'
+      it 'fails if the given JSON is invalid' do
+        json = '{
+          "externalId": "1"
+        }'
+
+        expect { District.from_json(json) }.to raise_error(ValidationError)
+      end
+
+      it 'has a kind' do
+        District.kind.should == 'hdo#district'
       end
 
       it 'has a description' do
         District.description.should be_kind_of(String)
       end
 
-      it 'has an XML example' do
-        District.xml_example.should be_kind_of(String)
+      it 'has a JSON example' do
+        District.json_example.should be_kind_of(String)
       end
 
       it 'has a list of fields' do
@@ -73,8 +84,6 @@ module Hdo
         District.example.short_inspect.should be_kind_of(String)
       end
 
-
-
     end
   end
 end

data/spec/hdo/storting_importer/issue_spec.rb

@@ -69,47 +69,64 @@ module Hdo
         issue.type.should == 'alminneligsak'
       end
 
-      it 'can serialize as HDO XML' do
-        Issue.example.to_hdo_xml.should == <<-XML
-<issue>
-  <externalId>53520</externalId>
-  <summary>Inngåelse av avtale om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)</summary>
-  <description>Samtykke til inngåelse av avtale av 25. november 2011 om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)</description>
-  <type>alminneligsak</type>
-  <status>mottatt</status>
-  <lastUpdate>2012-04-20T00:00:00</lastUpdate>
-  <reference>Prop. 90 S (2011-2012)</reference>
-  <documentGroup>proposisjon</documentGroup>
-  <committee>Transport- og kommunikasjonskomiteen</committee>
-  <categories>
-    <category>UTENRIKSSAKER</category>
-    <category>TRAKTATER</category>
-    <category>NORDISK SAMARBEID</category>
-  </categories>
-</issue>
-XML
+      it 'can serialize as JSON' do
+        Issue.example.to_json.should be_json <<-JSON
+        {
+          "kind": "hdo#issue",
+          "externalId" : "53520",
+          "summary": "Inngåelse av avtale om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)",
+          "description": "Samtykke til inngåelse av avtale av 25. november 2011 om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)",
+          "type": "alminneligsak",
+          "status": "mottatt",
+          "lastUpdate": "2012-04-20T00:00:00",
+          "reference": "Prop. 90 S (2011-2012)",
+          "documentGroup": "proposisjon",
+          "committee": "Transport- og kommunikasjonskomiteen",
+          "categories": ["UTENRIKSSAKER", "TRAKTATER", "NORDISK SAMARBEID"]
+        }
+        JSON
       end
 
-      it 'can deserialize an HDO XML node' do
+      it 'can deserialize JSON' do
         orig = Issue.example
-        Issue.from_hdo_node(parse(orig.to_hdo_xml)).should == orig
+        Issue.from_json(orig.to_json).should == orig
       end
 
       it 'can deserialize an HDO XML doc' do
-        orig = Issue.example
-        Issue.from_hdo_doc(parse("<issues>#{orig.to_hdo_xml}</issues>")).should == [orig]
+        orig = [Issue.example]
+        Issue.from_json(orig.to_json).should == orig
+      end
+
+      it 'fails if the given JSON is invalid' do
+        # summary is number.
+
+        json = '{
+          "kind": "hdo#issue",
+          "externalId" : "53520",
+          "summary": 1,
+          "description": "Samtykke til inngåelse av avtale av 25. november 2011 om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)",
+          "type": "alminneligsak",
+          "status": "mottatt",
+          "lastUpdate": "2012-04-20T00:00:00",
+          "reference": "Prop. 90 S (2011-2012)",
+          "documentGroup": "proposisjon",
+          "committee": "Transport- og kommunikasjonskomiteen",
+          "categories": ["UTENRIKSSAKER", "TRAKTATER", "NORDISK SAMARBEID"]
+        }'
+
+        expect { Issue.from_json(json) }.to raise_error(ValidationError)
       end
 
-      it 'has a type name' do
-        Issue.type_name.should == 'issue'
+      it 'has a kind' do
+        Issue.kind.should == 'hdo#issue'
       end
 
       it 'has a description' do
         Issue.description.should be_kind_of(String)
       end
 
-      it 'has an XML example' do
-        Issue.xml_example.should be_kind_of(String)
+      it 'has a JSON example' do
+        Issue.json_example.should be_kind_of(String)
       end
 
       it 'has a list of fields' do

data/spec/hdo/storting_importer/party_spec.rb

@@ -32,35 +32,44 @@ module Hdo
         parties.map(&:name).should == ['Arbeiderpartiet', 'Fremskrittspartiet']
       end
 
-      it 'can serialize as HDO XML' do
-        Party.new("A", "Arbeiderpartiet").to_hdo_xml.should == <<-XML
-<party>
-  <externalId>A</externalId>
-  <name>Arbeiderpartiet</name>
-</party>
-        XML
+      it 'can serialize as JSON' do
+        Party.new("A", "Arbeiderpartiet").to_json.should be_json <<-JSON
+        {
+          "kind": "hdo#party",
+          "externalId": "A",
+          "name": "Arbeiderpartiet"
+        }
+        JSON
       end
 
-      it 'can deserialize a HDO XML node' do
+      it 'can deserialize JSON' do
         orig = Party.new('Sp', 'Senterpartiet')
-        Party.from_hdo_node(parse(orig.to_hdo_xml)).should == orig
+        Party.from_json(orig.to_json).should == orig
       end
 
-      it 'can deserialize a HDO XML doc' do
-        orig = Party.new('Sp', 'Senterpartiet')
-        Party.from_hdo_doc(parse("<parties>#{orig.to_hdo_xml}</parties>")).should == [orig]
+      it 'can deserialize a JSON array' do
+        orig = [Party.new('Sp', 'Senterpartiet')]
+        Party.from_json(orig.to_json).should == orig
+      end
+
+      it 'fails if the given JSON is invalid' do
+        json = '{
+          "externalId": "1"
+        }'
+
+        expect { Party.from_json(json) }.to raise_error(ValidationError)
       end
 
-      it 'has a type name' do
-        Party.type_name.should == 'party'
+      it 'has a kind' do
+        Party.kind.should == 'hdo#party'
       end
 
       it 'has a description' do
         Party.description.should be_kind_of(String)
       end
 
-      it 'has an XML example' do
-        Party.xml_example.should be_kind_of(String)
+      it 'has a JSON example' do
+        Party.json_example.should be_kind_of(String)
       end
 
       it 'has a list of fields' do

data/spec/hdo/storting_importer/promise_spec.rb

@@ -33,44 +33,53 @@ module Hdo
         prom.page.should == '10'
       end
 
-      it 'serializes to HDO XML' do
-        Promise.example.to_hdo_xml.should == <<-XML
-<promise>
-  <party>H</party>
-  <general>true</general>
-  <categories>
-    <category>GRUNNSKOLE</category>
-  </categories>
-  <source>PP:8</source>
-  <body>Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen.</body>
-</promise>
-XML
+      it 'serializes to JSON' do
+        Promise.example.to_json.should be_json <<-JSON
+        {
+          "kind": "hdo#promise",
+          "externalId": "1",
+          "party": "H",
+          "general": true,
+          "categories": ["GRUNNSKOLE"],
+          "source": "PP",
+          "page": 8,
+          "body": "Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen."
+        }
+        JSON
       end
 
-      it 'deserializes from HDO XML' do
-        promises = Promise.from_hdo_doc(parse(<<-XML))
-        <promises>
-          <promise>
-            <party>H</party>
-            <general>true</general>
-            <categories>
-              <category>GRUNNSKOLE</category>
-            </categories>
-            <source>PP:8</source>
-            <body>Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen.</body>
-          </promise>
-        </promises>
-        XML
-
-        promises.size.should == 1
-        promise = promises.first
-
-        promise.party.should == "H"
-        promise.should be_general
-        promise.categories.should == ["GRUNNSKOLE"]
-        promise.source.should == "PP"
-        promise.page.should == "8"
-        promise.body.should == "Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen."
+      it 'deserializes from JSON' do
+        orig = Promise.example
+        Promise.from_json(orig.to_json).should == orig
+      end
+
+      it 'deserializes from a JSON array' do
+        orig = [Promise.example]
+        Promise.from_json(orig.to_json).should == orig
+      end
+
+      it 'deserializes from hash with externalId missing' do
+        pr = Promise.example
+        pr.external_id = nil
+
+        Promise.from_json(pr.to_json).should be_kind_of(Promise)
+      end
+
+      it 'fails if the given JSON is invalid' do
+        # missing general
+
+        json = '
+        {
+          "kind": "hdo#promise",
+          "externalId": "1",
+          "party": "H",
+          "categories": ["GRUNNSKOLE"],
+          "source": "PP",
+          "page": 8,
+          "body": "Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen."
+        }'
+
+        expect { Promise.from_json(json) }.to raise_error(ValidationError)
       end
 
       it 'has a description' do
@@ -81,18 +90,23 @@ XML
         Promise.fields.should_not be_empty
       end
 
-      it 'has a type name' do
-        Promise.type_name.should == 'promise'
+      it 'has a kind' do
+        Promise.kind.should == 'hdo#promise'
       end
 
-      it 'has a an XML example' do
-        Promise.xml_example.should be_kind_of(String)
+      it 'has a JSON example' do
+        Promise.json_example.should be_kind_of(String)
       end
 
       it 'has #short_inspect' do
         Promise.example.short_inspect.should be_kind_of(String)
       end
 
+      it 'strips trailing space from the body' do
+        promise = Promise.new("Party", "Body   ", true, ["æøå"], "PP", 8)
+        promise.body.should == "Body"
+      end
+
       it 'correctly upcases non-ASCII category names' do
         promise = Promise.new("Party", "Body", true, ["æøå"], "PP", 8)
         promise.categories.should == ["ÆØÅ"]

data/spec/hdo/storting_importer/proposition_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+module Hdo
+  module StortingImporter
+    describe Proposition do
+
+      it 'can deserialize JSON' do
+        orig = Proposition.example
+        Proposition.from_json(orig.to_json).should == orig
+      end
+
+      it 'can deserialize a JSON array' do
+        orig = [Proposition.example]
+        Proposition.from_json(orig.to_json).should == orig
+      end
+      
+      it 'fails if the given JSON is invalid' do
+        json = Proposition.example.to_hash
+        json.delete :description
+
+        expect { Proposition.from_json(json.to_json) }.to raise_error(ValidationError)
+      end
+
+      it 'has a kind' do
+        Proposition.kind.should == 'hdo#proposition'
+      end
+
+      it 'has a description' do
+        Proposition.description.should be_kind_of(String)
+      end
+
+      it 'has a JSON example' do
+        Proposition.json_example.should be_kind_of(String)
+      end
+
+      it 'has #short_inspect' do
+        str = Proposition.example.short_inspect
+        str.should be_kind_of(String)
+        str.should_not include("nil")
+      end
+
+    end
+  end
+end

data/spec/hdo/storting_importer/representative_spec.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require 'spec_helper'
 
 module Hdo
   module StortingImporter
@@ -47,46 +48,92 @@ module Hdo
         rep.date_of_death.should == '0001-01-01T00:00:00'
       end
 
-      it 'converts itself into HDO XML' do
+      it 'can be serialized to JSON' do
         rep = Representative.example
-        rep.to_hdo_xml.should == <<-XML
-<representative>
-  <externalId>ADA</externalId>
-  <firstName>André Oktay</firstName>
-  <lastName>Dahl</lastName>
-  <gender>M</gender>
-  <dateOfBirth>1975-07-07T00:00:00</dateOfBirth>
-  <dateOfDeath>0001-01-01T00:00:00</dateOfDeath>
-  <district>Akershus</district>
-  <party>Høyre</party>
-  <committees>
-    <committee>Justiskomiteen</committee>
-  </committees>
-  <period>2011-2012</period>
-</representative>
-        XML
+        rep.to_json.should be_json <<-JSON
+          {
+            "kind": "hdo#representative",
+            "externalId": "ADA",
+            "firstName": "André Oktay",
+            "lastName": "Dahl",
+            "gender": "M",
+            "dateOfBirth": "1975-07-07T00:00:00",
+            "dateOfDeath": "0001-01-01T00:00:00",
+            "district": "Akershus",
+            "party": "Høyre",
+            "committees": ["Justiskomiteen"],
+            "period": "2011-2012"
+          }
+        JSON
       end
 
-      it 'can deserialize a HDO XML node' do
+      it 'can deserialize JSON' do
         rep = Representative.example
-        Representative.from_hdo_node(parse(rep.to_hdo_xml)).should == rep
+        Representative.from_json(rep.to_json).should == rep
       end
 
-      it 'can deserialize a HDO XML doc' do
-        rep = Representative.example
-        Representative.from_hdo_doc(parse("<representatives>#{rep.to_hdo_xml}</representatives>")).should == [rep]
+      it 'can deserialize a JSON array' do
+        reps = [Representative.example]
+        Representative.from_json(reps.to_json).should == reps
+      end
+
+      it 'raises if the JSON if voteResult is invalid' do
+        pending "find a validator that checks format"
+
+        invalid = <<-JSON
+        {
+          "kind": "hdo#representative",
+          "externalId": "ADA",
+          "firstName": "André Oktay",
+          "lastName": "Dahl",
+          "gender": "M",
+          "dateOfBirth": "1975-07-07T00:00:00",
+          "dateOfDeath": "0001-01-01T00:00:00",
+          "district": "Akershus",
+          "party": "Høyre",
+          "committees": ["Justiskomiteen"],
+          "period": "2011-2012",
+          "voteResult": "blah"
+        }
+
+        JSON
+
+        expect {
+          Representative.from_json(invalid)
+        }.to raise_error(ValidationError)
+      end
+
+      it 'raises if the JSON data is invalid' do
+        invalid = <<-JSON
+        {
+          "kind": "hdo#representative",
+          "externalId": "ADA",
+          "lastName": "Dahl",
+          "gender": "M",
+          "dateOfBirth": "1975-07-07T00:00:00",
+          "dateOfDeath": "0001-01-01T00:00:00",
+          "district": "Akershus",
+          "party": "Høyre",
+          "committees": ["Justiskomiteen"],
+          "period": "2011-2012"
+        }
+        JSON
+
+        expect {
+          Representative.from_json(invalid)
+        }.to raise_error(ValidationError)
       end
 
-      it 'has a type name' do
-        Representative.type_name.should == 'representative'
+      it 'has a kind' do
+        Representative.kind.should == 'hdo#representative'
       end
 
       it 'has a description' do
         Representative.description.should be_kind_of(String)
       end
 
-      it 'has an XML example' do
-        Representative.xml_example.should be_kind_of(String)
+      it 'has an JSON example' do
+        Representative.json_example.should be_kind_of(String)
       end
 
       it 'has a list of fields' do