hdo-storting-importer 0.3.2 → 0.3.3

data/.travis.yml

@@ -11,4 +11,4 @@ notifications:
     on_failure: change
     template:
       - "%{author} | %{commit} | %{message} | %{build_url}"
-script: "bundle exec rake"
+script: "SPEC_OPTS=--backtrace bundle exec rake"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Holder De Ord
+Copyright (c) 2012-2013 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/README.md

@@ -1,3 +1,8 @@
+[![Build Status](https://secure.travis-ci.org/holderdeord/hdo-storting-importer.png?branch=master)](http://travis-ci.org/holderdeord/hdo-storting-importer)
+[![Code Climate](https://codeclimate.com/github/holderdeord/hdo-storting-importer.png)](https://codeclimate.com/github/holderdeord/hdo-storting-importer)
+[![Dependency Status](https://gemnasium.com/holderdeord/hdo-storting-importer.png)](https://gemnasium.com/holderdeord/hdo-storting-importer)
+[![Coverage Status](https://coveralls.io/repos/holderdeord/hdo-storting-importer/badge.png?branch=master)](https://coveralls.io/r/holderdeord/hdo-storting-importer)
+
 What
 ====
 

data/hdo-storting-importer.gemspec

@@ -32,4 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'coveralls'
 end

data/lib/hdo/storting_importer/parsing_data_source.rb

@@ -1,6 +1,10 @@
 module Hdo
   module StortingImporter
     class ParsingDataSource < DataSource
+      def self.default
+        new ApiDataSource.default
+      end
+
       def initialize(delegate_data_source)
         @data_source = delegate_data_source
       end

data/lib/hdo/storting_importer/representative.rb

@@ -10,7 +10,7 @@ module Hdo
       attr_reader :external_id, :first_name, :last_name, :date_of_birth, :date_of_death,
                   :district, :parties, :committees, :period, :gender
 
-      attr_accessor :vote_result
+      attr_accessor :vote_result, :permanent_substitute_for
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/representative.json").to_s
 
@@ -64,7 +64,7 @@ module Hdo
           CommitteeMembership.new(id, start_date, end_date)
         end
 
-        new(
+        rep = new(
           node.css("id").first.text,
           node.css("fornavn").first.text,
           node.css("etternavn").first.text,
@@ -75,6 +75,13 @@ module Hdo
           parties,
           committees
         )
+
+        sub = node.css('fast_vara_for').first
+        if sub && sub['nil'] != 'true'
+          rep.permanent_substitute_for = sub.css("id").first.text
+        end
+
+        rep
       end
 
       def self.from_hash(hash)
@@ -89,6 +96,7 @@ module Hdo
                 Array(hash['committees']).map { |e| CommitteeMembership.from_hash(e) }
 
         v.vote_result = hash['voteResult']
+        v.permanent_substitute_for = hash['permanentSubstituteFor']
 
         v
       end
@@ -105,6 +113,7 @@ module Hdo
         @committees    = committees
 
         @vote_result   = nil
+        @permanent_substitute_for = nil
       end
 
       def short_inspect
@@ -130,6 +139,7 @@ module Hdo
         }
 
         h['voteResult'] = @vote_result if @vote_result
+        h['permanentSubstituteFor'] = @permanent_substitute_for if @permanent_substitute_for
 
         h
       end

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

@@ -54,6 +54,10 @@
       "type": "string",
       "description": "If this representative object is part of a hdo#vote, this property describes how the representative voted. Valid values are for|against|absent.",
       "pattern": "for|against|absent"
+    },
+    "permanentSubstituteFor": {
+      "type": "string",
+      "description": "A representative the current representative is a permanent substitute for."
     }
   }
 }

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/hdo/storting_importer/vote.rb

@@ -8,7 +8,7 @@ module Hdo
       include Inspectable
 
       attr_reader :external_id, :external_issue_id, :personal, :enacted, :subject,
-                  :method, :result_type, :time, :counts
+                  :method_name, :result_type, :time, :counts
       attr_accessor :propositions, :representatives
 
       alias_method :personal?, :personal
@@ -87,13 +87,13 @@ module Hdo
         vote
       end
 
-      def initialize(external_id, external_issue_id, personal, enacted, subject, method, result_type, time, for_count, against_count, absent_count)
+      def initialize(external_id, external_issue_id, personal, enacted, subject, method_name, result_type, time, for_count, against_count, absent_count)
         @external_id       = external_id
         @external_issue_id = external_issue_id
         @personal          = personal
         @enacted           = enacted
         @subject           = subject
-        @method            = method
+        @method_name       = method_name
         @result_type       = result_type
         @time              = time
         @counts            = Counts.new(Integer(for_count || 0), Integer(against_count || 0), Integer(absent_count || 0))
@@ -141,7 +141,7 @@ module Hdo
           'personal'         => @personal,
           'enacted'          => @enacted,
           'subject'          => @subject,
-          'method'           => @method,
+          'method'           => @method_name,
           'resultType'       => @result_type,
           'time'             => @time,
           'representatives'  => @representatives.map(&:to_hash),

data/spec/hdo/storting_importer/representative_spec.rb

@@ -106,6 +106,16 @@ module Hdo
         obj.first_name.should == 'foo'
       end
 
+      it 'serializes the "permanent substitute for" field' do
+        obj = Representative.example
+        obj.permanent_substitute_for = "JB"
+
+        data = obj.to_hash
+        data['permanentSubstituteFor'].should == "JB"
+
+        Representative.from_hash(data).permanent_substitute_for.should == "JB"
+      end
+
     end
   end
 end

data/spec/hdo/storting_importer/vote_spec.rb

@@ -67,7 +67,7 @@ module Hdo
         vote.should be_personal
         vote.enacted.should be_false
         vote.subject.should == 'Forslag 24 - 26 på vegne av Per Olaf Lundteigen'
-        vote.method.should == 'ikke_spesifisert'
+        vote.method_name.should == 'ikke_spesifisert'
         vote.result_type.should == 'ikke_spesifisert'
         vote.time.should == '2012-04-12T16:37:27.053'
         vote.counts.for.should == 2

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'rspec'
 require 'pry'
 require 'pp'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -267,6 +267,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem to process data from data.stortinget.no
 email:
 - jari.bakken@gmail.com
@@ -359,21 +375,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1318751592972283247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1318751592972283247
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Gem to process data from data.stortinget.no