hdo-storting-importer 0.2.2 → 0.2.3

data/spec/hdo/storting_importer/converter_spec.rb

@@ -31,21 +31,25 @@ module Hdo
             data_source.should_receive(name).and_return(input_for(name))
 
             actual_output = converter.json_for(name)
-            actual_output.should == output_for(name)
+            actual_output.should be_json(output_for(name))
           end
         }
 
         it "converts representatives" do
+          Date.stub(:today).and_return(Date.new(2012, 9, 20))
+          
           data_source.should_receive(:representatives).and_return(input_for(:representatives))
           data_source.should_receive(:representatives_today).and_return(input_for(:representatives_today))
 
           actual = converter.json_for(:representatives)
           expected = output_for(:representatives)
 
-          actual.should == expected
+          actual.should be_json(expected)
         end
 
         it "converts votes" do
+          Date.stub(:today).and_return(Date.new(2012, 9, 20))
+          
           parsing_data_source.should_receive(:parliament_issues).and_return [mock(:external_id => 2175)]
 
           data_source.should_receive(:votes_for).and_return(input_for(:votes))
@@ -59,7 +63,7 @@ module Hdo
           actual = converter.json_for(:votes)
           expected = output_for(:votes)
 
-          actual.should == expected
+          actual.should be_json(expected)
         end
 
       end

data/spec/hdo/storting_importer/party_membership_spec.rb

@@ -0,0 +1,29 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+module Hdo
+  module StortingImporter
+    describe PartyMembership do
+
+      it_behaves_like 'type with JSON schema'
+
+      it 'can serialize as JSON' do
+        str = PartyMembership.example.to_json
+        str.should be_json <<-JSON
+          {
+            "kind": "hdo#partyMembership",
+            "externalId": "A",
+            "startDate": "2009-09-01",
+            "endDate": "2013-08-01"
+          }
+        JSON
+      end
+
+      it 'can create a customized example' do
+        obj = PartyMembership.example('externalId' => 'foo')
+        obj.external_id.should == 'foo'
+      end
+      
+    end
+  end
+end

data/spec/hdo/storting_importer/proposition_spec.rb

@@ -31,7 +31,7 @@ module Hdo
         </voteringsforslag>
         XML
 
-        props = Proposition.from_storting_doc(parse(xml))
+        props = Proposition.from_storting_doc(parse(xml), Date.today)
         props.size.should == 1
 
         prop = props.first
@@ -73,7 +73,7 @@ module Hdo
         </voteringsforslag_oversikt>
         XML
 
-        props = Proposition.from_storting_doc(parse(xml))
+        props = Proposition.from_storting_doc(parse(xml), Time.now)
         props.size.should == 1
 
         prop = props.first

data/spec/hdo/storting_importer/representative_spec.rb

@@ -34,6 +34,7 @@ module Hdo
               </parti>
             </representant>
           </representanter_liste>
+          <stortingsperiode_id>2009-2013</stortingsperiode_id>
         </representanter_oversikt>
         XML
 
@@ -45,7 +46,7 @@ module Hdo
         rep.last_name.should == 'Dahl'
         rep.gender.should == 'M'
         rep.district.should == 'Akershus'
-        rep.party.should == 'Høyre'
+        rep.parties.should == [PartyMembership.from_hash('externalId' => 'H', 'startDate' => '2009-10-01', 'endDate' => '2013-09-30')]
         rep.external_id.should == 'ADA'
         rep.date_of_birth.should == '1975-07-07T00:00:00'
         rep.date_of_death.should == '0001-01-01T00:00:00'
@@ -63,9 +64,8 @@ module Hdo
             "dateOfBirth": "1975-07-07T00:00:00",
             "dateOfDeath": "0001-01-01T00:00:00",
             "district": "Akershus",
-            "party": "Høyre",
-            "committees": ["Justiskomiteen"],
-            "period": "2011-2012"
+            "parties": [{"kind": "hdo#partyMembership", "externalId": "H", "startDate": "2011-10-01", "endDate": null}],
+            "committees": ["Justiskomiteen"]
           }
         JSON
       end

data/spec/hdo/storting_importer/vote_spec.rb

@@ -102,9 +102,8 @@ module Hdo
               "dateOfBirth": "1975-07-07T00:00:00",
               "dateOfDeath": "0001-01-01T00:00:00",
               "district": "Akershus",
-              "party": "Høyre",
+              "parties": [{"kind": "hdo#partyMembership", "externalId": "H", "startDate": "2011-10-01", "endDate": null}],
               "committees": ["Justiskomiteen"],
-              "period": "2011-2012",
               "voteResult": "for"
             }
             ],
@@ -124,9 +123,8 @@ module Hdo
                 "dateOfBirth": "1975-07-07T00:00:00",
                 "dateOfDeath": "0001-01-01T00:00:00",
                 "district": "Akershus",
-                "party": "Høyre",
-                "committees": ["Justiskomiteen"],
-                "period": "2011-2012"
+                "parties": [{"kind": "hdo#partyMembership", "externalId": "H", "startDate": "2011-10-01", "endDate": null}],
+                "committees": ["Justiskomiteen"]
               }
             }
           ]

data/spec/spec_helper.rb

@@ -43,16 +43,25 @@ module Hdo
         def initialize(expected)
           @expected = MultiJson.decode(expected)
         end
+
         def matches?(target)
           @target = MultiJson.decode(target)
           @target.eql?(@expected)
         end
+
         def failure_message
-          "expected #{@target.inspect} to be #{@expected}"
+          "expected #{@target.inspect} to be #{@expected}\n#{diff}"
         end
+
         def negative_failure_message
           "expected #{@target.inspect} not to be #{@expected}"
         end
+
+        private
+
+        def diff
+          RSpec::Expectations::Differ.new.diff_as_object(@target, @expected)
+        end
       end
 
       def be_json(expected)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -289,6 +289,7 @@ files:
 - lib/hdo/storting_importer/parliament_issue.rb
 - lib/hdo/storting_importer/parsing_data_source.rb
 - lib/hdo/storting_importer/party.rb
+- lib/hdo/storting_importer/party_membership.rb
 - lib/hdo/storting_importer/promise.rb
 - lib/hdo/storting_importer/proposition.rb
 - lib/hdo/storting_importer/representative.rb
@@ -298,6 +299,7 @@ files:
 - lib/hdo/storting_importer/schema/district.json
 - lib/hdo/storting_importer/schema/parliament_issue.json
 - lib/hdo/storting_importer/schema/party.json
+- lib/hdo/storting_importer/schema/party_membership.json
 - lib/hdo/storting_importer/schema/promise.json
 - lib/hdo/storting_importer/schema/proposition.json
 - lib/hdo/storting_importer/schema/representative.json
@@ -331,6 +333,7 @@ files:
 - spec/hdo/storting_importer/converter_spec.rb
 - spec/hdo/storting_importer/district_spec.rb
 - spec/hdo/storting_importer/parliament_issue_spec.rb
+- spec/hdo/storting_importer/party_membership_spec.rb
 - spec/hdo/storting_importer/party_spec.rb
 - spec/hdo/storting_importer/promise_spec.rb
 - spec/hdo/storting_importer/proposition_spec.rb
@@ -392,6 +395,7 @@ test_files:
 - spec/hdo/storting_importer/converter_spec.rb
 - spec/hdo/storting_importer/district_spec.rb
 - spec/hdo/storting_importer/parliament_issue_spec.rb
+- spec/hdo/storting_importer/party_membership_spec.rb
 - spec/hdo/storting_importer/party_spec.rb
 - spec/hdo/storting_importer/promise_spec.rb
 - spec/hdo/storting_importer/proposition_spec.rb