dassets 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: 7402d80d36dfa89d1f68c64a739ffbc516eb1901694e9638ee930835f8b68807fa8dd56245265f8c68af4719633d4b273f13c67ff744f60904f66c5ec27231c5
-  data.tar.gz: 657e6338f28159a89ef32225be168b3ca03379b26b73a6db01f0f3b0c0b11a01c3659286185d9d01471dc06aadcb308cbd51700ccf8bdfd0f0261f358fa9f27a
+  metadata.gz: 6c88f5b13dbd9fd2f53e83907fee24cafab13103d25764d95461bb9c0f440c5411b698a94283eb06d870279bacde458e87f7b0ae363da0ea2a9579fb1ae4bd98
+  data.tar.gz: 874b87a5c52bbd3e3f47eb5f1b816f4c92e95ba7af6904a0811eaf51b815e101da59081e13b0ca01a23e1cb0b2df10d942d978a0d6a8505adee7933458a67f0c
 SHA1: 
-  metadata.gz: 98e6907a11c2dc4e0409f14c0361094ecffa8396
-  data.tar.gz: fafaeb2c34ac116922f469b2ec7317f2688de99e
+  metadata.gz: 77e8957bf984a1b6957afee6fbb99d370a9752af
+  data.tar.gz: bf20c13e61aeccabed7110b6eb630fbfc933d0a6

data/lib/dassets/server/response.rb

@@ -47,19 +47,7 @@ class Dassets::Server
 
       def initialize(env, asset_file)
         @asset_file = asset_file
-
-        content_size = @asset_file.size
-        ranges = Rack::Utils.byte_ranges(env, content_size)
-        if ranges.nil? || ranges.empty? || ranges.length > 1
-          # No ranges or multiple ranges are not supported
-          @range         = 0..content_size-1
-          @content_range = nil
-        else
-          # single range
-          @range         = ranges[0]
-          @content_range = "bytes #{@range.begin}-#{@range.end}/#{content_size}"
-        end
-
+        @range, @content_range = get_range_info(env, @asset_file)
         @size = self.range_end - self.range_begin + 1
       end
 
@@ -96,6 +84,23 @@ class Dassets::Server
         self.range_end   == other_body.range_end
       end
 
+      private
+
+      def get_range_info(env, asset_file)
+        content_size = asset_file.size
+        # legacy rack version, just return full size
+        return full_size_range_info(content_size) if !Rack::Utils.respond_to?(:byte_ranges)
+        ranges = Rack::Utils.byte_ranges(env, content_size)
+        # No ranges or multiple ranges are not supported, just return full size
+        return full_size_range_info(content_size) if ranges.nil? || ranges.empty? || ranges.length > 1
+        # single range
+        [ranges[0], "bytes #{ranges[0].begin}-#{ranges[0].end}/#{content_size}"]
+      end
+
+      def full_size_range_info(content_size)
+        [(0..content_size-1), nil]
+      end
+
     end
 
   end

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

data/test/unit/server/response_tests.rb

@@ -182,7 +182,7 @@ class Dassets::Server::Response
 
   end
 
-  class PartialBodyTests < BodyIOTests
+  class PartialBodySetupTests < BodyIOTests
     desc "for a partial content request"
     setup do
       @start_chunk    = Factory.boolean ? 0 : 1
@@ -191,8 +191,14 @@ class Dassets::Server::Response
       @partial_size   = @partial_chunks * Body::CHUNK_SIZE
       @partial_end    = @partial_begin + (@partial_size-1)
 
-      env = { 'HTTP_RANGE' => "bytes=#{@partial_begin}-#{@partial_end}" }
-      @body = Body.new(env, @asset_file)
+      @env = { 'HTTP_RANGE' => "bytes=#{@partial_begin}-#{@partial_end}" }
+    end
+
+  end
+
+  class PartialBodyTests < PartialBodySetupTests
+    setup do
+      @body = Body.new(@env, @asset_file)
     end
     subject{ @body }
 
@@ -227,4 +233,39 @@ class Dassets::Server::Response
 
   end
 
+  class LegacyRackTests < PartialBodySetupTests
+    desc "when using a legacy version of rack that can't interpret byte ranges"
+    setup do
+      Assert.stub(Rack::Utils, :respond_to?).with(:byte_ranges){ false }
+      @body = Body.new(@env, @asset_file)
+    end
+
+    should "not be partial" do
+      assert_false subject.partial?
+    end
+
+    should "be the full content size" do
+      assert_equal @asset_file.size, subject.size
+    end
+
+    should "have no content range" do
+      assert_nil subject.content_range
+    end
+
+    should "have the full content size as its range" do
+      assert_equal 0,              subject.range_begin
+      assert_equal subject.size-1, subject.range_end
+    end
+
+    should "chunk the full content when iterated" do
+      chunks = []
+      subject.each{ |chunk| chunks << chunk }
+
+      assert_equal @num_chunks,               chunks.size
+      assert_equal subject.class::CHUNK_SIZE, chunks.first.size
+      assert_equal @asset_file.content,       chunks.join('')
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors: 
 - Kelly Redding