dassets 0.11.0 → 0.12.0

data/README.md

@@ -28,8 +28,8 @@ end
 ### Link To
 
 ```rb
-Dassets['css/site.css'].href       # => "/css/site-123abc.css"
-Dassets['img/logos/main.jpg'].href # => "/img/logos/main-a1b2c3.jpg"
+Dassets['css/site.css'].url       # => "/css/site-123abc.css"
+Dassets['img/logos/main.jpg'].url # => "/img/logos/main-a1b2c3.jpg"
 ```
 
 ### Serve

data/lib/dassets/server/response.rb

@@ -6,6 +6,7 @@ module Dassets; end
 class Dassets::Server
 
   class Response
+
     attr_reader :asset_file, :status, :headers, :body
 
     def initialize(env, asset_file)
@@ -13,18 +14,20 @@ class Dassets::Server
 
       mtime = @asset_file.mtime.to_s
       @status, @headers, @body = if env['HTTP_IF_MODIFIED_SINCE'] == mtime
-        [ 304, Rack::Utils::HeaderHash.new, [] ]
+        [ 304, Rack::Utils::HeaderHash.new('Last-Modified' => mtime), [] ]
       elsif !@asset_file.exists?
         [ 404, Rack::Utils::HeaderHash.new, ["Not Found"] ]
       else
         @asset_file.digest!
-        [ 200,
+        body = Body.new(env, @asset_file)
+        [ body.partial? ? 206 : 200,
           Rack::Utils::HeaderHash.new.tap do |h|
-            h["Content-Type"]   = @asset_file.mime_type.to_s
-            h["Content-Length"] = @asset_file.size.to_s
-            h["Last-Modified"]  = mtime
+            h['Last-Modified']  = mtime
+            h['Content-Type']   = @asset_file.mime_type.to_s
+            h['Content-Length'] = body.size.to_s
+            h['Content-Range']  = body.content_range if body.partial?
           end,
-          env["REQUEST_METHOD"] == "HEAD" ? [] : [ @asset_file.content ]
+          env["REQUEST_METHOD"] == "HEAD" ? [] : body
         ]
       end
     end
@@ -33,6 +36,68 @@ class Dassets::Server
       [@status, @headers.to_hash, @body]
     end
 
+    class Body
+
+      # this class borrows from the body range handling in Rack::File and adapts
+      # it for use with Dasset's asset files and their generic string content.
+
+      CHUNK_SIZE = (8*1024).freeze # 8k
+
+      attr_reader :asset_file, :size, :content_range
+
+      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
+
+        @size = self.range_end - self.range_begin + 1
+      end
+
+      def partial?
+        !@content_range.nil?
+      end
+
+      def range_begin; @range.begin; end
+      def range_end;   @range.end;   end
+
+      def each
+        StringIO.open(@asset_file.content, "rb") do |io|
+          io.seek(@range.begin)
+          remaining_len = self.size
+          while remaining_len > 0
+            part = io.read([CHUNK_SIZE, remaining_len].min)
+            break if part.nil?
+
+            remaining_len -= part.length
+            yield part
+          end
+        end
+      end
+
+      def inspect
+        "#<#{self.class}:#{'0x0%x' % (self.object_id << 1)} " \
+          "digest_path=#{self.asset_file.digest_path} " \
+          "range_begin=#{self.range_begin} range_end=#{self.range_end}>"
+      end
+
+      def ==(other_body)
+        self.asset_file  == other_body.asset_file  &&
+        self.range_begin == other_body.range_begin &&
+        self.range_end   == other_body.range_end
+      end
+
+    end
+
   end
 
 end

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/test/system/rack_tests.rb

@@ -38,6 +38,45 @@ module Dassets
       assert_empty resp.body
     end
 
+    should "return a partial content response on valid partial content requests" do
+      content = Dassets['file1.txt'].content
+      size    = Factory.integer(content.length)
+
+      # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
+      env = { 'HTTP_RANGE' => "bytes=0-#{size}" }
+
+      resp = get '/file1-daa05c683a4913b268653f7a7e36a5b4.txt', {}, env
+      assert_equal 206, resp.status
+      assert_equal content[0..size], resp.body
+    end
+
+    should "return a full response on no-range partial content requests" do
+      # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
+      env = { 'HTTP_RANGE' => 'bytes=' }
+
+      resp = get '/file1-daa05c683a4913b268653f7a7e36a5b4.txt', {}, env
+      assert_equal 200, resp.status
+      assert_equal Dassets['file1.txt'].content, resp.body
+    end
+
+    should "return a full response on multiple-range partial content requests" do
+      # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
+      env = { 'HTTP_RANGE' => 'bytes=0-1,2-3' }
+
+      resp = get '/file1-daa05c683a4913b268653f7a7e36a5b4.txt', {}, env
+      assert_equal 200, resp.status
+      assert_equal Dassets['file1.txt'].content, resp.body
+    end
+
+    should "return a full response on invalid-range partial content requests" do
+      # see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35
+      env = { 'HTTP_RANGE' => ['bytes=3-2', 'bytes=abc'].choice }
+
+      resp = get '/file1-daa05c683a4913b268653f7a7e36a5b4.txt', {}, env
+      assert_equal 200, resp.status
+      assert_equal Dassets['file1.txt'].content, resp.body
+    end
+
   end
 
   class DigestTests < SuccessTests

data/test/unit/server/response_tests.rb

@@ -9,61 +9,220 @@ class Dassets::Server::Response
   class UnitTests < Assert::Context
     desc "Dassets::Server::Response"
     setup do
-      @resp = file_response(Dassets::AssetFile.new(''))
+      @env        = {}
+      @asset_file = Dassets['file1.txt']
+
+      @response = Dassets::Server::Response.new(@env, @asset_file)
     end
-    subject{ @resp }
+    subject{ @response }
 
     should have_readers :asset_file, :status, :headers, :body
     should have_imeths :to_rack
 
     should "handle not modified files" do
-      af = Dassets['file1.txt']
-      resp = file_response(af, 'HTTP_IF_MODIFIED_SINCE' => af.mtime)
+      env = { 'HTTP_IF_MODIFIED_SINCE' => @asset_file.mtime }
+      resp = Dassets::Server::Response.new(env, @asset_file)
 
       assert_equal 304, resp.status
-      assert_equal [], resp.body
-      assert_equal Rack::Utils::HeaderHash.new, resp.headers
-      assert_equal [ 304, {}, [] ], resp.to_rack
+      assert_equal [],  resp.body
+
+      exp_headers = Rack::Utils::HeaderHash.new('Last-Modified' => @asset_file.mtime.to_s)
+      assert_equal exp_headers, resp.headers
+
+      assert_equal [304, exp_headers.to_hash, []], resp.to_rack
     end
 
     should "handle found files" do
-      af = Dassets['file1.txt']
-      resp = file_response(af)
+      resp = Dassets::Server::Response.new(@env, @asset_file)
+
+      assert_equal 200, resp.status
+
+      exp_body = Body.new(@env, @asset_file)
+      assert_equal exp_body, resp.body
+
       exp_headers = {
         'Content-Type'   => 'text/plain',
-        'Content-Length' => Rack::Utils.bytesize(af.content).to_s,
-        'Last-Modified'  => af.mtime.to_s
+        'Content-Length' => Rack::Utils.bytesize(@asset_file.content).to_s,
+        'Last-Modified'  => @asset_file.mtime.to_s
       }
-
-      assert_equal 200, resp.status
-      assert_equal [ af.content ], resp.body
       assert_equal exp_headers, resp.headers
-      assert_equal [ 200, exp_headers, [ af.content ] ], resp.to_rack
+
+      assert_equal [200, exp_headers, exp_body], resp.to_rack
     end
 
     should "have an empty body for found files with a HEAD request" do
-      af = Dassets['file1.txt']
-      resp = file_response(af, 'REQUEST_METHOD' => 'HEAD')
+      env = { 'REQUEST_METHOD' => 'HEAD' }
+      resp = Dassets::Server::Response.new(env, @asset_file)
 
       assert_equal 200, resp.status
       assert_equal [], resp.body
     end
 
     should "handle not found files" do
-      af = Dassets['not-found-file.txt']
-      resp = file_response(af)
+      af   = Dassets['not-found-file.txt']
+      resp = Dassets::Server::Response.new(@env, af)
 
-      assert_equal 404, resp.status
-      assert_equal ['Not Found'], resp.body
+      assert_equal 404,                         resp.status
+      assert_equal ['Not Found'],               resp.body
       assert_equal Rack::Utils::HeaderHash.new, resp.headers
-      assert_equal [ 404, {}, ['Not Found'] ], resp.to_rack
+      assert_equal [404, {}, ['Not Found']],    resp.to_rack
+    end
+
+  end
+
+  class PartialContentTests < UnitTests
+    desc "for a partial content request"
+    setup do
+      @body = Body.new(@env, @asset_file)
+      Assert.stub(Body, :new).with(@env, @asset_file){ @body }
+
+      content_range = Factory.string
+      Assert.stub(@body, :content_range){ content_range }
+      Assert.stub(@body, :partial?){ true }
+
+      @response = Dassets::Server::Response.new(@env, @asset_file)
+    end
+
+    should "be a partial content response" do
+      assert_equal 206, subject.status
+
+      assert_includes 'Content-Range', subject.headers
+      assert_equal @body.content_range, subject.headers['Content-Range']
+    end
+
+  end
+
+  class BodyTests < UnitTests
+    desc "Body"
+    setup do
+      @body = Body.new(@env, @asset_file)
     end
+    subject{ @body }
+
+    should have_readers :asset_file, :size, :content_range
+    should have_imeths :partial?, :range_begin, :range_end
+    should have_imeths :each
+
+    should "know its chunk size" do
+      assert_equal 8192, Body::CHUNK_SIZE
+    end
+
+    should "know its asset file" do
+      assert_equal @asset_file, subject.asset_file
+    end
+
+    should "know if it is equal to another body" do
+      same_af_same_range = Body.new(@env, @asset_file)
+      Assert.stub(same_af_same_range, :range_begin){ subject.range_begin }
+      Assert.stub(same_af_same_range, :range_end){ subject.range_end }
+      assert_equal same_af_same_range, subject
+
+      other_af_same_range = Body.new(@env, Dassets['file2.txt'])
+      Assert.stub(other_af_same_range, :range_begin){ subject.range_begin }
+      Assert.stub(other_af_same_range, :range_end){ subject.range_end }
+      assert_not_equal other_af_same_range, subject
+
+      same_af_other_range = Body.new(@env, @asset_file)
+
+      Assert.stub(same_af_other_range, :range_begin){ Factory.integer }
+      Assert.stub(same_af_other_range, :range_end){ subject.range_end }
+      assert_not_equal same_af_other_range, subject
+
+      Assert.stub(same_af_other_range, :range_begin){ subject.range_begin }
+      Assert.stub(same_af_other_range, :range_end){ Factory.integer }
+      assert_not_equal same_af_other_range, subject
+    end
+
+  end
+
+  class BodyIOTests < BodyTests
+    setup do
+      @min_num_chunks = 3
+      @num_chunks     = @min_num_chunks + Factory.integer(3)
+
+      content = 'a' * (@num_chunks * Body::CHUNK_SIZE)
+      Assert.stub(@asset_file, :content){ content }
+    end
+
+  end
+
+  class NonPartialBodyTests < BodyIOTests
+    desc "for non/multi/invalid partial content requests"
+    setup do
+      range = [nil, 'bytes=', 'bytes=0-1,2-3', 'bytes=3-2', 'bytes=abc'].choice
+      env = range.nil? ? {} : { 'HTTP_RANGE' => range }
+      @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
+
+  class PartialBodyTests < BodyIOTests
+    desc "for a partial content request"
+    setup do
+      @start_chunk    = Factory.boolean ? 0 : 1
+      @partial_begin  = @start_chunk * Body::CHUNK_SIZE
+      @partial_chunks = @num_chunks - Factory.integer(@min_num_chunks)
+      @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)
+    end
+    subject{ @body }
+
+    should "be partial" do
+      assert_true subject.partial?
+    end
+
+    should "be the specified partial size" do
+      assert_equal @partial_size, subject.size
+    end
+
+    should "know its content range" do
+      exp = "bytes #{@partial_begin}-#{@partial_end}/#{@asset_file.size}"
+      assert_equal exp, subject.content_range
+    end
+
+    should "have the know its range" do
+      assert_equal @partial_begin, subject.range_begin
+      assert_equal @partial_end,   subject.range_end
+    end
+
+    should "chunk the range when iterated" do
+      chunks = []
+      subject.each{ |chunk| chunks << chunk }
 
-    protected
+      assert_equal @partial_chunks,           chunks.size
+      assert_equal subject.class::CHUNK_SIZE, chunks.first.size
 
-    def file_response(asset_file, env={})
-      require 'dassets/server/response'
-      Dassets::Server::Response.new(env, asset_file)
+      exp = @asset_file.content[@partial_begin..@partial_end]
+      assert_equal exp, chunks.join('')
     end
 
   end

metadata

@@ -1,95 +1,110 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dassets
-version: !ruby/object:Gem::Version
-  version: 0.11.0
+version: !ruby/object:Gem::Version 
+  hash: 47
+  prerelease: 
+  segments: 
+  - 0
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
-authors:
+authors: 
 - Kelly Redding
 - Collin Redding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: assert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
+
+date: 2015-11-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 2
+        - 15
+        version: "2.15"
   type: :development
+  name: assert
+  version_requirements: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
-- !ruby/object:Gem::Dependency
-  name: assert-rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  name: assert-rack-test
+  version_requirements: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :development
+  name: sinatra
+  version_requirements: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: ns-options
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
+  name: ns-options
+  version_requirements: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
+  name: rack
+  version_requirements: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Digest and serve HTML asset files
-email:
+email: 
 - kelly@kellyredding.com
 - collin.redding@me.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
+
+files: 
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -142,30 +157,39 @@ files:
 - test/unit/source_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/dassets
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Digested asset files
-test_files:
+test_files: 
 - test/helper.rb
 - test/support/app.rb
 - test/support/app/assets/file1.txt

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 244a7ebdc3e3946a77738679d15461540e10fdf4
-  data.tar.gz: f9139f0feab58b8ec02fdb7f65741e1066e13968
-SHA512:
-  metadata.gz: d0986dc632093cc8960fb505c67bfec57e760e25c51a5023a307cb628ce45e4bc1939cf24afa756dd81d74a313e214f99671704d5d6ca900c9bfb8eba8a570f1
-  data.tar.gz: af99765ab02de4783213f347106fe2fff5d863120b0a687f17c84e47a7a66d1e16a1539e00348447bea0ff3d307df5a114fc0bba8de92cdd7045eb9f1a978752