gds-api-adapters 0.0.7 → 0.0.9

data/lib/gds_api/base.rb

@@ -1,16 +1,16 @@
 require_relative 'json_utils'
 require 'cgi'
-require 'logger'
+require 'null_logger'
 
 class GdsApi::Base
   include GdsApi::JsonUtils
 
-  class <<self
+  class << self
     attr_writer :logger
   end
 
   def self.logger
-    @logger ||= Logger.new(STDOUT)
+    @logger ||= NullLogger.instance
   end
 
   def initialize(platform, endpoint_url=nil)

data/lib/gds_api/json_utils.rb

@@ -14,11 +14,12 @@ module GdsApi::JsonUtils
   TIMEOUT_IN_SECONDS = 0.5
 
   def do_request(url, &block)
-    loggable = {request_uri: url, start_time: Time.now}
+    loggable = {request_uri: url, start_time: Time.now.to_f}
 
     url = URI.parse(url)
     request = url.path
     request = request + "?" + url.query if url.query
+    logger.debug "I will request #{request}"
 
     response = Net::HTTP.start(url.host, url.port) do |http|
       http.read_timeout = TIMEOUT_IN_SECONDS
@@ -26,21 +27,26 @@ module GdsApi::JsonUtils
     end
 
     if response.is_a?(Net::HTTPSuccess)
-      GdsApi::Base.logger.info loggable.merge(status: 'success', end_time: Time.now).to_json
+      logger.info loggable.merge(status: 'success', end_time: Time.now).to_json
       JSON.parse(response.body)
     else
-      loggable.merge!(status: '404', end_time: Time.now)
-      GdsApi::Base.logger.info loggable.to_json
+      loggable.merge!(status: '404', end_time: Time.now.to_f)
+      logger.warn loggable.to_json
       nil
     end
   rescue Errno::ECONNREFUSED
-    GdsApi::Base.logger.info loggable.merge(status: 'refused', end_time: Time.now).to_json
+    logger.error loggable.merge(status: 'refused', end_time: Time.now.to_f).to_json
     raise GdsApi::EndpointNotFound.new("Could not connect to #{url}")
   rescue Timeout::Error, Errno::ECONNRESET
-    GdsApi::Base.logger.info loggable.merge(status: 'failed', end_time: Time.now).to_json
+    logger.error loggable.merge(status: 'failed', end_time: Time.now.to_f).to_json
     nil
   end
 
+  def logger
+    GdsApi::Base.logger
+  end
+  private :logger
+
   def get_json(url)
     do_request(url) do |http, path|
       http.get(path, REQUEST_HEADERS)

data/lib/gds_api/test_helpers/imminence.rb

@@ -0,0 +1,12 @@
+module GdsApi
+  module TestHelpers
+    module Imminence
+      def imminence_has_places(latitude, longitude, details)
+        response = JSON.dump(details['details'])
+        stub_request(:get, "http://imminence.test.alphagov.co.uk/places/#{details['slug']}.json").
+          with(:query => {"lat" => latitude, "lng" => longitude, "limit" => "5"}).
+          to_return(:status => 200, :body => response, :headers => {})
+      end
+    end
+  end
+end

data/lib/gds_api/test_helpers/publisher.rb

@@ -9,6 +9,33 @@ module GdsApi
         stub_request(:get, uri).to_return(:body => json, :status => 200)
         return uri
       end
+
+      def publication_exists_for_snac(snac, details)
+        json = JSON.dump(details)
+        uri = "#{PUBLISHER_ENDPOINT}/publications/#{details['slug']}.json"
+        stub_request(:get, uri).with(:query => {:snac => snac.to_s}).to_return(:body => json, :status => 200)
+        return uri
+      end
+
+      def publication_does_not_exist(details)
+        uri = "#{PUBLISHER_ENDPOINT}/publications/#{details['slug']}.json"
+        stub_request(:get, uri).to_return(:body => 'Not Found', :status => 404)
+        return uri
+      end
+
+      def council_exists_for_slug(input_details, output_details)
+        json = JSON.dump(output_details)
+        slug = input_details.delete('slug')
+        uri = "#{PUBLISHER_ENDPOINT}/local_transactions/#{slug}/verify_snac.json"
+        stub_request(:post, uri).with(:body => JSON.dump(input_details), 
+          :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json', 'User-Agent'=>'GDS Api Client v. 0.0.7'}).
+          to_return(:body => json, :status => 200)
+      end
+
+      def no_council_for_slug(slug)
+        uri = "#{PUBLISHER_ENDPOINT}/local_transactions/#{slug}/verify_snac.json"
+        stub_request(:post, uri).to_return(:body => "", :status => 404)
+      end
     end
   end
 end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &70266639863640 !ruby/object:Gem::Requirement
+  requirement: &70358011132760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266639863640
+  version_requirements: *70358011132760
+- !ruby/object:Gem::Dependency
+  name: null_logger
+  requirement: &70358011115280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70358011115280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70266639855540 !ruby/object:Gem::Requirement
+  requirement: &70358011102660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70266639855540
+  version_requirements: *70358011102660
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70266639853460 !ruby/object:Gem::Requirement
+  requirement: &70358011083160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *70266639853460
+  version_requirements: *70358011083160
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70266639852360 !ruby/object:Gem::Requirement
+  requirement: &70358011074400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266639852360
+  version_requirements: *70358011074400
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70266639850240 !ruby/object:Gem::Requirement
+  requirement: &70358011068120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +76,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70266639850240
+  version_requirements: *70358011068120
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &70266639840080 !ruby/object:Gem::Requirement
+  requirement: &70358011063780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266639840080
+  version_requirements: *70358011063780
 description: A set of adapters providing easy access to the GDS gov.uk APIs
 email:
 - jystewart@gmail.com
@@ -95,6 +106,7 @@ files:
 - lib/gds_api/part_methods.rb
 - lib/gds_api/publisher.rb
 - lib/gds_api/test_helpers/contactotron.rb
+- lib/gds_api/test_helpers/imminence.rb
 - lib/gds_api/test_helpers/panopticon.rb
 - lib/gds_api/test_helpers/publisher.rb
 - lib/gds_api/version.rb