wcc-contentful 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964aa9bb9b781c8ca90803f8117130daf1aac1ea88324ab64237b0e2a6a6c328
-  data.tar.gz: 834dd56d5e39fdad058efa794f1e5022b92d9122463c827d91d85ffcd9dbe291
+  metadata.gz: 3facd27f1d4401d01c3e42dc9ab11d75652cc6859a74c5c74ffb58647b13c28d
+  data.tar.gz: 48072021ae935b5c7d9a684f488dafb3ffa53b94ea153bfeeba7f1b5f5a46806
 SHA512:
-  metadata.gz: ff532ebd5b3750554a63786877d846c724e5edb28796f964977b7bc03064eada4ea3c608d0b0809a4306306c5bb75dfedc0ed5fa670ef7fb2b224b39ebcaafcc
-  data.tar.gz: '0886f5a8caad820a963af4d37a07fb319ae5cfc8735f400f41eb22131df9f90477b966d91f3e2f26e40bffc1579bcbc9bba2dd351cb677a28df90dea87368eef'
+  metadata.gz: b884394e95a3c722c8a3a1327780700f153f9e724c920d9d57e81409d836e5111777f3493b504bfe7b6321a1d83ed95f6fe2613b9f77677393d2caab631caa4e
+  data.tar.gz: 6891f2e8a291d4a72c725ce09a7270681ed8e2f7485d2f68d195f6fc0f55005e07408855f194d1ac130fe3c874c59c3bdc4e5aa87b512b776c37be792dd5e605

data/lib/wcc/contentful/model.rb

@@ -41,10 +41,6 @@ require_relative './model_api'
 class WCC::Contentful::Model
   include WCC::Contentful::ModelAPI
 
-  # The Model base class maintains a registry which is best expressed as a
-  # class var.
-  # rubocop:disable Style/ClassVars
-
   class << self
     def const_missing(name)
       type = WCC::Contentful::Helpers.content_type_from_constant(name)
@@ -53,5 +49,3 @@ class WCC::Contentful::Model
     end
   end
 end
-
-# rubocop:enable Style/ClassVars

data/lib/wcc/contentful/model_api.rb

@@ -13,9 +13,8 @@ module WCC::Contentful::ModelAPI
       services.instrumentation
     end
 
-    # We use a class var here because this is a global registry for all subclasses
-    # of this namespace
-    @@registry = {} # rubocop:disable Style/ClassVars
+    # Set the registry at the top of the namespace
+    @registry = {}
   end
 
   class_methods do
@@ -89,7 +88,7 @@ module WCC::Contentful::ModelAPI
     def resolve_constant(content_type)
       raise ArgumentError, 'content_type cannot be nil' unless content_type
 
-      const = @@registry[content_type]
+      const = _registry[content_type]
       return const if const
 
       const_name = WCC::Contentful::Helpers.constant_from_content_type(content_type).to_s
@@ -143,14 +142,14 @@ module WCC::Contentful::ModelAPI
 
       content_type ||= WCC::Contentful::Helpers.content_type_from_constant(klass)
 
-      @@registry[content_type] = klass
+      _registry[content_type] = klass
     end
 
     # Returns the current registry of content type names to constants.
     def registry
-      return {} unless @@registry
+      return {} unless _registry
 
-      @@registry.dup.freeze
+      _registry.dup.freeze
     end
 
     def reload!
@@ -176,7 +175,15 @@ module WCC::Contentful::ModelAPI
     # that class.  If nil, the generated WCC::Contentful::Model::{content_type} class
     # will be resolved for this content type.
     def registered?(content_type)
-      @@registry[content_type]
+      _registry[content_type]
+    end
+
+    protected
+
+    def _registry
+      # If calling register_for_content_type in a subclass, look up the superclass
+      # chain until we get to the model namespace which defines the registry
+      @registry || superclass._registry
     end
   end
 end

data/lib/wcc/contentful/model_singleton_methods.rb

@@ -69,9 +69,9 @@ module WCC::Contentful::ModelSingletonMethods
   def inherited(subclass)
     # If another different class is already registered for this content type,
     # don't auto-register this one.
-    return if WCC::Contentful::Model.registered?(content_type)
+    return if model_namespace.registered?(content_type)
 
-    WCC::Contentful::Model.register_for_content_type(content_type, klass: subclass)
+    model_namespace.register_for_content_type(content_type, klass: subclass)
   end
 
   class ModelQuery

data/lib/wcc/contentful/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Watermark Dev