contentful_bootstrap 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a980f96add79c447bc7c0fefe9a9adf6ca7a0a2
-  data.tar.gz: c985777812c51b5ea56cbb72b408dc4084c4fd37
+  metadata.gz: 0c266426ff6158f7c5254cab98f9ca38bd5fe20f
+  data.tar.gz: 5993a12e19927dc0de0caa3e93e58863e59b83f1
 SHA512:
-  metadata.gz: 98d0f125902b0f630e68d221cc1d1f46e8e10bc4d8269053b8900a3b8cf6860a0ddc7734203672ae5e38cf95aaa57c07342b128a808ebc4a4dc6a3d778fe09e5
-  data.tar.gz: 0efd66ede3afb522c91aeea013097e7a638ac5e68ea9d0b38da2c28b1b722523e1e077848c5e09c5658b4f8841d948547aaafbbe7e9f7dedc83ba6ae81c91467
+  metadata.gz: aa0980d9e60346eaa9dfd951ff10f007505fd68326f4b6c832842b9feb58b29fb95da89160a864e38c47fd9e7edd6822cf69c63f2940a9416adf92d432ab544b
+  data.tar.gz: 779f7ef0e31f395930d2a14b20b3a45d156dfb61a951d73d132b4021f803461560fb25d708db23b0a7000629e0c1e27a077ba3e09c994251c8502a98a32ebf97

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.1.7
   - 2.2.3
+  - 2.3.1
+  - 2.4.0
   - 2.0.0
 notifications:
   slack:

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## v3.5.2
+
+### Fixed
+* Fixed compatibility with CDA 2.0.0 SDK
+
 ## v3.5.1
 ### Fixed
 * Fixed organization fetching when no organization ID is provided on the configuration file [#54](https://github.com/contentful/contentful-bootstrap.rb/issues/54)

data/lib/contentful/bootstrap/generator.rb

@@ -45,7 +45,7 @@ module Contentful
           result['displayField'] = type.display_field unless type.display_field.nil?
 
           result['fields'] = type.fields.map do |field|
-            map_field_properties(field.properties)
+            map_field_properties(field)
           end
 
           result
@@ -63,7 +63,7 @@ module Contentful
 
           entry.fields.each do |key, value|
             value = map_field(value)
-            result['fields'][key] = value unless value.nil?
+            result['fields'][field_id(entry, key)] = value unless value.nil?
           end
 
           ct_id = entry.content_type.sys[:id]
@@ -74,6 +74,10 @@ module Contentful
         entries
       end
 
+      def field_id(entry, field_name)
+        entry.raw['fields'].keys.detect { |f| f == field_name.to_s || f == Support.camel_case(field_name.to_s).to_s }
+      end
+
       def map_field(value)
         return value.map { |v| map_field(v) } if value.is_a? ::Array
 
@@ -89,11 +93,17 @@ module Contentful
         value
       end
 
-      def map_field_properties(properties)
-        items = properties[:items]
-        properties[:items] = map_field_properties(items.properties) unless items.nil?
+      def map_field_properties(field)
+        properties = {}
+
+        [:id, :name, :type, :link_type, :required, :localized].each do |property|
+          value = field.public_send(property) if field.respond_to?(property)
+          properties[Support.camel_case(property.to_s).to_sym] = value unless value.nil? || [:required, :localized].include?(property)
+        end
+
+        items = field.items if field.respond_to?(:items)
+        properties[:items] = map_field_properties(items) unless items.nil?
 
-        properties.delete_if { |k, v| v.nil? || [:required, :localized].include?(k) }
         properties
       end
     end

data/lib/contentful/bootstrap/support.rb

@@ -3,6 +3,10 @@ require 'stringio'
 module Contentful
   module Bootstrap
     module Support
+      def self.camel_case(a_string)
+        a_string.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+      end
+
       def self.silence_stderr
         old_stderr = $stderr
         $stderr = StringIO.new

data/lib/contentful/bootstrap/version.rb

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

metadata

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