pinch 0.0.3 → 0.0.4

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.'
+  t.ruby_opts << '-I. -w'
 end

data/lib/pinch.rb

@@ -3,13 +3,10 @@ require 'net/http'
 require 'zlib'
 
 class Pinch
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 
   attr_reader :uri
   attr_reader :file_name
-  attr_reader :content_length
-  attr_reader :central_directory
-  attr_reader :file_headers
 
   def self.get(url, file_name)
     new(url).data(file_name)
@@ -20,29 +17,8 @@ class Pinch
   end
 
   def initialize(url)
-    @uri        = URI.parse(url)
-    @files      = {}
-  end
-
-  def file_headers
-    @file_headers ||= begin
-      raise RuntimeError, "Couldn’t find the central directory." if central_directory.nil?
-
-      headers = {}
-      tmp     = central_directory
-
-      begin
-        cd = tmp.unpack('VvvvvvvVVVvvvvvVV')
-        break if cd[1] == 0
-
-        length            = 46+cd[10]+cd[11]+cd[12]
-        current_file_name = tmp[46...46+cd[10]]
-        tmp               = tmp[length..-1]
-        headers[current_file_name] = cd
-      end while true
-
-      headers
-    end
+    @uri    = URI.parse(url)
+    @files  = {}
   end
 
   def file_list
@@ -50,6 +26,24 @@ class Pinch
   end
 
   def data(file_name)
+    local_file(file_name)
+  end
+
+private
+
+  def local_file(file_name)
+    #0  uint32 localFileHeaderSignature
+    #1  uint16 versionNeededToExtract
+    #2  uint16 generalPurposeBitFlag
+    #3  uint16 compressionMethod
+    #4  uint16 fileLastModificationTime
+    #5  uint16 fileLastModificationDate
+    #6  uint32 CRC32
+    #7  uint32 compressedSize
+    #8  uint32 uncompressedSize
+    #9  uint16 fileNameLength
+    #10 uint16 extraFieldLength
+
     raise Errno::ENOENT if file_headers[file_name].nil?
 
     req = Net::HTTP::Get.new(uri.path)
@@ -64,21 +58,6 @@ class Pinch
       http.request(req)
     end
 
-    ###########################################################################
-    # Local file header
-    ###########################################################################
-
-    #0  uint32 localFileHeaderSignature
-    #1  uint16 versionNeededToExtract
-    #2  uint16 generalPurposeBitFlag
-    #3  uint16 compressionMethod
-    #4  uint16 fileLastModificationTime
-    #5  uint16 fileLastModificationDate
-    #6  uint32 CRC32
-    #7  uint32 compressedSize
-    #8  uint32 uncompressedSize
-    #9  uint16 fileNameLength
-    #10 uint16 extraFieldLength
 
     local_file_header = res.body.unpack('VvvvvvVVVvv')
     file_data         = res.body[30+local_file_header[9]+local_file_header[10]..-1]
@@ -94,6 +73,27 @@ class Pinch
     end
   end
 
+  def file_headers
+    @file_headers ||= begin
+      raise RuntimeError, "Couldn’t find the central directory." if central_directory.nil?
+
+      headers = {}
+      tmp     = central_directory
+
+      begin
+        cd = tmp.unpack('VvvvvvvVVVvvvvvVV')
+        break if cd[1] == 0
+
+        length            = 46+cd[10]+cd[11]+cd[12]
+        current_file_name = tmp[46...46+cd[10]]
+        tmp               = tmp[length..-1]
+        headers[current_file_name] = cd
+      end while true
+
+      headers
+    end
+  end
+
   def central_directory
     #0  uint32 centralDirectoryFileHeaderSignature
     #1  uint16 versionMadeBy
@@ -131,13 +131,6 @@ class Pinch
     end
   end
 
-  # Retrieve the content length of the file
-  def content_length
-    @content_length ||= Net::HTTP.start(@uri.host, @uri.port) { |http|
-      http.head(@uri.path)
-    }['Content-Length'].to_i
-  end
-
   def end_of_central_directory_record
     #0  uint16 numberOfThisDisk;
     #1  uint16 diskWhereCentralDirectoryStarts;
@@ -165,4 +158,11 @@ class Pinch
       [hex.split("504b0506").last].pack("H*").unpack("vvvvVVv")
     end
   end
+
+  # Retrieve the content length of the file
+  def content_length
+    @content_length ||= Net::HTTP.start(@uri.host, @uri.port) { |http|
+      http.head(@uri.path)
+    }['Content-Length'].to_i
+  end
 end

data/spec/pinch_spec.rb

@@ -13,7 +13,7 @@ describe Pinch do
 
     it "should return the contents of the file" do
       data = Pinch.get @url, @file
-      data.must_match /Morphic graphics architecture/
+      data.must_match(/Morphic graphics architecture/)
       data.size.must_equal 26424
     end
   end
@@ -26,7 +26,7 @@ describe Pinch do
 
     it "should return the contents of the file" do
       data = Pinch.get @url, @file
-      data.must_match /Daring Escape/
+      data.must_match(/Daring Escape/)
       data.size.must_equal 2288
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: pinch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Peter Hellberg