hdo-storting-importer 0.0.3 → 0.0.4

data/lib/hdo/storting_importer/party.rb

@@ -40,6 +40,10 @@ module Hdo
         @name        = name
       end
 
+      def external_id
+        Util.unescape_param @external_id
+      end
+
       def to_hdo_xml(builder = Util.builder)
         builder.party do |party|
           party.externalId external_id

data/lib/hdo/storting_importer/representative.rb

@@ -125,6 +125,10 @@ module Hdo
         @vote_result   = nil
       end
 
+      def external_id
+        Util.unescape_param @external_id
+      end
+
       def to_hdo_xml(builder = Util.builder)
         builder.representative do |rep|
           rep.externalId external_id

data/lib/hdo/storting_importer/util.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Hdo
   module StortingImporter
     module Util
@@ -21,6 +23,20 @@ module Hdo
       def remove_invalid_html(str)
         str.gsub("<\\p>", "")
       end
+
+      ID_CONVERSIONS = {
+        '_AE' => 'Æ',
+        '_O'  => 'Ø',
+        '_A'  => 'Å'
+      }
+
+      def unescape_param(query_param)
+        q = query_param.dup
+        ID_CONVERSIONS.each { |k, v| q.gsub!(k, v) }
+
+        q
+      end
+
     end
   end
 end

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/hdo/storting_importer/party_spec.rb

@@ -67,6 +67,11 @@ module Hdo
         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
+
     end
   end
 end

data/spec/hdo/storting_importer/representative_spec.rb

@@ -93,6 +93,13 @@ module Hdo
         Representative.fields.should_not be_empty
       end
 
+      it 'unescapes non-ASCII characters in the external id' do
+        rep = Representative.example
+
+        rep.instance_variable_set("@external_id", '_AE_O_A')
+        rep.external_id.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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder