hdo-storting-importer 0.2.2 → 0.2.3

data/lib/hdo/storting_importer/data_source.rb

@@ -5,7 +5,7 @@ module Hdo
       class NotFoundError < StandardError
       end
 
-      DEFAULT_SESSION = '2011-2012'
+      DEFAULT_SESSION = '2012-2013'
       DEFAULT_PERIOD = '2009-2013'
 
       private

data/lib/hdo/storting_importer/party_membership.rb

@@ -0,0 +1,45 @@
+module Hdo
+  module StortingImporter
+    class PartyMembership
+
+      include HasJsonSchema
+      include IvarEquality
+
+      schema_path StortingImporter.lib.join('hdo/storting_importer/schema/party_membership.json')
+
+      def self.example(overrides = nil)
+        obj = new 'A', Date.parse("2009-09-01"), Date.parse("2013-08-01")
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
+      end
+
+      def self.from_hash(hash)
+        new hash['externalId'],
+            (Date.parse(hash['startDate']) if hash['startDate']),
+            (Date.parse(hash['endDate']) if hash['endDate'])
+      end
+
+      attr_reader :external_id, :start_date, :end_date
+
+      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.strftime("%Y-%m-%d") if start_date),
+          'endDate'    => (end_date.strftime("%Y-%m-%d") if end_date)
+        }
+      end
+
+    end # PartyMembership
+  end
+end

data/lib/hdo/storting_importer/proposition.rb

@@ -35,11 +35,11 @@ module Hdo
         new(*arr)
       end
 
-      def self.from_storting_doc(doc)
+      def self.from_storting_doc(doc, time)
         doc.css("voteringsforslag").map do |n|
           rep_node = n.css("forslag_levert_av_representant").first
           if rep_node && rep_node['nil'] != 'true'
-            delivered_by = Representative.from_storting_node(rep_node)
+            delivered_by = Representative.from_storting_node(rep_node, Util.session_for_date(time))
           else
             delivered_by = nil
           end

data/lib/hdo/storting_importer/representative.rb

@@ -8,7 +8,7 @@ module Hdo
       include Inspectable
 
       attr_reader :external_id, :first_name, :last_name, :date_of_birth, :date_of_death,
-                  :district, :party, :committees, :period, :gender
+                  :district, :parties, :committees, :period, :gender
 
       attr_accessor :vote_result
 
@@ -23,9 +23,8 @@ module Hdo
           '1975-07-07T00:00:00',
           '0001-01-01T00:00:00',
           'Akershus',
-          'Høyre',
+          [PartyMembership.from_hash("externalId" => 'H', 'startDate' => '2011-10-01', 'endDate' => nil)],
           ['Justiskomiteen'],
-          '2011-2012'
         )
 
         if overrides
@@ -43,18 +42,27 @@ module Hdo
         nodes = doc.css("dagensrepresentant")
         nodes += doc.css("representant")
 
-        nodes.map { |e| from_storting_node(e) }
+        period_node = doc.css("stortingsperiode_id").first
+        period = Util.period_to_date_range(period_node.text) if period_node
+
+        nodes.map { |e| from_storting_node(e, period) }
       end
 
-      def self.from_storting_node(node)
+      def self.from_storting_node(node, period = nil)
         district_node = node.css("fylke navn").first
         district      = district_node ? district_node.text : ''
 
-        party_node = node.css("parti navn").first
-        party      = party_node ? party_node.text : ''
+        party_node = node.css("parti id").first
+        if party_node
+          start_date = period ? period.begin : Util.current_session.begin
+          end_date = period ? period.end : nil
+
+          parties = [ PartyMembership.new(party_node.text, start_date, end_date) ]
+        else
+          parties = []
+        end
 
         committees = node.css("komite").map { |c| c.css("navn").text.strip }
-        period     = '2011-2012' # FIXME
 
         new(
           node.css("id").first.text,
@@ -64,9 +72,8 @@ module Hdo
           node.css("foedselsdato").first.text,
           node.css("doedsdato").first.text,
           district,
-          party,
-          committees,
-          period
+          parties,
+          committees
         )
       end
 
@@ -78,16 +85,15 @@ module Hdo
                 hash['dateOfBirth'],
                 hash['dateOfDeath'],
                 hash['district'],
-                hash['party'],
-                hash['committees'],
-                hash['period']
+                Array(hash['parties']).map { |e| PartyMembership.from_hash(e) },
+                hash['committees']
 
         v.vote_result = hash['voteResult']
 
         v
       end
 
-      def initialize(external_id, first_name, last_name, gender, date_of_birth, date_of_death, district, party, committees, period)
+      def initialize(external_id, first_name, last_name, gender, date_of_birth, date_of_death, district, parties, committees)
         @external_id   = external_id
         @first_name    = first_name
         @last_name     = last_name
@@ -95,15 +101,14 @@ module Hdo
         @date_of_birth = date_of_birth
         @date_of_death = date_of_death
         @district      = district
-        @party         = party
+        @parties       = parties
         @committees    = committees
-        @period        = period
 
         @vote_result   = nil
       end
 
       def short_inspect
-        short_inspect_string :include => [:external_id, :first_name, :last_name, :party, :vote_result]
+        short_inspect_string :include => [:external_id, :first_name, :last_name, :parties, :vote_result]
       end
 
       def external_id
@@ -120,9 +125,8 @@ module Hdo
           'dateOfBirth' => @date_of_birth,
           'dateOfDeath' => @date_of_death,
           'district'    => @district,
-          'party'       => @party,
-          'committees'  => @committees,
-          'period'      => @period
+          'parties'     => @parties.map { |e| e.to_hash },
+          'committees'  => @committees
         }
 
         h['voteResult'] = @vote_result if @vote_result

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

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

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

@@ -22,25 +22,21 @@
       "description": "The first name of the representative",
       "required": true
     },
-    "period": {
-      "type": "string",
-      "description": "An identifier for the period the representative is elected for.",
-      "required": true
-    },
     "district": {
       "type": "string",
       "description": "The electoral district the representative belongs to. Must match the 'name' field of the district type.",
       "required": true
     },
-    "party": {
-      "type": "string",
-      "description": "The name of the representative's party.",
+    "parties": {
+      "type": "array",
+      "description": "A list of party memberships for this representative. Note that the import code will assume the field is incomplete, and handle this as an append to the current data unless the start date matches.",
+      "items": { "$ref": "hdo#partyMembership"},
       "required": true
     },
     "committees": {
       "type": "array",
       "description": "A list of committees the representative is a member of. This should match the 'name' field of the committee type.",
-      "items": { "type": "string"},
+      "items": { "type": "string" },
       "required": true
     },
     "dateOfBirth": {

data/lib/hdo/storting_importer/util.rb

@@ -29,6 +29,40 @@ module Hdo
         q
       end
 
+      def period_to_date_range(str)
+        start_year, end_year = str.split("-").map do |y|
+          case y.size
+          when 4
+            Integer(y)
+          when 2
+            Integer("19#{y}")
+          else
+            "couldn't parse year #{str.inspect}"
+          end
+        end
+
+        if start_year > end_year
+          raise "invalid period: #{str.inspect}"
+        end
+
+        # approximate dates
+        Date.new(start_year, 10, 1)..Date.new(end_year, 9, 30)
+      end
+
+      def current_session
+        session_for_date Date.today
+      end
+
+      def session_for_date(date)
+        new_session_start = Date.new(date.year, 10, 1)
+
+        if date >= new_session_start
+          new_session_start..(Date.new(date.year + 1, 9, 30))
+        else
+          Date.new(date.year - 1, 10, 1)..Date.new(date.year, 9, 30)
+        end
+      end
+
       def json_pretty(obj)
         case obj
         when Array

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/lib/hdo/storting_importer/vote.rb

@@ -107,7 +107,7 @@ module Hdo
       end
 
       def add_storting_propositions(node)
-        @propositions += Proposition.from_storting_doc(node)
+        @propositions += Proposition.from_storting_doc(node, Date.parse(time))
       end
 
       def add_storting_results(node)

data/lib/hdo/storting_importer.rb

@@ -125,6 +125,7 @@ require 'hdo/storting_importer/committee'
 require 'hdo/storting_importer/district'
 require 'hdo/storting_importer/parliament_issue'
 require 'hdo/storting_importer/party'
+require 'hdo/storting_importer/party_membership'
 require 'hdo/storting_importer/promise'
 require 'hdo/storting_importer/representative'
 require 'hdo/storting_importer/proposition'