gds-api-adapters 23.2.1 → 23.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da4e4ae0fc44e8c9ebe795756199c5077dd6d318
-  data.tar.gz: 8bd24552bad840fa445a1aa1ea965d20d7af8772
+  metadata.gz: 146fc2c08df691e77339fe6b7bc1fa0610e5524f
+  data.tar.gz: 16b5c231df6ba9635b444d0361bda7612f973903
 SHA512:
-  metadata.gz: d87312aceb19389654c848d02bbf0815713fec58ced7d8a914035bb4c18149987da6f1866cbd9af27eaaaecb6dfea0c681ef23928a55d3a3bf378b1df4c3696a
-  data.tar.gz: d3ddb7828a6469a7bfcc5cce1c372810debb85899a3c490486f12321a2a746c07ff836c4e96287734dd416a519de54fdaa8133339b5233efd7a033674547adba
+  metadata.gz: 9294bcfdfdcc7c4548e74bd617e7df6ecdc5562ced0f01e0393f579b7fdc4fbe8f5b25d1a6174fdfc2c0a9c15910ea610a1af0963398508e758f0a101279f287
+  data.tar.gz: eeb30426caaa3501e658041ea962e90347aa040e89352e0ceb7dd3588f15d5f9a98ccdfa4e2bf62c8b223ab9fd260dd67b23b693fe721005f381de04d0d908a9

data/lib/gds_api/publishing_api/special_route_publisher.rb

@@ -1,4 +1,5 @@
 require "gds_api/publishing_api"
+require "time"
 
 module GdsApi
   class PublishingApi < GdsApi::Base
@@ -25,12 +26,16 @@ module GdsApi
           publishing_app: options.fetch(:publishing_app),
           rendering_app: options.fetch(:rendering_app),
           update_type: "major",
-          public_updated_at: (Time.respond_to?(:zone) ? Time.zone.try(:now) : Time.now).iso8601,
+          public_updated_at: time.now.iso8601,
         })
       end
 
     private
       attr_reader :logger, :publishing_api
+
+      def time
+        (Time.respond_to?(:zone) && Time.zone) || Time
+      end
     end
   end
 end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '23.2.1'
+  VERSION = '23.2.2'
 end

data/test/publishing_api/special_route_publisher_test.rb

@@ -3,44 +3,77 @@ require "gds_api/publishing_api/special_route_publisher"
 
 describe GdsApi::PublishingApi::SpecialRoutePublisher do
   let(:publishing_api) {
-    stub(:publishing_api)
+    stub(:publishing_api, put_content_item: nil)
   }
 
   let(:publisher) {
     GdsApi::PublishingApi::SpecialRoutePublisher.new(publishing_api: publishing_api)
   }
 
+  let(:special_route) {
+    {
+      content_id: "a-content-id-of-sorts",
+      title: "A title",
+      description: "A description",
+      base_path: "/favicon.ico",
+      type: "exact",
+      publishing_app: "static-publisher",
+      rendering_app: "static-frontend",
+    }
+  }
+
   describe ".publish" do
     it "publishes the special routes" do
-      publishing_api.expects(:put_content_item).with(
-        "/favicon.ico",
-        {
-          content_id: "a-content-id-of-sorts",
-          format: "special_route",
-          title: "A title",
-          description: "A description",
-          routes: [
-            {
-              path: "/favicon.ico",
-              type: "exact",
-            }
-          ],
-          publishing_app: "static-publisher",
-          rendering_app: "static-frontend",
-          update_type: "major",
-          public_updated_at: Time.now.iso8601,
-        }
-      )
-
-      publisher.publish(
-        content_id: "a-content-id-of-sorts",
-        title: "A title",
-        description: "A description",
-        base_path: "/favicon.ico",
-        type: "exact",
-        publishing_app: "static-publisher",
-        rendering_app: "static-frontend",
-      )
+      Timecop.freeze(Time.now) do
+        publishing_api.expects(:put_content_item).with(
+          special_route[:base_path],
+          {
+            content_id: special_route[:content_id],
+            format: "special_route",
+            title: special_route[:title],
+            description: special_route[:description],
+            routes: [
+              {
+                path: special_route[:base_path],
+                type: special_route[:type],
+              }
+            ],
+            publishing_app: special_route[:publishing_app],
+            rendering_app: special_route[:rendering_app],
+            update_type: "major",
+            public_updated_at: Time.now.iso8601,
+          }
+        )
+
+        publisher.publish(special_route)
+      end
+    end
+
+    it "is robust to Time.zone returning nil" do
+      Timecop.freeze(Time.now) do
+        Time.stubs(:zone).returns(nil)
+
+        publishing_api.expects(:put_content_item).with(
+          anything,
+          has_entries(public_updated_at: Time.now.iso8601)
+        )
+
+        publisher.publish(special_route)
+      end
+    end
+
+    it "uses Time.zone if available" do
+      Timecop.freeze(Time.now) do
+        time_in_zone = stub("Time in zone", now: Time.parse("2010-01-01 10:10:10 +04:00"))
+        Time.stubs(:zone).returns(time_in_zone)
+
+        publishing_api.expects(:put_content_item).with(
+          anything,
+          has_entries(public_updated_at: time_in_zone.now.iso8601)
+        )
+
+        publisher.publish(special_route)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 23.2.1
+  version: 23.2.2
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek