arb 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ddadc6ffd2b754d3d63791fdd01f31997d5d05c18e041fb3038b82a2d774a2
-  data.tar.gz: d9fb9329a49647697db941edcd868a234aadcfe4cc07a411ac66192b55a611f7
+  metadata.gz: 8d454532830cbf8751a94aa4a5e781c6ee6a525f710fd35e04d285b04fabf121
+  data.tar.gz: 439f987eac66dcf5e973c702abd03e8254fbd2f8ff52dfe6c1734e2ac27555f5
 SHA512:
-  metadata.gz: eb3c50b9711396d38ef262c28948b2e6cf9cb01ef2e7924b1016ffde8453c42547ce9ecda1e9f9ad07c3d3d902de5c30446e6509cc6b5da03a147adad6a3ee7c
-  data.tar.gz: dd62f1dc4c30aab862c51a8995cf826431222b4d5ff3465d67c53592dc8e283d25b124f4ffc66fb1f3caed8481489126b4ff9a86d043102eb700b2ce298efe0f
+  metadata.gz: 26cb7ed457e96f6073965b41181da303d63215e479ab80feec350d28aaa897ddbcf5b4a9f827dbfd6dbcdd5d0b24bbc2645d877145b897077c67f4908a6b93fd
+  data.tar.gz: 268f5ecc8e6dc03ede632c6cb49e7209b73cfab73497c08f7ec9fe3c55a98b60c3aabfb815eb503a5ec39385e5f2feb951534049a90111cdbd1580aed9c9a483

data/lib/arb.rb

@@ -8,7 +8,7 @@ module Kernel
       loop do 
         tmp=modules.shift
         break unless tmp
-        if require("arb/#{tmp}")
+        if require("arb/#{tmp.downcase}")
           imported<<tmp 
         else
           #warn("Fail to require arb/#{tmp}, maybe it had already been required!")
@@ -23,37 +23,31 @@ module Kernel
 
   def arb_use(arb_module_name,prefix=nil,forced=false)
     prefix="#{prefix}_" if prefix && !prefix.to_s.end_with?('_')
-    arb_module_name=arb_module_name.to_s.capitalize!
+    arb_module_name=arb_module_name.to_s.capitalize.to_sym
     res={:succeed=>[],:failed=>[]}
     tried_arb_use=false
-    begin
-      arb_module=Module.const_get(:Arb).const_get(arb_module_name)
-      Kernel.class_eval do
-        arb_module.singleton_methods.each do |m|
-          mm=prefix.to_s+m.to_s
-          if !forced && Kernel.instance_methods.include?(mm)
-            warn("Conflict method: #{mm}")
-            res[:failed] << mm
-            next
-          end
-          define_method(mm) do |*args,&block|
-            arb_module.send(m,*args,&block)
-          end
-          res[:succeed] << mm
+    #always try to import
+    arb_import arb_module_name
+    return nil unless Arb.constants.include?(arb_module_name)
+    arb_module=Module.const_get(:Arb).const_get(arb_module_name)
+    Kernel.class_eval do
+      arb_module.singleton_methods.each do |m|
+        mm=prefix.to_s+m.to_s
+        if !forced && Kernel.instance_methods.include?(mm)
+          warn("Conflict method: #{mm}")
+          res[:failed] << mm
+          next
         end
+        define_method(mm) do |*args,&block|
+          arb_module.send(m,*args,&block)
+        end
+        res[:succeed] << mm
       end
-      res
-    rescue NameError=>e
-      #Note that NoMethodError is subclass of NameError, which means that
-      #invoking nil.xxx(that throws NoMethodError) will also lead to the
-      #Name Error, we have to make sure that e is the instance of NameError!!!
-      if e.instance_of?(NameError) && !tried_arb_use
-        tried_arb_use=true
-        arb_import(arb_module_name.downcase)
-        retry
-      end
-      warn("Arb::#{arb_module_name} not found!")
     end
+    res
+    #Note that NoMethodError is subclass of NameError, which means that
+    #invoking nil.xxx(that throws NoMethodError) will also lead to the
+    #Name Error, we have to make sure that e is the instance of NameError!!!
   end
 
   alias_method :import,:arb_import

data/lib/arb/version.rb

@@ -1,3 +1,3 @@
 module Arb
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arb
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - arybin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler