pinch 0.0.7 → 0.0.8

data/Rakefile

@@ -5,5 +5,5 @@ task :default => :test
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['spec/*_spec.rb']
   t.ruby_opts = ['-rubygems'] if defined? Gem
-  t.ruby_opts << '-I. -w'
+  t.ruby_opts << '-I.'
 end

data/lib/pinch.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
-require 'net/http'
+require 'net/https'
 require 'zlib'
 
 # @author Peter Hellberg
 # @author Edward Patel
 class Pinch
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 
   attr_reader :uri
 
@@ -82,38 +82,32 @@ private
 
     raise Errno::ENOENT if file_headers[file_name].nil?
 
-    req = Net::HTTP::Get.new(uri.path)
     padding = 16
 
-    req.set_range(file_headers[file_name][16],
-      30 +
-      file_headers[file_name][16] +
-      file_headers[file_name][8]  +
-      file_headers[file_name][10] +
-      file_headers[file_name][11] +
-      file_headers[file_name][12] +
-      padding)
-
-    res = Net::HTTP.start(uri.host, uri.port) do |http|
-      http.request(req)
-    end
+    offset_start = file_headers[file_name][16]
+    offset_end   = 30 + padding +
+                   file_headers[file_name][16] +
+                   file_headers[file_name][8]  +
+                   file_headers[file_name][10] +
+                   file_headers[file_name][11] +
+                   file_headers[file_name][12]
 
+    response = fetch_data(offset_start, offset_end)
 
-    local_file_header = res.body.unpack('VvvvvvVVVvv')
-    file_data         = res.body[30+local_file_header[9]+local_file_header[10]..-1]
+    local_file_header = response.body.unpack('VvvvvvVVVvv')
+    file_data         = response.body[30+local_file_header[9]+local_file_header[10]..-1]
 
     if local_file_header[3] == 0
       # Uncompressed file
       offset = 30+local_file_header[9]+local_file_header[10]
-      res.body[offset..(offset+local_file_header[8]-1)]
+      response.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]
+      file_data = response.body[30+local_file_header[9]+local_file_header[10]..-1]
       Zlib::Inflate.new(-Zlib::MAX_WBITS).inflate(file_data)
     end
   end
 
-
   def file_headers
     @file_headers ||= begin
       raise RuntimeError, "Couldn’t find the central directory." if central_directory.nil?
@@ -155,19 +149,15 @@ private
     #16 uint32 relativeOffsetOfLocalFileHeader
 
     @central_directory ||= begin
-      req = Net::HTTP::Get.new(uri.path)
-      req.set_range(end_of_central_directory_record[5],
-                    end_of_central_directory_record[5] +
-                    end_of_central_directory_record[4])
+      offset_start = end_of_central_directory_record[5]
+      offset_end   = end_of_central_directory_record[5] + end_of_central_directory_record[4]
 
-      res = Net::HTTP.start(uri.host, uri.port) { |http|
-        http.request(req)
-      }
+      response = fetch_data(offset_start, offset_end)
 
-      if [200, 206].include?(res.code)
-        raise RuntimeError, "Couldn’t find the ZIP file (HTTP: #{res.code})"
+      if [200, 206].include?(response.code)
+        raise RuntimeError, "Couldn’t find the ZIP file (HTTP: #{response.code})"
       else
-        res.body
+        response.body
       end
     end
   end
@@ -183,27 +173,50 @@ private
 
     @end_of_central_directory_record ||= begin
       # Retrieve a 4k of data from the end of the zip file
-      request = Net::HTTP::Get.new(uri.path)
-      offset = content_length >= 4096 ? content_length-4096 : 0
+      offset  = content_length >= 4096 ? content_length-4096 : 0
 
-      request.set_range(offset, content_length)
-
-      response = Net::HTTP.start(uri.host, uri.port) do |http|
-        http.request(request)
-      end
+      response = fetch_data(offset, content_length)
 
       # Unpack the body into a hex string
       hex = response.body.unpack("H*")[0]
 
       # Split on the end record signature, and unpack the last one
       [hex.split("504b0506").last].pack("H*").unpack("vvvvVVv")
+
+      # Skipping the hex unpack and splitting on
+      # PK\x05\x06 instead was for some reason slower.
     end
   end
 
+  ##
+  # Get range of data from URL
+  def fetch_data(offset_start, offset_end)
+    request = Net::HTTP::Get.new(@uri.request_uri)
+    request.set_range(offset_start, offset_end)
+
+    prepared_connection.request(request)
+  end
+
+  ##
   # Retrieve the content length of the file
   def content_length
-    @content_length ||= Net::HTTP.start(@uri.host, @uri.port) { |http|
+    @content_length ||= prepared_connection.start { |http|
       http.head(@uri.path)
     }['Content-Length'].to_i
   end
+
+  ##
+  # Prepare the connection and GET request
+  def prepared_connection
+    @prepared_connection ||= begin
+      http = Net::HTTP.new(@uri.host, @uri.port)
+
+      if @uri.is_a?(URI::HTTPS)
+        http.use_ssl      = true
+        http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      http
+    end
+  end
 end

data/spec/pinch_spec.rb

@@ -1,33 +1,40 @@
 require 'minitest/pride'
 require 'minitest/autorun'
 require 'minitest/spec'
+require 'vcr'
+
+VCR.config do |c|
+  c.allow_http_connections_when_no_cassette = true
+  c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
+  c.stub_with :fakeweb
+end
 
 require File.dirname(__FILE__) + '/../lib/pinch'
 
 describe Pinch 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
-      data = Pinch.get @url, @file
-      data.must_match(/Morphic graphics architecture/)
-      data.size.must_equal 26431
+      VCR.use_cassette('squeak') 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.must_match(/Morphic graphics architecture/)
+        data.size.must_equal 26431
+      end
     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 return the contents of the file" do
-      data = Pinch.get @url, @file
-      data.must_match(/Daring Escape/)
-      data.size.must_equal 2288
+      VCR.use_cassette('canabalt') do
+        @url  = 'http://memention.com/ericjohnson-canabalt-ios-ef43b7d.zip'
+        @file = 'ericjohnson-canabalt-ios-ef43b7d/README.TXT'
+
+        data = Pinch.get @url, @file
+        data.must_match(/Daring Escape/)
+        data.size.must_equal 2288
+      end
     end
   end
 
@@ -35,27 +42,42 @@ describe Pinch do
     before do
       @url  = 'http://peterhellberg.github.com/pinch/test.zip'
       @file = 'data.json'
+      @data = "{\"gem\":\"pinch\",\"authors\":[\"Peter Hellberg\",\"Edward Patel\"],\"github_url\":\"https://github.com/peterhellberg/pinch\"}\n"
     end
 
     it "should retrieve the contents of the file data.json" do
-      data = Pinch.get @url, @file
-      data.must_equal "{\"gem\":\"pinch\",\"authors\":[\"Peter Hellberg\",\"Edward Patel\"],\"github_url\":\"https://github.com/peterhellberg/pinch\"}\n"
-      data.size.must_equal 114
+      VCR.use_cassette('test_zip') do
+        data = Pinch.get @url, @file
+        data.must_equal @data
+        data.size.must_equal 114
+      end
+    end
+
+    it "should retrieve the contents of the file data.json when passed a HTTPS url" do
+      VCR.use_cassette('ssl_test') do
+        @url  = 'https://dl.dropbox.com/u/2230186/pinch_test.zip'
+
+        data = Pinch.get @url, @file
+        data.must_equal @data
+        data.size.must_equal 114
+      end
     end
 
     it "should contain three files" do
-      Pinch.file_list(@url).size.must_equal 3
+      VCR.use_cassette('test_file_count') do
+        Pinch.file_list(@url).size.must_equal 3
+      end
     end
   end
 
   describe "#file_list" do
-    before do
-      @url = 'http://memention.com/ericjohnson-canabalt-ios-ef43b7d.zip'
-    end
-
     it "should return a list with all the file names in the zip" do
-      file_list = Pinch.file_list(@url)
-      file_list.size.must_equal 491
+      VCR.use_cassette('file_list') do
+        @url = 'http://memention.com/ericjohnson-canabalt-ios-ef43b7d.zip'
+
+        file_list = Pinch.file_list(@url)
+        file_list.size.must_equal 491
+      end
     end
   end
 end

metadata

@@ -1,38 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pinch
-version: !ruby/object:Gem::Version
-  version: 0.0.7
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.8
 platform: ruby
-authors:
+authors: 
 - Peter Hellberg
 - Edward Patel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-05 00:00:00.000000000 +02:00
+
+date: 2011-07-07 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &2152860800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: vcr
   prerelease: false
-  version_requirements: *2152860800
-description: Pinch makes it possible to download a specific file from within a ZIP
-  file over HTTP 1.1.
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+description: Pinch makes it possible to download a specific file from within a ZIP file over HTTP 1.1.
 email: peter@c7.se
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - MIT-LICENSE
-files:
+files: 
 - lib/pinch.rb
 - MIT-LICENSE
 - README.rdoc
@@ -40,34 +64,35 @@ files:
 - .gemtest
 - spec/pinch_spec.rb
 has_rdoc: true
-homepage: https://github.com/peterhellberg/pinch
-licenses:
+homepage: http://peterhellberg.github.com/pinch/
+licenses: 
 - MIT-LICENSE
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Retrieve a file from inside a zip file, over the network!
-test_files:
+test_files: 
 - spec/pinch_spec.rb