require-magic 0.4.0 → 0.4.1

data/lib/require-dsl.rb

@@ -39,27 +39,37 @@ module Require
     end
     
     def except(*reg_exps) 
-      self.each do |file|    
-        reg_exps.each {|re| self.delete(file) if file.match(re) }         
+      duplicate = self.dup.extend(MagicList)  
+      duplicate.each do |file|    
+        reg_exps.each {|re| duplicate.delete(file) if file.match(re) }         
       end
-      self
+      duplicate
     end        
 
     def postfix_rb(str)
       str << '.rb' if !str.include? '.rb'            
     end            
+
+    def fix(str)   
+      postfix_rb(str) 
+      str = Regexp.escape(str)
+      str.gsub! '\*', '[a-zA-Z0-9\s_-]*'
+      str.gsub! '/', '\/'
+      str
+    end
     
     def matching(*reg_exps) 
+      duplicate = self.dup.extend(MagicList)  
       keep_list = []
-      each do |file| 
+      duplicate.each do |file| 
         reg_exps.each do |re|
-          postfix_rb(re) if re.kind_of? String
+          re = fix(re) if re.kind_of? String
           keep_list << file if file.match(re)
         end
       end                              
-      reject_list = (self - keep_list).flatten
-      delete_these(reject_list)
-      self
+      reject_list = (duplicate - keep_list).flatten
+      duplicate.delete_these(reject_list)
+      duplicate
     end    
   end
 
@@ -90,7 +100,7 @@ module Require
       list.extend(MagicList)  
       list.base_path = dir_stack.first 
       list.rel_path = current_path    
-      list
+      list.freeze
     end
         
   end

data/spec/require-dsl_spec.rb

@@ -4,8 +4,12 @@ describe "RequireMagic" do
   it "works" do
     Require.magic '../spec/fixtures' do |magic|
       magic.enter 'game' do |path|
-        list = magic.require_all('**/*.rb')    
-        puts list.matching( 'sound', 'network').except(/sound/).show_require(:relative).inspect.should include("network/network.rb")
+        list = magic.require_all('**/*.rb')                                                    
+        l1 = list.matching( 'sound', 'network').except(/sound/).show_require(:relative).inspect
+        l1.should include("network/network.rb")
+
+        l2 = list.matching( '*/sound', 'network').show_require(:relative).inspect        
+        l2.should include("network/network.rb")
       end
     end    
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: require-magic
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kristian Mandrup