hdo-storting-importer 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c84c68937cad8fc60f41a854c96563f4636432e
-  data.tar.gz: 6c018689a03459290880cedc6327e998003b5a92
+  metadata.gz: ee6237e304ec169aee02aab0d0618a741eb3f115
+  data.tar.gz: f2c6313359d9090cde4daaef2861290b65d3dfb3
 SHA512:
-  metadata.gz: beabc7770b26f7010682b7578f0ef8df848d424ac3391d06fea0066c835880ec5ce416db7ec03f6d0c0b9712fb3c31d06422a006af1b4e08262c57fffd7200f9
-  data.tar.gz: f49cfe73e20c27db2114633806d6a71b6a921bfcd12fb9e7f098b8928e9a49a0165dc495aff6ef6c2f23d0adc5b4b39dfa7f9d632ec2548f52f96c30aaa8b841
+  metadata.gz: 5d86212acfc14acc08615a983c4f48ff145098c110e8a45d3c8fe65db67418baad498de2bdc8196dd6fee828adb4ac096453f863c85083ed6ad2ddf8885df574
+  data.tar.gz: ace3798c59cb6ffe14ca47e370c94a8777ee48e18182cef4228f7bc94b145b87a43057167d498460fb5bd5337c901617af90fcea26b008ca794db27b430f53b7

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

@@ -57,6 +57,10 @@
       "type": "string",
       "description": "Not entirely what sure this is at the moment."
     },
+    "comment": {
+      "type": "string",
+      "description": "A comment for the vote (usually to make corrections)"
+    },
     "representatives": {
       "type": "array",
       "description": "An array of each representative's vote. The object should contain a set of <a href='#input-format-representative'>hdo#representative</a> objects with the property 'vote_result' added, for which valid values are 'for', 'against', 'absent'.",

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.5.7"
+    VERSION = "0.5.8"
   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_name, :result_type, :time, :counts
+                  :method_name, :result_type, :time, :counts, :comment
       attr_accessor :propositions, :representatives
 
       alias_method :personal?, :personal
@@ -17,7 +17,7 @@ module Hdo
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/vote.json").to_s
 
       def self.example(overrides = nil)
-        vote = new('2175', '51448', true, false, 'Forslag 24 - 26 på vegne av Per Olaf Lundteigen', 'ikke_spesifisert', 'ikke_spesifisert', '2012-04-12T16:37:27.053', 2, 96, 71)
+        vote = new('2175', '51448', true, false, 'Forslag 24 - 26 på vegne av Per Olaf Lundteigen', 'ikke_spesifisert', 'ikke_spesifisert', '2012-04-12T16:37:27.053', 2, 96, 71, 'hei')
 
         rep = Representative.example
         rep.vote_result = 'for'
@@ -49,6 +49,7 @@ module Hdo
           method      = vote_node.css("votering_metode").text
           result_type = vote_node.css("votering_resultat_type").text
           time        = vote_node.css("votering_tid").text
+          comment     = vote_node.css('kommentar').text
 
           forc     = Integer(vote_node.css("antall_for").text)
           againstc = Integer(vote_node.css("antall_mot").text)
@@ -59,7 +60,7 @@ module Hdo
           againstc = 0 if againstc < 0
           absentc = 0 if absentc < 0
 
-          new vote_id, issue_id, personal, enacted, subject, method, result_type, time, forc, againstc, absentc
+          new vote_id, issue_id, personal, enacted, subject, method, result_type, time, forc, againstc, absentc, comment
         end
       end
 
@@ -78,6 +79,7 @@ module Hdo
           counts && counts["for"],
           counts && counts["against"],
           counts && counts["absent"],
+          hash["comment"],
         ]
 
         vote = new(*args)
@@ -87,7 +89,7 @@ module Hdo
         vote
       end
 
-      def initialize(external_id, external_issue_id, personal, enacted, subject, method_name, 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, comment)
         @external_id       = external_id
         @external_issue_id = external_issue_id
         @personal          = personal
@@ -96,6 +98,7 @@ module Hdo
         @method_name       = method_name
         @result_type       = result_type
         @time              = time
+        @comment           = comment
         @counts            = Counts.new(Integer(for_count || 0), Integer(against_count || 0), Integer(absent_count || 0))
 
         @propositions    = []
@@ -144,6 +147,7 @@ module Hdo
           'method'            => @method_name,
           'result_type'       => @result_type,
           'time'              => @time,
+          'comment'           => @comment,
           'representatives'   => @representatives.map(&:to_hash),
           'propositions'      => @propositions.map(&:to_hash)
         }

data/spec/hdo/storting_importer/vote_spec.rb

@@ -24,7 +24,7 @@ module Hdo
               <behandlingsrekkefoelge>1</behandlingsrekkefoelge>
               <dagsorden_sak_nummer>2</dagsorden_sak_nummer>
               <fri_votering>false</fri_votering>
-              <kommentar i:nil="true" />
+              <kommentar>Dette gikk fint.</kommentar>
               <personlig_votering>true</personlig_votering>
               <president>
                 <versjon>1.0</versjon>
@@ -73,6 +73,7 @@ module Hdo
         vote.counts.for.should == 2
         vote.counts.against.should == 96
         vote.counts.absent.should == 71
+        vote.comment.should == 'Dette gikk fint.'
       end
 
       it 'can serialize as JSON' do
@@ -92,6 +93,7 @@ module Hdo
           "method": "ikke_spesifisert",
           "result_type": "ikke_spesifisert",
           "time": "2012-04-12T16:37:27.053",
+          "comment": "hei",
           "representatives": [
             {
               "kind": "hdo#representative",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -347,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Gem to process data from data.stortinget.no
@@ -372,4 +372,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_json_schema.rb
 - spec/support/shared_examples_for_short_inspect.rb
-has_rdoc: