contentful_bootstrap 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d0bf2dba800e936efa11794d15440a1da64db05
-  data.tar.gz: 9af2801f2a777c99d2dd4f46bb6323964b7592a9
+  metadata.gz: e58541eab6426bb8208b9b0c33244d1bea9d65fa
+  data.tar.gz: d0e26fbf73b7e1c01e080eb1268dc90bab01cee0
 SHA512:
-  metadata.gz: 9de02a76a5062f9c084f886168c9d41d800cb72d44bfdab9c8437e61ed9dbab30b1d0d4bdfb821e9bb95262ff86aaabe3f831f37a4f64a86e88bdebe07d6feb1
-  data.tar.gz: 0b37f36ec8d8b5cd26112f071180bcbdaa1838ec239b485bb1f22dbdd2f32bda827e6d6fcd8a6cbf8d73046a722db6130d5744ec39a15f5edea703f3a555e33d
+  metadata.gz: 03150c56609259ab73f72026b0feaf962db95cb7b75066dc8166f03568b2022ff73111021bd23220ba3cd0291993d2b65826243d7ba56df906830aaa8fea2ec2
+  data.tar.gz: 22f9528bb02b02b60ffa529df0623c156c1816b8bb8f26e7370bdb93f83284cdeed8c5c9e684c9aae93ccf233792ee065e516c920be6c06e487e721d5009807f

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v3.9.1
+### Fixed
+* Fixed an issue in which assets save as `Contentful::Management::File` objects instead of as JSON when using `--mark-processed`.
+
 ## v3.9.0
 ### Fixed
 * Fixed `quiet` not being forwarded properly to `generate_json` and `update_space`

data/lib/contentful/bootstrap/templates/json_template.rb

@@ -34,15 +34,18 @@ module Contentful
         def after_run
           return unless mark_processed?
 
-          @json.fetch(CONTENT_TYPES_KEY, []).each do |content_type|
+          # Re-parse JSON to avoid side effects from `Templates::Base`
+          @json = parse_json
+
+          json.fetch(CONTENT_TYPES_KEY, []).each do |content_type|
             content_type[BOOTSTRAP_PROCCESSED_KEY] = true
           end
 
-          @json.fetch(ASSETS_KEY, []).each do |asset|
+          json.fetch(ASSETS_KEY, []).each do |asset|
             asset[BOOTSTRAP_PROCCESSED_KEY] = true
           end
 
-          @json.fetch(ENTRIES_KEY, {}).each do |_content_type_name, entry_list|
+          json.fetch(ENTRIES_KEY, {}).each do |_content_type_name, entry_list|
             entry_list.each do |entry|
               if entry.key?(SYS_KEY)
                 entry[SYS_KEY][BOOTSTRAP_PROCCESSED_KEY] = true
@@ -55,8 +58,19 @@ module Contentful
           ::File.write(@file, JSON.pretty_generate(@json))
         end
 
+        def json
+          @json ||= parse_json
+        end
+
         private
 
+        def parse_json
+          ::JSON.parse(::File.read(@file))
+        rescue
+          output 'File is not JSON. Exiting!'
+          exit(1)
+        end
+
         def check_version
           json_version = json.fetch('version', 0)
           gem_major_version = Contentful::Bootstrap.major_version
@@ -65,13 +79,6 @@ module Contentful
           end
         end
 
-        def json
-          @json ||= ::JSON.parse(::File.read(@file))
-        rescue
-          output 'File is not JSON. Exiting!'
-          exit(1)
-        end
-
         def process_content_types
           processed_content_types = json.fetch(CONTENT_TYPES_KEY, [])
 
@@ -127,8 +134,8 @@ module Contentful
               processed_entry['id'] = entry[SYS_KEY]['id'] if entry.key?(SYS_KEY) && entry[SYS_KEY].key?('id')
 
               entry.fetch('fields', {}).each do |field, value|
-                link_fields << field if is_link?(value)
-                array_fields << field if is_array?(value)
+                link_fields << field if link?(value)
+                array_fields << field if array?(value)
 
                 unless link_fields.include?(field) || array_fields.include?(field)
                   processed_entry[field] = value
@@ -141,7 +148,7 @@ module Contentful
 
               array_fields.each do |af|
                 processed_entry[af] = entry['fields'][af].map do |item|
-                  is_link?(item) ? create_link(item) : item
+                  link?(item) ? create_link(item) : item
                 end
               end
 
@@ -173,11 +180,11 @@ module Contentful
           @mark_processed
         end
 
-        def is_link?(value)
+        def link?(value)
           value.is_a?(::Hash) && value.key?('id') && value.key?('linkType')
         end
 
-        def is_array?(value)
+        def array?(value)
           value.is_a?(::Array)
         end
       end

data/lib/contentful/bootstrap/version.rb

@@ -1,6 +1,6 @@
 module Contentful
   module Bootstrap
-    VERSION = '3.9.0'
+    VERSION = '3.9.1'
 
     def self.major_version
       VERSION.split('.').first.to_i

data/spec/contentful/bootstrap/templates/json_template_spec.rb

@@ -178,7 +178,50 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
       end
 
       expect(subject).to receive(:after_run).and_call_original
-      expect(::File).to receive(:write)
+
+      expected = {
+        "version": 3,
+        "contentTypes": [
+          {
+            "id": "cat",
+            "name": "Cat",
+            "displayField": "name",
+            "fields": [
+              {
+                "id": "name",
+                "name": "Name",
+                "type": "Symbol"
+              }
+            ],
+            "bootstrapProcessed": true
+          }
+        ],
+        "assets": [
+          {
+            "id": "cat_asset",
+            "title": "Cat",
+            "file": {
+              "filename": "cat",
+              "url": "https://somecat.com/my_cat.jpeg"
+            },
+            "bootstrapProcessed": true
+          }
+        ],
+        "entries": {
+          "cat": [
+            {
+              "sys": {
+                "id": "nyancat",
+                "bootstrapProcessed": true
+              },
+              "fields": {
+                "name": "Nyan Cat"
+              }
+            }
+          ]
+        }
+      }
+      expect(::File).to receive(:write).with(path, JSON.pretty_generate(expected))
 
       subject.run
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - David Litvak Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler