hdo-storting-importer 0.2.9 → 0.3.0

data/hdo-storting-importer.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "nokogiri"
   gem.add_runtime_dependency "aruba"
   gem.add_runtime_dependency "rake"
-  gem.add_runtime_dependency "rest-client"
+  gem.add_runtime_dependency "faraday"
+  gem.add_runtime_dependency "net-http-persistent"
   gem.add_runtime_dependency "unicode_utils"
   gem.add_runtime_dependency "multi_json"
   gem.add_runtime_dependency "yajl-ruby"

data/lib/hdo/storting_importer/api_data_source.rb

@@ -7,14 +7,14 @@ module Hdo
         new "http://data.stortinget.no"
       end
 
-      def initialize(url_or_resource)
-        @resource = case url_or_resource
-                    when RestClient::Resource
-                      url_or_resource
-                    when URI
-                      RestClient::Resource.new(url_or_resource)
-                    when String
-                      RestClient::Resource.new(URI.parse(url_or_resource))
+      def initialize(connection_or_url)
+        @connection = case connection_or_url
+                    when Faraday::Connection
+                      connection_or_url
+                    when String, URI
+                      Faraday.new(:url => connection_or_url.to_s) do |faraday|
+                        faraday.adapter :net_http_persistent
+                      end
                     else
                       raise ArgumentError, "invalid argument #{url_or_resource.inspect}"
                     end
@@ -81,10 +81,12 @@ module Hdo
       private
 
       def fetch(path)
-        sub_resource = @resource[path]
-        Hdo::StortingImporter.logger.info "parsing #{sub_resource}"
+        Hdo::StortingImporter.logger.info "parsing #{path}"
+        response = @connection.get(path) do |request|
+          request.headers['User-Agent'] = USER_AGENT
+        end
 
-        parse sub_resource.get(:user_agent => USER_AGENT)
+        parse response.body
       end
 
     end

data/lib/hdo/storting_importer/promise.rb

@@ -78,7 +78,10 @@ module Hdo
           end
 
           clean_invalid_unicode = lambda do |str|
-            str.gsub("\u00c5\u030a", 'Å').gsub("\u00e5\u030a", 'å')
+            str.gsub("\u00c5\u030a", 'Å').
+                gsub("\u00e5\u030a", 'å').
+                gsub("\u0041\u030a", 'Å').
+                gsub("\u0061\u030a", 'å')
           end
 
           promise = new external_id,

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.2.9"
+    VERSION = "0.3.0"
   end
 end

data/lib/hdo/storting_importer.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
-require 'restclient'
+require 'faraday'
+require 'net/http/persistent'
 require 'tempfile'
 require 'pathname'
 require 'open-uri'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -76,7 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
+  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'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: