hdo-storting-importer 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c3d13a06c7ea55cc04ad7141a7336571aa06cac
-  data.tar.gz: dd694adc08a45ee11478a29e5b9d771290f9bed3
+  metadata.gz: 3c84c68937cad8fc60f41a854c96563f4636432e
+  data.tar.gz: 6c018689a03459290880cedc6327e998003b5a92
 SHA512:
-  metadata.gz: 7f3d898f4bb92157937e8ff04b0874e437894cff1fdb0684b259cd03ae005ac272430a30e60be9b08c6467a09a1f163c1aee32d08f2024e4a9bf6a93ef821132
-  data.tar.gz: a6271016a4f37a68e1a95be5e27a2d36c14f18e351d38650329515990790f32cd6a4d781509c1cb6f276c2fa8fbdf1f1b4d71f33fb590878b92962586b3f47b4
+  metadata.gz: beabc7770b26f7010682b7578f0ef8df848d424ac3391d06fea0066c835880ec5ce416db7ec03f6d0c0b9712fb3c31d06422a006af1b4e08262c57fffd7200f9
+  data.tar.gz: f49cfe73e20c27db2114633806d6a71b6a921bfcd12fb9e7f098b8928e9a49a0165dc495aff6ef6c2f23d0adc5b4b39dfa7f9d632ec2548f52f96c30aaa8b841

data/lib/hdo/storting_importer/representative.rb

@@ -10,7 +10,7 @@ module Hdo
       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
+      attr_accessor :vote_result, :permanent_substitute_for, :substitute
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/representative.json").to_s
 
@@ -85,9 +85,14 @@ module Hdo
           committees
         )
 
-        sub = node.css('fast_vara_for').first
+        sub_for = node.css('fast_vara_for').first
+        if sub_for && sub_for['nil'] != 'true'
+          rep.permanent_substitute_for = sub_for.css("id").first.text
+        end
+
+        sub = node.css('vara').first
         if sub && sub['nil'] != 'true'
-          rep.permanent_substitute_for = sub.css("id").first.text
+          rep.substitute = sub.css('id').first.text
         end
 
         rep
@@ -107,6 +112,7 @@ module Hdo
 
         v.vote_result = hash['vote_result']
         v.permanent_substitute_for = hash['permanent_substitute_for']
+        v.substitute = hash['substitute']
 
         v
       end
@@ -123,8 +129,9 @@ module Hdo
         @parties       = parties
         @committees    = committees
 
-        @vote_result   = nil
+        @vote_result              = nil
         @permanent_substitute_for = nil
+        @substitute               = nil
       end
 
       def short_inspect
@@ -152,6 +159,7 @@ module Hdo
 
         h['vote_result'] = @vote_result if @vote_result
         h['permanent_substitute_for'] = @permanent_substitute_for if @permanent_substitute_for
+        h['substitute'] = @substitute if @substitute
 
         h
       end

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

@@ -61,7 +61,11 @@
     },
     "permanent_substitute_for": {
       "type": "string",
-      "description": "A representative the current representative is a permanent substitute for."
+      "description": "The external id of the representative the current representative is a permanent substitute for."
+    },
+    "substitute": {
+      "type": "string",
+      "description": "The external id of the representative that is the substitute for the current representative"
     }
   }
 }

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.5.6"
+    VERSION = "0.5.7"
   end
 end

data/spec/hdo/storting_importer/representative_spec.rb

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

data/spec/hdo/storting_importer/vote_spec.rb

@@ -65,7 +65,7 @@ module Hdo
         vote.external_id.should == "2175"
         vote.external_issue_id.should == "51448"
         vote.should be_personal
-        vote.enacted.should be_false
+        vote.enacted.should be false
         vote.subject.should == 'Forslag 24 - 26 på vegne av Per Olaf Lundteigen'
         vote.method_name.should == 'ikke_spesifisert'
         vote.result_type.should == 'ikke_spesifisert'

data/spec/spec_helper.rb

@@ -42,6 +42,8 @@ module Hdo
           "expected #{@target.inspect} not to be #{@expected}"
         end
 
+        alias_method :failure_message_when_negated, :negative_failure_message
+
         private
 
         def diff

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder