hdo-storting-importer 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd6d7e280a3b4652fdba0b86b7575d1dd9ca4e3
-  data.tar.gz: 03ef9bebf0c9ccad233f3ca5065b9b21422bd97c
+  metadata.gz: 5af832dfe75f36ebe57837c1765372a3006db7ce
+  data.tar.gz: 188fc6fa520a69fa71e3fc062bcfdc35942e8dc8
 SHA512:
-  metadata.gz: b0b656209a26d71e97d2ac31f9973f9c6632e5404e6518272d4a2bcb431b8b62cb4df86cccf9bb10b849a99eac165809b47602ca828bb0c566899767ad62c0e9
-  data.tar.gz: 5a292ad4053c5fdc0fcdf09e0066d410d1551ceb29a084a46b6f0fff8a02d0aa5490c353aa9ef58a01755361ab17151d38a7827f0754746e51868dd755c3cbbb
+  metadata.gz: 9f0014cc7fc871d881a6bd035d346a340cc475dc856e93690f925726f365041943072f9e01fd49e1a2f0a4e774b9f16fe008e47aae0f4006c09f0125e1074163
+  data.tar.gz: c05a862e059dfa37ac2e6d7a2b95b144e156429c17427d850877ede306996b56c680adefec25e93cfb952c912d398941c6e1c9e2cf4541ad41a9ad506748f256

data/.travis.yml

@@ -7,7 +7,7 @@ notifications:
   irc:
     channels:
       - "irc.freenode.net#holderdeord"
-    on_success: change
+    on_success: always
     on_failure: change
     template:
       - "%{author} | %{commit} | %{message} | %{build_url}"

data/lib/hdo/storting_importer/governing_period.rb

@@ -16,7 +16,7 @@ module Hdo
 
       #
       # Who and who isn't in government is not available in the data
-      # from Stortinget and changes just every 4 years, so we hardcode it here.
+      # from Stortinget, so we hardcode it here.
       #
 
       def self.all

data/lib/hdo/storting_importer/has_json_schema.rb

@@ -41,12 +41,11 @@ module Hdo
         attr_reader :schema
 
         def schema_path(path)
-          @schema = MultiJson.decode(open(path).read)
-          HasJsonSchema.schemas << @schema
+          @schema_path = path
         end
 
         def schema
-          @schema or raise "schema must be set with #{self}.schema_path"
+          @schema ||= load_schema
         end
 
         def json_example
@@ -95,6 +94,17 @@ module Hdo
         rescue Jschematic::ValidationError => ex
           raise ValidationError, "#{ex.message}: #{e.inspect}"
         end
+
+        private
+
+        def load_schema
+          @schema_path or raise "schema must be set with #{self}.schema_path"
+
+          schema = MultiJson.decode(File.read(@schema_path))
+          HasJsonSchema.schemas << schema
+
+          schema
+        end
       end
 
     end

data/lib/hdo/storting_importer/promise.rb

@@ -38,7 +38,14 @@ module Hdo
       end
 
       def self.from_xlsx(path)
-        table  = Roo::Excelx.new(path)
+        from_spreadsheet Roo::Excelx.new(path)
+      end
+
+      def self.from_xls(path)
+        from_spreadsheet Roo::Excel.new(path)
+      end
+
+      def self.from_spreadsheet(table)
         raise "empty spreadsheet" unless table.first_row
 
         errors = []

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-10-09 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.0.0
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Gem to process data from data.stortinget.no