contentful_bootstrap 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c454afb5aa1257e813b5f668b67c49538091812f
-  data.tar.gz: dc137c43d045a69be4dd75102b7b6389a41be490
+  metadata.gz: c952447ab1885c58f1e64320aba4ebf2b1697cc4
+  data.tar.gz: 98ecff172ff775441525ba47fa0ecab3de8a4323
 SHA512:
-  metadata.gz: 9890d7da94353a39bf694cba99921f660513490a362d23bd0134ba68eb39253b9ae761f3d96ccf496df1b920717217186b57972923af244be2831578b127f7c4
-  data.tar.gz: 48b153d5610352f98ab2291b63cc87fe6a52cc283163be42babfea205376418d362e6bd5116683dcdf09a646bebd9cd1c641738305c18abf777dc1112e2cf788
+  metadata.gz: a7111f2b133ab7359ddec7246cb054f5c9bbbc4b708e18ec8d6d4327765fa3b0dde5812db2a083da0001467c015a84cf153e66c240354440d861e65a3bf071ec
+  data.tar.gz: df0a573b361e23c174b674584cfd64af0b7d7408347a8b6369777588aabcfa443cd0ac65a8e55092ff54e4201b75d219cfd0711e2c91ee4a617565da7131374a

data/.travis.yml

@@ -4,3 +4,6 @@ rvm:
   - 2.1.7
   - 2.2.3
   - 2.0.0
+notifications:
+  slack:
+    secure: Pw7UFAHD2fSAUtjf0P/W0Wg91TVTMAV8Gl04B/XhFrYpjVtifsGxWipOBDvJr9S7ep2UFbR3YbBABRWAJAigoDHvwEaf6eytEFT9LGsMwmPQOtb5NlJt0+Qhvys3sZUM0KskBORQ+Etz1M0O4e9baC5Tz1V8GzI/lNxIbpIM7dwQU18st+9sUTjBh6UFJDRXd0Qm28VAHk7fjlhpdKVH+5F4iEnFfRw414wVja8kPVmVDHCEqHPWS1JyHIj4eU8E50yBi3WjC60eE2TjAsCA9wc9gzvxb4tN5vXyuIVtqopPW4JPIBCaIv+j07biNAiLrTccQ5vv9RD9NTPmXANX9LyF/qD9I+itFl8xLatnwy1JXtPpi/S+OlQj6lluF17F+3c8g64vVgTYXyCDgCqpzSTj/KsTfwC9PkVGh8bmZMLtfUyd4IiMw8qiXt2opEmv90K1aodcixrpL2Db/OS2aSo4djRfMrjMlUN7tGM7hg9yQfAaZQKCPjof4C/XGG9me9FX+BvnNf9Xl6/t6uHFnkBfF969UX7gk7tzkwyyqpOp/FQ+6c+EiZF7wnVotbW49FBgEmZN62JsXSquDBlDfWrALeX4y9dZ+uYrWBd4q47N+kZUtogwf3f3gj0pE+K1XmKV549HkiHZ9MHcFtOwNu7KrCFMmUSPGIUKSotbg/c=

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v3.0.0
+### Changed
+* Change JSON Template format to resemble the API more closely
+* Create Entries on 2 Steps [#27](https://github.com/contentful-labs/contentful-bootstrap.rb/pull/27)
+* Add JSON Template Version Check [#31](https://github.com/contentful-labs/contentful-bootstrap.rb/issues/31)
+
 ## v2.0.2
 ### Fixed
 * Array and Link handling

data/Gemfile

@@ -6,4 +6,4 @@ gemspec
 gem "launchy"
 gem "inifile"
 gem "contentful-management"
-gem "contentful", "~> 0.7"
+gem "contentful", "~> 0.7", ">= 0.7.3"

data/examples/templates/catalogue.json

@@ -1,9 +1,10 @@
 {
+  "version": 3,
   "content_types": [
     {
       "id": "brand",
       "name": "Brand",
-      "display_field": "name",
+      "displayField": "name",
       "fields": [
         {
           "id": "name",
@@ -19,14 +20,14 @@
           "id": "logo",
           "name": "Logo",
           "type": "Link",
-          "link_type": "Asset"
+          "linkType": "Asset"
         }
       ]
     },
     {
       "id": "category",
       "name": "Category",
-      "display_field": "title",
+      "displayField": "title",
       "fields": [
         {
           "id": "title",
@@ -42,14 +43,14 @@
           "id": "icon",
           "name": "Icon",
           "type": "Link",
-          "link_type": "Asset"
+          "linkType": "Asset"
         }
       ]
     },
     {
       "id": "product",
       "name": "Product",
-      "display_field": "name",
+      "displayField": "name",
       "fields": [
         {
           "id": "name",
@@ -65,19 +66,19 @@
           "id": "image",
           "name": "Image",
           "type": "Link",
-          "link_type": "Asset"
+          "linkType": "Asset"
         },
         {
           "id": "brand",
           "name": "Brand",
           "type": "Link",
-          "link_type": "Entry"
+          "linkType": "Entry"
         },
         {
           "id": "category",
           "name": "Category",
           "type": "Link",
-          "link_type": "Entry"
+          "linkType": "Entry"
         },
         {
           "id": "url",
@@ -140,80 +141,104 @@
   "entries": {
     "brand": [
       {
-        "id": "playsam",
-        "name": "Playsam, Inc",
-        "website": "http://www.playsam.com",
-        "logo": {
-          "link_type": "Asset",
-          "id": "playsam_image"
+        "sys": {
+          "id": "playsam"
+        },
+        "fields": {
+          "name": "Playsam, Inc",
+          "website": "http://www.playsam.com",
+          "logo": {
+            "link_type": "Asset",
+            "id": "playsam_image"
+          }
         }
       },
       {
-        "id": "normann",
-        "name": "Normann Copenhagen, Inc",
-        "website": "http://www.normann-copenhagen.com/",
-        "logo": {
-          "link_type": "Asset",
-          "id": "normann_image"
+        "sys": {
+          "id": "normann"
+        },
+        "fields": {
+          "name": "Normann Copenhagen, Inc",
+          "website": "http://www.normann-copenhagen.com/",
+          "logo": {
+            "linkType": "Asset",
+            "id": "normann_image"
+          }
         }
       }
     ],
     "category": [
       {
-        "id": "toys",
-        "title": "Toys",
-        "description": "Toys for children",
-        "icon": {
-          "link_type": "Asset",
-          "id": "toy_image"
+        "sys": {
+          "id": "toys"
+        },
+        "fields": {
+          "title": "Toys",
+          "description": "Toys for children",
+          "icon": {
+            "linkType": "Asset",
+            "id": "toy_image"
+          }
         }
       },
       {
-        "id": "kitchen",
-        "title": "House and Kitchen",
-        "description": "House and Kitchen accessories",
-        "icon": {
-          "link_type": "Asset",
-          "id": "kitchen_image"
+        "sys": {
+          "id": "kitchen"
+        },
+        "fields": {
+          "title": "House and Kitchen",
+          "description": "House and Kitchen accessories",
+          "icon": {
+            "linkType": "Asset",
+            "id": "kitchen_image"
+          }
         }
       }
     ],
     "product": [
       {
-        "id": "playsam_car",
-        "name": "Playsam Streamliner Classic Car, Espresso",
-        "description": "A classic Playsam design, the Streamliner Classic Car has been selected as Swedish Design Classic by the Swedish National Museum for its inventive style and sleek surface. It's no wonder that this wooden car has also been a long-standing favorite for children both big and small!",
-        "image": {
-          "link_type": "Asset",
-          "id": "toy_car"
-        },
-        "brand": {
-          "link_type": "Entry",
-          "id": "playsam"
-        },
-        "category": {
-          "link_type": "Entry",
-          "id": "toys"
+        "sys": {
+          "id": "playsam_car"
         },
-        "url": "http://www.amazon.com/dp/B001R6JUZ2/"
+        "fields": {
+          "name": "Playsam Streamliner Classic Car, Espresso",
+          "description": "A classic Playsam design, the Streamliner Classic Car has been selected as Swedish Design Classic by the Swedish National Museum for its inventive style and sleek surface. It's no wonder that this wooden car has also been a long-standing favorite for children both big and small!",
+          "image": {
+            "linkType": "Asset",
+            "id": "toy_car"
+          },
+          "brand": {
+            "linkType": "Entry",
+            "id": "playsam"
+          },
+          "category": {
+            "linkType": "Entry",
+            "id": "toys"
+          },
+          "url": "http://www.amazon.com/dp/B001R6JUZ2/"
+        }
       },
       {
-        "id": "whisk_beater",
-        "name": "Whisk Beater",
-        "description": "A creative little whisk that comes in 8 different colors. Handy and easy to clean after use. A great gift idea.",
-        "image": {
-          "link_type": "Asset",
-          "id": "whiskers"
+        "sys": {
+          "id": "whisk_beater"
         },
-        "brand": {
-          "link_type": "Entry",
-          "id": "normann"
-        },
-        "category": {
-          "link_type": "Entry",
-          "id": "kitchen"
-        },
-        "url": "http://www.amazon.com/dp/B0081F2CCK/"
+        "fields": {
+          "name": "Whisk Beater",
+          "description": "A creative little whisk that comes in 8 different colors. Handy and easy to clean after use. A great gift idea.",
+          "image": {
+            "linkType": "Asset",
+            "id": "whiskers"
+          },
+          "brand": {
+            "linkType": "Entry",
+            "id": "normann"
+          },
+          "category": {
+            "linkType": "Entry",
+            "id": "kitchen"
+          },
+          "url": "http://www.amazon.com/dp/B0081F2CCK/"
+        }
       }
     ]
   }

data/lib/contentful/bootstrap/commands/create_space.rb

@@ -64,7 +64,7 @@ module Contentful
           url = client.base_url.sub('spaces', 'token')
           response = Contentful::Management::Client.get_http(url, nil, client.request_headers)
           organization_ids = JSON.load(response.body.to_s)['includes']['Organization'].map do |org|
-            "#{org['name']} - #{org['sys']['id']}"
+            sprintf('%-20s %s', org['name'], org['sys']['id'])
           end
           organization_ids.sort
         end

data/lib/contentful/bootstrap/generator.rb

@@ -2,6 +2,7 @@ require 'contentful'
 require 'inifile'
 require 'json'
 require 'zlib'
+require 'contentful/bootstrap/version'
 
 module Contentful
   module Bootstrap
@@ -12,7 +13,8 @@ module Contentful
 
       def generate_json
         template = {}
-        template['content_types'] = content_types
+        template['version'] = Contentful::Bootstrap.major_version
+        template['contentTypes'] = content_types
         template['assets'] = assets
         template['entries'] = entries
         JSON.pretty_generate(template)
@@ -21,7 +23,7 @@ module Contentful
       private
 
       def assets
-        proccessed_assets = @client.assets.map do |asset|
+        proccessed_assets = @client.assets(limit: 1000).map do |asset|
           result = { 'id' => asset.sys[:id], 'title' => asset.title }
           result['file'] = {
             'filename' => ::File.basename(asset.file.file_name, '.*'),
@@ -35,7 +37,7 @@ module Contentful
       def content_types
         proccessed_content_types = @client.content_types.map do |type|
           result = { 'id' => type.sys[:id], 'name' => type.name }
-          result['display_field'] = type.display_field unless type.display_field.nil?
+          result['displayField'] = type.display_field unless type.display_field.nil?
 
           result['fields'] = type.fields.map do |field|
             map_field_properties(field.properties)
@@ -49,12 +51,12 @@ module Contentful
       def entries
         entries = {}
 
-        @client.entries.each do |entry|
-          result = { 'id' => entry.sys[:id] }
+        @client.entries(limit: 1000).each do |entry|
+          result = { 'sys' => { 'id' => entry.sys[:id] }, 'fields' => {} }
 
           entry.fields.each do |key, value|
             value = map_field(value)
-            result[key] = value unless value.nil?
+            result['fields'][key] = value unless value.nil?
           end
 
           ct_id = entry.content_type.sys[:id]
@@ -70,7 +72,7 @@ module Contentful
 
         if value.is_a?(Contentful::Asset) || value.is_a?(Contentful::Entry)
           return {
-            'link_type' => value.class.name.split('::').last,
+            'linkType' => value.class.name.split('::').last,
             'id' => value.sys[:id]
           }
         end
@@ -81,8 +83,6 @@ module Contentful
       end
 
       def map_field_properties(properties)
-        properties['link_type'] = properties.delete(:linkType) unless properties[:linkType].nil?
-
         items = properties[:items]
         properties[:items] = map_field_properties(items.properties) unless items.nil?
 

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

@@ -13,18 +13,16 @@ module Contentful
         end
 
         def run
-          begin
-            create_content_types
-            create_assets
-            create_entries
-          rescue Contentful::Management::Error => e
-            error = e.error
-            puts "Error at: #{error[:url]}"
-            puts "Message: #{error[:message]}"
-            puts "Details: #{error[:details]}"
-
-            raise e
-          end
+          create_content_types
+          create_assets
+          create_entries
+        rescue Contentful::Management::Error => e
+          error = e.error
+          puts "Error at: #{error[:url]}"
+          puts "Message: #{error[:message]}"
+          puts "Details: #{error[:details]}"
+
+          raise e
         end
 
         def content_types
@@ -66,12 +64,12 @@ module Contentful
               field.id = f['id']
               field.name = f['name']
               field.type = f['type']
-              field.link_type = f['link_type'] if link?(f)
+              field.link_type = f['linkType'] if link?(f)
 
               if array?(f)
                 array_field = Contentful::Management::Field.new
                 array_field.type = f['items']['type']
-                array_field.link_type = f['items']['link_type']
+                array_field.link_type = f['items']['linkType']
                 field.items = array_field
               end
 
@@ -85,7 +83,7 @@ module Contentful
         end
 
         def link?(field)
-          field.key?('link_type')
+          field.key?('linkType')
         end
 
         def array?(field)
@@ -117,13 +115,11 @@ module Contentful
 
         def create_entries
           content_types = []
-          entries.each do |content_type_id, entry_list|
+          processed_entries = entries.map do |content_type_id, entry_list|
             content_type = space.content_types.find(content_type_id)
             content_types << content_type
 
-            entry_list.each_with_index do |e, index|
-              puts "Creating Entry #{index} for #{content_type_id.capitalize}"
-
+            entry_list.each.map do |e|
               array_fields = []
               regular_fields = []
               e.each do |field_name, value|
@@ -147,17 +143,39 @@ module Contentful
               end
 
               regular_fields.each do |rf|
-                e[rf.to_sym] = e.delete(rf)
+                value = e.delete(rf)
+                if value.is_a? ::Contentful::Bootstrap::Templates::Links::Base
+                  value = value.to_management_object
+                end
+                e[rf.to_sym] = value
               end
 
-              entry = content_type.entries.create(e.clone)
+              entry = content_type.entries.create({:id => e[:id]})
               entry.save
+
+              e = e.clone
+              e[:id] = entry.id # in case no ID was specified in template
+              e
             end
-          end
+          end.flatten
 
-          content_types.each do |content_type|
-            content_type.entries.all.map(&:publish)
+          processed_entries = processed_entries.map do |e|
+            puts "Creating Entry #{e[:id]}"
+
+            entry = space.entries.find(e[:id])
+            e.delete(:id)
+            entry.update(e)
+            entry.save
+
+            10.times do
+              break if space.entries.find(entry.id).sys[:version] >= 4
+              sleep(1)
+            end
+
+            entry.id
           end
+
+          processed_entries.each { |e| space.entries.find(e).publish }
         end
       end
     end