pinch 0.0.1 → 0.0.2

data/lib/pinch.rb

@@ -3,7 +3,7 @@ require 'net/http'
 require 'zlib'
 
 class Pinch
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   attr_reader :uri
   attr_reader :file_name
@@ -76,8 +76,12 @@ class Pinch
     file_data         = res.body[30+local_file_header[9]+local_file_header[10]..-1]
 
     if local_file_header[3] == 0
-      raise NotImplementedError, "Unable to read uncompressed ZIP files for now"
+      # Uncompressed file
+      offset = 30+local_file_header[9]+local_file_header[10]
+      res.body[offset..(offset+local_file_header[8]-1)]
     else
+      # Compressed file
+      file_data = res.body[30+local_file_header[9]+local_file_header[10]..-1]
       Zlib::Inflate.new(-Zlib::MAX_WBITS).inflate(file_data)
     end
   end

data/spec/pinch_spec.rb

@@ -5,20 +5,29 @@ require 'minitest/spec'
 require File.dirname(__FILE__) + '/../lib/pinch'
 
 describe Pinch do
-  describe "when calling get" do
+  describe "when calling get on a compressed zip file" do
+    before do
+      @url  = 'http://ftp.sunet.se/pub/lang/smalltalk/Squeak/current_stable/Squeak3.8-6665-full.zip'
+      @file = 'ReadMe.txt'
+    end
+
     it "should return the contents of the file" do
-      url  = 'http://ftp.sunet.se/pub/lang/smalltalk/Squeak/current_stable/Squeak3.8-6665-full.zip'
-      file = 'ReadMe.txt'
-      data = Pinch.get url, file
+      data = Pinch.get @url, @file
       data.must_match /Morphic graphics architecture/
+      data.size.must_equal 26424
+    end
+  end
+
+  describe "when calling get on a zip file that is not compressed" do
+    before do
+      @url  = 'http://memention.com/ericjohnson-canabalt-ios-ef43b7d.zip'
+      @file = 'ericjohnson-canabalt-ios-ef43b7d/README.TXT'
     end
 
-    it "should not pinch from a zip file that is not deflated (for now)" do
-      lambda {
-        url  = 'http://memention.com/ericjohnson-canabalt-ios-ef43b7d.zip'
-        file = 'ericjohnson-canabalt-ios-ef43b7d/README.TXT'
-        data = Pinch.get url, file
-      }.must_raise NotImplementedError
+    it "should return the contents of the file" do
+      data = Pinch.get @url, @file
+      data.must_match /Daring Escape/
+      data.size.must_equal 2288
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156678820 !ruby/object:Gem::Requirement
+  requirement: &2153205580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156678820
+  version_requirements: *2153205580
 description: Pinch makes it possible to download a specific file from within a ZIP
   file over HTTP 1.1.
 email: peter@c7.se