torquebox-vfs 1.0.0.CR2-java → 1.0.0-java

data/lib/torquebox-vfs.rb

@@ -1,6 +1,6 @@
 module TorqueboxVfs
-  VERSION = '1.0.0.CR2'
-  MAVEN_VERSION = '1.0.0.CR2'
+  VERSION = '1.0.0'
+  MAVEN_VERSION = '1.0.0'
 end
 begin
   require 'java'

data/lib/torquebox/vfs/ext/dir.rb

@@ -121,7 +121,6 @@ class Dir
 
       #str_pattern = "#{pattern}"
       str_pattern = pattern.to_str
-      #puts "glob(#{str_pattern})"
 
       segments = str_pattern.split( '/' )
 
@@ -156,6 +155,7 @@ class Dir
 
       matcher_segments = segments - base_segments
       matcher = matcher_segments.join( '/' )
+      dirs_only = (str_pattern[-1,1] == '/')
       #puts "matcher [#{matcher}]"
 
       begin
@@ -173,7 +173,8 @@ class Dir
         child_path = "" if child_path == "/"
         #puts "child_path=#{child_path}"
         #puts "base=#{base}"
-        filter = TorqueBox::VFS::GlobFilter.new( child_path, matcher )
+        # puts "preparing glob filter for path #{child_path} and match #{matcher}"
+        filter = TorqueBox::VFS::GlobFilter.new( child_path, matcher, dirs_only )
         #puts "filter is #{filter}"
         paths = starting_point.getChildrenRecursively( filter ).collect{|e|
           #path_name = e.path_name

data/lib/torquebox/vfs/glob_filter.rb

@@ -23,7 +23,7 @@ module TorqueBox
     class GlobFilter
       include Java::org.jboss.vfs.VirtualFileFilter
       
-      def initialize(child_path, glob)
+      def initialize(child_path, glob, dirs_only)
         regexp_str = GlobTranslator.translate( glob )
         if ( child_path && child_path != '' )
           if ( child_path[-1,1] == '/' )
@@ -34,11 +34,19 @@ module TorqueBox
         else
           regexp_str = "^#{regexp_str}$"
         end
-        @regexp = Regexp.new( regexp_str ) 
+        @regexp = Regexp.new( regexp_str )
+        @dirs_only = dirs_only
+        # puts "glob #{glob} ==> #{@regexp}"
       end
       
       def accepts(file)
-        !!( file.path_name =~ @regexp )
+        matched = !!( file.path_name =~ @regexp )
+        matched &&= file.directory? if @dirs_only
+        matched
+      end
+
+      def to_s
+        "#{@regexp}, dirs_only: #{@dirs_only}"
       end
     end
   end

data/lib/torquebox/vfs/glob_translator.rb

@@ -31,7 +31,7 @@ module TorqueBox
       def self.translate(glob_str)
         translator = GlobTranslator.new( glob_str )
         regexp_str = translator.glob()
-        #puts "#{glob_str} ==> #{regexp_str}"
+        # puts "#{glob_str} ==> #{regexp_str}"
         regexp_str
       end
 
@@ -62,7 +62,7 @@ module TorqueBox
             end
           end
         end
-        result 
+        result
       end
       
       def splat()
@@ -71,10 +71,12 @@ module TorqueBox
           result = double_splat()
         else
           if ( cur() == 0 || lb() == '/' )
-            result = '[^/.][^/]*'
+            result = '(?<=/|^)[^.][^/]*'
+            # result = '[^/.][^/]*'
           else
             result = '[^/]+'
           end
+          
           consume('*')
         end
         #puts "exit splat()"
@@ -83,7 +85,12 @@ module TorqueBox
 
       def double_splat()
         #puts "enter double_splat()"
-        result = '(.*)'
+        if la(2) == '/'
+        	# result = '([^.][^/]+/){0,}'
+        	result = '([^/.][^/]*/){0,}'
+        else
+        	result = '([^/.][^/]*)'
+        end
         consume('*')
         consume('*')
         consume('/') if ( la() == '/' )

data/spec/dir_spec.rb

@@ -42,7 +42,25 @@ describe "Dir extensions for VFS" do
         when :vfs
           prefix = test_data_base_path( :vfs )
       end
+      
+      it "should ignore dotdirs by default" do
+      	items = Dir.glob( "#{prefix}/**/*" )
+      	items.should_not be_empty
+      	items.size.should eql(32)
+      end
 
+      it "should handle trailing double splats" do
+      	items = Dir.glob( "#{prefix}/**" )
+      	items.should_not be_empty
+      	items.size.should eql(5)
+      end
+      
+      it "should handle Rails 2 glob-related arglebargle" do
+      	items = Dir.glob( "#{prefix}/**/*/**" )
+      	items.should_not be_empty
+      	items.size.should eql(27)
+      end
+      
       it "should ignore dotfiles by default" do
         glob_pattern = "#{prefix}/dotfiles/*"
         items = Dir.glob( glob_pattern )
@@ -216,6 +234,15 @@ describe "Dir extensions for VFS" do
         items.should include( "#{prefix}/home/todd/index.html.haml" )
       end
 
+      it "should match only directories if trailing slash" do
+        items = Dir.glob( "#{prefix}/*/" )
+        items.should_not be_empty
+        items.size.should eql(3)
+        items.should include( "#{prefix}/dotfiles" )
+        items.should include( "#{prefix}/home" )
+        items.should include( "#{prefix}/sound of music" )
+      end
+
       it "should allow globbing of multiple patterns via []" do
         items = []
         lambda {

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-vfs
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.0.0.CR2
+  prerelease: 
+  version: 1.0.0
 platform: java
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -04:00
+date: 2011-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -100,9 +100,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: