contentful-database-importer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 452224245e7a1c58fdb80466f7beef6911546e4d
-  data.tar.gz: 7f860c92ea18230ecc8a7a50b7a39fc6be06fe32
+  metadata.gz: 0302793d39ecf33e81c86cafe39e6125a5851c75
+  data.tar.gz: 3a24e01de0daf7d481a2bd13f0c2052bd3b0b880
 SHA512:
-  metadata.gz: faa9477146f720378be62b5299ea633e4bec319ac930c181138ff47bf7f9d10e2837736bbd2f0bd4895350cf424ee0c7709a5dfad9613df8ab0db314e5698d62
-  data.tar.gz: 30589e531b05f151f1b6e66a74f527cdcab762579fd72ef6af03818e307fce78c1aae941fdef7874bd43ef7d6eed2d5f2b931fd43cc698e0e7d78b0542beef6a
+  metadata.gz: e042169712b3bd6c3069e2b5f16ab88b58080610f2029bdc52e7b663c37e363c2e72e65be9864448875fcab0fe1d2eaae85f5c12aacdc06dbb9b27459e685550
+  data.tar.gz: 9e32f719aaf1337a003a471b2cda2b215d74ad28d2bf297f880124b5242c9deb3069c675bf09841d2d91d75a7da94eba200f045d562e6b280033a8ce90d00cdc

data/.rubocop.yml

@@ -0,0 +1,13 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-01-30 13:40:58 -0300 using RuboCop version 0.47.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 6
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 100

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## 0.3.0
+
+### Changed
+* Updated Contentful Bootstrap Version
+
+### Fixed
+* Fix Rubocop Offenses
+
+### Added
+* Support for `:object` field type
+
 ## 0.2.0
 
 ### Added

data/README.md

@@ -18,6 +18,10 @@ Contentful offers tools for managing editorial teams and enabling cooperation be
 you to generate a JSON file that's a valid [`contentful_bootstrap`](https://github.com/contentful/contentful-bootstrap.rb) JSON Template,
 or directly import to Contentful, creating a new space and using your data to populate the content.
 
+## Requirements
+
+* Ruby
+* A Relational Database
 
 ## Installation
 
@@ -41,6 +45,14 @@ source 'https://rubygems.org'
 gem 'contentful-database-importer'
 ```
 
+* Add to your _`Gemfile`_ the handler specific to your database (e.g.):
+
+```ruby
+gem 'pg' # if using Postgres
+gem 'sqlite3' # if using SQLite
+gem 'mysql' # if using MySQL
+```
+
 * Create your importer file, for example _`import.rb`_:
 
 ```ruby
@@ -143,7 +155,7 @@ The options are:
 - `:boolean`: Boolean.
 - `:location`: Geographical Location (can be coerced from a String, Hash or Array.)
 - `:date`: An ISO8601 Date (can be coerced from a Date/DateTime object or String).
-- `:object`: A JSON Object. _Currently not supported_
+- `:object`: A JSON Object.
 - `:asset`: A File description. A String containing the file URL needs to be provided.
 - `:array`: An Array of elements.
 

data/contentful-database-importer.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'contentful_bootstrap', '~> 3.0'
-  spec.add_dependency 'contentful-management', '~> 0.9'
+  spec.add_dependency 'contentful_bootstrap', '~> 3.5'
   spec.add_dependency 'sequel', '~> 4.39'
   spec.add_dependency 'base62-rb'
   spec.add_dependency 'mimemagic'

data/lib/contentful/database_importer/id_generator/base.rb

@@ -23,11 +23,8 @@ module Contentful
         end
 
         def find_on_entry(entry_data, match)
-          if entry_data.excluded_fields.key?(match)
-            return entry_data.excluded_fields[match]
-          elsif entry_data.bootstrap_fields.key?(match)
-            return entry_data.bootstrap_fields[match]
-          end
+          return entry_data.excluded_fields[match] if entry_data.excluded_fields.key?(match)
+          return entry_data.bootstrap_fields[match] if entry_data.bootstrap_fields.key?(match)
 
           raise "Template could not be resolved, #{match} not found."
         end

data/lib/contentful/database_importer/json_generator.rb

@@ -67,9 +67,7 @@ module Contentful
 
         merge_entries(entry_definition, content_type_definition, result)
 
-        result[:assets].concat(
-          entry.associated_assets
-        ) unless entry.associated_assets.empty?
+        result[:assets].concat(entry.associated_assets) unless entry.associated_assets.empty?
 
         result[:entries][content_type_definition[:id]] << entry_definition
       end

data/lib/contentful/database_importer/resource.rb

@@ -79,9 +79,11 @@ module Contentful
       end
 
       def id
-        self.class.id_generator = IdGenerator::Base.new(
-          self.class.default_generator_options
-        ) if self.class.id_generator.nil?
+        if self.class.id_generator.nil?
+          self.class.id_generator = IdGenerator::Base.new(
+            self.class.default_generator_options
+          )
+        end
 
         self.class.id_generator.run(self, index)
       end

data/lib/contentful/database_importer/resource_bootstrap_class_methods.rb

@@ -32,10 +32,7 @@ module Contentful
       end
 
       def items_type(field_data)
-        return {
-          type: 'Link',
-          linkType: array_link_type(field_data)
-        } if array_link?(field_data)
+        return { type: 'Link', linkType: array_link_type(field_data) } if array_link?(field_data)
 
         type = definition_type(field_data[:item_type])
 
@@ -88,9 +85,7 @@ module Contentful
         definition = basic_field_definition(field_data)
 
         definition[:type] = 'Array' if array?(field_data)
-        definition[:linkType] = link_type(
-          field_data[:type]
-        ) if link_type?(field_data)
+        definition[:linkType] = link_type(field_data[:type]) if link_type?(field_data)
         definition[:items] = items_type(field_data) if array?(field_data)
 
         definition

data/lib/contentful/database_importer/resource_coercions.rb

@@ -79,8 +79,10 @@ module Contentful
         end
       end
 
-      def coerce_object(*)
-        raise 'Not yet supported by Contentful Bootstrap'
+      def coerce_object(value)
+        return value if value.is_a?(::Hash)
+
+        raise "Can't coerce #{value} to JSON Object"
       end
 
       def create_associated_asset(name, value)

data/lib/contentful/database_importer/resource_field_class_methods.rb

@@ -29,10 +29,7 @@ module Contentful
       def prepare_field(database_name, options)
         field = prepare_standard_field_options(database_name, options)
         field[:item_type] = options.fetch(:item_type) if field[:type] == :array
-        fetch_relationship_options(
-          field,
-          options
-        ) if options.fetch(:relationship, false)
+        fetch_relationship_options(field, options) if options.fetch(:relationship, false)
 
         field
       end

data/lib/contentful/database_importer/resource_relationships.rb

@@ -4,10 +4,12 @@ module Contentful
     module ResourceRelationships
       def fetch_relations(relationship_field_definition)
         relations = [:many, :one, :through]
-        return send(
-          "fetch_#{relationship_field_definition[:relationship]}".to_sym,
-          relationship_field_definition
-        ) if relations.include?(relationship_field_definition[:relationship])
+        if relations.include?(relationship_field_definition[:relationship])
+          return send(
+            "fetch_#{relationship_field_definition[:relationship]}".to_sym,
+            relationship_field_definition
+          )
+        end
 
         raise 'Invalid Relationship type'
       end

data/lib/contentful/database_importer/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module DatabaseImporter
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-database-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful_bootstrap
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: contentful-management
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +201,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md