hdo-storting-importer 0.2.1 → 0.2.2

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 1.9.3
 notifications:
   recipients:
-    - jari.bakken@gmail.com
+    - jari@holderdeord.no
   irc:
     channels:
       - "irc.freenode.net#holderdeord"

data/lib/hdo/storting_importer/category.rb

@@ -10,10 +10,14 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/category.json").to_s
 
-      def self.example
+      def self.example(overrides = nil)
         cat = new("5", "Employment")
         cat.children << new("6", "Wages")
 
+        if overrides
+          cat = from_hash(cat.to_hash.merge(overrides))
+        end
+
         cat
       end
 

data/lib/hdo/storting_importer/committee.rb

@@ -9,8 +9,14 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/committee.json").to_s
 
-      def self.example
-        new "ARBSOS", "Arbeids- og sosialkomiteen"
+      def self.example(overrides = nil)
+        obj = new "ARBSOS", "Arbeids- og sosialkomiteen"
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
       end
 
       def self.from_storting_doc(doc)

data/lib/hdo/storting_importer/district.rb

@@ -9,8 +9,14 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/district.json").to_s
 
-      def self.example
-        new("Db", "Duckburg")
+      def self.example(overrides = nil)
+        obj = new("Db", "Duckburg")
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
       end
 
       def self.from_storting_doc(doc)

data/lib/hdo/storting_importer/parliament_issue.rb

@@ -12,8 +12,8 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/parliament_issue.json").to_s
 
-      def self.example
-        new(
+      def self.example(overrides = nil)
+        obj = new(
           "53520",
           "Inngåelse av avtale om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)",
           "Samtykke til inngåelse av avtale av 25. november 2011 om opprettelse av sekretariatet for Den nordlige dimensjons partnerskap for helse og livskvalitet (NDPHS)",
@@ -25,6 +25,12 @@ module Hdo
           "Transport- og kommunikasjonskomiteen",
           ['UTENRIKSSAKER', 'TRAKTATER', 'NORDISK SAMARBEID']
         )
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
       end
 
       def self.json_example

data/lib/hdo/storting_importer/party.rb

@@ -10,10 +10,14 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/party.json").to_s
 
-      def self.example
+      def self.example(overrides = nil)
         obj = new("A", "Arbeiderpartiet")
         obj.governing_periods = [GoverningPeriod.new('2005-10-17', '2013-10-14')]
 
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
         obj
       end
 

data/lib/hdo/storting_importer/promise.rb

@@ -14,8 +14,8 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/promise.json").to_s
 
-      def self.example
-        new(
+      def self.example(overrides = nil)
+        obj = new(
           "1",
           ["H"],
           "Stille strengere krav til orden og oppførsel for å hindre at uro ødelegger undervisningen.",
@@ -25,6 +25,12 @@ module Hdo
           8,
           '2009-06-01'
         )
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
       end
 
       def self.json_example

data/lib/hdo/storting_importer/proposition.rb

@@ -9,8 +9,14 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/proposition.json").to_s
 
-      def self.example
-        new('1234', 'description', 'on behalf of', 'body', Representative.example)
+      def self.example(overrides = nil)
+        obj = new('1234', 'description', 'on behalf of', 'body', Representative.example)
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
       end
 
       def self.json_example

data/lib/hdo/storting_importer/representative.rb

@@ -14,8 +14,8 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/representative.json").to_s
 
-      def self.example
-        new(
+      def self.example(overrides = nil)
+        obj = new(
           'ADA',
           'André Oktay',
           'Dahl',
@@ -27,6 +27,12 @@ module Hdo
           ['Justiskomiteen'],
           '2011-2012'
         )
+
+        if overrides
+          obj = from_hash(obj.to_hash.merge(overrides))
+        end
+
+        obj
       end
 
       def self.json_example

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

@@ -39,7 +39,7 @@
       "required": true
     },
     "page": {
-      "type": "number",
+      "type": "integer",
       "description": "What page in the source the promise was found on"
     },
     "body": {

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

@@ -22,9 +22,9 @@
       "description": "Count of for, against or absent representatives.",
       "required": true,
       "properties": {
-        "for": { "type": "number" },
-        "against": { "type": "number" },
-        "absent": { "type": "number" }
+        "for": { "type": "integer" },
+        "against": { "type": "integer" },
+        "absent": { "type": "integer" }
       }
     },
     "personal": {

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/lib/hdo/storting_importer/vote.rb

@@ -16,7 +16,7 @@ module Hdo
 
       schema_path StortingImporter.lib.join("hdo/storting_importer/schema/vote.json").to_s
 
-      def self.example
+      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)
 
         rep = Representative.example
@@ -27,6 +27,10 @@ module Hdo
 
         vote.propositions << prop
 
+        if overrides
+          vote = from_hash(vote.to_hash.merge(overrides))
+        end
+
         vote
       end
 

data/lib/hdo/storting_importer.rb

@@ -111,7 +111,6 @@ require 'hdo/storting_importer/ivar_equality'
 require 'hdo/storting_importer/inspectable'
 require 'hdo/storting_importer/has_json_schema'
 require 'hdo/storting_importer/util'
-require 'hdo/storting_importer/fusion_table'
 require 'hdo/storting_importer/in_memory_cache'
 
 require 'hdo/storting_importer/data_source'

data/spec/hdo/storting_importer/category_spec.rb

@@ -59,6 +59,10 @@ module Hdo
         }')
       end
 
+      it 'can create a customized example' do
+        obj = Category.example('name' => 'foo')
+        obj.name.should == 'foo'
+      end
 
     end
   end

data/spec/hdo/storting_importer/committee_spec.rb

@@ -40,6 +40,12 @@ module Hdo
         JSON
       end
 
+      it 'can create a customized example' do
+        obj = Committee.example('name' => 'foo')
+        obj.name.should == 'foo'
+      end
+
+
     end
   end
 end

data/spec/hdo/storting_importer/district_spec.rb

@@ -49,6 +49,12 @@ module Hdo
         District.new("Ak", "Akershus").to_json.should be_json(expected)
       end
 
+      it 'can create a customized example' do
+        obj = District.example('name' => 'foo')
+        obj.name.should == 'foo'
+      end
+
+
     end
   end
 end

data/spec/hdo/storting_importer/parliament_issue_spec.rb

@@ -90,6 +90,12 @@ module Hdo
         JSON
       end
 
+      it 'can create a customized example' do
+        obj = ParliamentIssue.example('status' => 'behandlet')
+        obj.status.should == 'behandlet'
+      end
+
+
     end
   end
 end

data/spec/hdo/storting_importer/party_spec.rb

@@ -53,6 +53,11 @@ module Hdo
         party.external_id.should == "ÆØÅ"
       end
 
+      it 'can create a customized example' do
+        party = Party.example('name' => 'foo')
+        party.name.should == 'foo'
+      end
+
     end
   end
 end

data/spec/hdo/storting_importer/promise_spec.rb

@@ -39,6 +39,12 @@ module Hdo
         promise.categories.should == ["FOO"]
       end
 
+      it 'can create a customized example' do
+        obj = Promise.example('body' => 'foo')
+        obj.body.should == 'foo'
+      end
+
+
     end
   end
 end

data/spec/hdo/storting_importer/proposition_spec.rb

@@ -82,6 +82,11 @@ module Hdo
         prop.body.should_not be_empty
       end
 
+      it 'can create a customized example' do
+        obj = Proposition.example('body' => 'foo')
+        obj.body.should == 'foo'
+      end
+
     end
   end
 end

data/spec/hdo/storting_importer/representative_spec.rb

@@ -71,8 +71,6 @@ module Hdo
       end
 
       it 'is invalid if the voteResult property is invalid' do
-        pending "find a validator that checks format"
-
         invalid = <<-JSON
         {
           "kind": "hdo#representative",
@@ -91,7 +89,9 @@ module Hdo
 
         JSON
 
-        Representative.from_json(invalid).should_not be_valid
+        expect {
+          Representative.from_json(invalid)
+        }.to raise_error(ValidationError)
       end
 
       it 'unescapes non-ASCII characters in the external id' do
@@ -101,6 +101,11 @@ module Hdo
         rep.external_id.should == "ÆØÅ"
       end
 
+      it 'can create a customized example' do
+        obj = Representative.example('firstName' => 'foo')
+        obj.first_name.should == 'foo'
+      end
+
     end
   end
 end

data/spec/hdo/storting_importer/vote_spec.rb

@@ -134,6 +134,11 @@ module Hdo
         JSON
       end
 
+      it 'can create a customized example' do
+        obj = Vote.example('subject' => 'foo')
+        obj.subject.should == 'foo'
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -281,7 +281,6 @@ files:
 - lib/hdo/storting_importer/data_source.rb
 - lib/hdo/storting_importer/disk_data_source.rb
 - lib/hdo/storting_importer/district.rb
-- lib/hdo/storting_importer/fusion_table.rb
 - lib/hdo/storting_importer/governing_period.rb
 - lib/hdo/storting_importer/has_json_schema.rb
 - lib/hdo/storting_importer/in_memory_cache.rb

data/lib/hdo/storting_importer/fusion_table.rb

@@ -1,52 +0,0 @@
-module Hdo
-  module StortingImporter
-    #
-    # Simple query public Fusion Tables (onle need API key for auth).
-    # If we need to write to the table programatically, see https://gist.github.com/3265043.
-    #
-
-    class FusionTable
-      def initialize(api_key)
-        @api_key = api_key
-      end
-
-      def query(sql, opts = {})
-        resp = fix_request_failure do
-          RestClient.get("https://www.googleapis.com/fusiontables/v1/query", :params => {:sql => sql, :key => @api_key})
-        end
-
-        data = MultiJson.decode(resp)
-
-        if opts[:rows]
-          data.fetch('rows')
-        else
-          cols = data.fetch('columns')
-          rows = data.fetch('rows')
-
-          rows.map do |row|
-            res = {}
-            cols.each_with_index { |col, idx| res[col] = row[idx] }
-
-            res
-          end
-        end
-      end
-
-      def columns_for(table_id)
-        resp = fix_request_failure do
-          RestClient.get("https://www.googleapis.com/fusiontables/v1/tables/#{table_id}/columns", :params => {:key => @api_key})
-        end
-
-        data = MultiJson.decode(resp)
-        data['items']
-      end
-
-      def fix_request_failure(&blk)
-        yield
-      rescue RestClient::RequestFailed => ex
-        raise unless ex.respond_to?(:http_body)
-        raise "#{ex.message}: #{ex.http_body}"
-      end
-    end
-  end
-end