hdo-storting-importer 0.2.4 → 0.2.6

data/lib/hdo/storting_importer/api_data_source.rb

@@ -20,7 +20,16 @@ module Hdo
                     end
       end
 
-      def representatives(period = DEFAULT_PERIOD)
+      #
+      # fetch representatives for the given period
+      #
+      # @param [String] period
+      #
+      # @example
+      #   data_source.representatives('2009-2013')
+      #
+
+      def representatives(period)
         fetch "eksport/representanter/?StortingsPeriodeId=#{period}"
       end
 
@@ -28,11 +37,20 @@ module Hdo
         fetch 'eksport/dagensrepresentanter/'
       end
 
-      def parties(session_id = DEFAULT_SESSION)
+      #
+      # fetch parties for the given session
+      #
+      # @param [String] session
+      #
+      # @example
+      #   data_source.representatives('2011-2012')
+      #
+
+      def parties(session_id)
         fetch "eksport/partier/?sesjonid=#{session_id}"
       end
 
-      def committees(session_id = DEFAULT_SESSION)
+      def committees(session_id)
         fetch "eksport/komiteer/?SesjonId=#{session_id}"
       end
 
@@ -44,7 +62,7 @@ module Hdo
         fetch "eksport/emner"
       end
 
-      def parliament_issues(session_id = DEFAULT_SESSION)
+      def parliament_issues(session_id)
         fetch "eksport/saker?sesjonid=#{session_id}"
       end
 

data/lib/hdo/storting_importer/caching_data_source.rb

@@ -6,7 +6,7 @@ module Hdo
         @cache    = cache
       end
 
-      def representatives(period = DEFAULT_PERIOD)
+      def representatives(period)
         cache :representatives, period do
           @delegate.representatives(period)
         end
@@ -18,13 +18,13 @@ module Hdo
         end
       end
 
-      def parties(session_id = DEFAULT_SESSION)
+      def parties(session_id)
         cache :parties, session_id do
           @delegate.parties(session_id)
         end
       end
 
-      def committees(session_id = DEFAULT_SESSION)
+      def committees(session_id)
         cache :committees, session_id do
           @delegate.committees session_id
         end
@@ -42,7 +42,7 @@ module Hdo
         end
       end
 
-      def parliament_issues(session_id = DEFAULT_SESSION)
+      def parliament_issues(session_id)
         cache :parliament_issues, session_id do
           @delegate.issues session_id
         end

data/lib/hdo/storting_importer/data_source.rb

@@ -5,9 +5,6 @@ module Hdo
       class NotFoundError < StandardError
       end
 
-      DEFAULT_SESSION = '2012-2013'
-      DEFAULT_PERIOD = '2009-2013'
-
       private
 
       def parse(str)

data/lib/hdo/storting_importer/disk_data_source.rb

@@ -6,11 +6,11 @@ module Hdo
         @root = Pathname.new(root)
       end
 
-      def parties(session_id = DEFAULT_SESSION)
+      def parties(session_id)
         fetch "eksport/partier/index.html?sesjonid=#{session_id}"
       end
 
-      def committees(session_id = DEFAULT_SESSION)
+      def committees(session_id)
         fetch "eksport/komiteer/index.html?SesjonId=#{session_id}"
       end
 
@@ -22,11 +22,11 @@ module Hdo
         fetch "eksport/emner/index.html"
       end
 
-      def parliament_issues(session_id = DEFAULT_SESSION)
+      def parliament_issues(session_id)
         fetch "eksport/saker/index.html?sesjonid=#{session_id}"
       end
 
-      def representatives(period = DEFAULT_PERIOD)
+      def representatives(period)
         fetch "eksport/representanter/index.html?StortingsPeriodeId=#{period}"
       end
 

data/lib/hdo/storting_importer/parsing_data_source.rb

@@ -5,7 +5,7 @@ module Hdo
         @data_source = delegate_data_source
       end
 
-      def representatives(period = DEFAULT_PERIOD)
+      def representatives(period)
         Representative.from_storting_doc @data_source.representatives(period)
       end
 
@@ -13,11 +13,11 @@ module Hdo
         Representative.from_storting_doc @data_source.representatives_today
       end
 
-      def parties(session_id = DEFAULT_SESSION)
+      def parties(session_id)
         Party.from_storting_doc @data_source.parties(session_id)
       end
 
-      def committees(session_id = DEFAULT_SESSION)
+      def committees(session_id)
         Committee.from_storting_doc @data_source.committees(session_id)
       end
 
@@ -29,7 +29,7 @@ module Hdo
         Category.from_storting_doc @data_source.categories
       end
 
-      def parliament_issues(session_id = DEFAULT_SESSION)
+      def parliament_issues(session_id)
         ParliamentIssue.from_storting_doc @data_source.parliament_issues(session_id)
       end
 

data/lib/hdo/storting_importer/promise.rb

@@ -101,8 +101,7 @@ module Hdo
         }.compact
 
         if errors.any?
-          puts errors
-          # raise "found errors:\n#{errors.join("\n")}"
+          raise "found errors:\n#{errors.join("\n")}"
         end
 
         promises

data/lib/hdo/storting_importer/proposition.rb

@@ -35,11 +35,11 @@ module Hdo
         new(*arr)
       end
 
-      def self.from_storting_doc(doc, time)
+      def self.from_storting_doc(doc, date)
         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, Util.session_for_date(time))
+            delivered_by = Representative.from_storting_node(rep_node, date)
           else
             delivered_by = nil
           end

data/lib/hdo/storting_importer/representative.rb

@@ -42,18 +42,15 @@ module Hdo
         nodes = doc.css("dagensrepresentant")
         nodes += doc.css("representant")
 
-        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) }
+        nodes.map { |e| from_storting_node(e) }
       end
 
-      def self.from_storting_node(node, period = nil)
+      def self.from_storting_node(node, date = nil)
         district_node = node.css("fylke navn").first
         district      = district_node ? district_node.text : ''
 
-        start_date = period ? period.begin : Util.current_session.begin
-        end_date = period ? period.end : nil
+        start_date = date || Date.today
+        end_date   = nil
 
         party_node = node.css("parti id").first
         if party_node

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.2.4"
+    VERSION = "0.2.6"
   end
 end

data/lib/hdo/storting_importer/vote.rb

@@ -106,13 +106,17 @@ module Hdo
         short_inspect_string :include => [:external_id, :subject, :time, :counts]
       end
 
+      def date
+        @date ||= Date.parse(time)
+      end
+
       def add_storting_propositions(node)
-        @propositions += Proposition.from_storting_doc(node, Date.parse(time))
+        @propositions += Proposition.from_storting_doc(node, date)
       end
 
       def add_storting_results(node)
         @representatives += node.css("representant_voteringsresultat").map do |n|
-          rep = Representative.from_storting_node(n.css("representant").first)
+          rep = Representative.from_storting_node(n.css("representant").first, date)
           rep.vote_result = case n.css("votering").text
                             when 'for'
                               'for'

data/lib/hdo/storting_importer.rb

@@ -132,7 +132,6 @@ require 'hdo/storting_importer/proposition'
 require 'hdo/storting_importer/vote'
 require 'hdo/storting_importer/governing_period'
 
-require 'hdo/storting_importer/converter'
 require 'hdo/storting_importer/cli'
 
 

data/spec/hdo/storting_importer/caching_data_source_spec.rb

@@ -10,10 +10,12 @@ module Hdo
 
         ads = CachingDataSource.new(delegate)
 
-        delegate.should_receive(:representatives).once.and_return "data"
+        delegate.should_receive(:representatives).twice.and_return "data"
 
-        ads.representatives # not cached
-        ads.representatives # cached
+        ads.representatives('2011-2012') # not cached
+        ads.representatives('2011-2012') # cached
+        ads.representatives('2012-2013') # not cached
+        ads.representatives('2012-2013') # cached
       end
 
     end

data/spec/hdo/storting_importer/representative_spec.rb

@@ -46,7 +46,7 @@ module Hdo
         rep.last_name.should == 'Dahl'
         rep.gender.should == 'M'
         rep.district.should == 'Akershus'
-        rep.parties.should == [PartyMembership.from_hash('externalId' => 'H', 'startDate' => '2009-10-01', 'endDate' => '2013-09-30')]
+        rep.parties.should == [PartyMembership.from_hash('externalId' => 'H', 'startDate' => Date.today.strftime("%Y-%m-%d"), 'endDate' => nil)]
         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'

data/spec/spec_helper.rb

@@ -14,24 +14,6 @@ end
 module Hdo
   module StortingImporter
     module SpecHelper
-      FIXTURES = Pathname.new(File.expand_path("../fixtures", __FILE__))
-
-      def input_fixture(name)
-        FIXTURES.join(input_path("#{name}.xml")).read
-      end
-
-      def output_fixture(name)
-        FIXTURES.join(output_path("#{name}.json")).read
-      end
-
-      def input_path(filename)
-        FIXTURES.join("input/#{filename}")
-      end
-
-      def output_path(filename)
-        FIXTURES.join("output/#{filename}")
-      end
-
       def parse(str)
         doc = Nokogiri::XML.parse(str)
         doc.remove_namespaces!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -277,7 +277,6 @@ files:
 - lib/hdo/storting_importer/cli.rb
 - lib/hdo/storting_importer/committee.rb
 - lib/hdo/storting_importer/committee_membership.rb
-- lib/hdo/storting_importer/converter.rb
 - lib/hdo/storting_importer/core_ext/enumerable.rb
 - lib/hdo/storting_importer/data_source.rb
 - lib/hdo/storting_importer/disk_data_source.rb
@@ -309,31 +308,10 @@ files:
 - lib/hdo/storting_importer/util.rb
 - lib/hdo/storting_importer/version.rb
 - lib/hdo/storting_importer/vote.rb
-- spec/fixtures/input/categories.xml
-- spec/fixtures/input/committees.xml
-- spec/fixtures/input/districts.xml
-- spec/fixtures/input/parliament_issues.xml
-- spec/fixtures/input/parties.xml
-- spec/fixtures/input/promises-a.csv
-- spec/fixtures/input/propositions_2175.xml
-- spec/fixtures/input/propositions_2176.xml
-- spec/fixtures/input/representatives.xml
-- spec/fixtures/input/representatives_today.xml
-- spec/fixtures/input/vote_results_2175.xml
-- spec/fixtures/input/vote_results_2176.xml
-- spec/fixtures/input/votes.xml
-- spec/fixtures/output/categories.json
-- spec/fixtures/output/committees.json
-- spec/fixtures/output/districts.json
-- spec/fixtures/output/parliament_issues.json
-- spec/fixtures/output/parties.json
-- spec/fixtures/output/representatives.json
-- spec/fixtures/output/votes.json
 - spec/hdo/storting_importer/caching_data_source_spec.rb
 - spec/hdo/storting_importer/category_spec.rb
 - spec/hdo/storting_importer/committee_membership_spec.rb
 - spec/hdo/storting_importer/committee_spec.rb
-- 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
@@ -372,31 +350,10 @@ summary: Gem to process data from data.stortinget.no
 test_files:
 - features/convert.feature
 - features/support/env.rb
-- spec/fixtures/input/categories.xml
-- spec/fixtures/input/committees.xml
-- spec/fixtures/input/districts.xml
-- spec/fixtures/input/parliament_issues.xml
-- spec/fixtures/input/parties.xml
-- spec/fixtures/input/promises-a.csv
-- spec/fixtures/input/propositions_2175.xml
-- spec/fixtures/input/propositions_2176.xml
-- spec/fixtures/input/representatives.xml
-- spec/fixtures/input/representatives_today.xml
-- spec/fixtures/input/vote_results_2175.xml
-- spec/fixtures/input/vote_results_2176.xml
-- spec/fixtures/input/votes.xml
-- spec/fixtures/output/categories.json
-- spec/fixtures/output/committees.json
-- spec/fixtures/output/districts.json
-- spec/fixtures/output/parliament_issues.json
-- spec/fixtures/output/parties.json
-- spec/fixtures/output/representatives.json
-- spec/fixtures/output/votes.json
 - spec/hdo/storting_importer/caching_data_source_spec.rb
 - spec/hdo/storting_importer/category_spec.rb
 - spec/hdo/storting_importer/committee_membership_spec.rb
 - spec/hdo/storting_importer/committee_spec.rb
-- 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

data/lib/hdo/storting_importer/converter.rb

@@ -1,40 +0,0 @@
-module Hdo
-  module StortingImporter
-    class Converter
-
-      def initialize(data_source)
-        @data_source = data_source
-        @cache = {}
-      end
-
-      def json_for(name, opts = nil)
-        obj = data_for(name)
-
-        Yajl::Encoder.encode(obj, opts && opts[:pretty])
-      end
-
-      private
-
-      def data_for(name)
-        case name
-        when :votes
-          # not ideal
-          issue_ids = fetch(:parliament_issues).map { |e| e.external_id }
-          issue_ids.map { |id| @data_source.votes_for(id) }.flatten.uniq_by { |e| e.external_id }
-        when :districts
-          fetch(name).sort_by { |e| e.name }
-        when :representatives
-          data = fetch(:representatives_today) + fetch(:representatives)
-          data.uniq_by { |e| e.external_id }.sort_by { |e| e.external_id }
-        else
-          fetch(name)
-        end
-      end
-
-      def fetch(name)
-        @cache[name] ||= @data_source.__send__(name)
-      end
-
-    end
-  end
-end