consyncful 0.8.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7098621f9a1f36a61f658c4897016b0b578e30003a2e0efd84aca0c5c7385088
-  data.tar.gz: 6017ae2bb5a5565555d6fb264815d650bca697bd781b855f1b4df622ecc2c61f
+  metadata.gz: 4b9c4fef8bbf34bd564d13689dafc4bad203d3acfc542ecb99ee9c29b2abc490
+  data.tar.gz: b863ad7cfcc5039c84bf742fd42159ba5edfc0bb6f121d3350fbaeb0f505a9a1
 SHA512:
-  metadata.gz: 1938e0faa4a541d1f8c2070c81ecf5cd67ac2bc677cccd85eeb39c5d90d633ac9a2c3468f9880335f7a1090e32bcc5dbe56eef8ca1dc8c8742151798106f4a32
-  data.tar.gz: bfa6e4d41df6a91434411ef58a2eacd6a790eec522f3b392754d3fc2bf496ec79e436b3c0d95d527a61e74c9900a51cdae6b29fd8ed415fd8fb523cd8134d390
+  metadata.gz: 4c84d7cc4d4fc0a3242ffe9305d78965373306c43b28d219ea1456741698673c1b124e763cde4f1893b0473edddaf60e743483e8a0aa099f2bf0f753092da426
+  data.tar.gz: cc55690d0e1a9bf0a48382b01b77f7c61a4ccb461dc4893151becdff9d283067fe1e55d71e7ac6bec56fd62208061647c89b8c594d32c0cca1d55a84edaa5daf

data/.rubocop.yml

@@ -2,4 +2,8 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   TargetRubyVersion: 2.7
-  NewCops: enable
+  NewCops: enable
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/Gemfile.lock

@@ -1,34 +1,43 @@
 PATH
   remote: .
   specs:
-    consyncful (0.8.0)
+    consyncful (1.0.0)
       contentful (>= 2.11.1, < 3.0.0)
       hooks (>= 0.4.1)
-      mongoid (>= 7.0.2, < 9.0.0)
+      mongoid (= 9.0.0)
       rainbow
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.2)
-      activesupport (= 7.0.4.2)
-    activesupport (7.0.4.2)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    bson (4.15.0)
-    concurrent-ruby (1.2.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    bson (5.0.1)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     contentful (2.16.3)
       http (> 0.8, < 5.0)
       multi_json (~> 1)
     database_cleaner (1.8.3)
-    diff-lcs (1.3)
+    diff-lcs (1.5.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    drb (2.2.1)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -45,16 +54,17 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.12.0)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.17.0)
-    mongo (2.18.2)
-      bson (>= 4.14.1, < 5.0.0)
-    mongoid (8.0.3)
-      activemodel (>= 5.1, < 7.1, != 7.0.0)
+    minitest (5.25.1)
+    mongo (2.20.1)
+      bson (>= 4.14.1, < 6.0.0)
+    mongoid (9.0.0)
+      activemodel (>= 5.1, < 7.2, != 7.0.0)
+      concurrent-ruby (>= 1.0.5, < 2.0)
       mongo (>= 2.18.0, < 3.0.0)
-      ruby2_keywords (~> 0.0.5)
     multi_json (1.15.0)
+    mutex_m (0.2.0)
     parallel (1.22.1)
     parser (3.1.2.0)
       ast (~> 2.4.1)
@@ -63,19 +73,19 @@ GEM
     rake (13.0.1)
     regexp_parser (2.3.1)
     rexml (3.2.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.28.2)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -92,7 +102,6 @@ GEM
     rubocop-rspec (2.10.0)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.0.15)

data/consyncful.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'contentful', ['>=2.11.1', '<3.0.0']
   spec.add_dependency 'hooks', '>=0.4.1'
-  spec.add_dependency 'mongoid', ['>=7.0.2', '<9.0.0']
+  spec.add_dependency 'mongoid', ['9.0.0']
   spec.add_dependency 'rainbow'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/consyncful/base.rb

@@ -10,8 +10,8 @@ module Consyncful
 
     cattr_accessor :model_map
 
-    store_in collection: -> { Consyncful.configuration.mongo_collection },
-             client: -> { Consyncful.configuration.mongo_client }
+    store_in collection: Consyncful.configuration.mongo_collection.to_s,
+             client: Consyncful.configuration.mongo_client.to_s
 
     def self.contentful_model_name(name)
       self.model_map ||= {}

data/lib/consyncful/configuration.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# Handles Rails configurations for Consyncful
+module Consyncful
+  ##
+  class Configuration
+    attr_accessor :contentful_client_options,
+                  :contentful_sync_options,
+                  :locale,
+                  :mongo_client,
+                  :mongo_collection,
+                  :content_tags,
+                  :ignore_content_tags,
+                  :preserve_contentful_timestamps
+
+    def initialize
+      @contentful_client_options = {}
+      @contentful_sync_options = {}
+      @locale = 'en-NZ'
+      @mongo_client = :default
+      @mongo_collection = 'contentful_models'
+      @content_tags = []
+      @ignore_content_tags = []
+      @preserve_contentful_timestamps = false
+    end
+
+    def initial_sync_options
+      options = { initial: true }
+      options = options.reverse_merge(@contentful_sync_options)
+      options.reverse_merge(DEFAULT_SYNC_OPTIONS)
+    end
+
+    def client_options
+      options = @contentful_client_options
+      options.reverse_merge!(DEFAULT_CLIENT_OPTIONS)
+    end
+  end
+
+  DEFAULT_CLIENT_OPTIONS = {
+    reuse_entries: true,
+    api_url: 'cdn.contentful.com'
+  }.freeze
+
+  # see https://www.contentful.com/developers/docs/references/content-delivery-api/#/reference/synchronization
+  DEFAULT_SYNC_OPTIONS = {
+    limit: 100,
+    type: 'all'
+  }.freeze
+
+  class << self
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    def configure
+      yield configuration
+    end
+
+    def client
+      @client ||= Contentful::Client.new(Consyncful.configuration.client_options)
+    end
+  end
+end

data/lib/consyncful/item_mapper.rb

@@ -55,6 +55,7 @@ module Consyncful
         updated_at: @item.updated_at,
         revision: @item.revision,
         contentful_type: type,
+        contentful_tags: @item._metadata[:tags].map(&:id),
         synced_at: Time.current
       }
     end

data/lib/consyncful/sync.rb

@@ -19,7 +19,7 @@ module Consyncful
     include Mongoid::Document
     include Hooks
 
-    store_in client: -> { Consyncful.configuration.mongo_client }
+    store_in client: Consyncful.configuration.mongo_client.to_s
 
     define_hook :before_run
     define_hook :after_run

data/lib/consyncful/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Consyncful
-  VERSION = '0.8.0'
+  VERSION = '1.0.0'
 end

data/lib/consyncful.rb

@@ -3,67 +3,7 @@
 require 'consyncful/version'
 require 'mongoid'
 require 'contentful'
+require 'consyncful/configuration'
 require 'consyncful/base'
 require 'consyncful/sync'
 require 'consyncful/railtie' if defined?(Rails)
-
-module Consyncful
-  # Handles Rails configurations for Consynful
-  class Configuration
-    attr_accessor :contentful_client_options,
-                  :contentful_sync_options,
-                  :locale,
-                  :mongo_client,
-                  :mongo_collection,
-                  :content_tags,
-                  :ignore_content_tags,
-                  :preserve_contentful_timestamps
-
-    def initialize
-      @contentful_client_options = {}
-      @contentful_sync_options = {}
-      @locale = 'en-NZ'
-      @mongo_client = :default
-      @mongo_collection = 'contentful_models'
-      @content_tags = []
-      @ignore_content_tags = []
-      @preserve_contentful_timestamps = false
-    end
-
-    def initial_sync_options
-      options = { initial: true }
-      options = options.reverse_merge(@contentful_sync_options)
-      options.reverse_merge(DEFAULT_SYNC_OPTIONS)
-    end
-
-    def client_options
-      options = @contentful_client_options
-      options.reverse_merge!(DEFAULT_CLIENT_OPTIONS)
-    end
-  end
-
-  DEFAULT_CLIENT_OPTIONS = {
-    reuse_entries: true,
-    api_url: 'cdn.contentful.com'
-  }.freeze
-
-  # see https://www.contentful.com/developers/docs/references/content-delivery-api/#/reference/synchronization
-  DEFAULT_SYNC_OPTIONS = {
-    limit: 100,
-    type: 'all'
-  }.freeze
-
-  class << self
-    def configuration
-      @configuration ||= Configuration.new
-    end
-
-    def configure
-      yield configuration
-    end
-
-    def client
-      @client ||= Contentful::Client.new(Consyncful.configuration.client_options)
-    end
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consyncful
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andy Anastasiadis-Gray
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,20 +146,14 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.0.2
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
         version: 9.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 7.0.2
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
         version: 9.0.0
 - !ruby/object:Gem::Dependency
@@ -201,6 +195,7 @@ files:
 - docker-compose.yml
 - lib/consyncful.rb
 - lib/consyncful/base.rb
+- lib/consyncful/configuration.rb
 - lib/consyncful/item_mapper.rb
 - lib/consyncful/persisted_item.rb
 - lib/consyncful/railtie.rb