hdo-storting-importer 0.0.7 → 0.0.8

data/Rakefile

@@ -1,11 +1,32 @@
 require 'rake'
 require 'rspec/core/rake_task'
+require 'pry'
 
 RSpec::Core::RakeTask.new
 
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new
 
+task :env do
+  $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+  require 'hdo/storting_importer'
+end
+
+namespace :doc do
+  task :types => :env do
+    Hdo::StortingImporter.print_types
+  end
+
+  desc 'Like `rake docs`, but includes XML examples.'
+  task :xml => :env do
+    Hdo::StortingImporter.print_types :xml => true
+  end
+end
+
+desc 'Print docs for each import type.'
+task :doc => %w[doc:types]
+
+desc 'Default task runs all tests.'
 task :default => [:spec, :cucumber]
 
 require "bundler/gem_tasks"

data/hdo-storting-importer.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "rake"
   gem.add_runtime_dependency "rest-client"
   gem.add_runtime_dependency "unicode_utils"
+  gem.add_runtime_dependency "multi_json"
 end

data/lib/hdo/storting_importer/api_data_source.rb

@@ -1,9 +1,10 @@
 module Hdo
   module StortingImporter
     class ApiDataSource < DataSource
+      USER_AGENT = "holderdeord-storting-importer"
 
       def initialize(url)
-        @resource = RestClient::Resource.new(URI.parse(url))
+        @resource = RestClient::Resource.new(URI.parse(url), )
       end
 
       def representatives(period = DEFAULT_PERIOD)
@@ -52,7 +53,7 @@ module Hdo
         sub_resource = @resource[path]
         Hdo::StortingImporter.logger.info "parsing #{sub_resource}"
 
-        parse sub_resource.get
+        parse sub_resource.get(:user_agent => USER_AGENT)
       end
 
     end

data/lib/hdo/storting_importer/promise.rb

@@ -79,6 +79,15 @@ module Hdo
         end.compact
       end
 
+      def self.from_fusion_table(table_id, api_key)
+        url = "https://www.googleapis.com/fusiontables/v1/query"
+
+        resp = RestClient.get(url, :params => {:sql => "select * from #{table_id}", :key => api_key})
+        MultiJson.decode(resp).fetch('rows').map { |data| new(*data) }
+      rescue RestClient::RequestFailed => ex
+        raise "#{ex.message}: #{ex.http_body}"
+      end
+
       def initialize(party, body, general, categories, source, page)
         @party      = party
         @body       = body
@@ -103,6 +112,8 @@ module Hdo
       private
 
       def clean_categories(categories)
+        categories = categories.split(",") if categories.kind_of?(String)
+
         categories.map(&:strip).
                    reject(&:empty?).
                    map { |e| UnicodeUtils.upcase(e) }

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/hdo/storting_importer/vote.rb

@@ -27,6 +27,7 @@ module Hdo
           Field.new(:externalIssueId, true, :string, "The id (matching the issue's externalId) of the issue being voted on."),
           Field.new(:counts, true, :element, "An element with <for>, <against> and <absent> counts (see example)."),
           Field.new(:enacted, true, :boolean, "Whether the proposal was enacted."),
+          Field.new(:personal, true, :boolean, "Whether the vote was done using the voting system. If not, we attempt to infer the representative list from other votes on the same day."),
           Field.new(:subject, true, :string, "The subject of the vote."),
           Field.new(:method, true, :string, "??"),
           Field.new(:resultType, true, :string, "??"),

data/lib/hdo/storting_importer.rb

@@ -7,6 +7,8 @@ require 'erb'
 require 'logger'
 require 'builder'
 require 'unicode_utils'
+require 'uri'
+require 'multi_json'
 
 module Hdo
   module StortingImporter
@@ -14,6 +16,63 @@ module Hdo
       @root ||= File.expand_path("../../..", __FILE__)
     end
 
+    def self.types
+      [
+        Party,
+        Committee,
+        District,
+        Representative,
+        Category,
+        Issue,
+        Vote,
+        Vote::Proposition,
+        Promise
+      ]
+    end
+
+    def self.print_types(opts = {})
+      out = opts[:io] || $stdout
+      xml = !!opts[:xml]
+
+      max_name_size = 0
+      max_type_size  = 0
+
+      type_strings = []
+
+
+      types.each do |type|
+        type.fields.each do |e|
+          required = 'required' if e.required
+          type_strings << (type_string = "#{required}:#{e.type}")
+
+          max_name_size = [e.name.size, max_name_size].max
+          max_type_size = [type_string.size, max_type_size].max
+        end
+      end
+
+      types.each_with_index do |type, type_idx|
+        out.puts "\x1b[1m#{type.type_name}\x1b[0m\n"
+
+        type.fields.each_with_index do |field, field_idx|
+
+          parts = [
+            field.name.to_s.rjust(max_name_size + 5),
+            type_strings[type_idx + field_idx].rjust(max_type_size),
+            "\t#{field.description}"
+          ]
+
+          out.puts parts.join ' '
+        end
+
+        out.puts "\n\n"
+
+        if xml
+          puts type.xml_example.split("\n")
+          puts "\n\n"
+        end
+      end
+    end
+
     def self.logger
       @logger ||= (
         out = $stderr # should be able to pipe output to a file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem to process data from data.stortinget.no
 email:
 - jari.bakken@gmail.com