browse-everything 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd89b5a4d99d1d4d288de7ea1f2d169b1d65052
-  data.tar.gz: b75cd73ebf3bac49970c4f5de27def245039557e
+  metadata.gz: bdca52f24c726e1a0a0b04200f2ec65359b3b16b
+  data.tar.gz: 181729d5c03b8c06773cbe1f2797e471ccaac5de
 SHA512:
-  metadata.gz: de5b0b8a4626e22d166a1d90143e7c2c2ba7c59a15db9cc6f770c8929c4efaadcdcf8df7de09a5f1c55524b9d60c6e8e7f7198db394893eba42ad22e6d88dd1b
-  data.tar.gz: a6c7b57568667806cdc534e3fc5d7b939382c63cc509bb83b7f25e3c8ec07a81719209b59dcb2551f84b5a792fd73acefb09fe14deecbd18802b932cf5549bff
+  metadata.gz: 454cadb16e026a647559e5759042aeeaa04e724733053ea6f3215ec13bd4d35cca202249ac75b6b51f53e270a77dc9008065179f0b4e5c3913a6a64a2772af29
+  data.tar.gz: 4b4ce4d14208a57d43ec2462c96253f1a04c6546c40496bea0ab7c6450ddbbc997624035d30c18052d81a0c7db6e145877d13e8338863316febd624bea7c3199

data/app/views/browse_everything/_files.html.erb

@@ -9,7 +9,7 @@
       </tr>
     </thead>
     <% provider.contents(browse_path).each_with_index do |file, index| %>
-      <% next if file.relative_parent_path? %>
+      <% next if file.relative_parent_path? or file.size.nil? %>
       <%= render :partial => 'file', :locals => { :file => file, :index => index,
         :path => browse_everything_engine.contents_path(provider_name, file.id), :parent => params[:parent] } %>
     <% end %>

data/lib/browse_everything/retriever.rb

@@ -26,38 +26,68 @@ module BrowseEverything
       target
     end
 
-    def retrieve(spec)
+    def retrieve(spec, &block)
       if spec.key?('expires') && Time.parse(spec['expires']) < Time.now
         raise ArgumentError, "Download spec expired at #{spec['expires']}"
       end
 
-      url = ::Addressable::URI.parse(spec['url'])
-      file_size = spec.fetch('file_size', 0).to_i
-      retrieved = 0
-      case url.scheme
+      parsed_spec = parse_spec(spec)
+
+      case parsed_spec[:url].scheme
       when 'file'
-        File.open(url.path, 'rb') do |f|
+        retrieve_file(parsed_spec, &block)
+      when /https?/
+        retrieve_http(parsed_spec, &block)
+      else
+        raise URI::BadURIError, "Unknown URI scheme: #{parsed_spec[:url].scheme}"
+      end
+    end
+
+    private
+
+      def parse_spec(spec)
+        result = {
+          url: ::Addressable::URI.parse(spec['url']),
+          headers: spec['auth_header'] || {},
+          file_size: spec.fetch('file_size', 0).to_i
+        }
+
+        result[:headers].each_pair { |k, v| result[:headers][k] = v.tr('+', ' ') }
+        result[:file_size] = get_file_size(result) if result[:file_size] < 1
+        result
+      end
+
+      def retrieve_file(parsed_spec)
+        retrieved = 0
+        File.open(parsed_spec[:url].path, 'rb') do |f|
           until f.eof?
             chunk = f.read(chunk_size)
             retrieved += chunk.length
-            yield(chunk, retrieved, file_size)
+            yield(chunk, retrieved, parsed_spec[:file_size])
           end
         end
-      when /https?/
-        headers = spec['auth_header'] || {}
-        headers.each_pair do |k, v|
-          headers[k] = v.tr('+', ' ')
-        end
+      end
 
-        stream_body = file_size > 500.megabytes
+      def retrieve_http(parsed_spec)
+        retrieved = 0
+        stream_body = parsed_spec[:file_size] > 500.megabytes
 
-        HTTParty.get(url.to_s, stream_body: stream_body, headers: headers) do |chunk|
+        HTTParty.get(parsed_spec[:url].to_s, stream_body: stream_body, headers: parsed_spec[:headers]) do |chunk|
           retrieved += chunk.length
-          yield(chunk, retrieved, file_size)
+          yield(chunk, retrieved, parsed_spec[:file_size])
+        end
+      end
+
+      def get_file_size(parsed_spec)
+        case parsed_spec[:url].scheme
+        when 'file'
+          File.size(url.path)
+        when /https?/
+          response = HTTParty.head(parsed_spec[:url].to_s, headers: parsed_spec[:headers])
+          response.content_length
+        else
+          raise URI::BadURIError, "Unknown URI scheme: #{url.scheme}"
         end
-      else
-        raise URI::BadURIError, "Unknown URI scheme: #{url.scheme}"
       end
-    end
   end
 end

data/lib/browse_everything/version.rb

@@ -1,3 +1,3 @@
 module BrowseEverything
-  VERSION = '0.14.1'.freeze
+  VERSION = '0.14.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Carolyn Cole
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails