contentful-management 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9540f9f6f76faa7bc81ffc078b274f6ad41c9f
-  data.tar.gz: 627329c7f26dcb8f7866def702f06d0c44721777
+  metadata.gz: 1844d46d629774fbe7c768093c7231e16398315a
+  data.tar.gz: a0d6f81a64b1476ded7a6b7b84733da67587f6f0
 SHA512:
-  metadata.gz: 8d249c4f1a49c297c970a712c9e7a934b52928e839b2d7fa63e451c714ed7e002e26799eb8aa3550dd1cce1ab3d88537ebd6a30455c996bff32fd306fb6e0f13
-  data.tar.gz: e6e6a254e522a42befd514c7877db377c4f0c32abca8760fc8fb2f291afc155a815fca42057fb77e89a490269ce6251a5f95d1c6e51eb6832ae9ee1a2166f794
+  metadata.gz: 476e62803a1c5c19e19eec87a980cd7e31ea195b432a4e8c2c36bb403cb978632bb8d20fc4e231888456570b76677ab46af1c35792b668cc74040c49208cdb8a
+  data.tar.gz: 4c5c1d5f4f053284c28c250da4fe08dd3ee6d03665380007df353d90c64c641ea0e2afc4b19478952fa38153b41ecff81059360efa04333b3029864c862d7ed5

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Master
 
+## 1.2.0
+### Added
+* Add support for `::Contentful::Entry` and `::Contentful::Asset` serialization when using the CDA SDK along side this client [#105](https://github.com/contentful/contentful-management.rb/pull/105)
+* Add `:optional` property to Locale
+
 ## 1.1.0
 ### Added
 * Add Roles and Permissions Support

data/contentful-management.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'http', '~> 0.8'
+  spec.add_dependency 'http', '~> 1.0'
   spec.add_dependency 'multi_json', '~> 1'
+  spec.add_dependency 'json', '~> 1.8'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/lib/contentful/management/entry.rb

@@ -194,14 +194,17 @@ module Contentful
 
       def self.parse_objects_array(attributes)
         attributes.each_with_object([]) do |attr, arr|
-          arr << case attr
-                 when Entry then
-                   hash_with_link_object('Entry', attr)
-                 when Asset then
-                   hash_with_link_object('Asset', attr)
-                 when Hash then
-                   attr
-                 end
+          if attr.is_a? Entry
+            arr << hash_with_link_object('Entry', attr)
+          elsif attr.is_a? Asset
+            arr << hash_with_link_object('Asset', attr)
+          elsif attr.is_a? Hash
+            arr << attr
+          elsif attr.class.ancestors.map(&:to_s).include?('Contentful::Entry')
+            arr << hash_with_link_object('Entry', attr)
+          elsif attr.class.ancestors.map(&:to_s).include?('Contentful::Asset')
+            arr << hash_with_link_object('Asset', attr)
+          end
         end
       end
 

data/lib/contentful/management/locale.rb

@@ -14,12 +14,15 @@ module Contentful
       property :contentDeliveryApi, :boolean
       property :publish, :boolean
       property :default, :boolean
+      property :optional, :boolean
 
       # @private
       def self.create_attributes(_client, attributes)
         {
           'name' => attributes.fetch(:name),
-          'code' => attributes.fetch(:code)
+          'code' => attributes.fetch(:code),
+          'default' => attributes.fetch(:default, false),
+          'optional' => attributes.fetch(:default, false)
         }
       end
 

data/lib/contentful/management/response.rb

@@ -63,7 +63,7 @@ module Contentful
 
       def service_unavailable_error
         @status = :error
-        @error_message = 'Service Unavailable, contenful.com API seems to be down'
+        @error_message = 'Service Unavailable, contentful.com API seems to be down'
         @object = Error[@raw.status].new(self)
       end
 

data/lib/contentful/management/version.rb

@@ -3,6 +3,6 @@ module Contentful
   # Management Namespace
   module Management
     # Gem Version
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/spec/fixtures/vcr_cassettes/locale/find_not_optional.yml

@@ -0,0 +1,116 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/n5kqlvx9cnp1/locales/56eOu5hJwVNb4XfqsnQV97
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/1.1.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Connection:
+      - close
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Accept-Ranges:
+      - bytes
+      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:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Wed, 27 Jul 2016 00:44:26 GMT
+      Etag:
+      - '"55cd85af5d4a6ec286c5fd8fcf418afe"'
+      Server:
+      - Contentful
+      Status:
+      - 200 OK
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 086fc258eb4a537487280b96617b5e63
+      Content-Length:
+      - '754'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_297_673446=Cfo7V1j0LSOHXEjVMCgfBOoDmFcAAAAArdX1Odg7P2/opp7MwEhlzA==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=axG2W5jXn1uXFbEA6lKYhQAAAACuJE1202IvmVx+m3GGQPBL; path=/; Domain=.contentful.com
+      - visid_incap_673446=TObhmbwsTT+o3L0XHRV2+OoDmFcAAAAAQUIPAAAAAADJudOA9eqqUlc43jLa7/NS;
+        expires=Wed, 26 Jul 2017 06:56:27 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 3-184110786-184110796 NNNN CT(136 136 0) RT(1469580265521 100) q(0 0 2 -1)
+        r(5 5) U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: UTF-8
+      string: |+
+        {
+          "name":"U.S. English",
+          "internal_code":"en-US",
+          "code":"en-US",
+          "fallbackCode":null,
+          "default":true,
+          "contentManagementApi":true,
+          "contentDeliveryApi":true,
+          "optional":false,
+          "sys":{
+            "type":"Locale",
+            "id":"56eOu5hJwVNb4XfqsnQV97",
+            "version":0,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"n5kqlvx9cnp1"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "createdAt":"2016-07-27T00:40:35Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "updatedAt":"2016-07-27T00:40:35Z"
+          }
+        }
+
+    http_version: 
+  recorded_at: Wed, 27 Jul 2016 00:44:26 GMT
+recorded_with: VCR 3.0.3

data/spec/fixtures/vcr_cassettes/locale/find_optional.yml

@@ -0,0 +1,116 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/n5kqlvx9cnp1/locales/7IHOkHoMY1PpFp1VSVlCpH
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/1.1.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Connection:
+      - close
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Accept-Ranges:
+      - bytes
+      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:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Wed, 27 Jul 2016 00:44:25 GMT
+      Etag:
+      - '"c304d29a9b8e3984be75c89e61d5c654"'
+      Server:
+      - Contentful
+      Status:
+      - 200 OK
+      Strict-Transport-Security:
+      - max-age=15768000
+      X-Content-Type-Options:
+      - nosniff
+      X-Contentful-Request-Id:
+      - 3f29b6d250357c0f2b9eeeb5f85a52e4
+      Content-Length:
+      - '746'
+      Connection:
+      - Close
+      Set-Cookie:
+      - incap_ses_297_673446=48KmHgDm8BoLWkjVMCgfBOkDmFcAAAAANI6+A4engIj7K8jRnSqZNg==;
+        path=/; Domain=.contentful.com
+      - nlbi_673446=ALw4DCCNPVJRCy616lKYhQAAAABd2u9LFkVQA7vvkVGgFAmX; path=/; Domain=.contentful.com
+      - visid_incap_673446=RkLokwvtTyCCKH647SBEz+kDmFcAAAAAQUIPAAAAAACD5yltV/lSRTzg/RdChCMr;
+        expires=Wed, 26 Jul 2017 06:56:27 GMT; path=/; Domain=.contentful.com
+      X-Iinfo:
+      - 8-283382040-283382143 NNNN CT(143 135 0) RT(1469580264487 299) q(0 0 3 -1)
+        r(6 6) U5
+      X-Cdn:
+      - Incapsula
+    body:
+      encoding: UTF-8
+      string: |+
+        {
+          "name":"Chinese",
+          "internal_code":"zh",
+          "code":"zh",
+          "fallbackCode":"en-US",
+          "default":false,
+          "contentManagementApi":true,
+          "contentDeliveryApi":true,
+          "optional":true,
+          "sys":{
+            "type":"Locale",
+            "id":"7IHOkHoMY1PpFp1VSVlCpH",
+            "version":0,
+            "space":{
+              "sys":{
+                "type":"Link",
+                "linkType":"Space",
+                "id":"n5kqlvx9cnp1"
+              }
+            },
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "createdAt":"2016-07-27T00:42:59Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"4SejVrWT96dvL9IV4Nb7sQ"
+              }
+            },
+            "updatedAt":"2016-07-27T00:42:59Z"
+          }
+        }
+
+    http_version: 
+  recorded_at: Wed, 27 Jul 2016 00:44:25 GMT
+recorded_with: VCR 3.0.3

data/spec/lib/contentful/management/entry_spec.rb

@@ -103,7 +103,7 @@ module Contentful
           vcr('entry/service_unavailable') do
             result = subject.find(space_id, 'not_exist')
             expect(result).to be_kind_of Contentful::Management::ServiceUnavailable
-            expect(result.message).to eq 'Service Unavailable, contenful.com API seems to be down'
+            expect(result.message).to eq 'Service Unavailable, contentful.com API seems to be down'
           end
         end
       end
@@ -324,6 +324,45 @@ module Contentful
           end
         end
 
+        # Only here because we want to keep the contentful.rb-dependency out
+        class Contentful::Entry
+          attr_accessor :sys, :fields
+          def initialize(management_entry)
+            @sys = management_entry.sys
+            @fields = management_entry.fields
+          end
+
+          def id
+            @sys[:id]
+          end
+        end
+
+        class Contentful::BaseEntry < Contentful::Entry
+        end
+        #/ Only here because we want to keep the contentful.rb-dependency out
+
+        it 'with entry inherited from Contentful::Entry' do
+          vcr('entry/create_with_entry') do
+            entry_att = Contentful::BaseEntry.new(client.entries.find(space_id, '4o6ghKSmSko4i828YCYaEo'))
+            entry = subject.create(content_type, name: 'EntryWithEntry', age: 20, entry: entry_att)
+            expect(entry.name).to eq 'EntryWithEntry'
+            expect(entry.age).to eq 20
+            expect(entry.fields[:entry]['sys']['id']).to eq entry_att.id
+          end
+        end
+
+        it 'with entries inherited from Contentful::Entry' do
+          vcr('entry/create_with_entries') do
+            entry_att = Contentful::BaseEntry.new(subject.find(space_id, '1d1QDYzeiyWmgqQYysae8u'))
+            new_entry = subject.create(content_type,
+                                       name: 'EntryWithEntries',
+                                       age: 20,
+                                       entries: [entry_att, entry_att, entry_att])
+            expect(new_entry.name).to eq 'EntryWithEntries'
+            expect(new_entry.age).to eq 20
+          end
+        end
+
         it 'with asset' do
           vcr('entry/create_with_asset') do
             asset = client.assets.find(space_id, 'codequest_id_test_custom')

data/spec/lib/contentful/management/locale_spec.rb

@@ -83,6 +83,25 @@ module Contentful
         end
       end
 
+      describe '#optional' do
+        let(:space_id) { 'n5kqlvx9cnp1' }
+        it 'is false for non optional' do
+          vcr('locale/find_not_optional') do
+            locale_id = '56eOu5hJwVNb4XfqsnQV97'
+            locale = subject.find(space_id, locale_id)
+            expect(locale.optional).to be_falsey
+          end
+        end
+
+        it 'is true for optional' do
+          vcr('locale/find_optional') do
+            locale_id = '7IHOkHoMY1PpFp1VSVlCpH'
+            locale = subject.find(space_id, locale_id)
+            expect(locale.optional).to be_truthy
+          end
+        end
+      end
+
       describe '#update' do
         let!(:space_id) { 'bjwq7b86vgmm' }
         let!(:locale_id) { '63274yOrU0s4XiJlAp1ZMQ' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful-management
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Piotr Protas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -18,14 +18,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: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -40,6 +40,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -446,6 +460,8 @@ files:
 - spec/fixtures/vcr_cassettes/locale/find_default.yml
 - spec/fixtures/vcr_cassettes/locale/find_for_space_not_found.yml
 - spec/fixtures/vcr_cassettes/locale/find_not_default.yml
+- spec/fixtures/vcr_cassettes/locale/find_not_optional.yml
+- spec/fixtures/vcr_cassettes/locale/find_optional.yml
 - spec/fixtures/vcr_cassettes/locale/reload.yml
 - spec/fixtures/vcr_cassettes/locale/update_both.yml
 - spec/fixtures/vcr_cassettes/locale/update_code.yml
@@ -736,6 +752,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/locale/find_default.yml
 - spec/fixtures/vcr_cassettes/locale/find_for_space_not_found.yml
 - spec/fixtures/vcr_cassettes/locale/find_not_default.yml
+- spec/fixtures/vcr_cassettes/locale/find_not_optional.yml
+- spec/fixtures/vcr_cassettes/locale/find_optional.yml
 - spec/fixtures/vcr_cassettes/locale/reload.yml
 - spec/fixtures/vcr_cassettes/locale/update_both.yml
 - spec/fixtures/vcr_cassettes/locale/update_code.yml