gds-api-adapters 4.5.0 → 4.6.0

data/lib/gds_api/content_api.rb

@@ -94,7 +94,7 @@ class GdsApi::ContentApi < GdsApi::Base
   end
 
   def countries
-    get_json!("#{base_url}/travel-advice.json")
+    parse_times(get_json!("#{base_url}/travel-advice.json"))
   end
 
   private
@@ -112,4 +112,13 @@ class GdsApi::ContentApi < GdsApi::Base
         batch_response
       end
     end
+
+    def parse_times(response)
+      response["results"].map do |result|
+        if result.has_key?("updated_at")
+          result["updated_at"] = Time.parse(result["updated_at"])
+        end
+      end
+      response
+    end
 end

data/lib/gds_api/test_helpers/content_api.rb

@@ -302,13 +302,14 @@ module GdsApi
 
       def content_api_has_countries(countries)
         response = response_base.merge({
-          "results" => countries.map {|id,name|
+          "results" => countries.map { |slug, values|
+            updated_at = values.has_key?(:updated_at) ? {"updated_at" => values[:updated_at]} : {}
             {
-              "id" => "#{CONTENT_API_ENDPOINT}/travel-advice/#{id}.json",
-              "name" => name,
-              "identifier" => id,
-              "web_url" => "http://www.test.gov.uk/travel-advice/#{id}"
-            }
+              "id" => "#{CONTENT_API_ENDPOINT}/travel-advice/#{slug}.json",
+              "name" => values[:name],
+              "identifier" => slug,
+              "web_url" => "http://www.test.gov.uk/travel-advice/#{slug}",
+            }.merge(updated_at)
           },
           "total" => countries.length
         })

data/lib/gds_api/test_helpers/mapit.rb

@@ -11,7 +11,7 @@ module GdsApi
           "postcode"  => postcode
         }
 
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.sub(' ','+') + ".json")
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.gsub(' ','+') + ".json")
           .to_return(:body => response.to_json, :status => 200)
         stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/" + postcode.split(' ').first + ".json")
           .to_return(:body => response.to_json, :status => 200)
@@ -35,19 +35,19 @@ module GdsApi
           }]
         }]
 
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.sub(' ','+') + ".json")
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.gsub(' ','+') + ".json")
           .to_return(:body => response.merge({'areas' => area_response}).to_json, :status => 200)
         stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/partial/" + postcode.split(' ').first + ".json")
           .to_return(:body => response.to_json, :status => 200)
       end
 
       def mapit_does_not_have_a_postcode(postcode)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.sub(' ','+') + ".json")
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.gsub(' ','+') + ".json")
           .to_return(:body => { "code" => 404, "error" => "No Postcode matches the given query." }.to_json, :status => 404)
       end
 
       def mapit_does_not_have_a_bad_postcode(postcode)
-        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.sub(' ','+') + ".json")
+        stub_request(:get, "#{MAPIT_ENDPOINT}/postcode/" + postcode.gsub(' ','+') + ".json")
           .to_return(:body => { "code" => 400, "error" => "Postcode '#{postcode}' is not valid." }.to_json, :status => 400)
       end
 

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '4.5.0'
+  VERSION = '4.6.0'
 end

data/test/content_api_test.rb

@@ -492,21 +492,30 @@ describe GdsApi::ContentApi do
     end
   end
 
-  it "should fetch the list of countries" do
-    content_api_has_countries({
-      'afghanistan' => 'Afghanistan',
-      'albania' => 'Albania',
-      'algeria' => 'Algeria'
-    })
+  describe "countries" do
+    before(:each) do
+      content_api_has_countries({
+        'afghanistan' => {:name => 'Afghanistan', :updated_at => "2013-02-11T16:12:22+00:00" },
+        'albania' => {:name => 'Albania'},
+        'algeria' => {:name => 'Algeria'}
+      })
+
+      @results = @api.countries['results']
+    end
 
-    results = @api.countries['results']
-    assert_equal 3, results.length
+    it "should fetch the list of countries" do
+      assert_equal 3, @results.length
 
-    assert_equal ['afghanistan', 'albania', 'algeria'], results.map {|c| c['identifier'] }
-    assert_equal ['Afghanistan', 'Albania', 'Algeria'], results.map {|c| c['name'] }
+      assert_equal ['afghanistan', 'albania', 'algeria'], @results.map {|c| c['identifier'] }
+      assert_equal ['Afghanistan', 'Albania', 'Algeria'], @results.map {|c| c['name'] }
 
-    assert_equal "#{@base_api_url}/travel-advice/afghanistan.json", results.first['id']
-    assert_equal 'http://www.test.gov.uk/travel-advice/afghanistan', results.first['web_url']
+      assert_equal "#{@base_api_url}/travel-advice/afghanistan.json", @results.first['id']
+      assert_equal 'http://www.test.gov.uk/travel-advice/afghanistan', @results.first['web_url']
+    end
+
+    it "should parse all updated_at values to Time objects" do
+      assert_equal [Time.parse("2013-02-11T16:12:22+00:00"), nil, nil], @results.map {|c| c['updated_at'] }
+    end
   end
 
   def api_response_for_results(results)

metadata

@@ -2,7 +2,7 @@
 name: gds-api-adapters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors: 
 - James Stewart
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3906045177861584672
+      hash: 4475864604503724645
       segments: 
       - 0
       version: "0"
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3906045177861584672
+      hash: 4475864604503724645
       segments: 
       - 0
       version: "0"