hdo-storting-importer 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 797bc0f05e3fc75b91a35322e1638bcc8103977a
-  data.tar.gz: 4d52c0aec8069b11c1e0e63cd720b35185a31bf5
+  metadata.gz: 1182e5642b0955869ae3c0425018775fe2bef132
+  data.tar.gz: 54f6706a0ab1c0c2e1c0cb78713d9492bff944a7
 SHA512:
-  metadata.gz: 16424ec8da10a4bb44a4ed5ba3d49beefbb3c3df632f5ae218a7260b9a05b986cc03b3b866cc03341541784db60aa8a61b3f178c4209705b59858e4abaf96664
-  data.tar.gz: 935678f65e6f974fca1eeae86b945eb10aa89a5cfc0291aff3ff883560577b6769c2961da2f2bc87f7504b9c21272757329284e73490a12ad9266c362bc41674
+  metadata.gz: 63b7c08200579bbb5ed9be4991977a42928c172ba291a4f54be183f31b11f46ade4253f1ef222f3c8dffb3ead12bd87ba2bb8246d07b1a13cd5b2b71d4e91549
+  data.tar.gz: 66d0eb069be3951d9713d1b8cb810c8bc2d666dc5100b3a2fe4938d870be2169f64c47c3de1e0acd1ba391e147d6905d50e4c60214f13bbf7c305bcb58f5330c

data/lib/hdo/storting_importer/promise.rb

@@ -8,7 +8,7 @@ module Hdo
       include HasJsonSchema
       include IvarEquality
 
-      attr_reader :external_id, :parties, :body, :general, :categories, :source, :page, :date
+      attr_reader :external_id, :parties, :body, :general, :categories, :source, :page, :period
       alias_method :general?, :general
       alias_method :short_inspect, :inspect
 
@@ -23,7 +23,7 @@ module Hdo
           ["GRUNNSKOLE"],
           "PP",
           8,
-          '2009-06-01'
+          '2009-2013'
         )
 
         if overrides
@@ -50,7 +50,7 @@ module Hdo
           Hdo::StortingImporter.logger.info "promise row: #{data.inspect}"
 
           external_id = data.fetch(0).to_i.to_s
-          date        = data.fetch(1)
+          period      = data.fetch(1)
           parties     = data.fetch(2)
           body        = data.fetch(3)
           general     = data.fetch(4).to_s.strip.downcase
@@ -91,7 +91,7 @@ module Hdo
                         clean_invalid_unicode.call(categories),
                         source.strip,
                         Integer(page),
-                        date.strip
+                        period.strip
 
           begin
             promise.validate!
@@ -118,12 +118,12 @@ module Hdo
                  hash['categories'],
                  hash['source'],
                  hash['page'],
-                 hash['date']
+                 hash['period']
 
         pr
       end
 
-      def initialize(external_id, parties, body, general, categories, source, page, date)
+      def initialize(external_id, parties, body, general, categories, source, page, period)
         @external_id = external_id
         @parties     = clean_array(parties)
         @body        = strip_if_string(body)
@@ -131,7 +131,7 @@ module Hdo
         @categories  = clean_array(categories).map { |e| UnicodeUtils.upcase(e) }
         @source      = strip_if_string(source)
         @page        = page
-        @date        = date
+        @period      = period
       end
 
       def to_hash
@@ -144,7 +144,7 @@ module Hdo
           'source'     => @source,
           'page'       => @page,
           'body'       => @body,
-          'date'       => @date
+          'period'     => @period
         }
       end
 

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

@@ -47,10 +47,10 @@
       "description": "The body text of the promise.",
       "required": true
     },
-    "date": {
+    "period": {
       "type": "string",
-      "description": "The date the promise was made.",
-      "format": "date",
+      "description": "The period for which this promise is valid.",
+      "pattern": "\\d{4}-\\d{4}",
       "required": true
     }
   }

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/spec/hdo/storting_importer/promise_spec.rb

@@ -19,23 +19,23 @@ module Hdo
           "source": "PP",
           "page": 8,
           "body": "Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen.",
-          "date": "2009-06-01"
+          "period": "2009-2013"
         }
         JSON
       end
 
       it 'strips trailing space from the body' do
-        promise = Promise.new("1", "Party", "Body   ", true, ["æøå"], "PP", 8, '2012-06-01')
+        promise = Promise.new("1", "Party", "Body   ", true, ["æøå"], "PP", 8, '2009-2013')
         promise.body.should == "Body"
       end
 
       it 'correctly upcases non-ASCII category names' do
-        promise = Promise.new("1", "Party", "Body", true, ["æøå"], "PP", 8, '2012-06-01')
+        promise = Promise.new("1", "Party", "Body", true, ["æøå"], "PP", 8, '2009-2013')
         promise.categories.should == ["ÆØÅ"]
       end
 
       it 'ignores empty categories' do
-        promise = Promise.new("1", "Party", "Body", true, ["FOO", ""], "PP", 8, '2012-06-01')
+        promise = Promise.new("1", "Party", "Body", true, ["FOO", ""], "PP", 8, '2009-2013')
         promise.categories.should == ["FOO"]
       end
 
@@ -44,6 +44,9 @@ module Hdo
         obj.body.should == 'foo'
       end
 
+      it 'is invalid if period is not the correct format' do
+        Promise.example('period' => '2009-06-01').should_not be_valid
+      end
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder