hdo-storting-importer 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1119cf62009dd79de414881052d2230048c10e31
-  data.tar.gz: 727c4046bbfc3120b86efe37f9edb2459dcdb2ef
+  metadata.gz: 4fe9354e9fe6a588dc970a1a26d73196b8465bdd
+  data.tar.gz: de96b96e3f915c6dd1069fdf9e9445a854942b55
 SHA512:
-  metadata.gz: 7c04318a30bff6400278e5081efd171dad7fdc34567102c616189460c1f5418bf9e9cb607c24571f160ce4a67810cc295ffe6bdb7a1463e5dd34c2a11680761a
-  data.tar.gz: fb37072dcc4c5518a229a0a89eaad411902fb2f6860404c185dea16be3b15966757a6373de49e4f7d83ea2e47d77c864cc7ced4a9b7df982b5875abf64966f6a
+  metadata.gz: 846ac7b690036b90d35934e399bacc3d8d8315a9729fae33c401dc47af099d3c3592a5f0f0511ad9e0d6c7403f2caa133e172fb8c83e02e0700e46c364774839
+  data.tar.gz: 0ea68bf107bf2ba3dc129dbac8a149d727fb9cef485f0e5e5bb3006823bcf4d02eca8bff417f326727717f86f7a1115bf98691a0b462d87237a5217faf482632

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 Holder De Ord
+Copyright (c) 2012-2014 Holder De Ord
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/hdo/storting_importer/representative.rb

@@ -7,7 +7,7 @@ module Hdo
       include IvarEquality
       include Inspectable
 
-      attr_reader :external_id, :first_name, :last_name, :date_of_birth, :date_of_death,
+      attr_reader :external_id, :first_name, :last_name, :email, :date_of_birth, :date_of_death,
                   :district, :parties, :committees, :period, :gender
 
       attr_accessor :vote_result, :permanent_substitute_for
@@ -19,6 +19,7 @@ module Hdo
           'ADA',
           'André Oktay',
           'Dahl',
+          'aod@stortinget.no',
           'M',
           '1975-07-07T00:00:00',
           '0001-01-01T00:00:00',
@@ -59,6 +60,13 @@ module Hdo
           parties = []
         end
 
+        email_node = node.css('epost').first
+        if email_node
+          email = email_node.text
+        else
+          email = nil
+        end
+
         committee_ids = node.css("komite").map { |c| c.css("id").text.strip }
         committees = committee_ids.map do |id|
           CommitteeMembership.new(id, start_date, end_date)
@@ -68,6 +76,7 @@ module Hdo
           node.css("id").first.text,
           node.css("fornavn").first.text,
           node.css("etternavn").first.text,
+          email,
           node.css("kjoenn").first.text == "mann" ? 'M' : 'F',
           node.css("foedselsdato").first.text,
           node.css("doedsdato").first.text,
@@ -88,6 +97,7 @@ module Hdo
         v = new hash['external_id'],
                 hash['first_name'],
                 hash['last_name'],
+                hash['email'],
                 hash['gender'],
                 hash['date_of_birth'],
                 hash['date_of_death'],
@@ -101,10 +111,11 @@ module Hdo
         v
       end
 
-      def initialize(external_id, first_name, last_name, gender, date_of_birth, date_of_death, district, parties, committees)
+      def initialize(external_id, first_name, last_name, email, gender, date_of_birth, date_of_death, district, parties, committees)
         @external_id   = external_id
         @first_name    = first_name
         @last_name     = last_name
+        @email         = email
         @gender        = gender
         @date_of_birth = date_of_birth
         @date_of_death = date_of_death
@@ -117,7 +128,7 @@ module Hdo
       end
 
       def short_inspect
-        short_inspect_string :include => [:external_id, :first_name, :last_name, :parties, :vote_result]
+        short_inspect_string :include => [:external_id, :first_name, :last_name, :email, :parties, :vote_result]
       end
 
       def external_id
@@ -130,6 +141,7 @@ module Hdo
           'external_id'   => @external_id,
           'first_name'    => @first_name,
           'last_name'     => @last_name,
+          'email'         => @email,
           'gender'        => @gender,
           'date_of_birth' => @date_of_birth,
           'date_of_death' => @date_of_death,

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

@@ -24,6 +24,10 @@
       "description": "The first name of the representative",
       "required": true
     },
+    "email": {
+      "type": "string",
+      "description": "The representative email, if available."
+    },
     "district": {
       "type": "string",
       "description": "The electoral district the representative belongs to. Must match the 'name' field of the district type.",

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.5.2"
+    VERSION = "0.5.3"
   end
 end

data/spec/hdo/storting_importer/representative_spec.rb

@@ -20,6 +20,7 @@ module Hdo
               <etternavn>Dahl</etternavn>
               <foedselsdato>1975-07-07T00:00:00</foedselsdato>
               <fornavn>André Oktay</fornavn>
+              <epost>aod@stortinget.no</epost>
               <id>ADA</id>
               <kjoenn>mann</kjoenn>
               <fylke>
@@ -44,6 +45,7 @@ module Hdo
         rep = representatives.first
         rep.first_name.should == 'André Oktay'
         rep.last_name.should == 'Dahl'
+        rep.email.should == 'aod@stortinget.no'
         rep.gender.should == 'M'
         rep.district.should == 'Akershus'
         rep.parties.should == [PartyMembership.from_hash('external_id' => 'H', 'start_date' => Date.today.strftime("%Y-%m-%d"), 'end_date' => nil)]
@@ -60,6 +62,7 @@ module Hdo
             "external_id": "ADA",
             "first_name": "André Oktay",
             "last_name": "Dahl",
+            "email": "aod@stortinget.no",
             "gender": "M",
             "date_of_birth": "1975-07-07T00:00:00",
             "date_of_death": "0001-01-01T00:00:00",
@@ -77,6 +80,7 @@ module Hdo
           "external_id": "ADA",
           "first_name": "André Oktay",
           "last_name": "Dahl",
+          "email": "aod@stortinget.no",
           "gender": "M",
           "date_of_birth": "1975-07-07T00:00:00",
           "date_of_death": "0001-01-01T00:00:00",

data/spec/hdo/storting_importer/vote_spec.rb

@@ -98,6 +98,7 @@ module Hdo
               "external_id": "ADA",
               "first_name": "André Oktay",
               "last_name": "Dahl",
+              "email": "aod@stortinget.no",
               "gender": "M",
               "date_of_birth": "1975-07-07T00:00:00",
               "date_of_death": "0001-01-01T00:00:00",
@@ -119,6 +120,7 @@ module Hdo
                 "external_id": "ADA",
                 "first_name": "André Oktay",
                 "last_name": "Dahl",
+                "email": "aod@stortinget.no",
                 "gender": "M",
                 "date_of_birth": "1975-07-07T00:00:00",
                 "date_of_death": "0001-01-01T00:00:00",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Gem to process data from data.stortinget.no