imw 0.2.15 → 0.2.16

data/VERSION

@@ -1 +1 @@
-0.2.15
+0.2.16

data/lib/imw/schemes/local.rb

@@ -172,7 +172,7 @@ module IMW
         # @return [String]
         def snippet
           returning([]) do |snip|
-            io.read(1024).bytes.each do |byte|
+            (io.read(1024) || '').bytes.each do |byte|
                                         # CR            LF          SPACE            ~
               snip << byte.chr if byte == 13 || byte == 10 || byte >= 32 && byte <= 126
             end

data/lib/imw/schemes/s3.rb

@@ -33,17 +33,11 @@ module IMW
         IMW::Schemes::S3.get(self, new_uri)
       end
 
-      # The AWS::S3::S3Object corresponding to this resource.
-      def s3_object
-        ::IMW::Schemes::S3.make_connection!
-        @s3_object ||= AWS::S3::S3Object.new(path, :bucket => bucket)
-      end
-
       # Does this resource exist on S3?
       #
       # @return [true, false]
       def exist?
-        s3_object.exists?
+        AWS::S3::S3Object.exists?(raw_path, bucket)
       end
       alias_method :exists?, :exist?
 
@@ -51,7 +45,7 @@ module IMW
       #
       # @return [IMW::Resource] the deleted object
       def rm
-        s3_object.delete
+        AWS::S3::S3Object.delete(raw_path, bucket)
       end
       alias_method :rm!, :rm
 
@@ -70,7 +64,7 @@ module IMW
       #
       # @return [String]
       def read
-        s3_object.value
+        AWS::S3::S3Object.value(raw_path, bucket)
       end
 
       # Store +source+ into +destination+.
@@ -83,7 +77,7 @@ module IMW
         destintation = IMW.open(destination)
         raise IMW::ArgumentError.new("destination must be on S3 -- #{destination} given") unless destination.on_s3?
         make_connection!
-        AWS::S3::S3Object.store(destination.path, source.io, destination.bucket)
+        AWS::S3::S3Object.store(destination.raw_path, source.io, destination.bucket)
         destination
       end
 
@@ -97,7 +91,7 @@ module IMW
         destination = IMW.open!(destination)
         raise IMW::ArgumentError.new("source must be on S3 -- #{source} given") unless source.on_s3?
         make_connection!
-        AWS::S3::S3Object.stream(source.path, source.bucket) do |chunk|
+        AWS::S3::S3Object.stream(source.raw_path, source.bucket) do |chunk|
           destination.write(chunk)
         end
         destination.close
@@ -114,7 +108,7 @@ module IMW
         destination = IMW.open(destination)
         raise IMW::PathError.new("Bucket names must be non-blank and match to 'copy'") unless source.bucket.present? && destination.bucket.present? && source.bucket == destination.bucket
         make_connection!
-        AWS::S3::Object.copy(source.path, destination.path, destination.bucket)
+        AWS::S3::Object.copy(source.raw_path, destination.raw_path, destination.bucket)
         destination
       end
 

data/lib/imw/utils/has_uri.rb

@@ -108,6 +108,16 @@ module IMW
         uri.class.new(uri_args)
       end
 
+      # Return the path complete with query string and fragment.
+      #
+      # @return [String]
+      def raw_path
+        p = uri.path
+        p += "?#{uri.query}"    unless uri.query.nil?
+        p += "##{uri.fragment}" unless uri.fragment.nil?
+        p
+      end
+
       def to_s
         uri.to_s
       end

data/spec/imw/schemes/s3_spec.rb

@@ -19,5 +19,14 @@ describe IMW::Schemes::S3 do
       @resource.join('a', 'b/c').to_s.should == File.join(@resource.to_s, 'a/b/c')
     end
   end
-  
+
+  describe "reading S3 files" do
+    before { IMW::Schemes::S3.make_connection! }
+    ['file', 'file with spaces', 'file with # fragment'].each do |f|
+      it "can read a file named '#{f}' from S3" do
+        IMW::Resource.new("s3://imw.infinitemonkeys.info/spec/schemes/s3/#{f}").read.chomp.should == 'ok'
+      end
+    end
+  end
+
 end

data/spec/imw/utils/has_uri_spec.rb

@@ -50,6 +50,12 @@ describe IMW::Utils::HasURI do
     new_obj('/path/to/something').stripped_uri.to_s.should == '/path/to/something'
     new_obj('http://user:pass@example.com:8080/path/to/some/script.php?param=value#frag').stripped_uri.to_s.should == 'http://user:pass@example.com:8080/path/to/some/script.php'
   end
-  
+
+  it "should be able to return raw paths" do
+    new_obj('s3://bucket/crazy url with # some dumb naming convention').raw_path.should == '/crazy url with # some dumb naming convention'
+    new_obj('s3://bucket/crazy url with ?some dumb naming convention').raw_path.should  == '/crazy url with ?some dumb naming convention'
+    new_obj('s3://bucket/crazy url with ?some dumb naming #convention').raw_path.should == '/crazy url with ?some dumb naming #convention'
+    new_obj('s3://bucket/crazy url with #some dumb naming ?convention').raw_path.should == '/crazy url with #some dumb naming ?convention'
+  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imw
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Dhruv Bansal
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 -06:00
+date: 2010-12-21 00:00:00 -06:00
 default_executable: 
 dependencies: []