dassets 0.13.0 → 0.13.1

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: 7402d80d36dfa89d1f68c64a739ffbc516eb1901694e9638ee930835f8b68807fa8dd56245265f8c68af4719633d4b273f13c67ff744f60904f66c5ec27231c5
+  data.tar.gz: 657e6338f28159a89ef32225be168b3ca03379b26b73a6db01f0f3b0c0b11a01c3659286185d9d01471dc06aadcb308cbd51700ccf8bdfd0f0261f358fa9f27a
+SHA1: 
+  metadata.gz: 98e6907a11c2dc4e0409f14c0361094ecffa8396
+  data.tar.gz: fafaeb2c34ac116922f469b2ec7317f2688de99e

data/lib/dassets/asset_file.rb

@@ -56,6 +56,10 @@ class Dassets::AssetFile
     Rack::Mime.mime_type(@extname)
   end
 
+  def response_headers
+    @source_proxy.response_headers
+  end
+
   def exists?
     @source_proxy.exists?
   end

data/lib/dassets/server/response.rb

@@ -21,7 +21,7 @@ class Dassets::Server
         @asset_file.digest!
         body = Body.new(env, @asset_file)
         [ body.partial? ? 206 : 200,
-          Rack::Utils::HeaderHash.new.tap do |h|
+          Rack::Utils::HeaderHash.new.merge(@asset_file.response_headers).tap do |h|
             h['Last-Modified']  = mtime
             h['Content-Type']   = @asset_file.mime_type.to_s
             h['Content-Length'] = body.size.to_s

data/lib/dassets/source.rb

@@ -3,12 +3,13 @@ require 'dassets/engine'
 module Dassets; end
 class Dassets::Source
 
-  attr_reader :path, :engines
+  attr_reader :path, :engines, :response_headers
 
   def initialize(path)
     @path = path.to_s
     @filter = proc{ |paths| paths }
     @engines = Hash.new{ |h,k| Dassets::NullEngine.new }
+    @response_headers = Hash.new
   end
 
   def filter(&block)

data/lib/dassets/source_file.rb

@@ -60,6 +60,10 @@ module Dassets
       File.mtime(@file_path)
     end
 
+    def response_headers
+      self.source.nil? ? Hash.new : self.source.response_headers
+    end
+
     def ==(other_source_file)
       self.file_path == other_source_file.file_path
     end

data/lib/dassets/source_proxy.rb

@@ -35,6 +35,10 @@ class Dassets::SourceProxy
     @source_files.map{ |f| f.mtime }.compact.max
   end
 
+  def response_headers
+    @source_files.inject(Hash.new){ |hash, f| hash.merge!(f.response_headers) }
+  end
+
   def exists?
     @source_files.inject(true){ |res, f| res && f.exists? }
   end

data/lib/dassets/version.rb

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

data/test/helper.rb

@@ -29,5 +29,6 @@ Dassets.configure do |c|
   c.source TEST_SUPPORT_PATH.join("app/assets") do |s|
     s.engine 'dumb', @dumb_engine
     s.engine 'useless', @useless_engine
+    s.response_headers[Factory.string] = Factory.string
   end
 end

data/test/unit/asset_file_tests.rb

@@ -25,10 +25,11 @@ class Dassets::AssetFile
       assert_equal 'file1', subject.basename
     end
 
-    should "use its source file attrs as its own" do
+    should "use its source proxy attrs as its own" do
       assert_equal subject.source_proxy.mtime.httpdate, subject.mtime
       assert_equal Rack::Utils.bytesize(subject.content), subject.size
       assert_equal "text/plain", subject.mime_type
+      assert_equal subject.source_proxy.response_headers, subject.response_headers
       assert subject.exists?
 
       null_file = Dassets::AssetFile.new('')
@@ -36,6 +37,7 @@ class Dassets::AssetFile
       assert_nil null_file.size
       assert_nil null_file.mime_type
       assert_not null_file.exists?
+      assert_equal null_file.source_proxy.response_headers, null_file.response_headers
     end
 
     should "know its source proxy" do

data/test/unit/server/response_tests.rb

@@ -40,11 +40,11 @@ class Dassets::Server::Response
       exp_body = Body.new(@env, @asset_file)
       assert_equal exp_body, resp.body
 
-      exp_headers = {
+      exp_headers = @asset_file.response_headers.merge({
         'Content-Type'   => 'text/plain',
         'Content-Length' => Rack::Utils.bytesize(@asset_file.content).to_s,
         'Last-Modified'  => @asset_file.mtime.to_s
-      }
+      })
       assert_equal exp_headers, resp.headers
 
       assert_equal [200, exp_headers, exp_body], resp.to_rack

data/test/unit/source_file_tests.rb

@@ -17,33 +17,43 @@ class Dassets::SourceFile
 
     should have_readers :file_path
     should have_imeths :source, :asset_file, :digest_path
-    should have_imeths :compiled, :exists?, :mtime
+    should have_imeths :compiled, :exists?, :mtime, :response_headers
     should have_cmeth :find_by_digest_path
 
     should "know its file path" do
       assert_equal @file_path.to_s, subject.file_path
     end
 
-    should "know if it exists" do
-      assert subject.exists?
+    should "know its configured source" do
+      exp_source = Dassets.config.sources.select{ |s| @file_path.include?(s.path) }.last
+      assert_equal exp_source, subject.source
     end
 
-    should "use the mtime of its file as its mtime" do
-      assert_equal File.mtime(subject.file_path), subject.mtime
+    should "know its asset file" do
+      assert_kind_of Dassets::AssetFile, subject.asset_file
+      assert_equal Dassets::AssetFile.new(subject.digest_path), subject.asset_file
     end
 
     should "know its digest path" do
       assert_equal 'file1.txt', subject.digest_path
     end
 
-    should "know its asset file" do
-      assert_kind_of Dassets::AssetFile, subject.asset_file
-      assert_equal Dassets::AssetFile.new(subject.digest_path), subject.asset_file
+    should "not memoize its compiled source" do
+      compiled1 = subject.compiled
+      compiled2 = subject.compiled
+      assert_not_same compiled2, compiled1
     end
 
-    should "know its configured source" do
-      exp_source = Dassets.config.sources.select{ |s| @file_path.include?(s.path) }.last
-      assert_equal exp_source, subject.source
+    should "know if it exists" do
+      assert subject.exists?
+    end
+
+    should "use the mtime of its file as its mtime" do
+      assert_equal File.mtime(subject.file_path), subject.mtime
+    end
+
+    should "use the response headers of its source as its response headers" do
+      assert_same subject.source.response_headers, subject.response_headers
     end
 
     should "be findable by its digest path" do
@@ -53,12 +63,6 @@ class Dassets::SourceFile
       assert_not_same subject, found
     end
 
-    should "not memoize its compiled source" do
-      compiled1 = subject.compiled
-      compiled2 = subject.compiled
-      assert_not_same compiled2, compiled1
-    end
-
   end
 
   class NullSourceTests < UnitTests
@@ -80,6 +84,7 @@ class Dassets::SourceFile
       assert_equal false, null_src.exists?
       assert_nil null_src.compiled
       assert_nil null_src.mtime
+      assert_equal Hash.new, null_src.response_headers
     end
 
     should "pass options to a null src when finding by an unknown digest path" do

data/test/unit/source_proxy_tests.rb

@@ -17,7 +17,8 @@ class Dassets::SourceProxy
 
     should have_readers :digest_path, :content_cache, :fingerprint_cache
     should have_readers :source_files
-    should have_imeths :key, :content, :fingerprint, :mtime, :exists?
+    should have_imeths :key, :content, :fingerprint, :mtime, :response_headers
+    should have_imeths :exists?
 
   end
 
@@ -38,13 +39,13 @@ class Dassets::SourceProxy
 
     should "have a single source file" do
       assert_equal 1, subject.source_files.size
-      exp_source_file = Dassets::SourceFile.find_by_digest_path('file1.txt')
-      assert_equal exp_source_file, subject.source_files.first
+      exp = Dassets::SourceFile.find_by_digest_path('file1.txt')
+      assert_equal exp, subject.source_files.first
     end
 
     should "use its digest path and mtime as its key" do
-      exp_key = "#{subject.digest_path} -- #{subject.mtime}"
-      assert_equal exp_key, subject.key
+      exp = "#{subject.digest_path} -- #{subject.mtime}"
+      assert_equal exp, subject.key
     end
 
     should "get its content from the compiled source of the single source file" do
@@ -52,14 +53,18 @@ class Dassets::SourceProxy
     end
 
     should "get its fingerprint by MD5 hashing the content" do
-      exp_fp = Digest::MD5.new.hexdigest(subject.content)
-      assert_equal exp_fp, subject.fingerprint
+      exp = Digest::MD5.new.hexdigest(subject.content)
+      assert_equal exp, subject.fingerprint
     end
 
     should "use its single source file's max mtime as its mtime" do
       assert_equal subject.source_files.first.mtime, subject.mtime
     end
 
+    should "use its single source file's response headers as its resonse headers" do
+      assert_equal subject.source_files.first.response_headers, subject.response_headers
+    end
+
     should "exist if its single source file exists" do
       assert_equal subject.source_files.first.exists?, subject.exists?
     end
@@ -100,18 +105,25 @@ class Dassets::SourceProxy
     end
 
     should "get its content from the compiled source of its source files" do
-      exp_content = subject.source_files.map{ |f| f.compiled }.join("\n")
-      assert_equal exp_content, subject.content
+      exp = subject.source_files.map{ |f| f.compiled }.join("\n")
+      assert_equal exp, subject.content
     end
 
     should "use its source files' max mtime as its mtime" do
-      exp_mtime = subject.source_files.map{ |f| f.mtime }.max
-      assert_equal exp_mtime, subject.mtime
+      exp = subject.source_files.map{ |f| f.mtime }.max
+      assert_equal exp, subject.mtime
+    end
+
+    should "use its source files' merged response headers as its response headers" do
+      exp = subject.source_files.inject(Hash.new) do |hash, file|
+        hash.merge!(file.response_headers)
+      end
+      assert_equal exp, subject.response_headers
     end
 
     should "exist if its all its source files exist" do
-      exp_exists = subject.source_files.inject(true){ |res, f| res && f.exists? }
-      assert_equal exp_exists, subject.exists?
+      exp = subject.source_files.inject(true){ |res, f| res && f.exists? }
+      assert_equal exp, subject.exists?
     end
 
   end

data/test/unit/source_tests.rb

@@ -13,7 +13,7 @@ class Dassets::Source
     end
     subject{ @source }
 
-    should have_reader :path, :engines
+    should have_reader :path, :engines, :response_headers
     should have_imeth :files, :filter, :engine
 
     should "know its path and default filter" do
@@ -49,6 +49,14 @@ class Dassets::Source
       assert_kind_of Dassets::NullEngine, subject.engines['something']
     end
 
+    should "know its response headers" do
+      assert_equal Hash.new, subject.response_headers
+
+      name, value = Factory.string, Factory.string
+      subject.response_headers[name] = value
+      assert_equal value, subject.response_headers[name]
+    end
+
   end
 
   class EmptySourceTests < UnitTests

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: 
-  segments: 
-  - 0
-  - 13
-  - 0
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,83 +10,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-12-22 00:00:00 Z
+date: 2016-02-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: assert
+  prerelease: false
   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
 - !ruby/object:Gem::Dependency 
+  name: assert-rack-test
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
+      - &id005 !ruby/object:Gem::Version 
         version: "1.0"
   type: :development
-  name: assert-rack-test
   version_requirements: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
   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
 - !ruby/object:Gem::Dependency 
+  name: ns-options
+  prerelease: false
   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
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  name: rack
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - *id005
   type: :runtime
-  name: rack
-  version_requirements: *id005
-  prerelease: false
+  version_requirements: *id006
 description: Digest and serve HTML asset files
 email: 
 - kelly@kellyredding.com
@@ -158,35 +126,28 @@ files:
 homepage: http://github.com/redding/dassets
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - &id007 
+    - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id007
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Digested asset files
 test_files: 
 - test/helper.rb