contentful 2.15.3 → 2.15.4

data/lib/contentful/array_like.rb

@@ -37,8 +37,8 @@ module Contentful
     # Delegates to items#[]
     #
     # @return [Contentful::Entry, Contentful::Asset]
-    def [](index)
-      items[index]
+    def [](*args)
+      items[*args]
     end
 
     # Delegates to items#last

data/lib/contentful/asset.rb

@@ -93,6 +93,10 @@ module Contentful
     end
 
     def define_asset_methods!
+      define_singleton_method :title do
+        fields.fetch(:title, nil)
+      end
+
       define_singleton_method :description do
         fields.fetch(:description, nil)
       end

data/lib/contentful/base_resource.rb

@@ -36,7 +36,8 @@ module Contentful
       end
 
       {
-        configuration: @configuration.merge(entry_mapping: entry_mapping),
+        # loggers usually have a file handle that can't be marshalled, so let's not return that
+        configuration: @configuration.merge(entry_mapping: entry_mapping, logger: nil),
         raw: raw
       }
     end

data/lib/contentful/client.rb

@@ -30,7 +30,6 @@ module Contentful
       raw_mode: false,
       gzip_encoded: true,
       logger: false,
-      log_level: Logger::INFO,
       proxy_host: nil,
       proxy_username: nil,
       proxy_password: nil,
@@ -105,7 +104,7 @@ module Contentful
     # @private
     def setup_logger
       @logger = configuration[:logger]
-      logger.level = configuration[:log_level] if logger
+      logger.level = configuration[:log_level] if logger && configuration.key?(:log_level)
     end
 
     # @private

data/lib/contentful/version.rb

@@ -1,5 +1,5 @@
 # Contentful Namespace
 module Contentful
   # Gem Version
-  VERSION = '2.15.3'
+  VERSION = '2.15.4'
 end

data/spec/array_spec.rb

@@ -36,6 +36,16 @@ describe Contentful::Array do
     end
   end
 
+  describe '#[]' do
+    it 'provides access to items by index' do
+      expect(array[0]).to be_a Contentful::BaseResource
+    end
+
+    it 'provides access to items by two indices' do
+      expect(array[0, 4]).to eq array.items
+    end
+  end
+
   describe '#each' do
     it 'is an Enumerator' do
       expect(array.each).to be_a Enumerator

data/spec/client_configuration_spec.rb

@@ -48,6 +48,23 @@ describe 'Client Configuration Options' do
     end
   end
 
+  describe ':log_level' do
+
+    let(:logger) { Logger.new(STDOUT) }
+
+    it 'changes the level of the logger instance when given' do
+      expect do
+        create_client(logger: logger, log_level: ::Logger::WARN)
+      end.to change { logger.level }.from(::Logger::DEBUG).to(::Logger::WARN)
+    end
+
+    it 'does not change the level of the logger instance when not given' do
+      expect do
+        create_client(logger: logger)
+      end.not_to change { logger.level }
+    end
+  end
+
   describe ':dynamic_entries' do
     before :each do
       Contentful::ContentTypeCache.clear!

data/spec/entry_spec.rb

@@ -200,6 +200,16 @@ describe Contentful::Entry do
       }
     end
 
+    it 'marshals with a logger set but keeps the instance' do
+      logger = Logger.new(IO::NULL)
+      vcr('entry/marshall') {
+        nyancat = create_client(gzip_encoded: false, max_include_resolution_depth: 2, logger: logger).entries(include: 2, 'sys.id' => 'nyancat').first
+        expect(nyancat.instance_variable_get(:@configuration)[:logger]).to eq(logger)
+        test_dump(nyancat)
+        expect(nyancat.instance_variable_get(:@configuration)[:logger]).to eq(logger)
+      }
+    end
+
     it 'can remarshall an unmarshalled object' do
       vcr('entry/marshall') {
         nyancat = create_client(max_include_resolution_depth: 2).entries(include: 2, 'sys.id' => 'nyancat').first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.15.3
+  version: 2.15.4
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -252,6 +252,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -263,33 +264,40 @@ files:
 - RELEASE.md
 - Rakefile
 - contentful.gemspec
+- contentful.rb.sublime-project
+- contentful.rb.sublime-workspace
 - coverage/.last_run.json
 - coverage/.resultset.json
 - coverage/.resultset.json.lock
-- coverage/assets/0.10.2/application.css
-- coverage/assets/0.10.2/application.js
-- coverage/assets/0.10.2/colorbox/border.png
-- coverage/assets/0.10.2/colorbox/controls.png
-- coverage/assets/0.10.2/colorbox/loading.gif
-- coverage/assets/0.10.2/colorbox/loading_background.png
-- coverage/assets/0.10.2/favicon_green.png
-- coverage/assets/0.10.2/favicon_red.png
-- coverage/assets/0.10.2/favicon_yellow.png
-- coverage/assets/0.10.2/loading.gif
-- coverage/assets/0.10.2/magnify.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- coverage/assets/0.10.2/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- coverage/assets/0.10.2/smoothness/images/ui-icons_222222_256x240.png
-- coverage/assets/0.10.2/smoothness/images/ui-icons_2e83ff_256x240.png
-- coverage/assets/0.10.2/smoothness/images/ui-icons_454545_256x240.png
-- coverage/assets/0.10.2/smoothness/images/ui-icons_888888_256x240.png
-- coverage/assets/0.10.2/smoothness/images/ui-icons_cd0a0a_256x240.png
+- coverage/assets/0.12.2/DataTables-1.10.20/images/sort_asc.png
+- coverage/assets/0.12.2/DataTables-1.10.20/images/sort_asc_disabled.png
+- coverage/assets/0.12.2/DataTables-1.10.20/images/sort_both.png
+- coverage/assets/0.12.2/DataTables-1.10.20/images/sort_desc.png
+- coverage/assets/0.12.2/DataTables-1.10.20/images/sort_desc_disabled.png
+- coverage/assets/0.12.2/application.css
+- coverage/assets/0.12.2/application.js
+- coverage/assets/0.12.2/colorbox/border.png
+- coverage/assets/0.12.2/colorbox/controls.png
+- coverage/assets/0.12.2/colorbox/loading.gif
+- coverage/assets/0.12.2/colorbox/loading_background.png
+- coverage/assets/0.12.2/favicon_green.png
+- coverage/assets/0.12.2/favicon_red.png
+- coverage/assets/0.12.2/favicon_yellow.png
+- coverage/assets/0.12.2/images/ui-bg_flat_0_aaaaaa_40x100.png
+- coverage/assets/0.12.2/images/ui-bg_flat_75_ffffff_40x100.png
+- coverage/assets/0.12.2/images/ui-bg_glass_55_fbf9ee_1x400.png
+- coverage/assets/0.12.2/images/ui-bg_glass_65_ffffff_1x400.png
+- coverage/assets/0.12.2/images/ui-bg_glass_75_dadada_1x400.png
+- coverage/assets/0.12.2/images/ui-bg_glass_75_e6e6e6_1x400.png
+- coverage/assets/0.12.2/images/ui-bg_glass_95_fef1ec_1x400.png
+- coverage/assets/0.12.2/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- coverage/assets/0.12.2/images/ui-icons_222222_256x240.png
+- coverage/assets/0.12.2/images/ui-icons_2e83ff_256x240.png
+- coverage/assets/0.12.2/images/ui-icons_454545_256x240.png
+- coverage/assets/0.12.2/images/ui-icons_888888_256x240.png
+- coverage/assets/0.12.2/images/ui-icons_cd0a0a_256x240.png
+- coverage/assets/0.12.2/loading.gif
+- coverage/assets/0.12.2/magnify.png
 - coverage/index.html
 - doc/Contentful.html
 - doc/Contentful/AccessDenied.html
@@ -333,7 +341,6 @@ files:
 - doc/Contentful/ServiceUnavailable.html
 - doc/Contentful/Space.html
 - doc/Contentful/StringCoercion.html
-- doc/Contentful/StructuredTextCoercion.html
 - doc/Contentful/Support.html
 - doc/Contentful/SymbolCoercion.html
 - doc/Contentful/Sync.html
@@ -535,7 +542,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: contentful