hdo-storting-importer 0.1.2 → 0.1.3

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.tm_properties

data/lib/hdo/storting_importer/api_data_source.rb

@@ -1,10 +1,23 @@
 module Hdo
   module StortingImporter
     class ApiDataSource < DataSource
-      USER_AGENT = "holderdeord-storting-importer"
+      USER_AGENT = "holderdeord-storting-importer v#{Hdo::StortingImporter::VERSION}"
 
-      def initialize(url)
-        @resource = RestClient::Resource.new(URI.parse(url), )
+      def self.default
+        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))
+                    else
+                      raise ArgumentError, "invalid argument #{url_or_resource.inspect}"
+                    end
       end
 
       def representatives(period = DEFAULT_PERIOD)

data/lib/hdo/storting_importer/caching_data_source.rb

@@ -0,0 +1,78 @@
+module Hdo
+  module StortingImporter
+    class CachingDataSource < DataSource
+      def initialize(delegate, cache = InMemoryCache.new)
+        @delegate = delegate
+        @cache    = cache
+      end
+
+      def representatives(period = DEFAULT_PERIOD)
+        cache :representatives, period do
+          @delegate.representatives(period)
+        end
+      end
+
+      def representatives_today
+        cache :representatives_today do
+          @delegate.representatives_today
+        end
+      end
+
+      def parties(session_id = DEFAULT_SESSION)
+        cache :parties, session_id do
+          @delegate.parties(session_id)
+        end
+      end
+
+      def committees(session_id = DEFAULT_SESSION)
+        cache :committees, session_id do
+          @delegate.committees session_id
+        end
+      end
+
+      def districts
+        cache :districts do
+          @delegate.districts
+        end
+      end
+
+      def categories
+        cache :categories do
+          @delegate.categories
+        end
+      end
+
+      def issues(session_id = DEFAULT_SESSION)
+        cache :issues, session_id do
+          @delegate.issues session_id
+        end
+      end
+
+      def votes_for(issue_id)
+        cache :votes_for, issue_id do
+          @delegate.votes_for issue_id
+        end
+      end
+
+      def propositions_for(vote_id)
+        cache :propositions_for, vote_id do
+          @delegate.propositions_for vote_id
+        end
+      end
+
+      def vote_results_for(vote_id)
+        cache :vote_results_for, vote_id do
+          @delegate.vote_results_for vote_id
+        end
+      end
+
+      private
+
+      def cache(*args, &blk)
+        @cache.fetch(args, &blk)
+      end
+
+    end
+  end
+end
+

data/lib/hdo/storting_importer/in_memory_cache.rb

@@ -0,0 +1,13 @@
+module Hdo
+  module StortingImporter
+    class InMemoryCache
+      def initialize
+        @cache = {}
+      end
+
+      def fetch(key, &blk)
+        @cache[key] ||= yield
+      end
+    end
+  end
+end

data/lib/hdo/storting_importer/version.rb

@@ -1,5 +1,5 @@
 module Hdo
   module StortingImporter
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/hdo/storting_importer.rb

@@ -104,17 +104,22 @@ module Hdo
   end
 end
 
+require 'hdo/storting_importer/version'
+
 require 'hdo/storting_importer/core_ext/enumerable'
 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'
 require 'hdo/storting_importer/disk_data_source'
 require 'hdo/storting_importer/api_data_source'
 require 'hdo/storting_importer/parsing_data_source'
+require 'hdo/storting_importer/caching_data_source'
+
 
 require 'hdo/storting_importer/category'
 require 'hdo/storting_importer/committee'

data/spec/hdo/storting_importer/caching_data_source_spec.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+module Hdo
+  module StortingImporter
+    describe CachingDataSource do
+
+      it 'caches requests' do
+        delegate = mock(DataSource)
+
+        ads = CachingDataSource.new(delegate)
+
+        delegate.should_receive(:representatives).once.and_return "data"
+
+        ads.representatives # not cached
+        ads.representatives # cached
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hdo-storting-importer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -240,6 +240,7 @@ files:
 - hdo-storting-importer.gemspec
 - lib/hdo/storting_importer.rb
 - lib/hdo/storting_importer/api_data_source.rb
+- lib/hdo/storting_importer/caching_data_source.rb
 - lib/hdo/storting_importer/category.rb
 - lib/hdo/storting_importer/cli.rb
 - lib/hdo/storting_importer/committee.rb
@@ -251,6 +252,7 @@ files:
 - 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
 - lib/hdo/storting_importer/inspectable.rb
 - lib/hdo/storting_importer/issue.rb
 - lib/hdo/storting_importer/ivar_equality.rb
@@ -292,6 +294,7 @@ files:
 - spec/fixtures/output/parties.json
 - spec/fixtures/output/representatives.json
 - spec/fixtures/output/votes.json
+- spec/hdo/storting_importer/caching_data_source_spec.rb
 - spec/hdo/storting_importer/category_spec.rb
 - spec/hdo/storting_importer/committee_spec.rb
 - spec/hdo/storting_importer/converter_spec.rb
@@ -352,6 +355,7 @@ test_files:
 - spec/fixtures/output/parties.json
 - spec/fixtures/output/representatives.json
 - spec/fixtures/output/votes.json
+- spec/hdo/storting_importer/caching_data_source_spec.rb
 - spec/hdo/storting_importer/category_spec.rb
 - spec/hdo/storting_importer/committee_spec.rb
 - spec/hdo/storting_importer/converter_spec.rb