contentful_middleman 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 696271c04cb1bd35a07944ca7cdef844a4a04db0
-  data.tar.gz: 0666f72f63064ae8103fd5a6b5493eb3a1a6a7e6
+  metadata.gz: 7a948ce797429e759a2b669c3974a3a87af9169b
+  data.tar.gz: 0a5097bf21e15a5b0cb6be5f955187d3cc3ce3e9
 SHA512:
-  metadata.gz: 6c713f9374a71c4e66b9f02e8b15dc8ea537cd6f40e492916420c9e9471d7a4c9012ab4f39229d826f63ce860b952eb5002910e080d8d679410d9bf65d946bbe
-  data.tar.gz: b9cc6c52393aa54f1f490c154c690bf0587ebd8ce5708b6099567b91ee39f9c400827997f10ff3bfc45d502f2633dcb76d36fc331141e7187ac30add760dd1cf
+  metadata.gz: fe41fcfdd319df04a02552e9aa31de29025d25560ca5f0770cdb63bb901bc2c04329b07c00745f5fcb0355a5573b4e65e146cdb7f5fb6e18fd0426283a91db10
+  data.tar.gz: f875e7042ef6d44ce1d8880983ff7357b2b55cec7431ba7112308b3e87923bdfd13fd09e7a51390cd82e03887088e65a66cd2db93579e979a1a844ff79596e45

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 ## Unreleased
 
+## 2.1.0
+
+### Added
+* Added User Agent Integration Headers
+
 ## 2.0.1
 ### Fixed
 * Fixed issue when generating file on entries with a field called `Content Type`

data/DEPLOYING.md

@@ -21,6 +21,24 @@
 
 ---
 
+# Netlify
+
+## Requirements for Build
+
+> Minimum requirements for a clean build of a Contentful Middleman app on Netlify
+
+Steps to solve:
+
+1. add `.*-space-hash` to .gitignore
+2. add `/data` to .gitignore
+3. add a .ruby-version file
+4. add a .nvmrc file
+5. Netlify Site > Settings > Deploy Settings > Build Command: `middleman contentful --rebuild && middleman build`
+
+> Contributed by @joshRpowell
+
+---
+
 # Placeholder Platform
 
 ## Placeholder Caveat

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", '~> 2.0', '>= 2.0.1')
+  s.add_dependency("contentful", '~> 2.1')
   s.add_dependency("contentful-webhook-listener", '~> 0.1')
 
   s.add_development_dependency 'rubygems-tasks', '~> 0.2'

data/lib/contentful_middleman/instance.rb

@@ -38,6 +38,10 @@ module ContentfulMiddleman
       @extension.options
     end
 
+    def client
+      @client ||= Contentful::Client.new(client_options)
+    end
+
     private
 
     def all_entries(cda_query)
@@ -56,17 +60,15 @@ module ContentfulMiddleman
       all
     end
 
-    def client
-      @client ||= Contentful::Client.new(client_options)
-    end
-
     def client_options
       client_options = {
           access_token:     options.access_token,
           space:            options.space.fetch(:id),
           dynamic_entries:  :auto,
           raise_errors:     true,
-          default_locale:   options.default_locale
+          default_locale:   options.default_locale,
+          integration_name: 'middleman',
+          integration_version: ContentfulMiddleman::VERSION
       }.merge(options.client_options)
 
       client_options[:api_url] = API_PREVIEW_URL if options.use_preview_api

data/lib/contentful_middleman/version.rb

@@ -1,3 +1,3 @@
 module ContentfulMiddleman
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/spec/contentful_middleman/instance_spec.rb

@@ -82,6 +82,16 @@ describe ContentfulMiddleman::Instance do
   end
 
   describe 'client options' do
+    it 'has proper headers' do
+      options = OptionsDouble.new(client_options: {max_include_resolution_depth: 1})
+      extension = ExtensionDouble.new(options)
+      subject = described_class.new(extension)
+
+      vcr('client') {
+        expect(subject.client.integration_info).to eq(name: 'middleman', version: ContentfulMiddleman::VERSION)
+      }
+    end
+
     it 'respects the client configuration' do
       options = OptionsDouble.new(client_options: {max_include_resolution_depth: 1})
       extension = ExtensionDouble.new(options)

data/spec/fixtures/vcr_fixtures/client.yml

@@ -0,0 +1,98 @@
+---
+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/2.0.3
+      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
+      Access-Control-Max-Age:
+      - '86400'
+      Cache-Control:
+      - max-age=0
+      Content-Encoding:
+      - gzip
+      Content-Type:
+      - application/vnd.contentful.delivery.v1+json
+      Etag:
+      - W/"544f2fc4143849532b1aaa2d94f16221"
+      Server:
+      - Contentful
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 901257998b2b070f76084465e0b52295
+      Content-Length:
+      - '866'
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Wed, 14 Jun 2017 21:25:57 GMT
+      Via:
+      - 1.1 varnish
+      Age:
+      - '0'
+      Connection:
+      - close
+      X-Served-By:
+      - cache-lax8645-LAX
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1497475558.544372,VS0,VE352
+      Vary:
+      - Accept-Encoding
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAAAAAAAAA+1YTVPbMBC98ytSnxuPZRuT+AahTDOlvSSndjgotgKayB+1
+        FUrK8N+7kmNHsh0mmBCmQC4grT727Vpvn3R/1OsZ+So3/N49/AsNvkoJtIzT
+        LMMrA/oePosxPOGYQb8rW/mCptCwZIPRiHJoIcsqOignkVjxl1yxWLe2jdwq
+        T3Eg9ipHFJ2KM6JDdpZOXdJ4YYhNNz/YPl5M105P5Iq1ATQUeII5ucNRyghO
+        qYBV/h6q/yXQ4mcUcxAfjmfBPBwtvMhyl+PJJMfjb8r6lWOjJOYk5tIPZZkg
+        I5iT8FSEx7At5PYtu2+jKXJ81/Ydx7Ss4U91wjINnzYhI7c0p0ks4r92v8Jh
+        hDRPGV5dUMJkDGIcbdwrWtA7onxV+WCEJA8ymvJizXjJWInHmIt1NokVodJS
+        VwRN20SMqTb6oW4vLWVep+SOa2kzWBJgRv8S4fccs5yoSTUy8ntJM2nk2VK3
+        AWg8Y1smJvCpQkLKRdty3wIpgNSSTHdQwhTRa7FVnyuAkIHUnD80tDXIK/l3
+        /XH8x4fyZhlhNaJPPYNO3/L69snUtn3X85FrIsd59AzChCGc2yk69pHl2545
+        QANtgnIGnY5n8KsG6uMQthxClZi081SexHOFubQBe2CZJgW9AM0wuiB5O8tc
+        Nk16oe7GMM+Dpe1ZFn01cwrDT1bRLGEaOLDeAsdDwQOKlGWloChBU0BUO3Iz
+        jfC1XvKrejNuml48aI1yVKs4T4lZm9qpR0xdT2qxjRg6zXPCt0idN1YTwuRa
+        VVFllndUZbWK4JjuUCf4uiqrKoLrO7aPkDlwTrZVBLtjRThXINXqgXGGs8Wn
+        jWR7t7rs7ZeEbuzWII7d5fQeK8IjXFSS+1vRpCDz98c/tjk4th9VpF4fIXmN
+        PPYt5LuOOfCsbfzjdeSfkQKpzj/fSfLHfH3+adTaA18LP/RapdF212tBwpJt
+        V+mmqazkLfLxUJy2ow6dkZxfZJTEYbuCPwN7r21A9VhQf9s6FED96qAIyC8x
+        z+QT4FqRbwa2XM9mNOM3ITwZtt7NzlqtJfRzePPS5+38RvK8erUjNkbn2y9m
+        YOoxMq+9X5XQxvBydF1/O9oPugb9dXvcYvR2OzgwvQ64Zl67oXsfAgq+46uj
+        h6N/7PsSCM4XAAA=
+    http_version: 
+  recorded_at: Wed, 14 Jun 2017 21:25:57 GMT
+recorded_with: VCR 3.0.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_middleman
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Sascha Konietzke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -31,20 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: contentful-webhook-listener
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +255,7 @@ 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/client.yml
 - spec/fixtures/vcr_fixtures/entries/localized_references.yml
 - spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml
 - spec/fixtures/vcr_fixtures/entries/nil_file.yml
@@ -326,6 +321,7 @@ 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/client.yml
 - spec/fixtures/vcr_fixtures/entries/localized_references.yml
 - spec/fixtures/vcr_fixtures/entries/localized_references_localized_assets.yml
 - spec/fixtures/vcr_fixtures/entries/nil_file.yml