contentful_bootstrap 3.4.0 → 3.5.0

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Contentful::Bootstrap::Commands::CreateSpace do
   let(:path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'contentfulrc.ini')) }
   let(:token) { Contentful::Bootstrap::Token.new path }
-  subject { Contentful::Bootstrap::Commands::CreateSpace.new token, 'foo', 'bar', 'baz', false, false }
+  subject { described_class.new token, 'foo', template: 'bar', json_template: 'baz', trigger_oauth: false, quiet: true }
   let(:space_double) { SpaceDouble.new }
 
   before do
@@ -22,7 +22,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
       end
 
       it 'does not create template when template_name is nil' do
-        create_space_command = described_class.new(token, 'foo', nil, 'baz', false, false)
+        create_space_command = described_class.new(token, 'foo', json_template: 'baz', trigger_oauth: false, quiet: true)
 
         expect(create_space_command.template_name).to eq nil
 
@@ -35,7 +35,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
       end
 
       it 'does not create json template when json_template is nil' do
-        create_space_command = described_class.new(token, 'foo', 'bar', nil, false, false)
+        create_space_command = described_class.new(token, 'foo', template: 'bar', trigger_oauth: false, quiet: true)
 
         expect(create_space_command.json_template).to eq nil
 
@@ -63,10 +63,10 @@ describe Contentful::Bootstrap::Commands::CreateSpace 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'))
 
-      allow_any_instance_of(described_class).to receive(:gets).and_return('y')
-      allow_any_instance_of(Contentful::Bootstrap::Commands::GenerateToken).to receive(:gets).and_return('n')
+      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, 'issue_22', nil, json_path, false)
+      command = described_class.new(token, 'issue_22', json_template: json_path, quiet: true)
 
       vcr('issue_22') {
         command.run
@@ -76,10 +76,10 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
     it 'assets can be created with any content type #39' do
       json_path = File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'asset_no_transform.json'))
 
-      allow_any_instance_of(described_class).to receive(:gets).and_return('y')
-      allow_any_instance_of(Contentful::Bootstrap::Commands::GenerateToken).to receive(:gets).and_return('n')
+      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, 'asset_no_transform', nil, json_path, false)
+      command = described_class.new(token, 'asset_no_transform', json_template: json_path, mark_processed: false, quiet: true)
 
       vcr('asset_no_transform') {
         command.run
@@ -89,12 +89,12 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
 
   describe 'integration' do
     before do
-      allow_any_instance_of(described_class).to receive(:gets).and_return('y')
-      allow_any_instance_of(Contentful::Bootstrap::Commands::GenerateToken).to receive(:gets).and_return('n')
+      allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('y')
+      allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('n')
     end
 
     it 'create space' do
-      command = described_class.new token, 'some_space'
+      command = described_class.new token, 'some_space', quiet: true
 
       vcr('create_space') {
         command.run
@@ -102,7 +102,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
     end
 
     it 'create space with blog template' do
-      command = described_class.new token, 'blog_space', 'blog'
+      command = described_class.new token, 'blog_space', template: 'blog', quiet: true
 
       vcr('create_space_with_blog_template') {
         command.run
@@ -110,7 +110,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
     end
 
     it 'create space with gallery template' do
-      command = described_class.new token, 'gallery_space', 'gallery'
+      command = described_class.new token, 'gallery_space', template: 'gallery', quiet: true
 
       vcr('create_space_with_gallery_template') {
         command.run
@@ -118,7 +118,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
     end
 
     it 'create space with catalogue template' do
-      command = described_class.new token, 'catalogue_space', 'catalogue'
+      command = described_class.new token, 'catalogue_space', template: 'catalogue', quiet: true
 
       vcr('create_space_with_catalogue_template') {
         command.run
@@ -131,7 +131,7 @@ describe Contentful::Bootstrap::Commands::CreateSpace do
 
     it 'create space with json template with no ids' do
       json_path = File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'no_ids.json'))
-      command = described_class.new token, 'no_ids_space', nil, json_path
+      command = described_class.new token, 'no_ids_space', json_template: json_path, quiet: true
 
       vcr('no_ids') {
         command.run

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

@@ -18,7 +18,7 @@ end
 describe Contentful::Bootstrap::Commands::GenerateToken do
   let(:path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'contentfulrc.ini')) }
   let(:token) { Contentful::Bootstrap::Token.new path }
-  subject { Contentful::Bootstrap::Commands::GenerateToken.new token, 'foo', 'bar', false }
+  subject { described_class.new token, 'foo', token_name: 'bar', trigger_oauth: false, quiet: true }
   let(:space_double) { SpaceDouble.new }
 
   describe 'instance methods' do
@@ -28,45 +28,42 @@ describe Contentful::Bootstrap::Commands::GenerateToken do
 
     describe '#run' do
       it 'fetches space from api if space is a string' do
-        allow(subject).to receive(:gets) { 'n' }
-        allow_any_instance_of(Contentful::Management::Request).to receive(:post) { ResponseDouble.new }
-        expect(Contentful::Management::Space).to receive(:find).with('foo') { space_double }
+        allow(Contentful::Bootstrap::Support).to receive(:gets) { 'n' }
+        expect_any_instance_of(Contentful::Management::ClientSpaceMethodsFactory).to receive(:find).with('foo') { space_double }
 
         subject.run
       end
 
       it 'uses space if space is not a string' do
-        allow(subject).to receive(:gets) { 'n' }
-        allow_any_instance_of(Contentful::Management::Request).to receive(:post) { ResponseDouble.new }
-        expect(Contentful::Management::Space).not_to receive(:find).with('foo') { space_double }
-
-        subject.instance_variable_set(:@actual_space, space_double)
+        allow(Contentful::Bootstrap::Support).to receive(:gets) { 'n' }
+        expect_any_instance_of(Contentful::Management::ClientSpaceMethodsFactory).not_to receive(:find).with('foo') { space_double }
+        subject.instance_variable_set(:@space, space_double)
 
         subject.run
       end
 
       it 'returns access token' do
-        allow(subject).to receive(:gets) { 'n' }
-        allow_any_instance_of(Contentful::Management::Request).to receive(:post) { ResponseDouble.new }
-        allow(Contentful::Management::Space).to receive(:find).with('foo') { space_double }
+        allow(Contentful::Bootstrap::Support).to receive(:gets) { 'n' }
+        allow_any_instance_of(Contentful::Management::ClientSpaceMethodsFactory).to receive(:find).with('foo') { space_double }
+        expect(space_double).to receive(:api_keys).and_call_original
 
-        expect(subject.run).to eq 'foo'
+        expect(subject.run).to eq 'random_api_key'
       end
 
       it 'fails if API returns an error' do
-        allow(subject).to receive(:gets) { 'n' }
-        allow_any_instance_of(Contentful::Management::Request).to receive(:post) { ErrorDouble.new }
-        allow(Contentful::Management::Space).to receive(:find).with('foo') { space_double }
+        allow(Contentful::Bootstrap::Support).to receive(:gets) { 'n' }
+        allow_any_instance_of(Contentful::Management::ClientSpaceMethodsFactory).to receive(:find).with('foo') { space_double }
+        expect(space_double).to receive(:api_keys).and_raise(ErrorDouble.new)
 
         expect { subject.run }.to raise_error ErrorDouble
       end
 
       it 'token gets written if user input is other than no' do
-        allow(subject).to receive(:gets) { 'y' }
-        allow_any_instance_of(Contentful::Management::Request).to receive(:post) { ResponseDouble.new }
-        allow(Contentful::Management::Space).to receive(:find).with('foo') { space_double }
+        allow(Contentful::Bootstrap::Support).to receive(:gets) { 'y' }
+        allow_any_instance_of(Contentful::Management::ClientSpaceMethodsFactory).to receive(:find).with('foo') { space_double }
+        expect(space_double).to receive(:api_keys).and_call_original
 
-        expect(token).to receive(:write_access_token).with('foobar', 'foo')
+        expect(token).to receive(:write_access_token).with('foobar', 'random_api_key')
         expect(token).to receive(:write_space_id).with('foobar', 'foobar')
 
         subject.run
@@ -82,11 +79,11 @@ describe Contentful::Bootstrap::Commands::GenerateToken do
 
   describe 'integration' do
     before do
-      allow_any_instance_of(subject.class).to receive(:gets).and_return('n')
+      allow(Contentful::Bootstrap::Support).to receive(:gets).and_return('n')
     end
 
     it 'generates a token for a given space' do
-      command = subject.class.new token, 'zred3m25k5em', 'foo'
+      command = described_class.new token, 'zred3m25k5em', token_name: 'foo', quiet: true
 
       vcr('generate_token') {
         command.run

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Contentful::Bootstrap::Commands::UpdateSpace do
   let(:path) { File.expand_path(File.join('spec', 'fixtures', 'ini_fixtures', 'contentfulrc.ini')) }
   let(:token) { Contentful::Bootstrap::Token.new path }
-  subject { Contentful::Bootstrap::Commands::UpdateSpace.new token, 'foo', 'bar', false, false }
+  subject { described_class.new token, 'foo', json_template: 'bar', mark_processed: false, trigger_oauth: false, quiet: true }
   let(:space_double) { SpaceDouble.new }
 
   before do
@@ -20,15 +20,15 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
       end
 
       it 'exits if JSON not sent' do
-        update_space_command = described_class.new(token, 'foo', nil, false)
+        update_space_command = described_class.new(token, 'foo', mark_processed: false, quiet: true)
 
         expect { update_space_command.run }.to raise_error SystemExit
       end
 
       it 'exits if space is not found' do
-        update_space_command = described_class.new(token, 'foo', 'bar', false)
+        update_space_command = described_class.new(token, 'foo', json_template: 'bar', quiet: true)
 
-        expect(::Contentful::Management::Space).to receive(:find).with('foo').and_raise(::Contentful::Management::NotFound.new(ErrorRequestDouble.new))
+        expect_any_instance_of(::Contentful::Management::ClientSpaceMethodsFactory).to receive(:find).with('foo').and_raise(::Contentful::Management::NotFound.new(ErrorRequestDouble.new))
 
         expect { update_space_command.run }.to raise_error SystemExit
       end
@@ -42,7 +42,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
       describe 'runs JSON Template without already processed elements' do
         [true, false].each do |mark_processed|
           context "mark_processed is #{mark_processed}" do
-            subject { described_class.new token, 'foo', 'bar', mark_processed, false }
+            subject { described_class.new token, 'foo', json_template: 'bar', mark_processed: mark_processed, trigger_oauth: false, quiet: true}
 
             it "calls JsonTemplate with mark_processed as #{mark_processed}" do
               allow(::File).to receive(:exist?) { true }
@@ -61,7 +61,7 @@ describe Contentful::Bootstrap::Commands::UpdateSpace do
       end
 
       context 'with skip_content_types set to true' do
-        subject { described_class.new token, 'foo', 'bar', false, false, true }
+        subject { described_class.new token, 'foo', json_template: 'bar', trigger_oauth: false, skip_content_types: true, quiet: true }
 
         it 'calls JsonTemplate with skip_content_types' do
           allow(::File).to receive(:exist?) { true }

data/spec/contentful/bootstrap/support_spec.rb

@@ -1,14 +1,12 @@
 require 'spec_helper'
 
 class Double
-  include Contentful::Bootstrap::Support
-
   def write
     $stderr.write('foo\n')
   end
 
   def muted_write
-    silence_stderr do
+    Contentful::Bootstrap::Support.silence_stderr do
       write
     end
   end

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Contentful::Bootstrap::Templates::Base do
   let(:space) { Contentful::Management::Space.new }
-  subject { described_class.new(space) }
+  subject { described_class.new(space, true) }
 
   describe 'instance methods' do
     it '#content_types' do
@@ -33,7 +33,7 @@ describe Contentful::Bootstrap::Templates::Base do
       end
 
       context 'with skip_content_types set to true' do
-        subject { described_class.new(space, true) }
+        subject { described_class.new(space, true, true) }
 
         it 'doesnt call create_content_type if skip_content_types is sent' do
           expect(subject).to receive(:create_entries)

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Contentful::Bootstrap::Templates::JsonTemplate do
   let(:space) { Contentful::Management::Space.new }
   let(:path) { json_path('simple') }
-  subject { described_class.new space, path }
+  subject { described_class.new space, path, false, true, true }
 
   before do
     allow(::File).to receive(:write)
@@ -35,7 +35,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
       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')))
+        subject = described_class.new(space, File.expand_path(File.join('spec', 'fixtures', 'json_fixtures', 'display_field.json')), false, true, true)
 
         expect(subject.content_types.first['displayField']).to eq 'name'
       end
@@ -91,6 +91,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
 
   describe 'issues' do
     let(:link_entry_path) { json_path('links') }
+    let(:object_entry_path) { json_path('object') }
 
     it 'links are not properly getting processed - #33' do
       subject = described_class.new space, link_entry_path
@@ -102,6 +103,20 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
         }
       )
     end
+
+    it 'allows templates with object fields to work - #51' do
+      subject = described_class.new space, object_entry_path
+      expect(subject.entries['test'].first).to eq(
+        {
+          "id" => "foo",
+          "name" => "test",
+          "object" => {
+            "foo" => "bar",
+            "baz" => "qux"
+          }
+        }
+      )
+    end
   end
 
   describe 'bootstrap processed' do
@@ -171,7 +186,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
 
   describe 'skip_content_types' do
     context 'with skip_content_types set to true' do
-      subject { described_class.new(space, path, false, false, true) }
+      subject { described_class.new(space, path, false, false, true, true) }
 
       it 'skips content type creation' do
         ['assets', 'entries'].each do |n|
@@ -187,7 +202,7 @@ describe Contentful::Bootstrap::Templates::JsonTemplate do
     end
 
     context 'with skip_content_types set to false' do
-      subject { described_class.new(space, path, false, false, false) }
+      subject { described_class.new(space, path, false, false, true, false) }
 
       it 'doesnt skip content type creation' do
         ['assets', 'entries', 'content_types'].each do |n|

data/spec/fixtures/json_fixtures/object.json

@@ -0,0 +1,38 @@
+{
+  "version": 3,
+  "contentTypes": [
+    {
+      "id": "test",
+      "name": "Test",
+      "displayField": "name",
+      "fields": [
+        {
+          "id": "name",
+          "name": "Name",
+          "type": "Symbol"
+        },
+        {
+          "id": "object",
+          "name": "Object",
+          "type": "Object"
+        }
+      ]
+    }
+  ],
+  "assets": [],
+  "entries": {
+    "test": [
+      {
+        "sys": { "id": "foo" },
+        "fields": {
+          "name": "test",
+          "object": {
+            "foo": "bar",
+            "baz": "qux"
+          }
+        }
+      }
+    ]
+  }
+}
+

data/spec/spec_helper.rb

@@ -36,6 +36,22 @@ def ini(ini_file)
   file
 end
 
+class ApiKeyDouble
+  attr_reader :name, :description, :access_token
+
+  def initialize(name, description)
+    @name = name
+    @description = description
+    @access_token = 'random_api_key'
+  end
+end
+
+class ApiKeysHandlerDouble
+  def create(options)
+    ApiKeyDouble.new(options[:name], options[:description])
+  end
+end
+
 class SpaceDouble
   def id
     'foobar'
@@ -44,6 +60,10 @@ class SpaceDouble
   def name
     'foobar'
   end
+
+  def api_keys
+    ApiKeysHandlerDouble.new
+  end
 end
 
 class ServerDouble

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful_bootstrap
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - David Litvak Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,28 +170,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: contentful
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +291,7 @@ files:
 - spec/fixtures/json_fixtures/links.json
 - spec/fixtures/json_fixtures/low.json
 - spec/fixtures/json_fixtures/no_ids.json
+- spec/fixtures/json_fixtures/object.json
 - spec/fixtures/json_fixtures/ok_version.json
 - spec/fixtures/json_fixtures/processed.json
 - spec/fixtures/json_fixtures/simple.json
@@ -321,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Contentful CLI tool for getting started with Contentful
@@ -358,6 +365,7 @@ test_files:
 - spec/fixtures/json_fixtures/links.json
 - spec/fixtures/json_fixtures/low.json
 - spec/fixtures/json_fixtures/no_ids.json
+- spec/fixtures/json_fixtures/object.json
 - spec/fixtures/json_fixtures/ok_version.json
 - spec/fixtures/json_fixtures/processed.json
 - spec/fixtures/json_fixtures/simple.json