torquebox-vfs 1.1-java → 1.1.1-java

data/lib/torquebox-vfs.rb

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

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

@@ -43,6 +43,10 @@ module FileTest
       File.writable?(filename)
     end
 
+    def size(filename)
+      File.size(filename)
+    end
+
   end
 
 end

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

@@ -21,7 +21,9 @@ class Java::java.sql::DriverManager
     alias_method :register_driver_without_vfs, :registerDriver
 
     # Monkey patch getConnection so we can sort out local filesystem url's for
-    # SQLite (we need to remove the 'vfs:' from the url)
+    # SQLite (we need to remove the 'vfs:' from the url). This works
+    # for activerecord-jdbc-adapter v1.1.2 and under. For v1.1.3 and
+    # up, see web/web-core/src/main/java/org/torquebox/rails/core/boot.rb
     def getConnection(url, *params)
 
       # Remove any VFS prefix from the url (for SQLite)

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

@@ -20,6 +20,7 @@ require 'pathname'
 class Pathname
 
   alias_method :realpath_without_vfs, :realpath
+  alias_method :relative_without_vfs, :relative?
 
   def realpath
     vfs_path? ? expand_path : realpath_without_vfs
@@ -28,4 +29,8 @@ class Pathname
   def vfs_path?
     @path.to_s =~ /^vfs:/
   end
+
+  def relative?
+    vfs_path? ? false : relative_without_vfs
+  end
 end

data/lib/torquebox/vfs/glob_filter.rb

@@ -40,7 +40,7 @@ module TorqueBox
       end
       
       def accepts(file)
-        matched = !!( file.path_name =~ @regexp )
+        matched = !!( @regexp =~ file.path_name.to_s )
         matched &&= file.directory? if @dirs_only
         matched
       end

data/lib/torquebox/vfs/glob_translator.rb

@@ -71,10 +71,10 @@ module TorqueBox
           result = double_splat()
         else
           if ( cur() == 0 || lb() == '/' )
-            result = '(?<=/|^)[^.][^/]*'
+            result = '((?<=/|^)[^.][^/]*)*'
             # result = '[^/.][^/]*'
           else
-            result = '[^/]+'
+            result = '[^/]*'
           end
           
           consume('*')
@@ -87,7 +87,7 @@ module TorqueBox
         #puts "enter double_splat()"
         if la(2) == '/'
         	# result = '([^.][^/]+/){0,}'
-        	result = '([^/.][^/]*/){0,}'
+        	result = '([^/.][^/]*/)*'
         else
         	result = '([^/.][^/]*)'
         end

data/spec/dir_spec.rb

@@ -248,6 +248,13 @@ describe "Dir extensions for VFS" do
         items.should include( "#{prefix}/sound of music" )
       end
 
+      it "should allow for multiple single-star globbing" do
+        items = Dir.glob( "#{prefix}/home/**/*file*.txt" )
+        items.should_not be_empty
+        items.should include( "#{prefix}/home/larry/file1.txt" )
+        items.should include( "#{prefix}/home/larry/file2.txt" )
+      end
+
       it "should allow globbing of multiple patterns via []" do
         items = []
         lambda {
@@ -309,7 +316,7 @@ describe "Dir extensions for VFS" do
       pwd.should == Dir.pwd
     end
 
-    xit "should work for home dirs" do
+    it "should work for home dirs" do
       pwd = Dir.pwd
       dir = Dir.chdir { Dir.pwd }
       dir.downcase.should == ENV['HOME'].downcase

data/spec/file_test_spec.rb

@@ -26,6 +26,10 @@ describe "File extensions for VFS" do
     delegate_to_file(:writable?, 'file')
   end
 
+  it "should delegate to File.size" do
+    delegate_to_file(:size, 'file')
+  end
+
   def delegate_to_file(*args)
     method = args.shift
     File.should_receive(method).with(*args).and_return('value')

data/spec/pathname_spec.rb

@@ -16,5 +16,20 @@ describe "Pathname extensions for VFS" do
       pathname.should_receive(:realpath_without_vfs).and_return(Pathname.new("/real/path"))
       pathname.realpath.to_s.should == "/real/path"
     end
+
+    it "should not find vfs paths to be relative" do
+      pathname = Pathname.new("vfs:/tmp/test")
+      pathname.relative?.should_not be_true
+    end
+
+    it "should find real relative paths to be relative" do
+      pathname = Pathname.new("../tmp/test")
+      pathname.relative?.should be_true
+    end
+
+    it "should find real absolute paths to not be relative" do
+      pathname = Pathname.new("/tmp/test")
+      pathname.relative?.should_not be_true
+    end
   end
 end

metadata

@@ -2,15 +2,15 @@
 name: torquebox-vfs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "1.1"
+  version: 1.1.1
 platform: java
-authors: ["The TorqueBox Team"]
-
+authors: 
+  - The TorqueBox Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 -04:00
+date: 2011-08-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -37,6 +37,7 @@ dependencies:
     version_requirements: *id002
 description: ""
 email: 
+  - torquebox-dev@torquebox.org
 executables: []
 
 extensions: []