contentful-management 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,9 +1,14 @@
-### 0.2.0
+# Change Log
+
+## 0.2.1
+* Fix: Use array for symbols in entry fields
+
+## 0.2.0
 * Fix: create entry with multiple locales, skip attributes for not localized fields in content types
 * Fix: reload Assets
 * add optional gzip envoding
 
-### 0.1.0
+## 0.1.0
 * Support for webhooks
 * add image url to asset
 * Cleaning code
@@ -12,7 +17,7 @@
 * Fix: rename asset.process_files to asset.process
 
 
-### 0.0.3
+## 0.0.3
 * Fix: next_page feature
 * Fix: create entry with specific locale
 * Fix: service unavailable error (503)
@@ -20,10 +25,10 @@
 * Code cleanup
 * More documentation
 
-### 0.0.2
+## 0.0.2
 * Fix: Convert an Entry to a DynamicEntry after being created.
 
-### 0.0.1
+## 0.0.1
 * Fix: Headers not properly cleared between requests
 * Fix: Create entries with custom identifier
 * Code cleanup
@@ -31,5 +36,5 @@
 * Adding filter by content_type id
 
 
-### 0.0.1-pre
+## 0.0.1-pre
 * alpha pre-release

data/RELEASE.md

@@ -0,0 +1,8 @@
+# Releasing new versions:
+
+Make sure all points are taken care of:
+
+- [ ] Make sure tests are green.
+- [ ] Update Changelog: http://keepachangelog.com/
+- [ ] Bump version number: http://semver.org/
+- [ ] Release gem and communicate updates

data/examples/blog.rb

@@ -49,7 +49,7 @@ category_type.activate
 
 sleep 10 # prevent race conditions
 
-puts "creating categories"
+puts 'creating categories'
 entries = []
 entries << category_type.entries.create(category_name: 'Misc', category_description: 'Misc stuff')
 entries << category_type.entries.create(category_name: 'Serious', category_description: 'Serious stuff')
@@ -78,7 +78,7 @@ asset.save
 
 entries.map(&:publish)
 
-puts "Press any key to destroy space"
+puts 'Press any key to destroy space'
 gets
 
 blog_space.destroy

data/examples/content_types.rb

@@ -17,7 +17,7 @@ p space.content_types.all
 field = Contentful::Management::Field.new
 field.id = 'such_content'
 field.name = 'Such Content'
-field.type = 'Text' #content types maybe as symbol?
+field.type = 'Text' # content types maybe as symbol?
 
 type2 = space.content_types.new
 type2.name = 'ContentType 2'
@@ -27,7 +27,7 @@ type2.save
 field2 = Contentful::Management::Field.new
 field2.id = 'wow_content'
 field2.name = 'Wow Content'
-field2.type = 'Location' #content types maybe as symbol?
+field2.type = 'Location' # content types maybe as symbol?
 
 type2.update(name: 'whoat', fields: [field, field2])
 

data/examples/create_space.rb

@@ -15,7 +15,6 @@ my_space.update(name: 'MyNewSpace')
 
 dat_space = Contentful::Management::Space.find(my_space.id)
 
-
 dat_space.locales.create(name: 'English', code: 'en-US')
 
 locales = dat_space.locales.all

data/lib/contentful/management/asset.rb

@@ -8,7 +8,6 @@ module Contentful
     # Resource class for Asset.
     # https://www.contentful.com/developers/documentation/content-management-api/#resources-assets
     class Asset
-
       include Contentful::Management::Resource
       extend Contentful::Management::Resource::AssetFields
       include Contentful::Management::Resource::Fields
@@ -47,7 +46,7 @@ module Contentful
         asset.description = attributes[:description] if attributes[:description]
         asset.file = attributes[:file] if attributes[:file]
 
-        request = Request.new("/#{ space_id }/assets/#{ attributes[:id] || ''}", {fields: asset.fields_for_query})
+        request = Request.new("/#{ space_id }/assets/#{ attributes[:id] || ''}", fields: asset.fields_for_query)
         response = attributes[:id].nil? ? request.post : request.put
         result = ResourceBuilder.new(response, {}, {}).run
         result.locale = locale if locale
@@ -81,7 +80,7 @@ module Contentful
       # See README for details.
       def save
         if id.nil?
-          new_instance = self.class.create(sys[:space].id, {fields: instance_variable_get(:@fields)})
+          new_instance = self.class.create(sys[:space].id, fields: instance_variable_get(:@fields))
           refresh_data(new_instance)
         else
           update(title: title, description: description, file: file)
@@ -172,11 +171,11 @@ module Contentful
       # See https://www.contentful.com/developers/documentation/content-delivery-api/#image-asset-resizing
       def image_url(options = {})
         query = {
-            w:  options[:w]  || options[:width],
-            h:  options[:h]  || options[:height],
-            fm: options[:fm] || options[:format],
-            q:  options[:q]  || options[:quality]
-        }.reject { |k, v| v.nil? }
+          w:  options[:w]  || options[:width],
+          h:  options[:h]  || options[:height],
+          fm: options[:fm] || options[:format],
+          q:  options[:q]  || options[:quality]
+        }.reject { |_k, v| v.nil? }
 
         if query.empty?
           file.url

data/lib/contentful/management/client.rb

@@ -19,11 +19,11 @@ module Contentful
       attr_accessor :organization_id, :version, :zero_length, :content_type_id, :dynamic_entry_cache
 
       DEFAULT_CONFIGURATION = {
-          api_url: 'api.contentful.com',
-          api_version: '1',
-          secure: true,
-          default_locale: 'en-US',
-          gzip_encoded: false
+        api_url: 'api.contentful.com',
+        api_version: '1',
+        secure: true,
+        default_locale: 'en-US',
+        gzip_encoded: false
       }
 
       def initialize(access_token = nil, configuration = {})
@@ -49,8 +49,8 @@ module Contentful
         @dynamic_entry_cache = Hash[
             content_types.map do |ct|
               [
-                  ct.id.to_sym,
-                  DynamicEntry.create(ct)
+                ct.id.to_sym,
+                DynamicEntry.create(ct)
               ]
             end
         ]

data/lib/contentful/management/content_type.rb

@@ -9,16 +9,16 @@ module Contentful
     # https://www.contentful.com/developers/documentation/content-management-api/#resources-content-types
     class ContentType
       FIELD_TYPES = [
-          SYMBOL = 'Symbol',
-          TEXT = 'Text',
-          INTEGER = 'Integer',
-          FLOAT = 'Number',
-          DATE = 'Date',
-          BOOLEAN = 'Boolean',
-          LINK = 'Link',
-          ARRAY = 'Array',
-          OBJECT = 'Object',
-          LOCATION = 'Location'
+        SYMBOL = 'Symbol',
+        TEXT = 'Text',
+        INTEGER = 'Integer',
+        FLOAT = 'Number',
+        DATE = 'Date',
+        BOOLEAN = 'Boolean',
+        LINK = 'Link',
+        ARRAY = 'Array',
+        OBJECT = 'Object',
+        LOCATION = 'Location'
       ]
 
       include Contentful::Management::Resource
@@ -96,9 +96,9 @@ module Contentful
       # Returns a Contentful::Management::ContentType.
       def self.create(space_id, attributes)
         fields = fields_to_nested_properties_hash(attributes[:fields] || [])
-        request = Request.new("/#{ space_id }/content_types/#{ attributes[:id] || ''}", {name: attributes.fetch(:name),
-                                                                                         description: attributes[:description],
-                                                                                         fields: fields})
+        request = Request.new("/#{ space_id }/content_types/#{ attributes[:id] || ''}", name: attributes.fetch(:name),
+                                                                                        description: attributes[:description],
+                                                                                        fields: fields)
         response = attributes[:id].nil? ? request.post : request.put
         result = ResourceBuilder.new(response, {}, {}).run
         client.register_dynamic_entry(result.id, DynamicEntry.create(result)) if result.is_a?(self.class)

data/lib/contentful/management/content_type_entry_methods_factory.rb

@@ -1,7 +1,6 @@
 module Contentful
   module Management
     class ContentTypeEntryMethodsFactory
-
       attr_reader :content_type
 
       def initialize(content_type)
@@ -22,7 +21,6 @@ module Contentful
         dynamic_entry.content_type = content_type
         dynamic_entry
       end
-
     end
   end
-end
+end

data/lib/contentful/management/dynamic_entry.rb

@@ -7,14 +7,14 @@ module Contentful
   module Management
     class DynamicEntry < Contentful::Management::Entry
       KNOWN_TYPES = {
-          'String' => :string,
-          'Text' => :string,
-          'Symbol' => :string,
-          'Integer' => :integer,
-          'Float' => :float,
-          'Boolean' => :boolean,
-          'Date' => :date,
-          'Location' => Location
+        'String' => :string,
+        'Text' => :string,
+        'Symbol' => :string,
+        'Integer' => :integer,
+        'Float' => :float,
+        'Boolean' => :boolean,
+        'Date' => :date,
+        'Location' => Location
       }
 
       def self.create(content_type)

data/lib/contentful/management/entry.rb

@@ -65,7 +65,7 @@ module Contentful
       def update(attributes)
         fields_for_update = Contentful::Management::Support.deep_hash_merge(fields_for_query, fields_from_attributes(attributes))
 
-        request = Request.new("/#{ space.id }/entries/#{ self.id }", {fields: fields_for_update}, id = nil, version: sys[:version])
+        request = Request.new("/#{ space.id }/entries/#{ id }", {fields: fields_for_update}, id = nil, version: sys[:version])
         response = request.put
         result = ResourceBuilder.new(response, {}, {}).run
         refresh_data(result)
@@ -75,7 +75,7 @@ module Contentful
       # See README for details.
       def save
         if id.nil?
-          new_instance = Contentful::Management::Entry.create(content_type, {fields: instance_variable_get(:@fields)})
+          new_instance = Contentful::Management::Entry.create(content_type, fields: instance_variable_get(:@fields))
           refresh_data(new_instance)
         else
           update({})
@@ -151,11 +151,10 @@ module Contentful
       # Parser for assets attributes from query.
       # Returns a hash of existing fields.
       def fields_for_query
-        raw_fields = self.instance_variable_get(:@fields)
+        raw_fields = instance_variable_get(:@fields)
         fields_names = raw_fields.first[1].keys
         fields_names.each_with_object({}) do |field_name, results|
           results[field_name] = raw_fields.each_with_object({}) do |(locale, fields), field_results|
-            # field_results[locale] = fields[field_name]
             field_results[locale] = parse_update_attribute(fields[field_name]) unless fields[field_name].nil?
           end
         end
@@ -176,13 +175,12 @@ module Contentful
           when ContentType::ARRAY then
             parse_fields_array(attribute)
           when ContentType::LOCATION then
-            {lat: attribute.properties[:lat], lon: attribute.properties[:lon]}
+            {lat: attribute.properties[:lat], lon: attribute.properties[:lon]} if attribute
           else
             attribute
         end
       end
 
-      # TODO refactor
       def parse_update_attribute(attribute)
         if attribute.is_a? Asset
           {sys: {type: 'Link', linkType: 'Asset', id: attribute.id}}
@@ -191,41 +189,29 @@ module Contentful
         elsif attribute.is_a? Location
           {lat: attribute.properties[:lat], lon: attribute.properties[:lon]}
         elsif attribute.is_a? ::Array
-          parse_update_fields_array(attribute)
+          self.class.parse_fields_array(attribute)
         else
           attribute
         end
       end
 
-      def parse_update_fields_array(attributes)
+      def self.parse_fields_array(attributes)
         type = attributes.first.class.to_s
         if type == 'String'
           attributes
         else
-          attributes.each_with_object([]) do |attr, arr|
-            arr << case type
-                     when /Entry/ then
-                       {sys: {type: 'Link', linkType: 'Entry', id: attr.id}}
-                     when /Asset/ then
-                       {sys: {type: 'Link', linkType: 'Asset', id: attr.id}}
-                   end
-          end
+          parse_objects_array(attributes, type)
         end
       end
 
-      def self.parse_fields_array(attributes)
-        if attributes.is_a? ::Array
-          type = attributes.first.class
-          attributes.each_with_object([]) do |attr, arr|
-            arr << case type.to_s
-                     when /Entry/ then
-                       {sys: {type: 'Link', linkType: 'Entry', id: attr.id}}
-                     when /Asset/ then
-                       {sys: {type: 'Link', linkType: 'Asset', id: attr.id}}
-                   end
-          end
-        else
-          [attributes]
+      def self.parse_objects_array(attributes, type)
+        attributes.each_with_object([]) do |attr, arr|
+          arr << case type
+                   when /Entry/ then
+                     {sys: {type: 'Link', linkType: 'Entry', id: attr.id}}
+                   when /Asset/ then
+                     {sys: {type: 'Link', linkType: 'Asset', id: attr.id}}
+                 end
         end
       end
 

data/lib/contentful/management/field.rb

@@ -17,7 +17,7 @@ module Contentful
 
       def deep_merge!(field)
         properties.merge!(field.properties.select { |name, _type| name != :items })
-        items.properties.merge!(field.items.properties) if (items.respond_to?(:properties) && field.items.respond_to?(:properties))
+        items.properties.merge!(field.items.properties) if items.respond_to?(:properties) && field.items.respond_to?(:properties)
       end
 
       def properties_to_hash

data/lib/contentful/management/locale.rb

@@ -18,7 +18,7 @@ module Contentful
       # Gets a collection of locales.
       # Takes an id of a space.
       # Returns a Contentful::Management::Array of Contentful::Management::Locale.
-      def self.all(space_id = nil, parameters = {})
+      def self.all(space_id = nil, _parameters = {})
         request = Request.new("/#{ space_id }/locales")
         response = request.get
         result = ResourceBuilder.new(response, {'Locale' => Locale}, {})
@@ -44,7 +44,7 @@ module Contentful
       #   :publish
       # Returns a Contentful::Management::Locale.
       def self.create(space_id, attributes)
-        request = Request.new("/#{ space_id }/locales", {'name' => attributes.fetch(:name), 'code' => attributes.fetch(:code)})
+        request = Request.new("/#{ space_id }/locales", 'name' => attributes.fetch(:name), 'code' => attributes.fetch(:code))
         response = request.post
         result = ResourceBuilder.new(response, {'Locale' => Locale}, {})
         result.run

data/lib/contentful/management/request.rb

@@ -71,9 +71,9 @@ module Contentful
         Hash[
             query.map do |key, value|
               [
-                  key.to_sym,
-                  value
-              # value.is_a?(::Array) ? value.join(',') : value
+                key.to_sym,
+                value
+                # value.is_a?(::Array) ? value.join(',') : value
               ]
             end
         ]

data/lib/contentful/management/resource.rb

@@ -15,11 +15,11 @@ module Contentful
     # by the client by default
     module Resource
       COERCIONS = {
-          string: ->(value) { value.to_s },
-          integer: ->(value) { value.to_i },
-          float: ->(value) { value.to_f },
-          boolean: ->(value) { !!value },
-          date: ->(value) { !value.nil? ? DateTime.parse(value) : nil }
+        string: ->(value) { value.to_s },
+        integer: ->(value) { value.to_i },
+        float: ->(value) { value.to_f },
+        boolean: ->(value) { !!value },
+        date: ->(value) { !value.nil? ? DateTime.parse(value) : nil }
       }
 
       attr_reader :properties, :request, :client, :default_locale

data/lib/contentful/management/resource/array_like.rb

@@ -17,7 +17,7 @@ module Contentful
           items.each(&block)
         end
 
-        alias each each_item
+        alias_method :each, :each_item
 
         # Delegates to items#empty?
         def empty?
@@ -29,7 +29,7 @@ module Contentful
           items.size
         end
 
-        alias length size
+        alias_method :length, :size
       end
     end
   end

data/lib/contentful/management/resource/asset_fields.rb

@@ -5,9 +5,9 @@ module Contentful
         # Special fields for Asset.
         def fields_coercions
           {
-              title: :hash,
-              description: :hash,
-              file: Contentful::Management::File
+            title: :hash,
+            description: :hash,
+            file: Contentful::Management::File
           }
         end
       end

data/lib/contentful/management/resource/fields.rb

@@ -5,7 +5,6 @@ module Contentful
   module Management
     module Resource
       module Fields
-
         def fields(wanted_locale = default_locale)
           requested_locale = locale || wanted_locale
           @fields[requested_locale] = {} unless @fields[requested_locale]