contentful_middleman 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afab6f9f2082efc2316157faf338a513c2e6e6eb
-  data.tar.gz: 40656a4aec70d29441724ade7b93ef12b48b7f79
+  metadata.gz: 68a030c2034591f7185811846ef7291c2d4737f5
+  data.tar.gz: f7a6f9ac89751ed18e9eceea27685a2afc96afa2
 SHA512:
-  metadata.gz: 8cf2b26d03c3f463dce1bcb6ea57c5b8e0e76424752bfd00d0afdad350fc1ba9fadb70acfab4cf1d1eecad4ee6ea8e2473076eade4216431a3638a3a7b68c577
-  data.tar.gz: 60c4bc8fe795b67fdd33188c9de8349aa09ece3f8168a0fecea667283fb122bf368789e66812db330cc0c07eff5c57176fb9f0dd2b789d8b994009e8869984f7
+  metadata.gz: 3bc49305a332c10297de0d15b0b55ef5c9ef398c7f1ecb94fcc9772656dbe004b8063e6186d652a26272d370ed47bfc16b8648342386b1001c4b31f01363362d
+  data.tar.gz: 988f0484835b53d7373df49c55e69301f3f7aea24908e875a7117cdcf9fb78a7cf7345bbb8b037eb0c989885e9351cdb5660caa29bcfd72c6b6a09d9922052c7

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 ## Unreleased
 
+## 1.4.0
+
+### Added
+* Add asset's `:description` to asset mapping[#82](https://github.com/contentful/contentful_middleman/pull/82)
+* Add Page Size customization option when using `:all_entries`[#90](https://github.com/contentful/contentful_middleman/issues/90)
+
+### Fixed
+* Fixed error when asset's `:file` field is `nil`[#85](https://github.com/contentful/contentful_middleman/issues/85)
+
 ## 1.3.2
 ### Fixed
 * Fixed Entry ID fetch on import task when having an ID field in the Content Type[#77](https://github.com/contentful/contentful_middleman/issues/77)

data/README.md

@@ -49,17 +49,18 @@ activate :contentful do |f|
 end
 ```
 
-Parameter           | Description
-----------          | ------------
-space               | Hash with an user choosen name for the space as key and the space id as value
-access_token        | Contentful Delivery API access token
-cda_query           | Hash describing query configuration. See [contentful.rb](https://github.com/contentful/contentful.rb) for more info (look for filter options there). Note that by default only 100 entries will be fetched, this can be configured to up to 1000 entries using the `limit` option. Example: `f.cda_query = { limit: 1000 }`
-content_types       | Hash describing the mapping applied to entries of the imported content types
-use_preview_api     | Boolean to toggle the used API. Set it to `false` to use `cdn.contentful.com` (default value). Set it to `true` to use `preview.contentful.com`. More info in [the documentation](https://www.contentful.com/developers/documentation/content-delivery-api/#preview-api)
-all_entries         | Boolean to toggle multiple requests to the API for getting over 1000 entries. This uses a naive approach and can get rate limited. When using this, have in mind adding an `order` in your `:cda_query` . Default order is `order: 'sys.createdAt'`
-rebuild_on_webhook  | Boolean to toggle Webhook server. Server will run in port 5678, and will be expecting to receive Contentful Webhook calls on `/receive`
-webhook_timeout     | Integer (in seconds) for wait time after Webhook received for rebuilding. Only used if `:rebuild_on_webhook` is true. Defaults to 300 seconds
-webhook_controller  | Class for handling Webhook response, defaults to `::ContentfulMiddleman::WebhookHandler`
+Parameter             | Description
+----------            | ------------
+space                 | Hash with an user choosen name for the space as key and the space id as value
+access_token          | Contentful Delivery API access token
+cda_query             | Hash describing query configuration. See [contentful.rb](https://github.com/contentful/contentful.rb) for more info (look for filter options there). Note that by default only 100 entries will be fetched, this can be configured to up to 1000 entries using the `limit` option. Example: `f.cda_query = { limit: 1000 }`
+content_types         | Hash describing the mapping applied to entries of the imported content types
+use_preview_api       | Boolean to toggle the used API. Set it to `false` to use `cdn.contentful.com` (default value). Set it to `true` to use `preview.contentful.com`. More info in [the documentation](https://www.contentful.com/developers/documentation/content-delivery-api/#preview-api)
+all_entries           | Boolean to toggle multiple requests to the API for getting over 1000 entries. This uses a naive approach and can get rate limited. When using this, have in mind adding an `order` in your `:cda_query` . Default order is `order: 'sys.createdAt'`
+all_entries_page_size | Integer amount of items per page for `:all_entries` requests, allowing for smaller page sizes on content heavy requests.
+rebuild_on_webhook    | Boolean to toggle Webhook server. Server will run in port 5678, and will be expecting to receive Contentful Webhook calls on `/receive`
+webhook_timeout       | Integer (in seconds) for wait time after Webhook received for rebuilding. Only used if `:rebuild_on_webhook` is true. Defaults to 300 seconds
+webhook_controller    | Class for handling Webhook response, defaults to `::ContentfulMiddleman::WebhookHandler`
 
 You can activate the extension multiple times to import entries from different spaces.
 

data/contentful_middleman.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency("middleman-core", ["~> 3.4"])
 
   # Additional dependencies
-  s.add_dependency("contentful", '~> 0.8')
+  s.add_dependency("contentful", '~> 1.0')
   s.add_dependency("contentful-webhook-listener", '~> 0.1')
 
   s.add_development_dependency 'rubygems-tasks', '~> 0.2'
@@ -32,5 +32,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "vcr"
-  s.add_development_dependency "webmock"
+  s.add_development_dependency 'webmock', '~> 1', '>= 1.17.3'
+  s.add_development_dependency 'tins', '~> 1.6.0'
 end

data/lib/contentful_middleman/core.rb

@@ -34,6 +34,9 @@ module ContentfulMiddleman
     option :all_entries, false,
       'Allow multiple requests to the API for getting over 1000 entries'
 
+    option :all_entries_page_size, 1000,
+      'Size of each page when querying for all entries'
+
     option :rebuild_on_webhook, false,
       "Run `middleman contentful --rebuild` upon receiving a Webhook on http://0.0.0.0:5678/receive"
 

data/lib/contentful_middleman/instance.rb

@@ -46,9 +46,9 @@ module ContentfulMiddleman
       query[:order] = 'sys.createdAt' unless query.key?(:order)
       num_entries = client.entries(limit: 1).total
 
-      ((num_entries / 1000) + 1).times do |i|
-        query[:limit] = 1000
-        query[:skip] = i * 1000
+      ((num_entries / options.all_entries_page_size) + 1).times do |i|
+        query[:limit] = options.all_entries_page_size
+        query[:skip] = i * options.all_entries_page_size
         page = client.entries(query)
         page.each { |entry| all << entry }
       end

data/lib/contentful_middleman/mappers/base.rb

@@ -52,9 +52,10 @@ module ContentfulMiddleman
       end
 
       def map_asset(asset)
-        context       = Context.new
+        context = Context.new
         context.title = asset.title
-        context.url   = asset.file.url
+        context.description = asset.description
+        context.url = asset.file.url unless asset.file.nil?
 
         context
       end

data/lib/contentful_middleman/version.rb

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/spec/contentful_middleman/instance_spec.rb

@@ -11,8 +11,8 @@ class MapperDouble
 end
 
 describe ContentfulMiddleman::Instance do
-  let(:extension) { ExtensionDouble.new }
-  let(:options) { extension.options }
+  let(:options) { OptionsDouble.new }
+  let(:extension) { ExtensionDouble.new(options) }
   subject { described_class.new(extension) }
 
   describe 'instance methods' do
@@ -38,6 +38,18 @@ describe ContentfulMiddleman::Instance do
           subject.entries
         }
       end
+
+      it 'all_entries with a different page size' do
+        vcr('instance/entries_3') {
+          subject = described_class.new(ExtensionDouble.new(OptionsDouble.new(all_entries_page_size: 100, all_entries: true)))
+          client = subject.send(:client)
+
+          expect(client).to receive(:entries).with(limit: 1).and_call_original
+          expect(client).to receive(:entries).with(options.cda_query.merge(limit: 100, skip: 0, order: 'sys.createdAt')).and_call_original
+
+          subject.entries
+        }
+      end
     end
 
     it '#space_name' do

data/spec/contentful_middleman/mappers/base_spec.rb

@@ -40,6 +40,7 @@ describe ContentfulMiddleman::Mapper::Base do
           :name=>"Doge",
           :image=> {
             :title=>"Doge",
+            :description=>"nice picture",
             :url=> "//images.contentful.com/cfexampleapi/1x0xpXu4pSGS4OukSyWGUK/cc1239c6385428ef26f4180190532818/doge.jpg"
           },
           :description=>"such json\nwow"
@@ -94,5 +95,24 @@ describe ContentfulMiddleman::Mapper::Base do
       expect { subject.map(context, entry) }.not_to raise_error
       expect(context.hashize).to eq(id: 'foo')
     end
+
+    it 'should not fail on missing asset file - #85' do
+      vcr('entries/nil_file') {
+        context = ContentfulMiddleman::Context.new
+        client = Contentful::Client.new(
+          space: '7f19o1co4hn7',
+          access_token: '<ACCESS_TOKEN>',
+          api_url: 'preview.contentful.com',
+          dynamic_entries: :auto
+        )
+
+        entry_with_nil_file = client.entries('sys.id' => '6C4T3KAZUWaysA6ooQOWiE').first
+
+        expect(entry_with_nil_file.one_media.file).to be_nil
+
+        expect { subject.map(context, entry_with_nil_file) }.not_to raise_error
+        expect(context.hashize[:oneMedia].keys.map(&:to_s)).not_to include('url')
+      }
+    end
   end
 end

data/spec/fixtures/vcr_fixtures/entries/nil_file.yml

@@ -0,0 +1,160 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.9.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - preview.contentful.com
+  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
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Cache-Name:
+      - content_delivery
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - 7f19o1co4hn7
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Date:
+      - Tue, 19 Jul 2016 13:49:05 GMT
+      Etag:
+      - W/"fc29ab3a2f513fc6c7906826a270536c"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 1c1ffa9b68c2630a8e97c94b8ad3f1e4
+      Content-Length:
+      - '621'
+      Connection:
+      - Close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+1XS4+bMBC+51cgn5sISBoet6jaPXVVqUkvrXLwwkS1AoZi
+        70p0lf9eP2KwEdA9VKtqFQ4Jtscz/mbG3wwvC89DrGUo9V7EqxjwtgYxQrum
+        wS0Sc5cPUoZXHBdiPlQjdia1GPhqUJCScDEKfF9PEA6l1PhDadR6B2aUKVbj
+        TNoyEnrSOoycUJPmUJ8JPSNptH+EeXo+XA+9VxoHAiSXeKJTkFRBVm1+0kjC
+        Ms+le1dA9dMZ/FRRDpQr/dayViktQ35HedPaiw08E0Yqarx1VZk1gDnkO+kq
+        FPrBdulHyyA5BGH6MU6DzWqdJN9tPU91PrMh3Ky2sbuhqDJcqOABXX7bG5Qd
+        LpQTVhe4vSdQKJ9wwoW8wYUoLtVu6WXIPRcYyoFlDam5Rob6bSepro+3hOtE
+        VDvLtSWFOnsH5xhqyQR835aPVeFEFCmY5DdICCdcMLDjjRr49USaiUXhAPxY
+        TCxWIo1FgIzWsbwYwVVReICcYPeMxpVfKHgjy5P5/FbgHJfZN2jHGPD+flh3
+        YgR7iWk7gs6AfxDLc+g1xbhHeZvYOjYNXdkA/8I5zyIBxeUUV0Hl/XHAODMO
+        FXzaJ9b17aj+r65+v3QpeHSSKNcWuc4RZZT6ySqOt68jynUa+OkmXCVR7Gz4
+        V0R5Y0iZuF3qytcRlrgx5GR5uDGk7DTdkuMwZE8L44n1FU7QAB00fV1nIcvv
+        hMj/W4I1q7yy/ZAleAKhU4YnZNxu/x2UYquzH9KR5ir1vWC39eY7RS+bXyVm
+        mvuBUs/TFbvf0dd0OTfXDgyCO9MOCKPHxWXxB+T5B+KiDQAA
+    http_version: 
+  recorded_at: Tue, 19 Jul 2016 13:49:05 GMT
+- request:
+    method: get
+    uri: https://preview.contentful.com/spaces/7f19o1co4hn7/entries?sys.id=6C4T3KAZUWaysA6ooQOWiE
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/0.9.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - preview.contentful.com
+  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
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Cache-Name:
+      - content_delivery
+      Cf-Organization-Id:
+      - 4SsuxQCaMaemfIms52Jr8s
+      Cf-Space-Id:
+      - 7f19o1co4hn7
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Date:
+      - Tue, 19 Jul 2016 13:49:06 GMT
+      Etag:
+      - W/"eae0ff124df9052c96d03a5572af262c"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 2be7b37d89298c04da417517aa7deb52
+      Content-Length:
+      - '764'
+      Connection:
+      - Close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA91Wy3KbMBTd5ys8rBsPwhhi7yiTZOGmnsR2PU0nCwpyooIl
+        G5TMuBn/e/QALIgAp+MuWhY2EtLVfZxzj17Pej0j22XGuPfKXtmA7jaQjQwv
+        TYOdweb2n/gaSmiQsHkgRlmMNmxgikGC1ojyT6YcIwrX3OAPYVCarZ0iTso2
+        QciPKlbIScUXPiEmC5++IBwb/MzDw07H8Tz3eSYs1hagiIfjrsCIgJDYT9jl
+        URXPvnwXccqnPPAS03SnGDSkMce354OJd79YBrvMcwi5nS7RpbouJJhCTHPH
+        Thehr9jVxskOZR53BpjCF5QhgllqBkrcYQoDCiOPl9OwTOCcm+45GM3BYGyO
+        xsDpDx3nXo3zeRM1bWB7rGHfNi8qGxISBokAGMTni1nhaZl8Y4VgEh3wyAti
+        UETlnq8Ew96SpDHCj6obbPoGRig4KZq8LINUjyb788qf+ln8e2Zn/tTKHi++
+        b2/j7rSvA7wrHJX0kIBTAaKhSg2VGhoIGh6IoHOdLZHo7XaekV6LoAcFKizl
+        d3AFU4hPTOI65wQCpOfAs61vydPCnUCynPok3F5v48fj0q46+zdTr3P/AwE0
+        pj4viCwM/xXFMGCakvSYbisziAm9gxlJXoKfjFGajifsvWdlBGmAkjot87Zb
+        w2MrEotKTvDVBv66ekJLf3E9IzfBduKVBMqDlO41C8g/GFJZN4TD5DmCivBK
+        4BSyeRBObT/Qiqd2pWyg+krlfaVLQkv4NoloDbSqMDVKaRcnKkaa5fQUMTeL
+        aukkTxGMZImU1tgWuCKx4tJUPEaLyAIwtt2+5VY0kznRJrPW2AR9y6lvaRDa
+        /D6XV14jtuy0LrllSxoE9xTVaNUu0No3ZFQV7apkvkl+VbLlmVHvxIfa8eS0
+        UYl975bhElTHBFNFWHX0UKKqCFn+5zJtyEz+tx3lPVDaLzgVKPwJO82LsTno
+        m1adai3sHDBCD/suGKmXYI4S/TX4g+yk5V24CQlsfn+2P3sDzwDRnecNAAA=
+    http_version: 
+  recorded_at: Tue, 19 Jul 2016 13:49:06 GMT
+recorded_with: VCR 3.0.1

data/spec/fixtures/vcr_fixtures/instance/entries_3.yml

@@ -0,0 +1,334 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/content_types?limit=1000
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.0
+      Authorization:
+      - Bearer b4c0n73n7fu1
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+  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
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"350eabdacba992e492dc357c85bc5365"
+      Server:
+      - nginx
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 58b-1360343827
+      Content-Length:
+      - '897'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 07 Sep 2016 22:51:13 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '113'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7127-GRU
+      X-Cache:
+      - HIT
+      X-Cache-Hits:
+      - '1'
+      X-Timer:
+      - S1473288673.495879,VS0,VE0
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+1YS1PbMBC+8ytSnxuPZZuQ+AahTDOlvSSndjgotgKayI/a
+        CiVl+O+V5MiWbOWBYaCl+GRpJe1+q93VJ90f9XpWsS6soHfPflmDrjPEWtZp
+        nsO1xfoePvIxNKWQsH5ftIolzljDEQ2CY0xZCzhO2YEpivmKP8SK5boNNUJV
+        kcGQ65Ijyk7FGN4hOqVRlzhZWlxp/TH1yXK2MXoqVmwMwBHHEy7QHYwzgmCG
+        OSz5PVT/Amj5WZs5kCqLVVaM04SihAqlypwwR5Ci6JT7wnId4PWdQd89mblu
+        4A8C4NrDY/e7OmGVRdqEQd856QN3BvwADIJjxx6OHG1Cjm5xgdOE78PG1spo
+        K8JFRuD6AiMiACcwrs0rW6x3rECyIlSEOc5ouaT1FaW/7MpAa8FXqveRe0bb
+        qdJHmho+plL1TTVASOQ2ztCd6lgeQ2kICf6NuOU0XyF1C60c/Vzh3CxjqOGc
+        CNkCkkKfmLLAZDsiZaadNiAieIkKLYgqSJdtkZ4vmt0qqLZxCqq28DGwNJ0y
+        91Rciuen63iekmaG3DLfs1BkYSC2+2pfehicFqYkzc1OG7dF0mkGc7RQaDvm
+        2bx2YDDMUUEvcoySyAzujMl7pgFbS9ZLAdRDUSmSnxKai8pefkrZM+zrHOf0
+        JmIngbacSHpWTc6MUgn9nFU3fd4LZcSB2AhebE90JuoRtGjUKQltwk6Aa9QI
+        +OdB1yp/XavY7XZwTPQ64NoJ3Q0djuF1I7ZkTE7aor83F0+LAlElFzeRW1bg
+        TWb+wwQK0NFkHi6i8XIQO/5qMp0WcPJF5UByaw7kVH7fcfsumAEv8N3A82zH
+        Ge3kVHsnKJwKdOVUmNb1sUGqkhUhsnS+GqNqZ90LU6qQ0eVmtZT5OjbIqoRl
+        tFCw0268qlVKH0Or6kPkjSXlzSqGqkefeK/xbeB5O3OQXYRGLG9n4DgATuAO
+        7CEYbrvXeB1z8LMG6j0JDVROve0Z2dy5ch3UBsh03H1v21ll2sJuuVjbZUD4
+        fnOrihZ7tzmQBXejUuXzULeyvDMWWjW7QRA1lXtuu6bnouZdV11PPGbVr0kN
+        cqa59I2dCVF6/QRW1njp8mx/pBf45ktXdSL4gecGANhD72TbieB2PBHOFUjN
+        l64zmC8/VID/X1729o+EbtWtVThe/dFm90WRpcjV0cPRH4Dbx6LOFwAA
+    http_version: 
+  recorded_at: Wed, 07 Sep 2016 22:51:13 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?limit=1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.0
+      Authorization:
+      - Bearer b4c0n73n7fu1
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+  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
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - '"4963aeacd9e2ea8dbda07d7686f127a0"'
+      Server:
+      - nginx
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 4c3-1778517209
+      Content-Length:
+      - '827'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 07 Sep 2016 22:51:13 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7126-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1473288673.695781,VS0,VE163
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 10,
+          "skip": 0,
+          "limit": 1,
+          "items": [
+            {
+              "sys": {
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "cfexampleapi"
+                  }
+                },
+                "id": "5ETMRzkl9KM4omyMwKAOki",
+                "type": "Entry",
+                "createdAt": "2014-02-21T13:42:57.752Z",
+                "updatedAt": "2014-08-23T14:42:35.207Z",
+                "revision": 3,
+                "contentType": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "ContentType",
+                    "id": "1t9IbcfdCk6m04uISSsaIK"
+                  }
+                },
+                "locale": "en-US"
+              },
+              "fields": {
+                "name": "London",
+                "center": {
+                  "lon": -0.12548719999995228,
+                  "lat": 51.508515
+                }
+              }
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Wed, 07 Sep 2016 22:51:13 GMT
+- request:
+    method: get
+    uri: https://cdn.contentful.com/spaces/cfexampleapi/entries?limit=100&order=sys.createdAt&skip=0
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulGem/1.0.0
+      Authorization:
+      - Bearer b4c0n73n7fu1
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Accept-Encoding:
+      - gzip
+      Connection:
+      - close
+      Host:
+      - cdn.contentful.com
+  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
+      Access-Control-Allow-Methods:
+      - GET,HEAD,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      - Etag
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"b303c1577831b85822538c1896d73aab"
+      Server:
+      - nginx
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 58b-1360345546
+      Content-Length:
+      - '1958'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 07 Sep 2016 22:51:14 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-gru7126-GRU
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1473288674.033998,VS0,VE173
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+1aW3ObRhu+z69QuelFK7QnTrpTVMdxXdVNJddJ+nUyCFYS
+        FgICKLbSyX/vu4DwgtFhZKXxZ5fxeMRhYffd53nPf79otZRklSjd1t/wE07S
+        VcThTOnFsb1S4NqXH8UzaZjaPlzHKDtN5l4EZ/mJ7y28NLuXn3spX4g3/pm9
+        MX9v7TPZp5LIdsS31k/kF6XJiAvZxfWkfvGCuSImcHcoPlwbFZMeZm+sPeC5
+        Yj3OhN/ai8jnduSJZa2PL+XvbKH5oeRjgpUdOHYqvbCcyUmQxiv5hhNzO+Vu
+        TwhCIQjTNtLbxBgR0mV6F1uqhul7ecAycusDrDZiI2TB011qqYgYlQEx/+Ql
+        XhjABzRpqk4YpDxICxEcT5Z96b3NEgXJ7BSkHzq2nwGKB+3L4XpAKWtl4nHf
+        vcOfkL8S2ItsyK8g/1a/ugG+N+d34Cq2K7a9YBzeJJWth1cns7sZ/lWRmR/G
+        4gvFQHlfxjxJX8UeDwRsjifOOmCyheYwm9lRtBI42ynNsRenMxd4mWMMA14E
+        ZABjCMHfD9l/eTG+9ymTFqbUkOG9sKfHZV4vSbhMFGl5axY1r664mtOwgMX/
+        scoo91KS9lp71SGgbNcZBKnYwDt0BsZtbI6w1tXMLiIqwuYmnWE+D53xWpBp
+        L6XhzDj/PF7GUx7v0BJTYQol8f37KmI7h+SpVTQEom2M2sQcEbpTQ3wr9bBD
+        +z0x/TC148ziHcGnAP1gkl36AZnCCcFgF6wuMlSLWJv0A3ke+uG0YQMafQrf
+        TuxpYO9QDWFsB2BKNzAQWwb4dLpQ0dsYOMlsdLD0fek9a9NtPTEGTLwgOAb6
+        sco0tMM6IpC+NcLgf2tdhFVibfSo9ceA/tlyYQe7vcAH+dSvauJ3eeLEXpTm
+        gYXyituxz5OkZbufIKpYxjz+rvUTn4A7zONWOGlFIiQCF1ytupkNTnn5BolC
+        TwzL1yCJY2AZHDdL34FlTDJPj3ZBmRNdJZhs0uSPIjp0w+lXRvLPNeHXkPzS
+        hsi4hOuPrYU994LvW+PK5e/k3fP+zagog86zCIn08yC13721Xw9XZzfmQOch
+        0S/OD6QNxDtIFzkSpnWJoTJD20WbLEASSRXapYZqoo0B0qNwgL4+bX4Kq/5K
+        jTbJ0pm1rpMw+F9wE958M3rgW3QbvV2yaHg6ZBfL+XB1dXp5/jwIwwaXOKFR
+        mHqXJwNyysL5u4uPla3YO6MA6SHSJliYDQaJSA0CgO12ZucAKQuJH4PPhFPr
+        bOxM3P5cXyC2PBsOE/tsE1Bk9/ohicmXPIa0s0wOB5wlyCPUMoZ+lq3FVGWI
+        WRq18sOQDDQkAX3I/EFKl6gaQQjpWvFUaRvWGeqnkiLTTkaD3z/Pfet8wMLF
+        anBz3ruYewfZgypaNUM1tKpXVE+ywwAIiOkIM8EHqqkEbQwJ6LOF9y9h4AJy
+        5fVvgXcb8pREY6aBc+RqhEi5xjuAY1VDpoa1JwvsKce3r1ev6ZuLq6VzftXv
+        96Znpw/GNe0SCt7+9lBXJkLjgP/UNpRMfrNjT64RKdu0NlEpIJlgC5QyHNiQ
+        CiglqJmpmpquY/ZkQW18/OOl37+Ork5M/SLhIUPT3sm7I6CamirRqs54g7Zm
+        bayNkNmFEhcR5Y0qDSRUPwrv/Zs4I0Mokr6CNKTjJU64t9LGIE6GLYY1rQD4
+        nbov4Q0Bk2EwSBpvVNqA+6ywqniB4y8hlihdICUvCa7bAO4aAeBhueOgKOE2
+        NQM0PplVFrc0BIjJ72gJENPd2hQAXQ9yaF6RTD5yQ3xSebJspbhXG22o/MmB
+        LUYq7Ikc2MKM6+SA0s46I0SMLmaqhSuuDAyR6CHlN4WAmp3fotmj2JGGyryQ
+        vJfm9fxaHAm3apFk4Dm8FXmOSCJKsIQHJ172Crm4LhYYiwYTpdPJ8jCJWjQ2
+        TJY+/Fx05AaOTrP4O46DCbUcnZoaIyafEH3CsIlAh2uUmNjsQHjN1etoWplP
+        NvXU9vxqG8IamN5nMVmwBRaTXMLiblPOqLh147npTIw0876Y/PL6vzLj3nQm
+        PH9GNSShTTwgo6+yKeJmJr5fixaJTQuqdoUo2TQ71xHflJQrJlD2ZdztzRMg
+        a0NRXiB53em0Dz1FJYGIsEHTu5SpRK9z7T49iyFaF+MuYSrVK7U6mECz9YIb
+        x6BnUx38KNSjg/e/BdfvR2fJvHd2Nl8uw6SfJB1qEpuZ7sQmzhjrDjNs+GWQ
+        iTEmdDxBVme9CTcH8s+yqCWr14wKe9CPGPdYCwNL9lHLOJh8W5f0HwPzHcoM
+        ba1Q8mD27TaOJfvAc4RmOqZX8l5fm3212sRRiMdmfsrf9N4OTW+I3vUHl/qb
+        wdW0A7RzTQIhCJsgzDCyqM4cZ6I5poVd4rodIXs1Cg6weQQxM2vplI99OFd0
+        gtYGlpzDOj6Yc5tW00g3sWrZkSt/lzm19eqelL2737f6UMKxvQlXWsh7Q5pT
+        EEcydw2tosch3TTSU7t3c8X6i+F0ufhI+Pxy0bFcGzkuBq5B2mtsugahjHLT
+        0myEXB3jjpjPB+jp/EA0FN1+mMTgrx1GQgjU7luwfUgIX65zVzZ8cPtgEu67
+        ugNJmc3rL/j/5cWXF/8A5DPmDKMuAAA=
+    http_version: 
+  recorded_at: Wed, 07 Sep 2016 22:51:14 GMT
+recorded_with: VCR 3.0.3

data/spec/spec_helper.rb

@@ -47,19 +47,21 @@ class OptionsDouble
     content_types: {},
     use_preview_api: false,
     all_entries: false,
+    all_entries_page_size: 1000,
     rebuild_on_webhook: false,
     webhook_timeout: 300,
     webhook_controller: ::ContentfulMiddleman::WebhookHandler
   }
 
-  def initialize(options = DEFAULT_OPTIONS)
+  def initialize(options = {})
+    options = DEFAULT_OPTIONS.merge(options)
     options.each do |field, value|
       define_singleton_method(field.to_sym) do
         value
       end
 
-      define_singleton_method("#{field}=".to_sym) do |value|
-        options[field] = value
+      define_singleton_method("#{field}=".to_sym) do |v|
+        options[field] = v
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: contentful-webhook-listener
   requirement: !ruby/object:Gem::Requirement
@@ -155,16 +155,36 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.17.3
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 description: Load blog posts and other managed content into Middleman
 email:
 - sascha@contentful.com
@@ -219,9 +239,11 @@ files:
 - spec/fixtures/space_hash_fixtures/.foo-space-hash
 - spec/fixtures/space_hash_fixtures/.foobar-space-hash
 - spec/fixtures/space_hash_fixtures/.my_space-space-hash
+- spec/fixtures/vcr_fixtures/entries/nil_file.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml
 - spec/fixtures/vcr_fixtures/instance/entries_1.yml
 - spec/fixtures/vcr_fixtures/instance/entries_2.yml
+- spec/fixtures/vcr_fixtures/instance/entries_3.yml
 - spec/fixtures/vcr_fixtures/mappers/entries.yml
 - spec/fixtures/vcr_fixtures/mappers/entries_localized.yml
 - spec/fixtures/vcr_fixtures/tools/preview_helper.yml
@@ -254,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Include mangablable content from the Contentful CMS and API into your Middleman
@@ -278,9 +300,11 @@ test_files:
 - spec/fixtures/space_hash_fixtures/.foo-space-hash
 - spec/fixtures/space_hash_fixtures/.foobar-space-hash
 - spec/fixtures/space_hash_fixtures/.my_space-space-hash
+- spec/fixtures/vcr_fixtures/entries/nil_file.yml
 - spec/fixtures/vcr_fixtures/helpers/preview.yml
 - spec/fixtures/vcr_fixtures/instance/entries_1.yml
 - spec/fixtures/vcr_fixtures/instance/entries_2.yml
+- spec/fixtures/vcr_fixtures/instance/entries_3.yml
 - spec/fixtures/vcr_fixtures/mappers/entries.yml
 - spec/fixtures/vcr_fixtures/mappers/entries_localized.yml
 - spec/fixtures/vcr_fixtures/tools/preview_helper.yml