contentful_bootstrap 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7ea53fc8910927ad570b01662d13508ceeb6f2
-  data.tar.gz: b31f21982faf8bc39fb074b4f7b07bb6dda3b2b8
+  metadata.gz: 707aaf25b774e94bc57a7a4fcbafca299a087c0b
+  data.tar.gz: 931621f83a894b336f81fcd65b729dcd90c0e03f
 SHA512:
-  metadata.gz: 1961e824b175b3875c5763bccc14a514cc8a4620df2db15119c8d4b56ae713b8c84d2b1b907ac4e577d7f14338666cb9b36f37fff758d39fe0904be1abf299ae
-  data.tar.gz: 313723cd33fdf169acd945e675dd448e2db5930905a3d722197aaa71fc373079e166ef59739700c09af25c19b039c543a82e52027c098f6f683757d9bc75d2e5
+  metadata.gz: 4c306b28133c2411c327b6ee266ad8ec04f9eaa1284dc40a82dd798b8c332f1571c856bd010c7ebb330e45696ef2f3bb483d9b1771e13bf8bca074edba074a90
+  data.tar.gz: 20b2c92ab22e7b511fafb1cb9735e72a4fd8ec9ca0d37829d346245add717c80041dcc99594605dd72e1e4954a90ede31b5cb0110d4c372a7cba17f455e896a3

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v3.1.1
+### Fixed
+* Fixes a bug where `display_field` was not properly populated when being generated from JSON templates [#35](https://github.com/contentful/contentful-bootstrap.rb/issues/35)
+
 ## v3.1.0
 ### Fixed
 * Version Locked Webmock causing all our VCRs to fail

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

@@ -17,7 +17,12 @@ module Contentful
         end
 
         def content_types
-          json.fetch('contentTypes', [])
+          processed_content_types = json.fetch('contentTypes', [])
+          processed_content_types.each do |content_type|
+            content_type['display_field'] = content_type.key?('displayField') ? content_type.delete('displayField') : content_type['display_field']
+          end
+
+          processed_content_types
         end
 
         def assets

data/lib/contentful/bootstrap/version.rb

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

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

@@ -6,23 +6,35 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
   subject { described_class.new space, path }
 
   describe 'instance methods' do
-    it '#content_types' do
-      expect(subject.content_types.first).to eq(
-        {
-          "id" => "cat",
-          "name" => "Cat",
-          "displayField" => "name",
-          "fields" => [
-            {
-              "id" => "name",
-              "name" => "Name",
-              "type" => "Symbol"
-            }
-          ]
-        }
-      )
+    describe '#content_types' do
+      it 'fetches content types' do
+        expect(subject.content_types.first).to eq(
+          {
+            "id" => "cat",
+            "name" => "Cat",
+            "display_field" => "name",
+            "fields" => [
+              {
+                "id" => "name",
+                "name" => "Name",
+                "type" => "Symbol"
+              }
+            ]
+          }
+        )
+
+        expect(subject.content_types.size).to eq(1)
+      end
+
+      it 'uses displayField if found' do
+        expect(subject.content_types.first['display_field']).to eq 'name'
+      end
+
+      it 'uses display_field if not' do
+        subject = described_class.new(space, File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'display_field.json')))
 
-      expect(subject.content_types.size).to eq(1)
+        expect(subject.content_types.first['display_field']).to eq 'name'
+      end
     end
 
     it '#assets' do

data/spec/fixtures/json_fixtures/display_field.json

@@ -0,0 +1,39 @@
+{
+  "version": 3,
+  "contentTypes": [
+    {
+      "id": "cat",
+      "name": "Cat",
+      "display_field": "name",
+      "fields": [
+        {
+          "id": "name",
+          "name": "Name",
+          "type": "Symbol"
+        }
+      ]
+    }
+  ],
+  "assets": [
+    {
+      "id": "cat_asset",
+      "title": "Cat",
+      "file": {
+        "filename": "cat",
+        "url": "https://somecat.com/my_cat.jpeg"
+      }
+    }
+  ],
+  "entries": {
+    "cat": [
+      {
+        "sys": {
+          "id": "nyancat"
+        },
+        "fields": {
+          "name": "Nyan Cat"
+        }
+      }
+    ]
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - David Litvak Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -260,6 +260,7 @@ files:
 - spec/fixtures/ini_fixtures/no_global.ini
 - spec/fixtures/ini_fixtures/no_token.ini
 - spec/fixtures/ini_fixtures/sections.ini
+- spec/fixtures/json_fixtures/display_field.json
 - spec/fixtures/json_fixtures/high.json
 - spec/fixtures/json_fixtures/invalid.json
 - spec/fixtures/json_fixtures/issue_22.json
@@ -325,6 +326,7 @@ test_files:
 - spec/fixtures/ini_fixtures/no_global.ini
 - spec/fixtures/ini_fixtures/no_token.ini
 - spec/fixtures/ini_fixtures/sections.ini
+- spec/fixtures/json_fixtures/display_field.json
 - spec/fixtures/json_fixtures/high.json
 - spec/fixtures/json_fixtures/invalid.json
 - spec/fixtures/json_fixtures/issue_22.json