orthoses-rails 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec337b1da4ecda39f953797824239ede59c536c74da48cc1dbd01e46eed1d2b0
-  data.tar.gz: b146481d3fda9b3568a1593fd05608f09c811e1181356f2e36d2b010c30dd130
+  metadata.gz: d9681e80e9a106b8d984c304a0f26777deb5e2077aba6f8a0321f52976e24bcc
+  data.tar.gz: c1f248d0e236bc72491e507da185317d55d607cebf4d6364209cd1601cacb6aa
 SHA512:
-  metadata.gz: 2bec23dc332048a010d10a2dc01754b969f76d2dd19bfa4b50393c1a764b3de496a35d018560aca04fe43630de497e900bb580774698bda3073ea33dcbf44bb5
-  data.tar.gz: e2dac22ee12a3bf049a73e5609d4a3ca1693c2dbc851c3bb06256e4566e9adad6c991fa9a60b0aaa7b22d6ea19e0c7cbc65c403cd136669d4c98b58deb7d90e7
+  metadata.gz: 8ff02244b5844c28186021d4379818a5a0b56ffcb693425f500e3145ff36da721a278c972a6a324e3b3b26bcb3ce9652c98f9fb3c15549fd51924371362d37fb
+  data.tar.gz: 284d60f37efb290cf6e5230dd10cda55066278e89e4b81866896793c535b4864edc7cb13c389d0c98a861c34630fba09df3bb04b1035291f7c4cc46666d22b9b

data/lib/orthoses/active_record/belongs_to.rb

@@ -18,15 +18,7 @@ module Orthoses
               type = if ref.polymorphic?
                 'untyped'
               else
-                begin
-                  Utils.module_name(ref.klass) or next
-                rescue NameError => e
-                  while e
-                    Orthoses.logger.warn(e.message)
-                    e = e.cause
-                  end
-                  next
-                end
+                Orthoses::ActiveRecord.reflection_klass_name(ref) or next
               end
               opt = "#{type}?"
 

data/lib/orthoses/active_record/has_many.rb

@@ -15,16 +15,7 @@ module Orthoses
 
             lines = base.reflect_on_all_associations(:has_many).flat_map do |ref|
               singular_name = ref.name.to_s.singularize
-              type =
-                begin
-                  Utils.module_name(ref.klass)
-                rescue NameError => e
-                  while e
-                    Orthoses.logger.warn(e.message)
-                    e = e.cause
-                  end
-                  next
-                end
+              type = Orthoses::ActiveRecord.reflection_klass_name(ref) or next
 
               collection_proxy = "::#{type}::ActiveRecord_Associations_CollectionProxy"
               [

data/lib/orthoses/active_record/has_one.rb

@@ -14,16 +14,7 @@ module Orthoses
             base_name = Utils.module_name(base) || next
 
             lines = base.reflect_on_all_associations(:has_one).flat_map do |ref|
-              type =
-                begin
-                  Utils.module_name(ref.klass) or next
-                rescue NameError => e
-                  while e
-                    Orthoses.logger.warn(e.message)
-                    e = e.cause
-                  end
-                  next
-                end
+              type = Orthoses::ActiveRecord.reflection_klass_name(ref) or next
               opt = "#{type}?"
 
               [

data/lib/orthoses/active_record.rb

@@ -43,5 +43,16 @@ module Orthoses
         'untyped'
       end
     end
+
+    def self.reflection_klass_name(ref)
+      Utils.module_name(ref.klass)
+    rescue NameError, ArgumentError => e
+      while e
+        Orthoses.logger.warn(e.message)
+        e = e.cause
+      end
+
+      nil
+    end
   end
 end

data/lib/orthoses/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Orthoses
   module Rails
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orthoses
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 description: Orthoses middleware collection for Ruby on Rails
 email:
 - co000ri@gmail.com