torquebox-vfs 1.0.1-java → 1.1-java

data/lib/torquebox-vfs.rb

@@ -1,6 +1,6 @@
 module TorqueboxVfs
-  VERSION = '1.0.1'
-  MAVEN_VERSION = '1.0.1'
+  VERSION = '1.1'
+  MAVEN_VERSION = '1.1'
 end
 begin
   require 'java'

data/lib/torquebox/vfs.rb

@@ -41,17 +41,17 @@ module TorqueBox
       path = path.to_s
       return path if ( path =~ %r(^vfs:) )
       cur = path
+      trim_size = cur.length
       while ( cur != '.' && cur != '/' )
         if ( ::File.exist_without_vfs?( cur ) )
-
-          child_path = path[cur.length..-1]
-
+          child_path = path[trim_size..-1]
           if ( cur[-1,1] == '/' )
             cur = cur[0..-2]
           end
           return TorqueBox::VFS.resolve_path_url( cur ), child_path
         end
         cur = ::File.dirname( cur )
+        trim_size = cur.length
         cur << '/' unless cur[-1,1] == '/'
       end
       nil

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

@@ -116,9 +116,6 @@ class Dir
     private
 
     def glob_one(pattern, flags=0, &block)
-
-      is_absolute_vfs = false
-
       #str_pattern = "#{pattern}"
       str_pattern = pattern.to_str
 
@@ -135,23 +132,15 @@ class Dir
       base = base_segments.join( '/' )
 
       base.gsub!( /\\(.)/, '\1' )
-
-      #if ( base.empty? || ( ::File.exist_without_vfs?( base ) && ! Java::OrgJbossVirtualPluginsContextJar::JarUtils.isArchive( base ) ) )
-      #if ( base.empty? || ( ::File.exist_without_vfs?( base ) ) )
-        #puts "doing FS glob"
-        #paths = glob_before_vfs( str_pattern, flags, &block )
-        #return paths
-      #end
-
       #puts "base= #{base}"
-
+      
       vfs_url, child_path = TorqueBox::VFS.resolve_within_archive( base )
       #puts "vfs_url=#{vfs_url}"
       #puts "child_path=#{child_path}"
 
       return []       if vfs_url.nil?
       #puts "segments.size==base_segments.size? #{segments.size == base_segments.size}"
-      return [ base ] if segments.size == base_segments.size
+      return [ base ] if segments.size == base_segments.size && File.exists?( base )
 
       matcher_segments = segments - base_segments
       matcher = matcher_segments.join( '/' )

data/spec/dir_spec.rb

@@ -79,6 +79,11 @@ describe "Dir extensions for VFS" do
         items.should include( "#{prefix}/dotfiles/.four" )
       end
 
+      it "should not find non-existent files" do
+        items = Dir.glob( "#{prefix}/home/larry/not-there.txt" )
+        items.should be_empty
+      end
+
       it "should allow globbing without any special globbing characters on normal files" do
         items = Dir.glob( "#{prefix}/home/larry" )
         items.should_not be_empty

data/spec/file_spec.rb

@@ -20,6 +20,10 @@ describe "File extensions for VFS" do
     File.exists?(vfs_path("/nothingtoseehere")).should be_false
   end
 
+  it "should not report a file is there when it's not" do
+    File.exists?(".rspec").should be_false
+  end
+
   describe "expand_path" do
     it "should handle relative non-vfs path" do
       File.expand_path("../foo", "/tmp/bar").should == "#{absolute_prefix}/tmp/foo"

metadata

@@ -2,15 +2,15 @@
 name: torquebox-vfs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: "1.1"
 platform: java
-authors: []
+authors: ["The TorqueBox Team"]
 
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 -04:00
+date: 2011-07-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency