pinch 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 030d2274d6753a92063e30f52381861e0ac69668
+  data.tar.gz: 3f3dcec53eae2f7aa575848f0d69ea2ff1059ec4
+SHA512:
+  metadata.gz: c5c1921fde2cb1f4531664a7bfa11b6fb4dadd3f35511bf3e7efa91efdcceb3c3f33b9ce6292dffa98c5fdad361f5cc3bf3192415d1690edd7c1e687adf8316e
+  data.tar.gz: 18f2ed70982f7e3f85c4b4157310229bd2bda5798e2abec73eb73c43ba33a113c72e788a0d6817516908e8f17e81029f856621765e54148c1d571414b1f8e8e1

data/README.rdoc

@@ -27,26 +27,27 @@ The specs currently blows up on MagLev.
 
     require 'pinch'
 
-    data = Pinch.get 'http://peterhellberg.github.com/pinch/test.zip', 'data.json'
+    data = Pinch.get 'http://peterhellberg.github.io/pinch/test.zip', 'data.json'
 
     puts data
 
-== Patch to use Pinch against Amazon S3 storage with pre-signed urls
-AWS S3 storage verifies url signature against HTTP verb, therefore requiring different pre-signed urls for HEAD and GET requests. Patch extends Pinch gem to accept hash or 2 urls, allowing to fetch items stored in zip archives on S3.
+=== Amazon S3 storage with pre-signed urls
 
-require 'pinch'
+AWS S3 storage verifies url signature against HTTP verb, therefore 
+requiring different pre-signed urls for HEAD and GET requests. 
+Patch extends Pinch gem to accept hash or 2 urls, allowing to fetch 
+items stored in zip archives on S3.
 
-require 'right_aws'
-
-s3 = RightAws::S3Generator.new('...','...')
-
-bucket = s3.bucket('my-bucket')
-
-head_ticket = bucket.key('test.zip').head
-
-get_ticket = bucket.key('test.zip').get
-
-data=Pinch.get({:head => head_url, :get => get_url},'data.json')
+    require 'pinch'
+    require 'right_aws'
+    
+    s3 = RightAws::S3Generator.new('...','...')
+    
+    bucket      = s3.bucket('my-bucket')
+    head_ticket = bucket.key('test.zip').head
+    get_ticket  = bucket.key('test.zip').get
+    
+    data=Pinch.get({:head => head_url, :get => get_url},'data.json')
 
 == LICENSE
 

data/lib/pinch.rb

@@ -6,7 +6,7 @@ require 'pinch_response'
 # @author Peter Hellberg
 # @author Edward Patel
 class Pinch
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 
   attr_reader :get_uri, :user, :pass
 

data/lib/pinch_response.rb

@@ -1,33 +1,44 @@
 # This class only implements read_body
 # The rest can be implemented when required
+#
 class PinchResponse
+  ##
+  # Prepare pinch response
+  #
   def initialize(http_response)
     @http_response = http_response
-    @zstream = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-    @first_chunk = true
+    @zstream       = Zlib::Inflate.new(-Zlib::MAX_WBITS)
+    @first_chunk   = true
   end
 
+  ##
+  # Read the body of the HTTP response
+  #
   def read_body
     if block_given?
       @http_response.read_body do |chunk|
         if @first_chunk
           local_file_header = chunk.unpack('VvvvvvVVVvv')
-          @offset_start = 30+local_file_header[9]+local_file_header[10]
-          @compressed = (local_file_header[3] != 0)
-          @length = @compressed ? local_file_header[7] : local_file_header[8]
 
+          @offset_start = 30+local_file_header[9]+local_file_header[10]
+          @compressed   = (local_file_header[3] != 0)
+          @length       = @compressed ? local_file_header[7] : local_file_header[8]
           @cursor_start = @offset_start
-          @to_be_read = @length
-          @first_chunk = false
+          @to_be_read   = @length
+
+          @first_chunk  = false
         end
 
         cursor_start = [@cursor_start, 0].max
         cursor_end   = [@to_be_read, chunk.length].min
+
         data = chunk[cursor_start, cursor_end]
+
         @cursor_start -= chunk.length
 
         if data
           @to_be_read -= data.length
+
           if @compressed
             yield @zstream.inflate(data)
           else

data/spec/pinch_spec.rb

@@ -24,7 +24,7 @@ require 'vcr'
 VCR.configure do |c|
   c.allow_http_connections_when_no_cassette = true
   c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  c.hook_into :fakeweb
+  c.hook_into :webmock
 end
 
 require File.dirname(__FILE__) + '/../lib/pinch'
@@ -69,7 +69,7 @@ describe Pinch do
 
   describe "when calling get on the example ZIP file" do
     before do
-      @url  = 'http://peterhellberg.github.com/pinch/test.zip'
+      @url  = 'http://peterhellberg.github.io/pinch/test.zip'
       @file = 'data.json'
       @data = "{\"gem\":\"pinch\",\"authors\":[\"Peter Hellberg\",\"Edward Patel\"],\"github_url\":\"https://github.com/peterhellberg/pinch\"}\n"
     end
@@ -97,7 +97,7 @@ describe Pinch do
 
     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'
+        @url  = 'https://dl.dropboxusercontent.com/u/2230186/pinch_test.zip'
 
         data = Pinch.get @url, @file
         data.must_equal @data
@@ -111,10 +111,10 @@ describe Pinch do
       end
     end
   end
-  
+
   describe "when calling get on the example ZIP file behind HTTP Basic Authentication" do
     before do
-      @url  = 'http://code.mrgossett.com/pinch_test.zip'
+      @url  = 'http://assets.c7.se/data/pinch/auth/pinch_test.zip'
       @file = 'data.json'
       @data = "{\"gem\":\"pinch\",\"authors\":[\"Peter Hellberg\",\"Edward Patel\"],\"github_url\":\"https://github.com/peterhellberg/pinch\"}\n"
     end
@@ -149,7 +149,7 @@ describe Pinch do
 
   describe "Pinch.content_length" do
     before do
-      @url  = 'http://peterhellberg.github.com/pinch/test.zip'
+      @url  = 'http://peterhellberg.github.io/pinch/test.zip'
     end
 
     it "should return the size of the ZIP file" do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinch
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Peter Hellberg
@@ -10,56 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.8'
 description: Pinch makes it possible to download a specific file from within a ZIP
   file over HTTP 1.1.
 email: peter@c7.se
@@ -69,44 +62,40 @@ extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE
 files:
-- lib/pinch.rb
-- lib/pinch_response.rb
+- ".gemtest"
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- .gemtest
+- lib/pinch.rb
+- lib/pinch_response.rb
 - spec/pinch_spec.rb
 homepage: http://peterhellberg.github.com/pinch/
 licenses:
 - MIT-LICENSE
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 752809128111839856
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0.rc.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Retrieve a file from inside a zip file, over the network!
 test_files:
 - spec/pinch_spec.rb