contentful-database-importer 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b17382659fb9cb37caad7dcc726b1d8b1bf8e832
-  data.tar.gz: 6991bbcd25ed0283426a4fdcb08de456ec712189
+  metadata.gz: 9abdc777c01f879523c6f4aa2bb1d395e2d42eaf
+  data.tar.gz: 179fc5d6250c71c34baf4ec663d3281ef6802d46
 SHA512:
-  metadata.gz: f22eb2bf0b1a2c997130526d5e4e747f7e9ef2b1f6ac5aac2e7554516ad6b05127444828f2cf0d08480c328c3339f2f18893dd85cd91aa3b486062caf853715d
-  data.tar.gz: d3ae25e2559afaa74439bad1e50ed450e165ea9ca5fd4ca58216b46dfef629b5aa104b6d0ff36d99ff405df16380b182e92b7faf8aa4059bd5b63915c751cdda
+  metadata.gz: bdd7697218f80a8a164de2382b381cfffb4d3411cbbf9c2b4dc284f6e57df414e46555935a3bc7608859224043899cf76a3f47027b348632e9bc6434075b569b
+  data.tar.gz: c867fe2cc5f53b8a2a573dfd1a48dc85ae548e0977111467cb6904a3033ff0773d5c0f7809602ce6ebb76dc5c6fdd9b49781e9321185aec94811015571c30a6f

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.2.3
   - 2.3.1
+  - 2.4.0
 before_install: gem install bundler -v 1.12.5

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 0.3.3
+
+### Added
+* Added notice on using Sequel `v5` when requiring string literals on queries or namespaces. [#12](https://github.com/contentful/contentful-database-importer.rb/issues/12)
+
+### Fixed
+* Fixed Merge tables not properly working.
+
 ## 0.3.2
 
 ### Fixed

data/README.md

@@ -98,6 +98,10 @@ class MyTable
 end
 ```
 
+For specifying namespaces for your tables, use `self.table_name = :namespace__table_name`.
+
+If planning to upgrade to Sequel `v5`, and require namespaces, at the beggining of your file add: `Sequel.split_symbols = true`. This will allow to properly handle the namespaces.
+
 #### Overriding Table and Content Type ID
 
 The methods `::table_name=` and `::content_type_id=` allow you to override the IDs for either the table or content type.
@@ -242,6 +246,8 @@ class MyResource
 end
 ```
 
+If planning to upgrade to Sequel `v5`, use `self.query = Sequel.lit("foo = 'bar' AND baz > 2")`. Sequel is deprecating string literals and allowing only this new method.
+
 ### Configuration
 
 ```ruby

data/lib/contentful/database_importer/json_generator.rb

@@ -30,7 +30,9 @@ module Contentful
 
         if prev_ct_definition
           result[:contentTypes].delete(prev_ct_definition)
-          content_type_definition.merge!(prev_ct_definition)
+          content_type_definition = Support.merge(
+            prev_ct_definition, content_type_definition
+          )
         end
 
         result[:contentTypes] << content_type_definition
@@ -56,16 +58,16 @@ module Contentful
           result
         )
 
-        return unless prev_entry
+        return entry_definition unless prev_entry
 
         result[:entries][content_type_definition[:id]].delete(prev_entry)
-        entry_definition.merge!(prev_entry)
+        Support.merge(prev_entry, entry_definition)
       end
 
       def self.create_entry(entry, content_type_definition, result)
         entry_definition = entry.to_bootstrap
 
-        merge_entries(entry_definition, content_type_definition, result)
+        entry_definition = merge_entries(entry_definition, content_type_definition, result)
 
         result[:assets].concat(entry.associated_assets) unless entry.associated_assets.empty?
 

data/lib/contentful/database_importer/resource_bootstrap_class_methods.rb

@@ -46,7 +46,7 @@ module Contentful
       def array_link?(field_data)
         (field_data[:type] == :array && field_data[:item_type] == :asset) ||
           (resource?(field_data[:type]) &&
-           [:many, :through].include?(field_data[:relationship]))
+           %i[many through].include?(field_data[:relationship]))
       end
 
       def array_link_type(field_data)
@@ -61,7 +61,7 @@ module Contentful
       def array?(field_data)
         field_data[:type] == :array ||
           (resource?(field_data[:type]) &&
-           [:many, :through].include?(field_data[:relationship]))
+           %i[many through].include?(field_data[:relationship]))
       end
 
       def resource?(other)

data/lib/contentful/database_importer/resource_class_methods.rb

@@ -70,10 +70,16 @@ module Contentful
 
       def all
         entries = []
-        rows = table.where(query).all
+        rows = if query.nil?
+                 table.all
+               else
+                 table.where(query).all
+               end
+
         rows.each_with_index do |row, index|
           entries << new(row, index)
         end
+
         entries
       end
     end

data/lib/contentful/database_importer/resource_relationships.rb

@@ -3,7 +3,7 @@ module Contentful
     # Relationship methods for Resource
     module ResourceRelationships
       def fetch_relations(relationship_field_definition)
-        relations = [:many, :one, :through]
+        relations = %i[many one through]
         if relations.include?(relationship_field_definition[:relationship])
           return send(
             "fetch_#{relationship_field_definition[:relationship]}".to_sym,

data/lib/contentful/database_importer/support.rb

@@ -9,6 +9,31 @@ module Contentful
               .tr('-', '_')
               .downcase
       end
+
+      def self.deep_hash_merge(hash1, hash2)
+        result = {}
+        hash1.each do |key, value|
+          value2 = hash2[key]
+          result[key] = merge(value, value2)
+        end
+
+        hash2.each do |key, value|
+          next if hash1.keys.include?(key)
+          result[key] = value
+        end
+
+        result
+      end
+
+      def self.merge(value, value2)
+        if value.is_a?(::Hash) && value2.is_a?(::Hash)
+          deep_hash_merge(value, value2)
+        elsif value.is_a?(::Array) && value2.is_a?(::Array)
+          value + value2
+        else
+          value || value2
+        end
+      end
     end
   end
 end

data/lib/contentful/database_importer/version.rb

@@ -1,5 +1,5 @@
 module Contentful
   module DatabaseImporter
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentful-database-importer
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Contentful GmbH (David Litvak Bruno)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contentful_bootstrap
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Tool to import content from a Database to Contentful