fagin 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341dd1040e22d1cd15e631a07e8a4d513ce9cacf337de9497e95d194cd6375b2
-  data.tar.gz: 96ba74cbd13ee8248e3cadda9fe3aa3ea0bb904463f8f5b0968f9087ffc44f2c
+  metadata.gz: 2f1aca3358735598f0ab92cfd300cef33388cbfb270da2697793d89bbb85b4b7
+  data.tar.gz: f0e3dfd4ba73e37ff06399e43765dcdb2f23c401d8867e07ecc8705cc60bfca2
 SHA512:
-  metadata.gz: 6d752c5e24b90cfeb21e1bf40f107612fd680ad6762363a7652b8542d054f132b145c3de685cdcaa3ff104f27b058842cf9490ab75467f1e2d4afafafede99ac
-  data.tar.gz: '019a92d36b3d2f3d4284e7c7a876cf4baa30b8c0287716b0dbb09af5f28738cc13f944d8b6fc120c209c2ccc666f7db13b908843f0ee111073851b2edf332661'
+  metadata.gz: b4fa83afccb891d13ebe4050b8791bed7ef504b17e21353b780696f6830ac7501a1ea4e6b1028df4a84ef1c409747dad7a76301ad9c282f7a40acda16a2a781f
+  data.tar.gz: c2caf479c844d08978c5f04e4261c38665aecce5f65b89fdd863a189f0a0f1032aa9b617fb580adf2b083eaccc61ee11170662b68895d732aecc99d220fd61e9

data/lib/fagin.rb

@@ -9,18 +9,20 @@ class Fagin
         %x(
             \grep -EHos "^class +.+ *< *#{parent}" #{path}/*.rb
         ).each_line do |line|
-            clas = line.match(/class\s+(\S+)\s*</)[1]
-            next if (clas.nil? || clas.empty?)
-            file = line.match(/^([^:]+\.rb)/)[1]
-            next if (file.nil? || file.empty?)
-            begin
-                require_relative file
-                child = clas.split("::").inject(Object) do |m, c|
-                    m.const_get(c)
+            line.match(/^([^:]+\.rb).+class\s+(\S+)\s*</) do |match|
+                file = match[1]
+                next if (file.nil? || file.empty?)
+                clas = match[2]
+                next if (clas.nil? || clas.empty?)
+                begin
+                    require_relative file
+                    child = clas.split("::").inject(Object) do |m, c|
+                        m.const_get(c)
+                    end
+                    children[clas] = child
+                rescue NameError
+                    raise Error::UnknownChildClassError.new(clas)
                 end
-                children[clas] = child
-            rescue NameError
-                raise Error::UnknownChildClassError.new(clas)
             end
         end
 
@@ -35,18 +37,20 @@ class Fagin
         %x(
             \grep -EHors "^class +.+ *< *#{parent}" #{path}
         ).each_line do |line|
-            clas = line.match(/class\s+(\S+)\s*</)[1]
-            next if (clas.nil? || clas.empty?)
-            file = line.match(/^([^:]+\.rb)/)[1]
-            next if (file.nil? || file.empty?)
-            begin
-                require_relative file
-                child = clas.split("::").inject(Object) do |m, c|
-                    m.const_get(c)
+            line.match(/^([^:]+\.rb).+class\s+(\S+)\s*</) do |match|
+                file = match[1]
+                next if (file.nil? || file.empty?)
+                clas = match[2]
+                next if (clas.nil? || clas.empty?)
+                begin
+                    require_relative file
+                    child = clas.split("::").inject(Object) do |m, c|
+                        m.const_get(c)
+                    end
+                    children[clas] = child
+                rescue NameError
+                    raise Error::UnknownChildClassError.new(clas)
                 end
-                children[clas] = child
-            rescue NameError
-                raise Error::UnknownChildClassError.new(clas)
             end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fagin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Miles Whittaker