hdo-storting-importer 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee6237e304ec169aee02aab0d0618a741eb3f115
-  data.tar.gz: f2c6313359d9090cde4daaef2861290b65d3dfb3
+  metadata.gz: 04f4514972814ef1a08de1c48c467be9a244fc29
+  data.tar.gz: 80ec9a0d74693e86b609b27d41415974be553dbf
 SHA512:
-  metadata.gz: 5d86212acfc14acc08615a983c4f48ff145098c110e8a45d3c8fe65db67418baad498de2bdc8196dd6fee828adb4ac096453f863c85083ed6ad2ddf8885df574
-  data.tar.gz: ace3798c59cb6ffe14ca47e370c94a8777ee48e18182cef4228f7bc94b145b87a43057167d498460fb5bd5337c901617af90fcea26b008ca794db27b430f53b7
+  metadata.gz: 91dab0f0eb1a338a08b4fdd37867f0e11cc97842c5d573456445e9c125f73de868022bbb5d6756b7aff4e939c796803cf57701691deafd64c5989b31040b471a
+  data.tar.gz: e9281e3642b8119d3149ee4043c22d913e7d230427b76ae276e5b92b5ea63d259a7a9b3a15ea0b1b129d1a35061d45e68df097dc793038611f2b93aaced9b0bd

data/.travis.yml

@@ -1,14 +1,9 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.2.5
 notifications:
   recipients:
     - jari@holderdeord.no
-  irc:
-    channels:
-      - "irc.freenode.net#holderdeord"
-    on_success: always
-    on_failure: change
-    template:
-      - "%{author} | %{commit} | %{message} | %{build_url}"
-script: "SPEC_OPTS=--backtrace bundle exec rake"
+  slack:
+    secure: kqWLjIkXnKSnvinLB4wllKljWk0k9tXC8dA9s85qL7+UU0x90iEulx6GPhi8nIOK/5reNUhDcS6nktuzPz7/4iIM0J7BxMZiDLp6xjDaeag9cuXpNc8/lsFViyrsTqqs///WZjV5AmCsAM01GErqhkO5xxoCs5Pu50ulS4VvVc4=
+script: SPEC_OPTS=--backtrace bundle exec rake

data/features/convert.feature

@@ -104,7 +104,7 @@ Feature: Import data
         </fylker_liste>
       </fylker_oversikt>
       """
-      When I successfully run `hdo-converter districts fylker.xml`
+      When I successfully run `hdo-converter districts fylker.xml` for up to 5 seconds
       Then the stdout should contain:
       """
       [

data/hdo-storting-importer.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "builder"
   gem.add_runtime_dependency "nokogiri"
-  gem.add_runtime_dependency "aruba"
-  gem.add_runtime_dependency "rake"
+  gem.add_runtime_dependency "aruba", "0.6.2"
+  gem.add_runtime_dependency "rake", '< 11.0'
   gem.add_runtime_dependency "faraday"
   gem.add_runtime_dependency "net-http-persistent"
   gem.add_runtime_dependency "unicode_utils"

data/lib/hdo/storting_importer/api_data_source.rb

@@ -48,14 +48,16 @@ module Hdo
       # @param [:small, :medium, :large] size
       #
 
-      def person_photo(person_id, size = :medium)
+      def person_photo(person_id, size = :medium, fallback = false)
         size_param = {
           :small  => 'lite',
           :medium => 'middels',
           :large  => 'stort'
         }.fetch(size)
 
-        fetch_raw "eksport/personbilde?personid=#{person_id}&storrelse=#{size_param}"
+        fb = fallback ? '&erstatningsbilde=true' : ''
+
+        fetch_raw "eksport/personbilde?personid=#{person_id}&storrelse=#{size_param}#{fb}"
       end
 
       def speaker_list

data/lib/hdo/storting_importer/promise.rb

@@ -78,7 +78,7 @@ module Hdo
           elsif promisor.include?(",")
             errors << "row #{external_id}: comma not allowed in promisor id/name"
           end
-          
+
           if categories.nil? || categories.empty?
             errors << "row #{external_id}: categories missing"
           end
@@ -167,7 +167,7 @@ module Hdo
       private
 
       def clean_array(categories)
-        categories = categories.split(",") if categories.kind_of?(String)
+        categories = categories.split(/,\s*/) if categories.kind_of?(String)
         Array(categories).map(&:strip).reject(&:empty?)
       end
 

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.5.8"
+    VERSION = "0.5.9"
   end
 end

data/spec/spec_helper.rb

@@ -42,8 +42,11 @@ module Hdo
           "expected #{@target.inspect} not to be #{@expected}"
         end
 
+        alias_method :failure_message_for_should, :failure_message
+        alias_method :failure_message_for_should_not, :negative_failure_message
         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.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -42,30 +42,30 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement