contentful_bootstrap 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145e81e1443e293e56393c88c8609c4520abf6b5
-  data.tar.gz: 7ab10aa65b840cb8d00bd463e035ad8b0745484c
+  metadata.gz: 82634cc77febe8735ad7eaa0d876764cb6826df9
+  data.tar.gz: a6773a570d9487e7b0254d9d96026c5a9db2938c
 SHA512:
-  metadata.gz: 98bfc62b2a1eb07ab126fb1ab63bfdb7afdaf1d1315b95ec2e6b8b77a06ddfaba54bd99758cba01fc2ad09620fb0839c36bde47091946cbd3cd0d47de23ed544
-  data.tar.gz: 90ac5afb07bda160a8384a79d7a739bd9d775a1c7f90c16854d77c391b4b635c04ec12e57c92ceced10451715f2476b7b32568df106e1042091c71bfdd542105
+  metadata.gz: e621ae7ea0351fbea39c571193305bc053bcb19898bff47015775f2174389dc3f4e4e59546969fad7381df089d2cc7d8078e0fa2c80def6f9038c20c784246cc
+  data.tar.gz: bee10a5bbd3d2bb58200211e4761ee8c6e1344bc7f0d88ce8e48c1d14222bd9ee656d64300b07128234ea1e03b5aae664b4dee635db4796d0211d191ea1e6432

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.7
   - 2.2.3
   - 2.3.1
   - 2.4.0
-  - 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,13 @@
 
 ## Unreleased
 
+## v3.7.0
+### Fixed
+* Fixed `skip_content_types` option on `update_space` [#59](https://github.com/contentful/contentful-bootstrap.rb/pull/59)
+
+### Added
+* Added `--locale` option to `create_space` and `update_space` in order to create Spaces on a locale different to `en-US`
+
 ## v3.6.1
 
 ### Changed

data/README.md

@@ -26,7 +26,7 @@ $ gem install contentful_bootstrap
 You can create spaces by doing:
 
 ```bash
-$ contentful_bootstrap create_space <space_name> [--template template_name] [--json-template template_path] [--mark-processed] [--config CONFIG_PATH] [--quiet]
+$ contentful_bootstrap create_space <space_name> [--template template_name] [--json-template template_path] [--locale locale_code] [--mark-processed] [--config CONFIG_PATH] [--quiet]
 ```
 
 You can also generate new Delivery API Tokens by doing:
@@ -87,6 +87,7 @@ Additionally, you can send an options hash with the following keys:
 options = {
   template: "blog", # Will use one of the predefined templates and create Content Types, Assets and Entries
   json_template: "/path/to/template.json", # Will use the JSON file specified as a Template
+  locale: "es-AR", # Will create the space with the specified locale code as default locale, defaults to "en-US"
   mark_processed: false, # if true will mark all resources as 'bootstrapProcessed' and will be avoided for update_space calls (doesnt affect create_space)
   trigger_oauth: true, # if true will trigger OAuth process
   quiet: false, # if true will not output to STDOUT
@@ -100,6 +101,7 @@ To Update an existing Space
 ```ruby
 options = {
   json_template: "/path/to/template.json", # Will use the JSON file specified as a Template
+  locale: "es-AR", # Will create the space with the specified locale code as default locale, defaults to "en-US"
   mark_processed: false, # if true will mark all resources as 'bootstrapProcessed and will be avoided on future update_space calls
   trigger_oauth: true, # if true will trigger OAuth process
   skip_content_types: false, # if true will avoid creating the content types

data/bin/contentful_bootstrap

@@ -7,13 +7,16 @@ options = {}
 
 subcommands = {
   'create_space' => OptionParser.new do |opts|
-    opts.banner = "Usage: create_space <space_name> [--template TEMPLATE_NAME] [--json-template JSON_PATH] [--mark-processed] [--config CONFIG_PATH]"
+    opts.banner = "Usage: create_space <space_name> [--template TEMPLATE_NAME] [--json-template JSON_PATH] [--locale LOCALE] [--mark-processed] [--config CONFIG_PATH]"
     opts.on("-t TEMPLATE", "--template TEMPLATE", "Specify Template", "Available Templates: blog, catalogue, gallery") do |t|
       options[:template] = t
     end
     opts.on("-j JSON_PATH", "--json-template JSON_PATH", "Specify JSON Template Path") do |j|
       options[:json_template] = j
     end
+    opts.on("-l LOCALE", "--locale LOCALE", "Set the Default Locale for the Space", "Defaults to 'en-US'") do |l|
+      options[:locale] = l
+    end
     opts.on('-m', '--mark-processed', "Mark Processed Items on JSON Templates") do |m|
       options[:mark_processed] = m
     end
@@ -28,10 +31,13 @@ subcommands = {
     end
   end,
   'update_space' => OptionParser.new do |opts|
-    opts.banner = "Usage: update_space <space_id> --json-template JSON_PATH [--mark-processed] [--config CONFIG_PATH]"
+    opts.banner = "Usage: update_space <space_id> --json-template JSON_PATH [--locale LOCALE] [--mark-processed] [--config CONFIG_PATH]"
     opts.on("-j JSON_PATH", "--json-template JSON_PATH", "Specify JSON Template Path") do |j|
       options[:json_template] = j
     end
+    opts.on("-l LOCALE", "--locale LOCALE", "Set the Default Locale for the Space", "Defaults to 'en-US'") do |l|
+      options[:locale] = l
+    end
     opts.on('-m', '--mark-processed', "Mark Processed Items on JSON Templates") do |m|
       options[:mark_processed] = m
     end

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

@@ -37,6 +37,7 @@ module Contentful
         def management_client_init
           @client ||= ::Contentful::Management::Client.new(
             @token.read,
+            default_locale: options.fetch(:locale, "en-US"),
             raise_errors: true,
             integration_name: 'bootstrap',
             integration_version: ::Contentful::Bootstrap::VERSION

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

@@ -13,6 +13,7 @@ module Contentful
           @template_name = options.fetch(:template, nil)
           @json_template = options.fetch(:json_template, nil)
           @mark_processed = options.fetch(:mark_processed, false)
+          @locale = options.fetch(:locale, "en-US")
 
           super(token, space, options)
         end
@@ -45,7 +46,8 @@ module Contentful
           new_space = nil
           begin
             options = {
-              name: @space
+              name: @space,
+              defaultLocale: @locale
             }
             options[:organization_id] = @token.read_organization_id unless @token.read_organization_id.nil?
             management_client_init
@@ -61,6 +63,7 @@ module Contentful
               output 'Your Organization ID has been stored as the default organization.'
               new_space = client.spaces.create(
                 name: @space,
+                defaultLocale: @locale,
                 organization_id: organization_id
               )
             end

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

@@ -37,6 +37,7 @@ module Contentful
         protected
 
         def fetch_space
+          management_client_init
           client.spaces.find(@space)
         rescue Contentful::Management::NotFound
           output 'Space Not Found. Exiting!'
@@ -48,7 +49,7 @@ module Contentful
         def update_json_template(space)
           if ::File.exist?(@json_template)
             output "Updating from JSON Template '#{@json_template}'"
-            Templates::JsonTemplate.new(space, @json_template, @mark_processed, false, @skip_content_types).run
+            Templates::JsonTemplate.new(space, @json_template, @mark_processed, true, false, @skip_content_types).run
             output "JSON Template '#{@json_template}' updated!"
           else
             output "JSON Template '#{@json_template}' does not exist. Please check that you specified the correct file name."

data/lib/contentful/bootstrap/version.rb

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

data/spec/contentful/bootstrap/commands/base_spec.rb

@@ -46,6 +46,7 @@ describe Contentful::Bootstrap::Commands::Base do
       allow_any_instance_of(described_class).to receive(:configuration)
       expect(Contentful::Management::Client).to receive(:new).with(
         token.read,
+        default_locale: 'en-US',
         raise_errors: true,
         integration_name: 'bootstrap',
         integration_version: Contentful::Bootstrap::VERSION

data/spec/contentful/bootstrap/commands/create_space_spec.rb

@@ -59,6 +59,34 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
     end
   end
 
+  describe 'localization' do
+    it 'can create a space with a different locale' do
+      allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('y')
+      allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('n')
+
+      command = described_class.new(token, 'B.rb - locale creation', locale: 'es-AR')
+
+      vcr('space_with_different_locale') {
+        command.run
+      }
+
+      vcr('check_created_space') {
+        client = ::Contentful::Client.new(
+          space: 'vsy1ouf6jdcq',
+          access_token: '90e1b4964c3631cc9c751c42339814635623b001a53aec5aad23377299445433',
+          dynamic_entries: :auto,
+          raise_errors: true
+        )
+
+        space = client.space
+
+        expect(space.name).to eq("B.rb - locale creation")
+        expect(space.locales.first.code).to eq "es-AR"
+        expect(space.locales.first.default).to be_truthy
+      }
+    end
+  end
+
   describe 'issues' do
     it 'Importing asset array values does not work #22' do
       json_path = File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'issue_22.json'))
@@ -101,7 +129,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
         expect(subject.client).to receive(:spaces).and_call_original
         space_proxy_double = Object.new
         expect(subject.client).to receive(:spaces) { space_proxy_double }
-        expect(space_proxy_double).to receive(:create).with(name: 'foo', organization_id: 'foobar') { space_double }
+        expect(space_proxy_double).to receive(:create).with(name: 'foo', defaultLocale: 'en-US', organization_id: 'foobar') { space_double }
 
         subject.run
       }

data/spec/contentful/bootstrap/commands/update_space_spec.rb

@@ -52,12 +52,34 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
               expect(subject).to receive(:fetch_space) { space_double }
               expect(mock_template).to receive(:run)
 
-              expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', mark_processed, false, false) { mock_template }
+              expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', mark_processed, true, false, false) { mock_template }
 
               subject.run
             end
           end
         end
+
+        it 'can update localized spaces' do
+          vcr('update_space_localized') {
+            json_path = File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'update_space_localized.json'))
+            subject = described_class.new(token, 'vsy1ouf6jdcq', locale: 'es-AR', json_template: json_path, mark_processed: false, trigger_oauth: false, quiet: true)
+
+            subject.run
+          }
+
+          vcr('check_update_space_localized') {
+            client = Contentful::Client.new(
+              space: 'vsy1ouf6jdcq',
+              access_token: '90e1b4964c3631cc9c751c42339814635623b001a53aec5aad23377299445433',
+              dynamic_entries: :auto,
+              raise_errors: true
+            )
+
+            entries = client.entries(locale: 'es-AR')
+
+            expect(entries.map(&:text)).to eq ['Foo', 'Bar']
+          }
+        end
       end
 
       context 'with skip_content_types set to true' do
@@ -71,7 +93,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
           expect(subject).to receive(:fetch_space) { space_double }
           expect(mock_template).to receive(:run)
 
-          expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', false, false, true) { mock_template }
+          expect(::Contentful::Bootstrap::Templates::JsonTemplate).to receive(:new).with(space_double, 'bar', false, true, false, true) { mock_template }
 
           subject.run
         end

data/spec/fixtures/json_fixtures/update_space_localized.json

@@ -0,0 +1,40 @@
+{
+  "version": 3,
+  "contentTypes": [
+    {
+      "id": "test",
+      "name": "Test",
+      "displayField": "text",
+      "fields": [
+        {
+          "id": "text",
+          "name": "Text",
+          "type": "Symbol"
+        }
+      ]
+    }
+  ],
+  "assets": [
+
+  ],
+  "entries": {
+    "test": [
+      {
+        "sys": {
+          "id": "test_1"
+        },
+        "fields": {
+          "text": "Foo"
+        }
+      },
+      {
+        "sys": {
+          "id": "test_2"
+        },
+        "fields": {
+          "text": "Bar"
+        }
+      }
+    ]
+  }
+}

data/spec/fixtures/vcr_fixtures/check_created_space.yml

@@ -0,0 +1,177 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/vsy1ouf6jdcq/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.1.3; platform ruby/2.4.1; os macOS/16;
+      Authorization:
+      - Bearer 90e1b4964c3631cc9c751c42339814635623b001a53aec5aad23377299445433
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation,X-Contentful-User-Agent,X-Contentful-Enable-Experimental-Feature
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - '"c283f5e14b648b925eac46aa3ee07ca3"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - d1e40cd5d4cfb17b8122b3b8256bf31a
+      Content-Length:
+      - '98'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Fri, 18 Aug 2017 21:03:09 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-atl6236-ATL
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1503090189.214686,VS0,VE206
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 0,
+          "skip": 0,
+          "limit": 1000,
+          "items": []
+        }
+    http_version: 
+  recorded_at: Fri, 18 Aug 2017 21:03:09 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/vsy1ouf6jdcq
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      X-Contentful-User-Agent:
+      - sdk contentful.rb/2.1.3; platform ruby/2.4.1; os macOS/16;
+      Authorization:
+      - Bearer 90e1b4964c3631cc9c751c42339814635623b001a53aec5aad23377299445433
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+      User-Agent:
+      - http.rb/2.2.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation,X-Contentful-User-Agent,X-Contentful-Enable-Experimental-Feature
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - '"41e2e178aad9b651bb9c230458dacaa0"'
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 07c944a494b440cb72fbfc4a8aaee17b
+      Content-Length:
+      - '229'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Fri, 18 Aug 2017 21:03:10 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-atl6239-ATL
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1503090190.215703,VS0,VE174
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "type": "Space",
+            "id": "vsy1ouf6jdcq"
+          },
+          "name": "B.rb - locale creation",
+          "locales": [
+            {
+              "code": "es-AR",
+              "default": true,
+              "name": "es-AR",
+              "fallbackCode": null
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Fri, 18 Aug 2017 21:03:10 GMT
+recorded_with: VCR 2.9.3