display_case 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b797b22fdea67cccee304457cc19e01ef3aa1a6
-  data.tar.gz: 336a9351dd99f147cf98adc0f8873032e0797864
+SHA256:
+  metadata.gz: 945dfe570fe0c95e52b65e0f673ebd6226e2c82eaef75d9233af833cf2565ef4
+  data.tar.gz: bf0a1fe16e46ba68aeb290352fe2cd75831d1e6ba517011bd61896d7b9ec7e18
 SHA512:
-  metadata.gz: 639ea3ea3d110ca299a96df5f2a939399114e4705647b259857327bd9ce22a4b1f14a2f169b5d1b20dacc007ceef3fde412e4bea21a4080b12186b2417b29b72
-  data.tar.gz: 46b2059c482299fca753cd5599d2dc3f562ee4c5cb224b8f0a9222765b809f95f86ceacb03ff6332b4472318aa56381bb01b68f070037cd214ee1d2ad82084ac
+  metadata.gz: 8d93788b405a1273e46e59d341ca74f7b8570b5861c65f59d42056de0bb3d5cce2ad1cdd62dc5ab4fdfefa77befb60a2b890b5ac453afd76111dae9d403f6919
+  data.tar.gz: d59cf587424e12bb5572f6662572dc7236f2f2cd3a559136c52cea842e62ebd3aa8cdaebc759bf9274a1f7af51602e9f50a6ce4cfd9f9d4bcce7fc1fc3b0d2d4

data/lib/display_case/configuration.rb

@@ -1,5 +1,3 @@
-require_relative 'enumerable_exhibit'
-
 module DisplayCase
   class << self
     attr_accessor :configuration
@@ -30,7 +28,7 @@ module DisplayCase
     # A boolean indicating whether Exhibits with names that are similar to
     # context should be favored over other exhibits. By default, this is true
     attr_accessor :smart_matching
-    
+
     # A boolean indicating whether DisplayCase will swallow superclass mismatch
     # errors (see README for more info). By default, this is false.
     attr_accessor :swallow_superclass_mismatch_for_exhibits
@@ -52,7 +50,7 @@ module DisplayCase
     def smart_matching?
       smart_matching
     end
-    
+
     def swallow_superclass_mismatch_for_exhibits?
       swallow_superclass_mismatch_for_exhibits
     end
@@ -67,6 +65,8 @@ module DisplayCase
 
     def exhibits=(val)
       @exhibits = Array(val)
+      DisplayCase::Exhibit.initialize_exhibits
+      @exhibits
     end
   end
 

data/lib/display_case/exhibit.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'active_support'
 require 'active_support/core_ext'
 require 'display_case/railtie' if defined?(::Rails)
 require_relative 'configuration'
@@ -7,18 +8,22 @@ require_relative 'name_class_comparator'
 
 module DisplayCase
   class Exhibit < SimpleDelegator
-    @@exhibits = []
+    def self.initialize_exhibits
+      @@exhibits = []
+      @@exhibits = DisplayCase.configuration.exhibits.dup if DisplayCase.configuration.explicit?
+    end
+    initialize_exhibits
 
     def self.exhibits
-      if DisplayCase.configuration.explicit?
-        DisplayCase.configuration.exhibits
-      else
-        @@exhibits
-      end
+      @@exhibits
     end
 
     def self.inherited(child)
-      @@exhibits << child
+      if idx = @@exhibits.map(&:name).index(child.name)
+        @@exhibits[idx] = child
+      elsif !DisplayCase.configuration.explicit?
+        @@exhibits << child
+      end
     end
 
     def self.exhibit(object, context=nil)

data/lib/display_case/find_definitions.rb

@@ -1,5 +1,4 @@
 module DisplayCase
-
   def self.find_definitions
     absolute_definition_file_paths = configuration.definition_file_paths.map {|path| File.expand_path(path) }
 
@@ -18,19 +17,36 @@ module DisplayCase
   private
   def self.display_case_load(file)
     @file_changes ||= {}
-    if File.exists?(file) && (@file_changes[file].to_i < (mtime = File.mtime(file).to_i))
+    if File.exist?(file) && (@file_changes[file].to_i < (mtime = File.mtime(file).to_i))
       begin
         load file
         @file_changes[file] = mtime
-      rescue TypeError
-        klass = $!.message.gsub("superclass mismatch for class ", "").constantize
+      rescue TypeError => error
+        klass = find_class_candidates(error.message).first # TODO: Is there a way to make this work correctly if there are multiple candidates?
         if klass.ancestors.include?(DisplayCase::Exhibit) && configuration.swallow_superclass_mismatch_for_exhibits?
-          Object.send(:remove_const, klass.name.to_sym)
+          delimiter = '::'
+          namespace, klass_name =
+            if klass.name.index(delimiter)
+              klass_names = klass.name.split(delimiter)
+              namespace_name = klass_names[0..-2].join(delimiter).constantize
+              klass_name = klass_names.last
+              [namespace_name, klass_name]
+            else
+              [Object, klass.name]
+            end
+          namespace.send(:remove_const, klass_name.to_sym)
           retry
         else
-          raise $!
+          raise error
         end
       end
     end
   end
+
+  def self.find_class_candidates(error_message)
+    klass_name = error_message.gsub("superclass mismatch for class ", "")
+    [klass_name.constantize]
+  rescue NameError
+    ObjectSpace.each_object(Class).select{|c| c.to_s.split('::').last == klass_name}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: display_case
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Avdi Grimm
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies: []
 description: An implementation of the Exhibit pattern, as described in Objects on
   Rails
@@ -33,7 +33,7 @@ files:
 homepage: https://github.com/objects-on-rails/display-case
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -48,9 +48,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: An implementation of the Exhibit pattern, as described in Objects on Rails
 test_files: []