hdo-storting-importer 0.0.9 → 0.1.0

data/Guardfile

@@ -0,0 +1,7 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/hdo-storting-importer.gemspec

@@ -26,5 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "jschematic", ">= 0.1.0"
 
   gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'guard'
+  gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'rspec'
 end

data/lib/hdo/storting_importer/category.rb

@@ -17,10 +17,6 @@ module Hdo
         cat
       end
 
-      def self.json_example
-        Util.json_pretty example
-      end
-
       #
       # Deserialize from a Storting XML document (<emne_liste><emne>...</emne></emne_liste>)
       #
@@ -67,12 +63,12 @@ module Hdo
 
       def to_hash
         h = {
-          :kind       => self.class.kind,
-          :externalId => @external_id,
-          :name       => @name
+          'kind'       => self.class.kind,
+          'externalId' => @external_id,
+          'name'       => @name
         }
 
-        h[:subCategories] = @children.map { |e| e.to_hash } if @children.any?
+        h['subCategories'] = @children.map { |e| e.to_hash } if @children.any?
 
         h
       end

data/lib/hdo/storting_importer/committee.rb

@@ -13,10 +13,6 @@ module Hdo
         new "ARBSOS", "Arbeids- og sosialkomiteen"
       end
 
-      def self.json_example
-        Util.json_pretty example
-      end
-
       def self.from_storting_doc(doc)
         doc.css("komiteer_liste komite").map do |node|
           from_storting_node(node)
@@ -24,7 +20,8 @@ module Hdo
       end
 
       def self.from_storting_node(node)
-        new node.css("id").first.text, node.css("navn").first.text
+        new node.css("id").first.text,
+            node.css("navn").first.text
       end
 
       def self.from_hash(hash)
@@ -33,14 +30,14 @@ module Hdo
 
       def initialize(external_id, name)
         @external_id = external_id
-        @name = name
+        @name        = name
       end
 
       def to_hash
         {
-          :kind       => self.class.kind,
-          :externalId => @external_id,
-          :name       => @name
+          'kind'       => self.class.kind,
+          'externalId' => @external_id,
+          'name'       => @name
         }
       end
 

data/lib/hdo/storting_importer/district.rb

@@ -13,10 +13,6 @@ module Hdo
         new("Db", "Duckburg")
       end
 
-      def self.json_example
-        Util.json_pretty example
-      end
-
       def self.from_storting_doc(doc)
         doc.css("fylker_liste fylke").map do |node|
           from_storting_node(node)
@@ -24,23 +20,24 @@ module Hdo
       end
 
       def self.from_storting_node(node)
-        new node.css("id").first.text, node.css("navn").first.text
+        new node.css("id").first.text,
+            node.css("navn").first.text
       end
 
       def self.from_hash(hash)
-        new hash.fetch('externalId'), hash.fetch('name')
+        new hash['externalId'], hash['name']
       end
 
       def initialize(external_id, name)
         @external_id = external_id
-        @name = name
+        @name        = name
       end
 
       def to_hash
         {
-          :kind       => self.class.kind,
-          :externalId => @external_id,
-          :name       => @name
+          'kind'       => self.class.kind,
+          'externalId' => @external_id,
+          'name'       => @name
         }
       end
 

data/lib/hdo/storting_importer/has_json_schema.rb

@@ -7,6 +7,7 @@ module Hdo
     # Includer must define these methods:
     #
     #   .schema_path
+    #   .example
     #   #from_hash(hash)
     #   #to_hash
     #
@@ -28,6 +29,14 @@ module Hdo
         to_hash
       end
 
+      def valid?
+        self.class.valid? to_hash
+      end
+
+      def validate!
+        self.class.validate! to_hash
+      end
+
       module ClassMethods
         attr_reader :schema
 
@@ -40,6 +49,10 @@ module Hdo
           @schema or raise "schema must be set with #{self}.schema_path"
         end
 
+        def json_example
+          @json_example ||= Util.json_pretty example
+        end
+
         def kind
           @kind ||= schema['properties']['kind']['default']
         end
@@ -72,6 +85,10 @@ module Hdo
           end
         end
 
+        def valid?(e)
+          Jschematic.validate(e, schema, :context => HasJsonSchema.schemas, :debug => true)
+        end
+
         def validate!(e)
           Jschematic.validate!(e, schema, :context => HasJsonSchema.schemas, :debug => true)
           e

data/lib/hdo/storting_importer/issue.rb

@@ -58,22 +58,19 @@ module Hdo
         end
 
         new(external_id, summary, description, type, status, last_update, reference, document_group, committee, categories)
-      rescue
-        puts lnode
-        raise
       end
 
       def self.from_hash(hash)
-        new hash.fetch('externalId'),
-            hash.fetch('summary'),
-            hash.fetch('description'),
-            hash.fetch('type'),
-            hash.fetch('status'),
-            hash.fetch('lastUpdate'),
-            hash.fetch('reference'),
-            hash.fetch('documentGroup'),
-            hash.fetch('committee'),
-            hash.fetch('categories')
+        new hash['externalId'],
+            hash['summary'],
+            hash['description'],
+            hash['type'],
+            hash['status'],
+            hash['lastUpdate'],
+            hash['reference'],
+            hash['documentGroup'],
+            hash['committee'],
+            hash['categories']
       end
 
       def initialize(external_id, summary, description, type, status, last_update,
@@ -96,17 +93,17 @@ module Hdo
 
       def to_hash
         {
-          :kind           => self.class.kind,
-          :externalId     => @external_id,
-          :summary        => @summary,
-          :description    => @description,
-          :type           => @type,
-          :status         => @status,
-          :lastUpdate     => @last_update,
-          :reference      => @reference,
-          :documentGroup  => @document_group,
-          :committee      => @committee,
-          :categories     => @categories
+          'kind'           => self.class.kind,
+          'externalId'     => @external_id,
+          'summary'        => @summary,
+          'description'    => @description,
+          'type'           => @type,
+          'status'         => @status,
+          'lastUpdate'     => @last_update,
+          'reference'      => @reference,
+          'documentGroup'  => @document_group,
+          'committee'      => @committee,
+          'categories'     => @categories
         }
       end
 

data/lib/hdo/storting_importer/party.rb

@@ -13,18 +13,16 @@ module Hdo
         new("DEM", "Democratic Party")
       end
 
-      def self.json_example
-        Util.json_pretty example
-      end
-
       def self.from_storting_doc(doc)
         doc.css("partier_liste parti").map do |node|
-          new node.css("id").first.text, node.css("navn").first.text
+          new node.css("id").first.text,
+              node.css("navn").first.text
         end
       end
 
       def self.from_hash(hash)
-        new hash.fetch('externalId'), hash.fetch('name')
+        new hash['externalId'],
+            hash['name']
       end
 
       def initialize(external_id, name)
@@ -38,9 +36,9 @@ module Hdo
 
       def to_hash
         {
-          :kind       => self.class.kind,
-          :externalId => @external_id,
-          :name       => @name
+          'kind'       => self.class.kind,
+          'externalId' => @external_id,
+          'name'       => @name
         }
       end
 

data/lib/hdo/storting_importer/promise.rb

@@ -75,12 +75,12 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        pr = new hash.fetch('party'),
-                 hash.fetch('body'),
-                 hash.fetch('general'),
-                 hash.fetch('categories'),
-                 hash.fetch('source'),
-                 hash.fetch('page')
+        pr = new hash['party'],
+                 hash['body'],
+                 hash['general'],
+                 hash['categories'],
+                 hash['source'],
+                 hash['page']
 
         pr.external_id = hash['externalId']
 
@@ -88,11 +88,11 @@ module Hdo
       end
 
       def initialize(party, body, general, categories, source, page)
-        @party       = party.strip
-        @body        = body.strip
+        @party       = strip_if_string(party)
+        @body        = strip_if_string(body)
         @general     = general
         @categories  = clean_categories(categories)
-        @source      = source.strip
+        @source      = strip_if_string(source)
         @page        = page
 
         @external_id = nil
@@ -100,16 +100,16 @@ module Hdo
 
       def to_hash
         h = {
-          :kind       => self.class.kind,
-          :party      => @party,
-          :general    => @general,
-          :categories => @categories,
-          :source     => @source,
-          :page       => @page,
-          :body       => @body
+          'kind'       => self.class.kind,
+          'party'      => @party,
+          'general'    => @general,
+          'categories' => @categories,
+          'source'     => @source,
+          'page'       => @page,
+          'body'       => @body
         }
 
-        h[:externalId] = @external_id if @external_id
+        h["externalId"] = @external_id if @external_id
 
         h
       end
@@ -119,9 +119,17 @@ module Hdo
       def clean_categories(categories)
         categories = categories.split(",") if categories.kind_of?(String)
 
-        categories.map(&:strip).
-                   reject(&:empty?).
-                   map { |e| UnicodeUtils.upcase(e) }
+        Array(categories).map(&:strip).
+                          reject(&:empty?).
+                          map { |e| UnicodeUtils.upcase(e) }
+      end
+
+      def strip_if_string(str)
+        if str.respond_to? :strip
+          str.strip
+        else
+          str
+        end
       end
 
     end

data/lib/hdo/storting_importer/proposition.rb

@@ -19,15 +19,13 @@ module Hdo
 
       def self.from_hash(hash)
         arr = [
-          hash.fetch('externalId'),
-          hash.fetch('description'),
-          hash.fetch('onBehalfOf'),
-          hash.fetch('body')
+          hash['externalId'],
+          hash['description'],
+          hash['onBehalfOf'],
+          hash['body'],
+          Representative.from_hash(hash['deliveredBy'] || {})
         ]
 
-        delivered_by = hash['deliveredBy']
-        arr << Representative.from_hash(delivered_by) if delivered_by
-
         new(*arr)
       end
 
@@ -45,14 +43,14 @@ module Hdo
 
       def to_hash
         h = {
-          :kind        => self.class.kind,
-          :externalId  => @external_id,
-          :description => @description,
-          :onBehalfOf  => @on_behalf_of,
-          :body        => @body
+          'kind'        => self.class.kind,
+          'externalId'  => @external_id,
+          'description' => @description,
+          'onBehalfOf'  => @on_behalf_of,
+          'body'        => @body
         }
 
-        h[:deliveredBy] = @delivered_by.to_hash if @delivered_by
+        h['deliveredBy'] = @delivered_by.to_hash if @delivered_by
 
         h
       end

data/lib/hdo/storting_importer/representative.rb

@@ -65,16 +65,16 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        v = new hash.fetch('externalId'),
-                hash.fetch('firstName'),
-                hash.fetch('lastName'),
-                hash.fetch('gender'),
-                hash.fetch('dateOfBirth'),
-                hash.fetch('dateOfDeath'),
-                hash.fetch('district'),
-                hash.fetch('party'),
-                hash.fetch('committees'),
-                hash.fetch('period')
+        v = new hash['externalId'],
+                hash['firstName'],
+                hash['lastName'],
+                hash['gender'],
+                hash['dateOfBirth'],
+                hash['dateOfDeath'],
+                hash['district'],
+                hash['party'],
+                hash['committees'],
+                hash['period']
 
         v.vote_result = hash['voteResult']
 
@@ -106,20 +106,20 @@ module Hdo
 
       def to_hash
         h = {
-          :kind        => self.class.kind,
-          :externalId  => @external_id,
-          :firstName   => @first_name,
-          :lastName    => @last_name,
-          :gender      => @gender,
-          :dateOfBirth => @date_of_birth,
-          :dateOfDeath => @date_of_death,
-          :district    => @district,
-          :party       => @party,
-          :committees  => @committees,
-          :period      => @period
+          'kind'        => self.class.kind,
+          'externalId'  => @external_id,
+          'firstName'   => @first_name,
+          'lastName'    => @last_name,
+          'gender'      => @gender,
+          'dateOfBirth' => @date_of_birth,
+          'dateOfDeath' => @date_of_death,
+          'district'    => @district,
+          'party'       => @party,
+          'committees'  => @committees,
+          'period'      => @period
         }
 
-        h[:voteResult] = @vote_result if @vote_result
+        h['voteResult'] = @vote_result if @vote_result
 
         h
       end

data/lib/hdo/storting_importer/util.rb

@@ -20,6 +20,8 @@ module Hdo
       }
 
       def unescape_param(query_param)
+        return unless query_param.kind_of?(String)
+
         q = query_param.dup
         ID_CONVERSIONS.each { |k, v| q.gsub!(k, v) }
 

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/lib/hdo/storting_importer/vote.rb

@@ -60,25 +60,25 @@ module Hdo
       end
 
       def self.from_hash(hash)
-        counts = hash.fetch("counts")
+        counts = hash['counts']
 
         args = [
-          hash.fetch("externalId"),
-          hash.fetch("externalIssueId"),
-          hash.fetch("personal"),
-          hash.fetch("enacted"),
-          hash.fetch("subject"),
-          hash.fetch("method"),
-          hash.fetch("resultType"),
-          hash.fetch("time"),
-          counts.fetch("for"),
-          counts.fetch("against"),
-          counts.fetch("absent")
+          hash["externalId"],
+          hash["externalIssueId"],
+          hash["personal"],
+          hash["enacted"],
+          hash["subject"],
+          hash["method"],
+          hash["resultType"],
+          hash["time"],
+          counts && counts["for"],
+          counts && counts["against"],
+          counts && counts["absent"],
         ]
 
         vote = new(*args)
-        vote.representatives = hash.fetch('representatives').map { |e| Representative.from_hash(e) }
-        vote.propositions    = hash.fetch('propositions').map { |e| Proposition.from_hash(e) }
+        vote.representatives = Array(hash['representatives']).map { |e| Representative.from_hash(e || {}) }
+        vote.propositions    = Array(hash['propositions']).map { |e| Proposition.from_hash(e || {}) }
 
         vote
       end
@@ -92,7 +92,7 @@ module Hdo
         @method            = method
         @result_type       = result_type
         @time              = time
-        @counts            = Counts.new(Integer(for_count), Integer(against_count), Integer(absent_count))
+        @counts            = Counts.new(Integer(for_count || 0), Integer(against_count || 0), Integer(absent_count || 0))
 
         @propositions    = []
         @representatives = []
@@ -140,27 +140,27 @@ module Hdo
 
       def to_hash
         {
-          :kind             => self.class.kind,
-          :externalId       => @external_id,
-          :externalIssueId  => @external_issue_id,
-          :counts           => @counts.to_hash,
-          :personal         => @personal,
-          :enacted          => @enacted,
-          :subject          => @subject,
-          :method           => @method,
-          :resultType       => @result_type,
-          :time             => @time,
-          :representatives  => @representatives.map(&:to_hash),
-          :propositions     => @propositions.map(&:to_hash)
+          'kind'             => self.class.kind,
+          'externalId'       => @external_id,
+          'externalIssueId'  => @external_issue_id,
+          'counts'           => @counts.to_hash,
+          'personal'         => @personal,
+          'enacted'          => @enacted,
+          'subject'          => @subject,
+          'method'           => @method,
+          'resultType'       => @result_type,
+          'time'             => @time,
+          'representatives'  => @representatives.map(&:to_hash),
+          'propositions'     => @propositions.map(&:to_hash)
         }
       end
 
       class Counts < Struct.new(:for, :against, :absent)
         def to_hash
           {
-            :for     => self.for,
-            :against => against,
-            :absent  => absent
+            'for'     => self.for,
+            'against' => against,
+            'absent'  => absent
           }
         end
       end

data/spec/hdo/storting_importer/category_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe Category do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it 'builds categories from Storting XML list' do
         xml = <<-XML
         <?xml version="1.0" encoding="utf-8"?>
@@ -56,43 +59,6 @@ module Hdo
         }')
       end
 
-      it 'can deserialize JSON' do
-        ex = Category.example
-        Category.from_json(ex.to_json).should == ex
-      end
-
-      it 'can deserialize a JSON array' do
-        input = [Category.example]
-        Category.from_json(input.to_json).should == input
-      end
-
-      it 'fails if the given JSON is invalid' do
-        json = '{
-          "externalId": "1"
-        }'
-
-        expect { Category.from_json(json) }.to raise_error(ValidationError)
-      end
-
-      it 'has a kind' do
-        Category.kind.should == 'hdo#category'
-      end
-
-      it 'has a description' do
-        Category.description.should be_kind_of(String)
-      end
-
-      it 'has a JSON example' do
-        Category.json_example.should be_kind_of(String)
-      end
-
-      it 'has a list of fields' do
-        Category.fields.should_not be_empty
-      end
-
-      it 'has #short_inspect' do
-        Category.example.short_inspect.should be_kind_of(String)
-      end
 
     end
   end

data/spec/hdo/storting_importer/committee_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe Committee do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it 'builds committees from Storting XML list' do
         xml = <<-XML
         <?xml version="1.0" encoding="utf-8"?>
@@ -27,7 +30,7 @@ module Hdo
       end
 
       it 'can serialize as JSON' do
-        str = Committee.new("ARBSOS", 'Arbeids- og sosialkomiteen').to_json
+        str = Committee.example.to_json
         str.should be_json <<-JSON
           {
             "kind": "hdo#committee",
@@ -37,47 +40,6 @@ module Hdo
         JSON
       end
 
-      it 'can deserialize JSON' do
-        com = Committee.new("ARBSOS", 'Arbeids- og sosialkomiteen')
-        Committee.from_json(com.to_json).should == com
-      end
-
-      it 'can deserialize a JSON array' do
-        input = [Committee.new("ARBSOS", 'Arbeids- og sosialkomiteen')]
-        Committee.from_json(input.to_json).should == input
-      end
-
-      it 'fails to deserialize if the JSON input is invalid' do
-        invalid = <<-JSON
-        {
-          "kind": "hdo#committee",
-          "externalId": "foo"
-        }
-        JSON
-
-        expect { Committee.from_json invalid }.to raise_exception
-      end
-
-      it 'has a kind' do
-        Committee.kind.should == 'hdo#committee'
-      end
-
-      it 'has a description' do
-        Committee.description.should be_kind_of(String)
-      end
-
-      it 'has a JSON example' do
-        Committee.json_example.should be_kind_of(String)
-      end
-
-      it 'has a list of fields' do
-        Committee.fields.should_not be_empty
-      end
-
-      it 'has #short_inspect' do
-        Committee.example.short_inspect.should be_kind_of(String)
-      end
-
     end
   end
 end

data/spec/hdo/storting_importer/district_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe District do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it 'builds committees from Storting XML list' do
         xml = <<-XML
         <?xml version="1.0" encoding="utf-8"?>
@@ -46,44 +49,6 @@ module Hdo
         District.new("Ak", "Akershus").to_json.should be_json(expected)
       end
 
-      it 'can deserialize JSON' do
-        orig = District.new("Ak", "Akershus")
-        District.from_json(orig.to_json).should == orig
-      end
-
-      it 'can deserialize a JSON array' do
-        orig = [ District.new("Ak", "Akershus") ]
-        District.from_json(orig.to_json).should == orig
-      end
-
-      it 'fails if the given JSON is invalid' do
-        json = '{
-          "externalId": "1"
-        }'
-
-        expect { District.from_json(json) }.to raise_error(ValidationError)
-      end
-
-      it 'has a kind' do
-        District.kind.should == 'hdo#district'
-      end
-
-      it 'has a description' do
-        District.description.should be_kind_of(String)
-      end
-
-      it 'has a JSON example' do
-        District.json_example.should be_kind_of(String)
-      end
-
-      it 'has a list of fields' do
-        District.fields.should_not be_empty
-      end
-
-      it 'has #short_inspect' do
-        District.example.short_inspect.should be_kind_of(String)
-      end
-
     end
   end
 end

data/spec/hdo/storting_importer/issue_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe Issue do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it 'builds issues from Storting XML list' do
         xml = <<-XML
         <?xml version="1.0" encoding="utf-8"?>
@@ -87,56 +90,6 @@ module Hdo
         JSON
       end
 
-      it 'can deserialize JSON' do
-        orig = Issue.example
-        Issue.from_json(orig.to_json).should == orig
-      end
-
-      it 'can deserialize an HDO XML doc' do
-        orig = [Issue.example]
-        Issue.from_json(orig.to_json).should == orig
-      end
-
-      it 'fails if the given JSON is invalid' do
-        # summary is number.
-
-        json = '{
-          "kind": "hdo#issue",
-          "externalId" : "53520",
-          "summary": 1,
-          "description": "Samtykke til inngåelse av avtale av 25. november 2011 om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)",
-          "type": "alminneligsak",
-          "status": "mottatt",
-          "lastUpdate": "2012-04-20T00:00:00",
-          "reference": "Prop. 90 S (2011-2012)",
-          "documentGroup": "proposisjon",
-          "committee": "Transport- og kommunikasjonskomiteen",
-          "categories": ["UTENRIKSSAKER", "TRAKTATER", "NORDISK SAMARBEID"]
-        }'
-
-        expect { Issue.from_json(json) }.to raise_error(ValidationError)
-      end
-
-      it 'has a kind' do
-        Issue.kind.should == 'hdo#issue'
-      end
-
-      it 'has a description' do
-        Issue.description.should be_kind_of(String)
-      end
-
-      it 'has a JSON example' do
-        Issue.json_example.should be_kind_of(String)
-      end
-
-      it 'has a list of fields' do
-        Issue.fields.should_not be_empty
-      end
-
-      it 'has #short_inspect' do
-        Issue.example.short_inspect.should be_kind_of(String)
-      end
-
     end
   end
 end

data/spec/hdo/storting_importer/party_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe Party do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it 'builds parties from Storting XML list' do
         xml = <<-XML
         <?xml version="1.0" encoding="utf-8"?>
@@ -42,49 +45,11 @@ module Hdo
         JSON
       end
 
-      it 'can deserialize JSON' do
-        orig = Party.new('Sp', 'Senterpartiet')
-        Party.from_json(orig.to_json).should == orig
-      end
-
-      it 'can deserialize a JSON array' do
-        orig = [Party.new('Sp', 'Senterpartiet')]
-        Party.from_json(orig.to_json).should == orig
-      end
-
-      it 'fails if the given JSON is invalid' do
-        json = '{
-          "externalId": "1"
-        }'
-
-        expect { Party.from_json(json) }.to raise_error(ValidationError)
-      end
-
-      it 'has a kind' do
-        Party.kind.should == 'hdo#party'
-      end
-
-      it 'has a description' do
-        Party.description.should be_kind_of(String)
-      end
-
-      it 'has a JSON example' do
-        Party.json_example.should be_kind_of(String)
-      end
-
-      it 'has a list of fields' do
-        Party.fields.should_not be_empty
-      end
-
       it 'unescapes non-ASCII characters in the external id' do
         party = Party.new('_AE_O_A', "Senterpartiet")
         party.external_id.should == "ÆØÅ"
       end
 
-      it 'has #short_inspect' do
-        Party.example.short_inspect.should be_kind_of(String)
-      end
-
     end
   end
 end

data/spec/hdo/storting_importer/promise_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe Promise do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it 'builds promises from CSV' do
         csv = <<-CSV
         Parti;Løftetekst;Generell;Emner;Kilde;Side
@@ -48,60 +51,13 @@ module Hdo
         JSON
       end
 
-      it 'deserializes from JSON' do
-        orig = Promise.example
-        Promise.from_json(orig.to_json).should == orig
-      end
-
-      it 'deserializes from a JSON array' do
-        orig = [Promise.example]
-        Promise.from_json(orig.to_json).should == orig
-      end
-
-      it 'deserializes from hash with externalId missing' do
+      it 'deserializes from JSON with externalId missing' do
         pr = Promise.example
         pr.external_id = nil
 
         Promise.from_json(pr.to_json).should be_kind_of(Promise)
       end
 
-      it 'fails if the given JSON is invalid' do
-        # missing general
-
-        json = '
-        {
-          "kind": "hdo#promise",
-          "externalId": "1",
-          "party": "H",
-          "categories": ["GRUNNSKOLE"],
-          "source": "PP",
-          "page": 8,
-          "body": "Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen."
-        }'
-
-        expect { Promise.from_json(json) }.to raise_error(ValidationError)
-      end
-
-      it 'has a description' do
-        Promise.description.should be_kind_of(String)
-      end
-
-      it 'has fields' do
-        Promise.fields.should_not be_empty
-      end
-
-      it 'has a kind' do
-        Promise.kind.should == 'hdo#promise'
-      end
-
-      it 'has a JSON example' do
-        Promise.json_example.should be_kind_of(String)
-      end
-
-      it 'has #short_inspect' do
-        Promise.example.short_inspect.should be_kind_of(String)
-      end
-
       it 'strips trailing space from the body' do
         promise = Promise.new("Party", "Body   ", true, ["æøå"], "PP", 8)
         promise.body.should == "Body"

data/spec/hdo/storting_importer/proposition_spec.rb

@@ -4,40 +4,8 @@ module Hdo
   module StortingImporter
     describe Proposition do
 
-      it 'can deserialize JSON' do
-        orig = Proposition.example
-        Proposition.from_json(orig.to_json).should == orig
-      end
-
-      it 'can deserialize a JSON array' do
-        orig = [Proposition.example]
-        Proposition.from_json(orig.to_json).should == orig
-      end
-      
-      it 'fails if the given JSON is invalid' do
-        json = Proposition.example.to_hash
-        json.delete :description
-
-        expect { Proposition.from_json(json.to_json) }.to raise_error(ValidationError)
-      end
-
-      it 'has a kind' do
-        Proposition.kind.should == 'hdo#proposition'
-      end
-
-      it 'has a description' do
-        Proposition.description.should be_kind_of(String)
-      end
-
-      it 'has a JSON example' do
-        Proposition.json_example.should be_kind_of(String)
-      end
-
-      it 'has #short_inspect' do
-        str = Proposition.example.short_inspect
-        str.should be_kind_of(String)
-        str.should_not include("nil")
-      end
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
 
     end
   end

data/spec/hdo/storting_importer/representative_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe Representative do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it "builds representatives from the Storting XML list" do
         xml = <<-XML
         <?xml version="1.0" encoding="utf-8"?>
@@ -67,17 +70,7 @@ module Hdo
         JSON
       end
 
-      it 'can deserialize JSON' do
-        rep = Representative.example
-        Representative.from_json(rep.to_json).should == rep
-      end
-
-      it 'can deserialize a JSON array' do
-        reps = [Representative.example]
-        Representative.from_json(reps.to_json).should == reps
-      end
-
-      it 'raises if the JSON if voteResult is invalid' do
+      it 'is invalid if the voteResult property is invalid' do
         pending "find a validator that checks format"
 
         invalid = <<-JSON
@@ -98,46 +91,7 @@ module Hdo
 
         JSON
 
-        expect {
-          Representative.from_json(invalid)
-        }.to raise_error(ValidationError)
-      end
-
-      it 'raises if the JSON data is invalid' do
-        invalid = <<-JSON
-        {
-          "kind": "hdo#representative",
-          "externalId": "ADA",
-          "lastName": "Dahl",
-          "gender": "M",
-          "dateOfBirth": "1975-07-07T00:00:00",
-          "dateOfDeath": "0001-01-01T00:00:00",
-          "district": "Akershus",
-          "party": "Høyre",
-          "committees": ["Justiskomiteen"],
-          "period": "2011-2012"
-        }
-        JSON
-
-        expect {
-          Representative.from_json(invalid)
-        }.to raise_error(ValidationError)
-      end
-
-      it 'has a kind' do
-        Representative.kind.should == 'hdo#representative'
-      end
-
-      it 'has a description' do
-        Representative.description.should be_kind_of(String)
-      end
-
-      it 'has an JSON example' do
-        Representative.json_example.should be_kind_of(String)
-      end
-
-      it 'has a list of fields' do
-        Representative.fields.should_not be_empty
+        Representative.from_json(invalid).should_not be_valid
       end
 
       it 'unescapes non-ASCII characters in the external id' do
@@ -147,10 +101,6 @@ module Hdo
         rep.external_id.should == "ÆØÅ"
       end
 
-      it 'has #short_inspect' do
-        Representative.example.short_inspect.should be_kind_of(String)
-      end
-
     end
   end
 end

data/spec/hdo/storting_importer/vote_spec.rb

@@ -5,6 +5,9 @@ module Hdo
   module StortingImporter
     describe Vote do
 
+      it_behaves_like 'type with JSON schema'
+      it_behaves_like 'type with #short_inspect'
+
       it "builds votes from the Storting XML list" do
         xml = <<-XML
         <?xml version="1.0" encoding="utf-8"?>
@@ -131,43 +134,6 @@ module Hdo
         JSON
       end
 
-      it 'can deserialize JSON' do
-        orig = Vote.example
-        Vote.from_json(orig.to_json).should == orig
-      end
-
-      it 'can deserialize a JSON array' do
-        orig = [Vote.example]
-        Vote.from_json(orig.to_json).should == orig
-      end
-
-      it 'fails if the given JSON is invalid' do
-        json = Vote.example.to_hash
-        json.delete :personal
-
-        expect { Vote.from_json(json.to_json) }.to raise_error(ValidationError)
-      end
-
-      it 'has a kind' do
-        Vote.kind.should == 'hdo#vote'
-      end
-
-      it 'has a description' do
-        Vote.description.should be_kind_of(String)
-      end
-
-      it 'has a JSON example' do
-        Vote.json_example.should be_kind_of(String)
-      end
-
-      it 'has a list of fields' do
-        Vote.fields.should_not be_empty
-      end
-
-      it 'has #short_inspect' do
-        Vote.example.short_inspect.should be_kind_of(String)
-      end
-
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,10 @@ require 'hdo/storting_importer'
 require 'pry'
 require 'pp'
 
+Dir[File.expand_path("../support/**/*.rb", __FILE__)].each do |f|
+  require f
+end
+
 module Hdo
   module StortingImporter
     module SpecHelper

data/spec/support/shared_examples_for_json_schema.rb

@@ -0,0 +1,53 @@
+module Hdo
+  module StortingImporter
+    shared_examples_for "type with JSON schema" do
+
+      it 'can deserialize JSON' do
+        ex = described_class.example
+        described_class.from_json(ex.to_json).should == ex
+      end
+
+      it 'can deserialize a JSON array' do
+        input = [described_class.example]
+        described_class.from_json(input.to_json).should == input
+      end
+
+      it 'fails if the given JSON is invalid' do
+        expect {
+          described_class.from_json('{}')
+        }.to raise_error(ValidationError)
+      end
+
+      it 'knows if itself is valid' do
+        valid = described_class.example
+
+        valid.should be_valid
+        valid.validate!
+      end
+
+      it 'knows if itself is invalid' do
+        invalid = described_class.from_hash({})
+        invalid.should_not be_valid
+
+        expect { invalid.validate! }.to raise_error(ValidationError)
+      end
+
+      it 'has a kind' do
+        described_class.kind.should be_kind_of(String)
+      end
+
+      it 'has a description' do
+        described_class.description.should be_kind_of(String)
+      end
+
+      it 'has a JSON example' do
+        described_class.json_example.should be_kind_of(String)
+      end
+
+      it 'has a list of fields' do
+        described_class.fields.should_not be_empty
+      end
+
+    end
+  end
+end

data/spec/support/shared_examples_for_short_inspect.rb

@@ -0,0 +1,9 @@
+module Hdo
+  module StortingImporter
+    shared_examples_for "type with #short_inspect" do
+      it 'has #short_inspect' do
+        described_class.example.short_inspect.should be_kind_of(String)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -171,6 +171,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +230,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -277,6 +310,8 @@ files:
 - spec/hdo/storting_importer/representative_spec.rb
 - spec/hdo/storting_importer/vote_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples_for_json_schema.rb
+- spec/support/shared_examples_for_short_inspect.rb
 homepage: http://github.com/holderdeord/hdo-storting-importer
 licenses: []
 post_install_message: 
@@ -343,4 +378,6 @@ test_files:
 - spec/hdo/storting_importer/representative_spec.rb
 - spec/hdo/storting_importer/vote_spec.rb
 - spec/spec_helper.rb
+- spec/support/shared_examples_for_json_schema.rb
+- spec/support/shared_examples_for_short_inspect.rb
 has_rdoc: