gds-api-adapters 0.0.40 → 0.0.41

data/lib/gds_api/base.rb

@@ -4,11 +4,11 @@ require 'null_logger'
 
 class GdsApi::Base
   extend Forwardable
-  
+
   def client
     @client ||= create_client
   end
-  
+
   def create_client
     if options[:access_key]
       GdsApi::OAuth2Client.new(options)
@@ -16,8 +16,8 @@ class GdsApi::Base
       GdsApi::JsonClient.new(options)
     end
   end
-  
-  def_delegators :client, :get_json, :post_json, :put_json
+
+  def_delegators :client, :get_json, :post_json, :put_json, :get_raw
 
   attr_reader :options
 

data/lib/gds_api/helpers.rb

@@ -15,7 +15,7 @@ module GdsApi
     def panopticon_api
       @panopticon_api ||= GdsApi::Panopticon.new(Plek.current.environment, panopticon_api_credentials)
     end
-    
+
     def panopticon_api_credentials
       Object::const_defined?(:PANOPTICON_API_CREDENTIALS) ? PANOPTICON_API_CREDENTIALS : {}
     end

data/lib/gds_api/imminence.rb

@@ -18,4 +18,8 @@ class GdsApi::Imminence < GdsApi::Base
       o
     }
   end
+
+  def places_kml(type)
+    get_raw("#{@endpoint}/places/#{type}.kml")
+  end
 end

data/lib/gds_api/json_client.rb

@@ -28,19 +28,46 @@ module GdsApi
     }
     DEFAULT_TIMEOUT_IN_SECONDS = 2
 
+    def get_raw(url)
+      do_raw_request(Net::HTTP::Get, url)
+    end
+
     def get_json(url)
-      @cache[url] ||= do_request(Net::HTTP::Get, url)
+      @cache[url] ||= do_json_request(Net::HTTP::Get, url)
     end
 
     def post_json(url, params)
-      do_request(Net::HTTP::Post, url, params)
+      do_json_request(Net::HTTP::Post, url, params)
     end
 
     def put_json(url, params)
-      do_request(Net::HTTP::Put, url, params)
+      do_json_request(Net::HTTP::Put, url, params)
     end
 
     private
+    def do_raw_request(method_class, url, params = nil)
+      response, loggable = do_request(method_class, url, params)
+      response.body
+    end
+
+    def do_json_request(method_class, url, params = nil)
+      response, loggable = do_request(method_class, url, params)
+
+      if response.is_a?(Net::HTTPSuccess)
+        logger.info loggable.merge(status: 'success', end_time: Time.now.to_f).to_json
+        Response.new(response)
+      else
+        body = begin
+          JSON.parse(response.body)
+        rescue
+          response.body
+        end
+        loggable.merge!(status: response.code, end_time: Time.now.to_f, body: body)
+        logger.warn loggable.to_json
+        nil
+      end
+    end
+
     def do_request(method_class, url, params = nil)
       loggable = {request_uri: url, start_time: Time.now.to_f}
       start_logging = loggable.merge(action: 'start')
@@ -60,19 +87,8 @@ module GdsApi
         http.request(request)
       end
 
-      if response.is_a?(Net::HTTPSuccess)
-        logger.info loggable.merge(status: 'success', end_time: Time.now.to_f).to_json
-        Response.new(response)
-      else
-        body = begin
-          JSON.parse(response.body)
-        rescue
-          response.body
-        end
-        loggable.merge!(status: response.code, end_time: Time.now.to_f, body: body)
-        logger.warn loggable.to_json
-        nil
-      end
+      return response, loggable
+
     rescue Errno::ECONNREFUSED => e
       logger.error loggable.merge(status: 'refused', error_message: e.message, error_class: e.class.name, end_time: Time.now.to_f).to_json
       raise GdsApi::EndpointNotFound.new("Could not connect to #{url}")

data/lib/gds_api/response.rb

@@ -6,13 +6,13 @@ module GdsApi
   class Response
     extend Forwardable
     include Enumerable
-    
+
     def_delegators :to_hash, :[], :"<=>", :each
-    
+
     def initialize(net_http_response)
       @net_http_response = net_http_response
     end
-    
+
     def to_hash
       @parsed ||= JSON.parse(@net_http_response.body)
     end
@@ -20,7 +20,7 @@ module GdsApi
     def to_ostruct
       self.class.build_ostruct_recursively(to_hash)
     end
-    
+
     def method_missing(method)
       if to_hash.has_key?(method.to_s)
         to_ostruct.send(method)
@@ -28,16 +28,16 @@ module GdsApi
         nil
       end
     end
-    
+
     def respond_to_missing?(method, include_private)
       to_hash.has_key?(method.to_s)
     end
-    
+
     def present?; ! blank?; end
     def blank?; false; end
-        
+
   private
-  
+
     def self.build_ostruct_recursively(value)
       case value
       when Hash

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '0.0.40'
+  VERSION = '0.0.41'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.41
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &27792140 !ruby/object:Gem::Requirement
+  requirement: &70148847744340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27792140
+  version_requirements: *70148847744340
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &27791720 !ruby/object:Gem::Requirement
+  requirement: &70148847743920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27791720
+  version_requirements: *70148847743920
 - !ruby/object:Gem::Dependency
   name: lrucache
-  requirement: &27791220 !ruby/object:Gem::Requirement
+  requirement: &70148847743420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *27791220
+  version_requirements: *70148847743420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &27790720 !ruby/object:Gem::Requirement
+  requirement: &70148847742920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *27790720
+  version_requirements: *70148847742920
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &27790260 !ruby/object:Gem::Requirement
+  requirement: &70148847742460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *27790260
+  version_requirements: *70148847742460
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &27789800 !ruby/object:Gem::Requirement
+  requirement: &70148847742000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *27789800
+  version_requirements: *70148847742000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &27789340 !ruby/object:Gem::Requirement
+  requirement: &70148847772240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *27789340
+  version_requirements: *70148847772240
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &27788960 !ruby/object:Gem::Requirement
+  requirement: &70148847771860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27788960
+  version_requirements: *70148847771860
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &27788420 !ruby/object:Gem::Requirement
+  requirement: &70148847771320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *27788420
+  version_requirements: *70148847771320
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &27788000 !ruby/object:Gem::Requirement
+  requirement: &70148847770900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *27788000
+  version_requirements: *70148847770900
 description: A set of adapters providing easy access to the GDS gov.uk APIs
 email:
 - jystewart@gmail.com
@@ -128,34 +128,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/gds_api/response.rb
-- lib/gds_api/panopticon/registerer.rb
+- lib/gds_api/base.rb
+- lib/gds_api/contactotron.rb
 - lib/gds_api/core-ext/openstruct.rb
-- lib/gds_api/part_methods.rb
-- lib/gds_api/oauth2_client.rb
-- lib/gds_api/test_helpers/imminence.rb
-- lib/gds_api/test_helpers/contactotron.rb
-- lib/gds_api/test_helpers/panopticon.rb
-- lib/gds_api/test_helpers/json_client_helper.rb
-- lib/gds_api/test_helpers/publisher.rb
+- lib/gds_api/exceptions.rb
+- lib/gds_api/helpers.rb
 - lib/gds_api/imminence.rb
+- lib/gds_api/json_client.rb
 - lib/gds_api/needotron.rb
-- lib/gds_api/contactotron.rb
+- lib/gds_api/oauth2_client.rb
+- lib/gds_api/panopticon/registerer.rb
 - lib/gds_api/panopticon.rb
-- lib/gds_api/helpers.rb
-- lib/gds_api/json_client.rb
+- lib/gds_api/part_methods.rb
 - lib/gds_api/publisher.rb
-- lib/gds_api/exceptions.rb
+- lib/gds_api/response.rb
+- lib/gds_api/test_helpers/contactotron.rb
+- lib/gds_api/test_helpers/imminence.rb
+- lib/gds_api/test_helpers/json_client_helper.rb
+- lib/gds_api/test_helpers/panopticon.rb
+- lib/gds_api/test_helpers/publisher.rb
 - lib/gds_api/version.rb
-- lib/gds_api/base.rb
 - README.md
 - Rakefile
+- test/contactotron_api_test.rb
 - test/gds_api_base_test.rb
+- test/json_client_test.rb
+- test/panopticon_api_test.rb
 - test/publisher_api_test.rb
 - test/test_helper.rb
-- test/panopticon_api_test.rb
-- test/json_client_test.rb
-- test/contactotron_api_test.rb
 homepage: http://github.com/alphagov/gds-api-adapters
 licenses: []
 post_install_message: 
@@ -176,14 +176,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Adapters to work with GDS APIs
 test_files:
+- test/contactotron_api_test.rb
 - test/gds_api_base_test.rb
+- test/json_client_test.rb
+- test/panopticon_api_test.rb
 - test/publisher_api_test.rb
 - test/test_helper.rb
-- test/panopticon_api_test.rb
-- test/json_client_test.rb
-- test/contactotron_api_test.rb