hdo-storting-importer 0.0.5 → 0.0.6

data/hdo-storting-importer.gemspec

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

data/lib/hdo/storting_importer/cli.rb

@@ -106,8 +106,7 @@ module Hdo
           if csv =~ /^http/
             content << open(csv).read
           else
-            # local csv files are ISO-8859-1 for some reason.
-            content << File.read(File.expand_path(csv), encoding: "ISO-8859-1").encode("UTF-8")
+            content << File.read(File.expand_path(csv))
           end
         end
 

data/lib/hdo/storting_importer/promise.rb

@@ -72,7 +72,7 @@ module Hdo
             pr[:party].to_s.strip,
             pr[:body].to_s.strip,
             pr[:general].to_s.downcase == 'ja',
-            pr[:categories].to_s.split(",").map(&:upcase).map(&:strip),
+            pr[:categories].to_s.split(","),
             pr[:source].to_s.strip,
             pr[:page].to_s.strip
             )
@@ -83,7 +83,7 @@ module Hdo
         @party      = party
         @body       = body
         @general    = general
-        @categories = categories
+        @categories = categories.map(&:strip).map { |e| UnicodeUtils.upcase(e) }
         @source     = source
         @page       = page
       end

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/hdo/storting_importer.rb

@@ -5,6 +5,8 @@ require 'pathname'
 require 'open-uri'
 require 'erb'
 require 'logger'
+require 'builder'
+require 'unicode_utils'
 
 module Hdo
   module StortingImporter
@@ -56,8 +58,6 @@ require 'hdo/storting_importer/representative'
 require 'hdo/storting_importer/vote'
 
 require 'hdo/storting_importer/converter'
-require 'hdo/storting_importer/promise_converter'
-
 require 'hdo/storting_importer/cli'
 
 

data/spec/hdo/storting_importer/converter_spec.rb

@@ -62,10 +62,6 @@ module Hdo
           actual.should == expected
         end
 
-        it "converts promises" do
-          PromiseConverter.new(input_path('promises-a.csv')).xml.should == output_path('promises-a.xml').read
-        end
-
       end
     end
   end

data/spec/hdo/storting_importer/promise_spec.rb

@@ -93,6 +93,11 @@ XML
         Promise.example.short_inspect.should be_kind_of(String)
       end
 
+      it 'correctly upcases non-ASCII category names' do
+        promise = Promise.new("Party", "Body", true, ["æøå"], "PP", 8)
+        promise.categories.should == ["ÆØÅ"]
+      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.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode_utils
+  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
@@ -126,7 +142,6 @@ files:
 - lib/hdo/storting_importer/parsing_data_source.rb
 - lib/hdo/storting_importer/party.rb
 - lib/hdo/storting_importer/promise.rb
-- lib/hdo/storting_importer/promise_converter.rb
 - lib/hdo/storting_importer/representative.rb
 - lib/hdo/storting_importer/util.rb
 - lib/hdo/storting_importer/version.rb

data/lib/hdo/storting_importer/promise_converter.rb

@@ -1,29 +0,0 @@
-# encoding: utf-8
-
-require 'csv'
-require 'builder'
-
-module Hdo
-  module StortingImporter
-    class PromiseConverter
-      def initialize(exported_spreadsheet)
-        content = File.read(File.expand_path(exported_spreadsheet), encoding: "ISO-8859-1").encode("UTF-8")
-        @promises = Promise.from_csv(content)
-      end
-
-      def xml
-        builder = Builder::XmlMarkup.new :indent => 2
-        builder.instruct!
-
-        builder.promises do |promises|
-          @promises.each do |data|
-            next if data.body == "Løftetekst" || data.body.nil? || data.body.empty?
-            data.to_hdo_xml(promises)
-          end
-        end
-
-        builder.target!
-      end
-    end
-  end
-end