gds-api-adapters 18.3.1 → 18.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50b8a8d1af674fd28b30b7448d6db9ea75a24fb0
-  data.tar.gz: d10980131326a18a50b025be53155a0916ab6a19
+  metadata.gz: 358bf064a7109ec21703d589ad94f782883dcf90
+  data.tar.gz: 75b59ebe3c4a7d6a4f0e965cc3bd1136b18c50ee
 SHA512:
-  metadata.gz: 33d6af7da6e7fe24f435ca236ade36aafe93d5097a4c298a527a976715b08baf3bc88635249dcad6abd78dbf6e41a2e7ff0bae0f67d8e9e3ceef761ef6be8444
-  data.tar.gz: e18c56abeaf398171f3fd9046b4f12c7b65be1c3ccd9b90af4a1282382aaf9fd9da3f4352417e9a545d58e8ee68015d2f33d52e9b22951e6e090191c0a7c1727
+  metadata.gz: 24396827c28be4d5e1eb0ace99ebaf6c3a7fa56d3e544ce82ca11af71f2a7d78cee52ff75a665e1c91cd2e9847b382415598d21730aa7af226352e2c803e60cb
+  data.tar.gz: 4f6f807c0e5b192964c693aa83fd06b9097427db330ce51fa8bdac200972377a624791f575faa9e4b093ad0242814a450f6d8f1f4464baf00475660fc9f0daea

data/lib/gds_api/test_helpers/organisations.rb

@@ -11,22 +11,32 @@ module GdsApi
       ORGANISATIONS_API_ENDPOINT = Plek.current.find('whitehall-admin')
       PUBLIC_HOST = Plek.current.find('www')
 
+      def organisations_api_has_organisations(organisation_slugs)
+        bodies = organisation_slugs.map { |slug| organisation_for_slug(slug) }
+        organisations_api_has_organisations_with_bodies(bodies)
+      end
+
       # Sets up the index endpoints for the given organisation slugs
       # The stubs are setup to paginate in chunks of 20
       #
       # This also sets up the individual endpoints for each slug
       # by calling organisations_api_has_organisation below
-      def organisations_api_has_organisations(organisation_slugs)
-        organisation_slugs.each {|s| organisations_api_has_organisation(s) }
+      def organisations_api_has_organisations_with_bodies(organisation_bodies)
+        # Stub API call to the endpoint for an individual organisation
+        organisation_bodies.each do |body|
+          slug = body["details"]["slug"]
+          organisations_api_has_organisation(slug, body)
+        end
+
         pages = []
-        organisation_slugs.each_slice(20) do |slugs|
-          pages << slugs.map {|s| organisation_details_for_slug(s) }
+        organisation_bodies.each_slice(20) do |bodies|
+          pages << bodies
         end
 
         pages.each_with_index do |page, i|
           page_details = plural_response_base.merge({
             "results" => page,
-            "total" => organisation_slugs.size,
+            "total" => organisation_bodies.size,
             "pages" => pages.size,
             "current_page" => i + 1,
             "page_size" => 20,
@@ -71,7 +81,7 @@ module GdsApi
       #
       # if the slug contains 'ministry' the format will be set to 'Ministerial department'
       # otherwise it will be set to 'Executive agency'
-      def organisation_details_for_slug(slug)
+      def organisation_details_for_slug(slug, content_id=SecureRandom.uuid)
         {
           "id" => "#{ORGANISATIONS_API_ENDPOINT}/api/organisations/#{slug}",
           "title" => titleize_slug(slug, :title_case => true),
@@ -86,7 +96,7 @@ module GdsApi
             "organisation_logo_type_class_name" => (slug =~ /ministry/ ? "single-identity" : "eo"),
             "closed_at" => nil,
             "govuk_status" => (slug =~ /ministry/ ? "live" : "joining"),
-            "content_id" => SecureRandom.uuid,
+            "content_id" => content_id,
           },
           "parent_organisations" => [
             {
@@ -102,7 +112,6 @@ module GdsApi
           ],
         }
       end
-
     end
   end
 end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '18.3.1'
+  VERSION = '18.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 18.3.1
+  version: 18.4.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek