govuk_schemas 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e3774ac312636e52ae77ba38deab3b6f1e749cf
-  data.tar.gz: 43ab66a728f531e8881da0daf96ec0327b42baf5
+  metadata.gz: 0159a5f0fe899f67971dd67034deba8635b35e8d
+  data.tar.gz: aac60f618ada4ceaf5dd8393c92b3481f4a73d13
 SHA512:
-  metadata.gz: 231ae75cf41f46f6417a365b1b9bf39bad8fdf49cc65e3dec554371cd6dcbb92b6f47db3e3c1615c14d535c91ae37ad8511790ac72cc08560683b59b9022c72c
-  data.tar.gz: 772c6a9f27ca821ac05d2a5eae881b9be999b25649c6143efe56507c88156f47b900031ef69617390f0726ad5f32dcab0fbf841d112c8cba62d2f1f5c693572c
+  metadata.gz: f523a79a97ea8b5f2b2d0628acf9fe63a39e12bc90e93c86a1500f0c40ada8227096c0e9193e265ed586c77fe005d703764312fe18e3e6af5d73debb2b37ef06
+  data.tar.gz: 255d1f6196893e54f95eb1bd80ac579251030bc9c248a84eb5d4ee49f04e8cd1620cd29f9a8af3495832c55f5e8f44f6c8ac43ee64cb8e79ba83e1b2533105f1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.3.0
+
+* Allow looking up examples to work with schemas stored in `formats/{format}/{schema_type}/examples/` and `examples/{format}/{schema_type}/` to allow schema examples to move.
+
 # 2.2.0
 
 * Add RSpec test helpers

data/lib/govuk_schemas/example.rb

@@ -5,7 +5,7 @@ module GovukSchemas
     # @param schema_name [String] like "detailed_guide", "policy" or "publication"
     # @return [Array] array of example content items
     def self.find_all(schema_name)
-      Dir.glob("#{GovukSchemas::CONTENT_SCHEMA_DIR}/formats/#{schema_name}/frontend/examples/*.json").map do |filename|
+      Dir.glob("#{examples_path(schema_name)}/*.json").map do |filename|
         json = File.read(filename)
         JSON.parse(json)
       end
@@ -17,9 +17,22 @@ module GovukSchemas
     # @param example_name [String] the name of the example JSON file
     # @return [Hash] the example content item
     def self.find(schema_name, example_name:)
-      path = "/formats/#{schema_name}/frontend/examples/#{example_name}.json"
-      json = File.read("#{GovukSchemas::CONTENT_SCHEMA_DIR}#{path}")
+      json = File.read("#{examples_path(schema_name)}/#{example_name}.json")
       JSON.parse(json)
     end
+
+    # Examples are changing location in schemas, this allows this utility
+    # to work with both locations
+    #
+    # @param schema_name [String] like "detailed_guide", "policy" or "publication"
+    # @return [String] the path to use for examples
+    def self.examples_path(schema_name)
+      examples_dir = "#{GovukSchemas::CONTENT_SCHEMA_DIR}/examples"
+      if Dir.exist?(examples_dir)
+        "#{examples_dir}/#{schema_name}/frontend"
+      else
+        "#{GovukSchemas::CONTENT_SCHEMA_DIR}/formats/#{schema_name}/frontend/examples"
+      end
+    end
   end
 end

data/lib/govuk_schemas/version.rb

@@ -1,4 +1,4 @@
 module GovukSchemas
   # @private
-  VERSION = "2.2.0".freeze
+  VERSION = "2.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_schemas
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema