hdo-storting-importer 0.3.0 → 0.3.1

data/Guardfile

@@ -1,6 +1,6 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
-guard 'rspec', :version => 2 do
+guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^spec/fixtures})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }

data/lib/hdo/storting_importer/api_data_source.rb

@@ -58,6 +58,14 @@ module Hdo
         fetch "eksport/fylker"
       end
 
+      def parliament_periods
+        fetch "eksport/stortingsperioder"
+      end
+
+      def parliament_sessions
+        fetch "eksport/sesjoner"
+      end
+
       def categories
         fetch "eksport/emner"
       end

data/lib/hdo/storting_importer/disk_data_source.rb

@@ -22,6 +22,14 @@ module Hdo
         fetch "eksport/emner/index.html"
       end
 
+      def parliament_periods
+        fetch "eksport/stortingsperioder"
+      end
+
+      def parliament_sessions
+        fetch "eksport/sesjoner"
+      end
+
       def parliament_issues(session_id)
         fetch "eksport/saker/index.html?sesjonid=#{session_id}"
       end

data/lib/hdo/storting_importer/governing_period.rb

@@ -2,9 +2,11 @@ module Hdo
   module StortingImporter
     class GoverningPeriod
       include IvarEquality
+      include HasJsonSchema
 
       attr_reader :start_date, :end_date
 
+      schema_path StortingImporter.lib.join("hdo/storting_importer/schema/governing_period.json").to_s
 
       def self.add_to(parties)
         Array(parties).each do |party|
@@ -25,19 +27,24 @@ module Hdo
         }
       end
 
+      def self.example
+        all['A'].first
+      end
+
       def self.from_hash(hash)
         new hash['startDate'], hash['endDate']
       end
 
       def initialize(start_date, end_date = nil)
-        @start_date = Date.strptime(start_date)
+        @start_date = Date.strptime(start_date) if start_date
         @end_date = Date.strptime(end_date) if end_date
       end
 
       def to_hash
         {
-          'startDate' => @start_date.iso8601,
-          'endDate' => @end_date && @end_date.iso8601
+          'kind'      => self.class.kind,
+          'startDate' => @start_date && @start_date.iso8601,
+          'endDate'   => @end_date && @end_date.iso8601
         }
       end
 

data/lib/hdo/storting_importer/parliament_period.rb

@@ -0,0 +1,58 @@
+# encoding: UTF-8
+
+module Hdo
+  module StortingImporter
+    class ParliamentPeriod
+      include HasJsonSchema
+      include IvarEquality
+
+      attr_reader :external_id, :start_date, :end_date
+
+      schema_path StortingImporter.lib.join("hdo/storting_importer/schema/parliament_period.json").to_s
+
+      def self.from_storting_doc(doc)
+        doc.css('stortingsperioder_liste stortingsperiode').map do |node|
+          from_storting_node(node)
+        end
+      end
+
+      def self.from_storting_node(node)
+        new node.css("id").text,
+            Date.parse(node.css("fra").text),
+            Date.parse(node.css("til").text)
+      end
+
+      def self.from_hash(hash)
+        new hash['externalId'],
+            hash['startDate'] && Date.parse(hash['startDate']),
+            hash['endDate'] && Date.parse(hash['endDate'])
+      end
+
+      def self.example(overrides = nil)
+        obj = new('2009-2013', Date.parse('2009-10-01'), Date.parse('2013-09-30'))
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
+      end
+
+      def initialize(external_id, start_date, end_date)
+        @external_id = external_id
+        @start_date  = start_date
+        @end_date    = end_date
+      end
+
+      def to_hash
+        {
+          'kind'       => self.class.kind,
+          'externalId' => @external_id,
+          'startDate'  => @start_date && @start_date.iso8601,
+          'endDate'    => @end_date && @end_date.iso8601
+        }
+      end
+
+    end
+  end
+end

data/lib/hdo/storting_importer/parliament_session.rb

@@ -0,0 +1,58 @@
+# encoding: UTF-8
+
+module Hdo
+  module StortingImporter
+    class ParliamentSession
+      include HasJsonSchema
+      include IvarEquality
+
+      attr_reader :external_id, :start_date, :end_date
+
+      schema_path StortingImporter.lib.join("hdo/storting_importer/schema/parliament_session.json").to_s
+
+      def self.from_storting_doc(doc)
+        doc.css("sesjoner_liste sesjon").map do |node|
+          from_storting_node node
+        end
+      end
+
+      def self.from_storting_node(node)
+        new node.css("id").text,
+            Date.parse(node.css("fra").text),
+            Date.parse(node.css("til").text)
+      end
+
+      def self.from_hash(hash)
+        new hash['externalId'],
+            hash['startDate'] && Date.parse(hash['startDate']),
+            hash['endDate'] && Date.parse(hash['endDate'])
+      end
+
+      def self.example(overrides = nil)
+        obj = new('2012-2013', Date.parse('2012-10-01'), Date.parse('2013-09-30'))
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
+      end
+
+      def initialize(external_id, start_date, end_date)
+        @external_id = external_id
+        @start_date  = start_date
+        @end_date    = end_date
+      end
+
+      def to_hash
+        {
+          'kind'       => self.class.kind,
+          'externalId' => @external_id,
+          'startDate'  => @start_date && @start_date.iso8601,
+          'endDate'    => @end_date && @end_date.iso8601
+        }
+      end
+
+    end
+  end
+end

data/lib/hdo/storting_importer/parsing_data_source.rb

@@ -25,6 +25,14 @@ module Hdo
         District.from_storting_doc @data_source.districts
       end
 
+      def parliament_periods
+        ParliamentPeriod.from_storting_doc @data_source.parliament_periods
+      end
+
+      def parliament_sessions
+        ParliamentSession.from_storting_doc @data_source.parliament_sessions
+      end
+
       def categories
         Category.from_storting_doc @data_source.categories
       end

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

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

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

@@ -0,0 +1,24 @@
+{
+  "id": "hdo#parliamentPeriod",
+  "description": "Object representing the period between elections.",
+  "type":"object",
+  "properties": {
+    "kind": {
+      "type": "string",
+      "description": "This is always 'hdo#parliamentPeriod'",
+      "default": "hdo#parliamentPeriod",
+      "required": true
+    },
+    "startDate": {
+      "type": "string",
+      "description": "The date the period started.",
+      "format": "date",
+      "required": true
+    },
+    "endDate": {
+      "type": "string",
+      "description": "The date the period ended.",
+      "format": "date",
+      "required": true
+    }
+}

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

@@ -0,0 +1,24 @@
+{
+  "id": "hdo#parliamentSession",
+  "description": "Object representing the parliamentary year.",
+  "type":"object",
+  "properties": {
+    "kind": {
+      "type": "string",
+      "description": "This is always 'hdo#parliamentSession'",
+      "default": "hdo#parliamentSession",
+      "required": true
+    },
+    "startDate": {
+      "type": "string",
+      "description": "The date the period started.",
+      "format": "date",
+      "required": true
+    },
+    "endDate": {
+      "type": "string",
+      "description": "The date the period ended.",
+      "format": "date",
+      "required": true
+    }
+}

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/hdo/storting_importer.rb

@@ -26,15 +26,20 @@ module Hdo
 
     def self.types
       [
-        Party,
+        Category,
         Committee,
+        CommitteeMembership,
         District,
+        GoverningPeriod,
+        ParliamentIssue,
+        ParliamentSession,
+        ParliamentPeriod,
+        Party,
+        PartyMembership,
+        Promise,
+        Proposition,
         Representative,
-        Category,
-        Issue,
         Vote,
-        Proposition,
-        Promise
       ]
     end
 
@@ -125,6 +130,8 @@ require 'hdo/storting_importer/committee'
 require 'hdo/storting_importer/committee_membership'
 require 'hdo/storting_importer/district'
 require 'hdo/storting_importer/parliament_issue'
+require 'hdo/storting_importer/parliament_period'
+require 'hdo/storting_importer/parliament_session'
 require 'hdo/storting_importer/party'
 require 'hdo/storting_importer/party_membership'
 require 'hdo/storting_importer/promise'

data/spec/hdo/storting_importer/governing_period_spec.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+module Hdo
+  module StortingImporter
+    describe GoverningPeriod do
+
+      it_behaves_like 'type with JSON schema'
+
+      it 'can serialize as JSON' do
+        expected = <<-JSON
+        {
+          "kind": "hdo#governingPeriod",
+          "startDate": "2005-10-01",
+          "endDate": "2013-09-30"
+        }
+        JSON
+
+        session = GoverningPeriod.new('2005-10-01', '2013-09-30')
+        session.to_json.should be_json(expected)
+      end
+
+    end
+  end
+end

data/spec/hdo/storting_importer/parliament_period_spec.rb

@@ -0,0 +1,71 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+module Hdo
+  module StortingImporter
+    describe ParliamentPeriod do
+
+      it_behaves_like 'type with JSON schema'
+
+      it 'builds parliament periods from Storting XML list' do
+        xml = <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<stortingsperioder_oversikt xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://data.stortinget.no">
+  <versjon>1.0</versjon
+  <innevaerende_stortingsperiode>
+    <versjon>1.0</versjon
+    <fra>2009-10-01T00:00:00</fra
+    <id>2009-2013</id
+    <til>2013-09-30T23:59:59</til
+  </innevaerende_stortingsperiode>
+  <stortingsperioder_liste>
+    <stortingsperiode>
+      <versjon>1.0</versjon>
+      <fra>2009-10-01T00:00:00</fra>
+      <id>2009-2013</id>
+      <til>2013-09-30T23:59:59</til>
+    </stortingsperiode>
+    <stortingsperiode>
+      <versjon>1.0</versjon>
+      <fra>2005-10-01T00:00:00</fra>
+      <id>2005-2009</id>
+      <til>2009-09-30T23:59:59</til>
+    </stortingsperiode>
+  </stortingsperioder_liste>
+</stortingsperioder_oversikt>
+        XML
+
+        periods = ParliamentPeriod.from_storting_doc(parse(xml))
+
+        # we ignore the 'current period', which can be inferred from the current date
+        periods.size.should == 2
+
+        period = periods.first
+
+        period.external_id.should == '2009-2013'
+        period.start_date.should == Date.parse('2009-10-01')
+        period.end_date.should == Date.parse('2013-09-30')
+      end
+
+      it 'can serialize as JSON' do
+        expected = <<-JSON
+        {
+          "kind": "hdo#parliamentPeriod",
+          "externalId": "2009-2013",
+          "startDate": "2009-10-01",
+          "endDate": "2013-09-30"
+        }
+        JSON
+
+        period = ParliamentPeriod.new("2009-2013", Date.parse('2009-10-01'), Date.parse('2013-09-30'))
+        period.to_json.should be_json(expected)
+      end
+
+      it 'can create a customized example' do
+        obj = ParliamentPeriod.example('endDate' => nil)
+        obj.end_date.should be_nil
+      end
+
+    end
+  end
+end

data/spec/hdo/storting_importer/parliament_session_spec.rb

@@ -0,0 +1,69 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+module Hdo
+  module StortingImporter
+    describe ParliamentSession do
+
+      it_behaves_like 'type with JSON schema'
+
+      it 'builds parliament sessions from Storting XML list' do
+        xml = <<-XML
+<?xml version="1.0" encoding="utf-8"?>
+<sesjoner_oversikt xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://data.stortinget.no">
+  <versjon>1.0</versjon>
+  <innevaerende_sesjon>
+    <versjon>1.0</versjon>
+    <fra>2012-10-01T00:00:00</fra>
+    <id>2012-2013</id>
+    <til>2013-09-30T23:59:59</til>
+  </innevaerende_sesjon>
+  <sesjoner_liste>
+    <sesjon>
+      <versjon>1.0</versjon>
+      <fra>2012-10-01T00:00:00</fra>
+      <id>2012-2013</id>
+      <til>2013-09-30T23:59:59</til>
+    </sesjon>
+    <sesjon>
+      <versjon>1.0</versjon>
+      <fra>2011-10-01T00:00:00</fra>
+      <id>2011-2012</id>
+      <til>2012-09-30T23:59:59</til>
+    </sesjon>
+  </sesjoner_liste>
+</sesjoner_oversikt>
+        XML
+
+        sessions = ParliamentSession.from_storting_doc(parse(xml))
+        sessions.size.should == 2
+
+        session = sessions.first
+
+        session.external_id.should == '2012-2013'
+        session.start_date.should == Date.parse('2012-10-01')
+        session.end_date.should == Date.parse('2013-09-30')
+      end
+
+      it 'can serialize as JSON' do
+        expected = <<-JSON
+        {
+          "kind": "hdo#parliamentSession",
+          "externalId": "2012-2013",
+          "startDate": "2012-10-01",
+          "endDate": "2013-09-30"
+        }
+        JSON
+
+        session = ParliamentSession.new("2012-2013", Date.parse('2012-10-01'), Date.parse('2013-09-30'))
+        session.to_json.should be_json(expected)
+      end
+
+      it 'can create a customized example' do
+        obj = ParliamentSession.example('endDate' => nil)
+        obj.end_date.should be_nil
+      end
+
+    end
+  end
+end

data/spec/hdo/storting_importer/party_spec.rb

@@ -42,7 +42,11 @@ module Hdo
           "externalId": "A",
           "name": "Arbeiderpartiet",
           "governingPeriods": [
-            { "startDate": "2005-10-17", "endDate": "2013-10-14" }
+            {
+              "kind": "hdo#governingPeriod",
+              "startDate": "2005-10-17",
+              "endDate": "2013-10-14"
+            }
           ]
         }
         JSON

data/spec/spec_helper.rb

@@ -54,5 +54,6 @@ module Hdo
 end
 
 RSpec.configure do |c|
+  c.color = $stdout.tty?
   c.include Hdo::StortingImporter::SpecHelper
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -303,6 +303,8 @@ files:
 - lib/hdo/storting_importer/inspectable.rb
 - lib/hdo/storting_importer/ivar_equality.rb
 - lib/hdo/storting_importer/parliament_issue.rb
+- lib/hdo/storting_importer/parliament_period.rb
+- lib/hdo/storting_importer/parliament_session.rb
 - lib/hdo/storting_importer/parsing_data_source.rb
 - lib/hdo/storting_importer/party.rb
 - lib/hdo/storting_importer/party_membership.rb
@@ -314,7 +316,10 @@ files:
 - lib/hdo/storting_importer/schema/committee.json
 - lib/hdo/storting_importer/schema/committee_membership.json
 - lib/hdo/storting_importer/schema/district.json
+- lib/hdo/storting_importer/schema/governing_period.json
 - lib/hdo/storting_importer/schema/parliament_issue.json
+- lib/hdo/storting_importer/schema/parliament_period.json
+- lib/hdo/storting_importer/schema/parliament_session.json
 - lib/hdo/storting_importer/schema/party.json
 - lib/hdo/storting_importer/schema/party_membership.json
 - lib/hdo/storting_importer/schema/promise.json
@@ -329,7 +334,10 @@ files:
 - spec/hdo/storting_importer/committee_membership_spec.rb
 - spec/hdo/storting_importer/committee_spec.rb
 - spec/hdo/storting_importer/district_spec.rb
+- spec/hdo/storting_importer/governing_period_spec.rb
 - spec/hdo/storting_importer/parliament_issue_spec.rb
+- spec/hdo/storting_importer/parliament_period_spec.rb
+- spec/hdo/storting_importer/parliament_session_spec.rb
 - spec/hdo/storting_importer/party_membership_spec.rb
 - spec/hdo/storting_importer/party_spec.rb
 - spec/hdo/storting_importer/promise_spec.rb
@@ -351,12 +359,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 200633762499888561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 200633762499888561
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -371,7 +385,10 @@ test_files:
 - spec/hdo/storting_importer/committee_membership_spec.rb
 - spec/hdo/storting_importer/committee_spec.rb
 - spec/hdo/storting_importer/district_spec.rb
+- spec/hdo/storting_importer/governing_period_spec.rb
 - spec/hdo/storting_importer/parliament_issue_spec.rb
+- spec/hdo/storting_importer/parliament_period_spec.rb
+- spec/hdo/storting_importer/parliament_session_spec.rb
 - spec/hdo/storting_importer/party_membership_spec.rb
 - spec/hdo/storting_importer/party_spec.rb
 - spec/hdo/storting_importer/promise_spec.rb
@@ -381,4 +398,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_json_schema.rb
 - spec/support/shared_examples_for_short_inspect.rb
-has_rdoc: