wcc-contentful 1.1.1 → 1.2.1

data/lib/wcc/contentful/sys.rb

@@ -11,7 +11,7 @@ WCC::Contentful::Sys =
     :revision,
     :context
   ) do
-
+    # rubocop:disable Lint/ConstantDefinitionInBlock
     ATTRIBUTES = %i[
       id
       type
@@ -22,6 +22,7 @@ WCC::Contentful::Sys =
       revision
       context
     ].freeze
+    # rubocop:enable Lint/ConstantDefinitionInBlock
 
     undef []=
     ATTRIBUTES.each { |a| __send__(:undef_method, "#{a}=") }

data/lib/wcc/contentful/test/double.rb

@@ -8,9 +8,7 @@ module WCC::Contentful::Test::Double
   # All attributes that are known to be required fields on the content type
   # will return a default value based on the field type.
   def contentful_double(const, **attrs)
-    unless const.respond_to?(:content_type_definition)
-      const = WCC::Contentful::Model.resolve_constant(const.to_s)
-    end
+    const = WCC::Contentful::Model.resolve_constant(const.to_s) unless const.respond_to?(:content_type_definition)
     attrs.symbolize_keys!
 
     bad_attrs = attrs.reject { |a| const.instance_methods.include?(a) }
@@ -45,7 +43,7 @@ module WCC::Contentful::Test::Double
           sys: {
             type: 'Link',
             linkType: 'Space',
-            id: ENV['CONTENTFUL_SPACE_ID']
+            id: ENV.fetch('CONTENTFUL_SPACE_ID', nil)
           }
         },
         id: SecureRandom.urlsafe_base64,
@@ -62,7 +60,7 @@ module WCC::Contentful::Test::Double
         revision: rand(100),
         locale: 'en-US'
       },
-      fields: attrs.each_with_object({}) { |(k, v), h| h[k] = { 'en-US' => v } }
+      fields: attrs.transform_values { |v| { 'en-US' => v } }
     }
 
     double(attrs)

data/lib/wcc/contentful/test/factory.rb

@@ -8,9 +8,7 @@ module WCC::Contentful::Test::Factory
   # All attributes that are known to be required fields on the content type
   # will return a default value based on the field type.
   def contentful_create(const, context = nil, **attrs)
-    unless const.respond_to?(:content_type_definition)
-      const = WCC::Contentful::Model.resolve_constant(const.to_s)
-    end
+    const = WCC::Contentful::Model.resolve_constant(const.to_s) unless const.respond_to?(:content_type_definition)
     attrs = attrs.transform_keys { |a| a.to_s.camelize(:lower) }
 
     id = attrs.delete('id')
@@ -59,7 +57,7 @@ module WCC::Contentful::Test::Factory
         sys: {
           type: 'Link',
           linkType: 'Space',
-          id: ENV['CONTENTFUL_SPACE_ID']
+          id: ENV.fetch('CONTENTFUL_SPACE_ID', nil)
         }
       },
       id: id || SecureRandom.urlsafe_base64,
@@ -86,8 +84,8 @@ module WCC::Contentful::Test::Factory
   end
 
   def contentful_fields(model)
-    WCC::Contentful::Test::Attributes.defaults(model).each_with_object({}) do |(k, v), h|
-      h[k] = { 'en-US' => v }
+    WCC::Contentful::Test::Attributes.defaults(model).transform_values do |v|
+      { 'en-US' => v }
     end
   end
 

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '1.1.1'
+    VERSION = '1.2.1'
   end
 end

data/lib/wcc/contentful.rb

@@ -3,7 +3,7 @@
 require 'wcc/contentful/version'
 
 require 'active_support'
-require 'active_support/core_ext/object'
+require 'active_support/all'
 
 require 'wcc/contentful/active_record_shim'
 require 'wcc/contentful/configuration'
@@ -48,7 +48,7 @@ module WCC::Contentful
     def logger
       return Rails.logger if defined?(Rails)
 
-      @logger ||= Logger.new(STDERR)
+      @logger ||= Logger.new($stderr)
     end
   end
 
@@ -82,7 +82,7 @@ module WCC::Contentful
 
     if configuration.update_schema_file == :always ||
         (configuration.update_schema_file == :if_possible && Services.instance.management_client) ||
-        configuration.update_schema_file == :if_missing && !File.exist?(configuration.schema_file)
+        (configuration.update_schema_file == :if_missing && !File.exist?(configuration.schema_file))
 
       begin
         downloader = WCC::Contentful::DownloadsSchema.new
@@ -96,9 +96,7 @@ module WCC::Contentful
 
     content_types =
       begin
-        if File.exist?(configuration.schema_file)
-          JSON.parse(File.read(configuration.schema_file))['contentTypes']
-        end
+        JSON.parse(File.read(configuration.schema_file))['contentTypes'] if File.exist?(configuration.schema_file)
       rescue JSON::ParserError
         WCC::Contentful.logger.warn("Schema file invalid, ignoring it: #{configuration.schema_file}")
         nil
@@ -119,8 +117,8 @@ module WCC::Contentful
     end
 
     unless content_types
-      raise InitializationError, 'Unable to load content types from schema file or API!' \
-        ' Check your access token and space ID.'
+      raise InitializationError, 'Unable to load content types from schema file or API! ' \
+                                 'Check your access token and space ID.'
     end
 
     # Set the schema on the default WCC::Contentful::Model

data/wcc-contentful.gemspec

@@ -6,7 +6,7 @@ require 'wcc/contentful/version'
 
 doc_version = Gem::Version.new(WCC::Contentful::VERSION).release.to_s.sub(/\.\d+$/, '')
 
-# rubocop:disable Metrics/LineLength
+# rubocop:disable Layout/LineLength
 Gem::Specification.new do |spec|
   spec.name          = 'wcc-contentful'
   spec.version       = WCC::Contentful::VERSION
@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.metadata = {
-    'documentation_uri' => "https://watermarkchurch.github.io/wcc-contentful/#{doc_version}/wcc-contentful"
+    'documentation_uri' => "https://watermarkchurch.github.io/wcc-contentful/#{doc_version}/wcc-contentful",
+    'rubygems_mfa_required' => 'true'
   }
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.files = Dir['app/**/*', 'config/**/*', 'lib/**/*'] +
     %w[Rakefile README.md wcc-contentful.gemspec]
@@ -38,7 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-instrumentation-matcher'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4.1'
-  spec.add_development_dependency 'rubocop', '0.68'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'vcr', '~> 5.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
@@ -54,7 +54,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'generator_spec', '~> 0.9.4'
   # spec.add_development_dependency 'rails', '~> 5.0'
   # spec.add_development_dependency 'rspec-rails', '~> 3.7'
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
+  spec.add_development_dependency 'sqlite3', '~> 1.4'
   spec.add_development_dependency 'timecop', '~> 0.9.1'
 
   # optional dependencies
@@ -68,4 +68,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'wcc-base', '~> 0.3.1'
   spec.add_dependency 'wisper', '~> 2.0.0'
 end
-# rubocop:enable Metrics/LineLength
+# rubocop:enable Layout/LineLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Watermark Dev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.68'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.68'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -461,6 +447,8 @@ files:
 - lib/wcc/contentful/model_singleton_methods.rb
 - lib/wcc/contentful/rails.rb
 - lib/wcc/contentful/rake.rb
+- lib/wcc/contentful/rich_text.rb
+- lib/wcc/contentful/rich_text/node.rb
 - lib/wcc/contentful/rspec.rb
 - lib/wcc/contentful/services.rb
 - lib/wcc/contentful/simple_client.rb
@@ -501,8 +489,9 @@ homepage: https://github.com/watermarkchurch/wcc-contentful/wcc-contentful
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.1/wcc-contentful
-post_install_message:
+  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.2/wcc-contentful
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -510,16 +499,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://rubygems.org/gems/wcc-contentful)
   [![Build Status](https://circleci.com/gh/watermarkchurch/wcc-contentful.svg?style=svg)](https://circleci.com/gh/watermarkchurch/wcc-contentful)