govuk-content-schema-test-helpers 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f9fcae915c287cae77f19e2f189b9bd6858f23f
-  data.tar.gz: e50af50fca493575e933c982ce0a36749ab83b13
+  metadata.gz: a41979e7929525bfa58a347e99bca0e02855eae7
+  data.tar.gz: d1525dd75203ea8902290d8fa586aed105ef46ae
 SHA512:
-  metadata.gz: 2428aebd180cbd3a47844240422e4286397010ce29b9ff2f019162db02882af93488ba873239bd1ed3feaa5b0f7413ed6d77aaa9864022e8f47e91b31ab75e0e
-  data.tar.gz: 087633067fe7a5f726935981b4e4aca067ac438e72901316ca30d6a389a07290bf7f4f13cdc918ff0a03001c00a843963daa09be1042de98ae90add2773ae92e
+  metadata.gz: 90c38440d1d5e97130d452d754bb9f641a6b4350ea25dff5b4aa2fc3028b8815ca6baee63ee0177d8ca5bcc51aa148a7d90d2c5d7da13d2777e94fdfb30aa4b1
+  data.tar.gz: 7dbc461c7de71b58aad54db4686553d195a309d5c2df14d2215514a75bda15d4e558d608566ec7cdff62bb12207ec762ccdc5a0fb4dfa926c50da02826f690b9

data/README.md

@@ -24,7 +24,7 @@ You will need to configure which type of schemas your app uses. A good place to
   require 'govuk-content-schema-test-helpers'
 
   GovukContentSchemaTestHelpers.configure do |config|
-    config.schema_type = 'frontend' # or 'publisher'
+    config.schema_type = 'frontend' # or 'publisher_v2'
     config.project_root = Rails.root
   end
 ```

data/lib/govuk-content-schema-test-helpers/examples.rb

@@ -6,14 +6,24 @@ module GovukContentSchemaTestHelpers
 
     def get(format, example_name)
       path = example_path(format, example_name)
-      check_example_file_exists!(path)
-      File.read(path)
+      legacy_path = legacy_example_path(format, example_name)
+      file_that_exists = check_an_example_file_exists(path, legacy_path)
+      File.read(file_that_exists)
     end
 
     def get_all_for_format(schema_name)
       glob_path = example_path(schema_name, '*')
-      Dir.glob(glob_path).map do |path|
-        File.read(path)
+      legacy_glob_path = legacy_example_path(schema_name, '*')
+
+      example_paths = Dir.glob(glob_path)
+      example_paths = Dir.glob(legacy_glob_path) unless example_paths.any?
+
+      if example_paths.any?
+        example_paths.map do |path|
+          File.read(path)
+        end
+      else
+        raise ImproperlyConfiguredError, "No examples found for schema: #{schema_name}"
       end
     end
 
@@ -23,16 +33,23 @@ module GovukContentSchemaTestHelpers
       end
     end
 
-    def check_example_file_exists!(path)
-      if !File.exists?(path)
-        raise ImproperlyConfiguredError, "Example file not found: #{path}."
-      end
+  private
+
+    def check_an_example_file_exists(path, legacy_path)
+      return path if File.exists?(path)
+      return legacy_path if File.exists?(legacy_path)
+
+      raise ImproperlyConfiguredError, "Example file not found, checked: #{path} and #{legacy_path}."
     end
 
-  private
-    def example_path(format, example_name)
+    def legacy_example_path(format, example_name)
       schema_type = GovukContentSchemaTestHelpers.configuration.schema_type
       File.join(Util.govuk_content_schemas_path, "/formats/#{format}/#{schema_type}/examples/#{example_name}.json").to_s
     end
+
+    def example_path(format, example_name)
+      schema_type = GovukContentSchemaTestHelpers.configuration.schema_type
+      File.join(Util.govuk_content_schemas_path, "/examples/#{format}/#{schema_type}/#{example_name}.json").to_s
+    end
   end
 end

data/lib/govuk-content-schema-test-helpers/version.rb

@@ -1,3 +1,3 @@
 module GovukContentSchemaTestHelpers
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk-content-schema-test-helpers
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jamie Cobbett
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -25,20 +25,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Test helpers for working with GOV.UK content schemas