consyncful 0.9.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ba8337492a23b2e64415655bbf40d173a242cab785100a8f63c1aaa9c9c66d3
-  data.tar.gz: aa802f57a1d04f013440bda7b81d9780226942d779f8031e51c60c4dcc822be2
+  metadata.gz: 5fef048cde9fc6f6bccbb88e9d3cb474d72f09c09ebc0af29b8170061359392c
+  data.tar.gz: ef2b2ba5842d0e8f8b0413216099cd909d8558372aa63c7b830c1a3348fd0f7e
 SHA512:
-  metadata.gz: 0cdcba4664eb12afb0b1a4ca1d6a8a302605d9334ec2342aa5f699d3e71926815e271f701f32fa7f2c3cc73f085fecbd4c4261dedf3b0300cd0641b195dceb47
-  data.tar.gz: 7cb9d7289b6524c2e2ff95fe547fd2cbf6614601e2177aff275ce21ab9b467afdf039f4cfff566c2095bc3fce44b15020b7d0beaa7556b6c1312b384ac64833b
+  metadata.gz: 94710c404e50238924be677f99a2615aea6604c4ba9e9792d19c1db83dbd5d86ec8e51f14191ff804e797e69143d3b680247c05a67c4ba9f771fbd4007d145e1
+  data.tar.gz: 3e38a6ceb8a84db7b67bdf1c7a610f8bd4cf927bb6c4de0c915c673e65531ca21cb9cff87e546af993463e20cf32c9bb79b60e5996268a243058c6577ee9c1ea

data/.github/workflows/ci.yml

@@ -12,13 +12,13 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.7.5
           - 3.0.3
           - 3.1.1
+          - 3.2.2
         mongodb:
-          - 4.2
-          - 4.4
           - 5.0
+          - 6.0
+          - 7.0
 
     name: Ruby ${{ matrix.ruby }} sample
 

data/Gemfile.lock

@@ -1,81 +1,92 @@
 PATH
   remote: .
   specs:
-    consyncful (0.9.0)
+    consyncful (1.0.1)
       contentful (>= 2.11.1, < 3.0.0)
       hooks (>= 0.4.1)
-      mongoid (>= 7.0.2, < 9.0.0)
+      mongoid (~> 9)
       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.4)
+      activesupport (= 7.1.4)
+    activesupport (7.1.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)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    bson (4.15.0)
-    concurrent-ruby (1.2.0)
-    contentful (2.16.3)
-      http (> 0.8, < 5.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.17.1)
+      http (> 0.8, < 6.0)
       multi_json (~> 1)
     database_cleaner (1.8.3)
-    diff-lcs (1.3)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    diff-lcs (1.5.1)
+    domain_name (0.6.20240107)
+    drb (2.2.1)
+    ffi (1.17.0)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
     hooks (0.4.1)
       uber (~> 0.0.14)
-    http (4.4.1)
-      addressable (~> 2.3)
+    http (5.2.0)
+      addressable (~> 2.8)
+      base64 (~> 0.1)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.5)
+      llhttp-ffi (~> 0.5.0)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
-    http-parser (1.2.3)
-      ffi-compiler (>= 1.0, < 2.0)
-    i18n (1.12.0)
+    i18n (1.14.6)
       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)
+    llhttp-ffi (0.5.0)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
+    minitest (5.25.1)
+    mongo (2.20.1)
+      bson (>= 4.14.1, < 6.0.0)
+    mongoid (9.0.1)
+      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)
-    public_suffix (5.0.1)
+    public_suffix (6.0.1)
     rainbow (3.1.1)
     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,13 +103,9 @@ 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)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
     unicode-display_width (2.1.0)
 
 PLATFORMS

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'
   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/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.9.0'
+  VERSION = '1.0.1'
 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.9.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andy Anastasiadis-Gray
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,22 +146,16 @@ 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
+        version: '9'
   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
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -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