hdo-storting-importer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caec1b7f38dd610a7482f789ef4957f3d94e00c7
-  data.tar.gz: f4e44a467ad3c43852b15f2a691c6d2f0300898a
+  metadata.gz: 26642ade6747a6d4a227ea61654c0443f16b04c7
+  data.tar.gz: a6ea9cb8e7948b2cb632a735c43adecfcfd07b0a
 SHA512:
-  metadata.gz: c2d4698c08db85f21d58a8986e477f5478caaa1582ec2f057d4f6788950ab1181d00c6f5a78cdb54ab6be3e94361431541629ee133f04f8afd636e29f0a9ac6f
-  data.tar.gz: c59796448cefa43002fc12efc881aaae4e8e6e889c41c003cb8e7a54a7e4374f68ce552bc4018b33f3500546c9e9e279027fff9d3f44d7a75606172e5f2fc6af
+  metadata.gz: bcc036048f7b3da58c364a41e34846cf3d76000242e163afb001e725040c4077774785fe268bc4c8eb755bd6414435ef8e47b5ad1db1dff7e28aa44c8f6911cc
+  data.tar.gz: 3e38dce611e3ffda4cfde125c968fbbbd21b459880ac5b556965e4318e8414b4e2163c744da31b1e4a1007f6823016d2969f424bb6eaf253e095ff41aec10061

data/features/convert.feature

@@ -104,7 +104,7 @@ Feature: Import data
         </fylker_liste>
       </fylker_oversikt>
       """
-      When I run `hdo-converter districts fylker.xml`
+      When I successfully run `hdo-converter districts fylker.xml`
       Then the stdout should contain:
       """
       [

data/lib/hdo/storting_importer/party.rb

@@ -5,14 +5,12 @@ module Hdo
       include IvarEquality
 
       attr_reader :external_id, :name
-      attr_accessor :governing_periods
       alias_method :short_inspect, :inspect
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/party.json").to_s
 
       def self.example(overrides = nil)
         obj = new("A", "Arbeiderpartiet")
-        obj.governing_periods = [GoverningPeriod.new('2005-10-17', '2013-10-14')]
 
         if overrides
           obj = from_hash(obj.to_hash.merge(overrides))
@@ -22,31 +20,20 @@ module Hdo
       end
 
       def self.from_storting_doc(doc)
-        parties = doc.css("partier_liste parti").map do |node|
+        doc.css("partier_liste parti").map do |node|
           new node.css("id").first.text,
               node.css("navn").first.text
         end
-
-        GoverningPeriod.add_to parties
-
-        parties
       end
 
       def self.from_hash(hash)
-        obj = new hash['external_id'],
-                  hash['name']
-
-        obj.governing_periods = Array(hash['governing_periods']).map do |gp|
-          GoverningPeriod.from_hash gp
-        end
-
-        obj
+        new hash['external_id'],
+            hash['name']
       end
 
       def initialize(external_id, name)
         @external_id       = external_id
         @name              = name
-        @governing_periods = nil
       end
 
       def external_id
@@ -54,17 +41,11 @@ module Hdo
       end
 
       def to_hash
-        h = {
+        {
           'kind'        => self.class.kind,
           'external_id' => @external_id,
           'name'        => @name,
         }
-
-        if @governing_periods
-          h['governing_periods'] = @governing_periods.map { |e| e.to_hash }
-        end
-
-        h
       end
 
     end

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

@@ -18,26 +18,6 @@
       "description": "The name of the party",
       "type": "string",
       "required": true
-    },
-    "governing_periods": {
-      "type": "array",
-      "description": "Periods where this party was in the elected government.",
-      "items": {
-        "type": "object",
-        "properties": {
-          "start_date": {
-            "type": "string",
-            "format": "date",
-            "description": "When the governing period started.",
-            "required": true
-          },
-          "end_date": {
-            "type": "string",
-            "format": "date",
-            "description": "When the governing period stopped."
-          }
-        }
-      }
     }
   }
 }

data/lib/hdo/storting_importer/version.rb

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

data/lib/hdo/storting_importer.rb

@@ -30,7 +30,6 @@ module Hdo
         Committee,
         CommitteeMembership,
         District,
-        GoverningPeriod,
         ParliamentIssue,
         ParliamentSession,
         ParliamentPeriod,
@@ -138,6 +137,5 @@ require 'hdo/storting_importer/promise'
 require 'hdo/storting_importer/representative'
 require 'hdo/storting_importer/proposition'
 require 'hdo/storting_importer/vote'
-require 'hdo/storting_importer/governing_period'
 
 require 'hdo/storting_importer/cli'

data/spec/hdo/storting_importer/caching_data_source_spec.rb

@@ -6,7 +6,7 @@ module Hdo
     describe CachingDataSource do
 
       it 'caches requests' do
-        delegate = mock(DataSource)
+        delegate = double(DataSource)
 
         ads = CachingDataSource.new(delegate)
 

data/spec/hdo/storting_importer/party_spec.rb

@@ -40,14 +40,7 @@ module Hdo
         {
           "kind": "hdo#party",
           "external_id": "A",
-          "name": "Arbeiderpartiet",
-          "governing_periods": [
-            {
-              "kind": "hdo#governing_period",
-              "start_date": "2005-10-17",
-              "end_date": "2013-10-14"
-            }
-          ]
+          "name": "Arbeiderpartiet"
         }
         JSON
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -278,7 +278,6 @@ files:
 - lib/hdo/storting_importer/data_source.rb
 - lib/hdo/storting_importer/disk_data_source.rb
 - lib/hdo/storting_importer/district.rb
-- lib/hdo/storting_importer/governing_period.rb
 - lib/hdo/storting_importer/has_json_schema.rb
 - lib/hdo/storting_importer/in_memory_cache.rb
 - lib/hdo/storting_importer/inspectable.rb
@@ -297,7 +296,6 @@ 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
@@ -315,7 +313,6 @@ 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
@@ -347,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Gem to process data from data.stortinget.no
@@ -359,7 +356,6 @@ 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
@@ -372,3 +368,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_json_schema.rb
 - spec/support/shared_examples_for_short_inspect.rb
+has_rdoc: 

data/lib/hdo/storting_importer/governing_period.rb

@@ -1,54 +0,0 @@
-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|
-          party.governing_periods = all[party.external_id]
-        end
-      end
-
-      #
-      # Who and who isn't in government is not available in the data
-      # from Stortinget, so we hardcode it here.
-      #
-
-      def self.all
-        @periods ||= {
-          "A"  => [ GoverningPeriod.new('2005-10-17') ],
-          "SV" => [ GoverningPeriod.new('2005-10-17') ],
-          "Sp" => [ GoverningPeriod.new('2005-10-17') ]
-        }
-      end
-
-      def self.example
-        all['A'].first
-      end
-
-      def self.from_hash(hash)
-        new hash['start_date'], hash['end_date']
-      end
-
-      def initialize(start_date, end_date = nil)
-        @start_date = Date.strptime(start_date) if start_date
-        @end_date = Date.strptime(end_date) if end_date
-      end
-
-      def to_hash
-        {
-          'kind'       => self.class.kind,
-          'start_date' => @start_date && @start_date.iso8601,
-          'end_date'   => @end_date && @end_date.iso8601
-        }
-      end
-
-    end
-
-  end
-end

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

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

data/spec/hdo/storting_importer/governing_period_spec.rb

@@ -1,25 +0,0 @@
-# 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#governing_period",
-          "start_date": "2005-10-01",
-          "end_date": "2013-09-30"
-        }
-        JSON
-
-        session = GoverningPeriod.new('2005-10-01', '2013-09-30')
-        session.to_json.should be_json(expected)
-      end
-
-    end
-  end
-end