dassets 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 6c88f5b13dbd9fd2f53e83907fee24cafab13103d25764d95461bb9c0f440c5411b698a94283eb06d870279bacde458e87f7b0ae363da0ea2a9579fb1ae4bd98
-  data.tar.gz: 874b87a5c52bbd3e3f47eb5f1b816f4c92e95ba7af6904a0811eaf51b815e101da59081e13b0ca01a23e1cb0b2df10d942d978a0d6a8505adee7933458a67f0c
 SHA1: 
-  metadata.gz: 77e8957bf984a1b6957afee6fbb99d370a9752af
-  data.tar.gz: bf20c13e61aeccabed7110b6eb630fbfc933d0a6
+  data.tar.gz: 42a4505c113f65ab11aba8c4eb4b8e8ffc6ad909
+  metadata.gz: fe45e83de311469fdb752d0d002c99a458ec4391
+SHA512: 
+  data.tar.gz: 43319a4222a6daefb725ce87b9d8c0c8dc6169a518f5cef67176ef8f9acae20cfe60f360bbef5f6e29dc138e4047d3797f9950de5728ae91b2aa4fb5ca74d96a
+  metadata.gz: b648a9c3df1e2f01196aba0aaf3add9a967fb93fee069f54c714b419f34d82117671a43740b68143759de8e9e580db0c2f1f7cd3a47e061a88be0a8c96d509c6

data/Gemfile

@@ -2,5 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake', "~> 10.4.0"
-gem 'pry',  "~> 0.9.0"
+gem 'pry', "~> 0.9.0"

data/dassets.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version     = Dassets::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.description = %q{Digest and serve HTML asset files}
   gem.summary     = %q{Digested asset files}
+  gem.description = %q{Digest and serve HTML asset files}
   gem.homepage    = "http://github.com/redding/dassets"
   gem.license     = 'MIT'
 
@@ -18,11 +18,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert",           ["~> 2.15"])
-  gem.add_development_dependency('assert-rack-test', ["~> 1.0"])
+  gem.add_development_dependency("assert",           ["~> 2.16.1"])
+  gem.add_development_dependency('assert-rack-test', ["~> 1.0.4"])
   gem.add_development_dependency("sinatra",          ["~> 1.4"])
 
-  gem.add_dependency('ns-options', ["~> 1.1"])
-  gem.add_dependency("rack",       ["~> 1.0"])
+  gem.add_dependency("rack", ["~> 1.0"])
 
 end

data/lib/dassets/config.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'ns-options'
 require 'dassets/cache'
 require 'dassets/file_store'
 require 'dassets/source'
@@ -7,9 +6,6 @@ require 'dassets/source'
 module Dassets
 
   class Config
-    include NsOptions::Proxy
-
-    option :file_store, FileStore, :default => proc{ FileStore::NullStore.new }
 
     attr_reader :sources, :combinations
 
@@ -19,6 +15,7 @@ module Dassets
       @combinations      = Hash.new{ |h, k| [k] } # digest pass-thru if none defined
       @content_cache     = Dassets::Cache::NoCache.new
       @fingerprint_cache = Dassets::Cache::NoCache.new
+      @file_store        = FileStore::NullStore.new
     end
 
     def base_url(value = nil)
@@ -30,6 +27,13 @@ module Dassets
       @base_url = value
     end
 
+    def file_store(value = nil)
+      if !value.nil?
+        @file_store = (value.kind_of?(FileStore) ? value : FileStore.new(value))
+      end
+      @file_store
+    end
+
     def content_cache(cache = nil)
       @content_cache = cache if !cache.nil?
       @content_cache

data/lib/dassets/version.rb

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

data/test/helper.rb

@@ -9,6 +9,15 @@ require 'pry'
 
 require 'test/support/factory'
 
+# 1.8.7 backfills
+
+# Array#sample
+if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
+  class Array
+    alias_method :sample, :choice
+  end
+end
+
 require 'pathname'
 TEST_SUPPORT_PATH = Pathname.new(File.expand_path('../support', __FILE__))
 

data/test/system/rack_tests.rb

@@ -70,7 +70,7 @@ module Dassets
 
     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 }
+      env = { 'HTTP_RANGE' => ['bytes=3-2', 'bytes=abc'].sample }
 
       resp = get '/file1-daa05c683a4913b268653f7a7e36a5b4.txt', {}, env
       assert_equal 200, resp.status
@@ -83,13 +83,13 @@ module Dassets
     setup do
       base_url = Factory.base_url
       Assert.stub(Dassets.config, :base_url){ base_url }
-      Dassets.config.file_store = TEST_SUPPORT_PATH.join('public').to_s
+      Dassets.config.file_store TEST_SUPPORT_PATH.join('public').to_s
       @url = Dassets['file1.txt'].url
       @url_file = Dassets.config.file_store.store_path(@url)
     end
     teardown do
       FileUtils.rm(@url_file)
-      Dassets.config.file_store = FileStore::NullStore.new
+      Dassets.config.file_store FileStore::NullStore.new
     end
 
     should "digest the asset" do

data/test/unit/asset_file_tests.rb

@@ -116,14 +116,14 @@ class Dassets::AssetFile
     setup do
       base_url = Factory.base_url
       Assert.stub(Dassets.config, :base_url){ base_url }
-      Dassets.config.file_store = TEST_SUPPORT_PATH.join('public').to_s
+      Dassets.config.file_store TEST_SUPPORT_PATH.join('public').to_s
 
       @save_path = @asset_file.digest!
       @outfile = Dassets.config.file_store.store_path(@asset_file.url)
     end
     teardown do
       FileUtils.rm(@outfile)
-      Dassets.config.file_store = Dassets::FileStore::NullStore.new
+      Dassets.config.file_store Dassets::FileStore::NullStore.new
     end
 
     should "return the asset file url" do

data/test/unit/config_tests.rb

@@ -1,25 +1,21 @@
 require 'assert'
 require 'dassets/config'
 
-require 'ns-options/assert_macros'
 require 'dassets/cache'
 require 'dassets/file_store'
 
 class Dassets::Config
 
   class UnitTests < Assert::Context
-    include NsOptions::AssertMacros
-
     desc "Dassets::Config"
     setup do
       @config = Dassets::Config.new
     end
     subject{ @config }
 
-    should have_options :file_store
     should have_readers :combinations
     should have_imeths :base_url, :set_base_url
-    should have_imeths :content_cache, :fingerprint_cache
+    should have_imeths :file_store, :content_cache, :fingerprint_cache
     should have_imeths :source, :combination, :combination?
 
     should "have no base url by default" do
@@ -48,11 +44,24 @@ class Dassets::Config
       assert_kind_of Dassets::FileStore::NullStore, subject.file_store
     end
 
+    should "configure non-nil file stores" do
+      store_root = Factory.path
+      subject.file_store(store_root)
+      assert_equal store_root, subject.file_store.root
+
+      store = Dassets::FileStore.new(Factory.path)
+      subject.file_store(store)
+      assert_equal store, subject.file_store
+
+      subject.content_cache(nil)
+      assert_equal store, subject.file_store
+    end
+
     should "default its content cache" do
       assert_instance_of Dassets::Cache::NoCache, subject.content_cache
     end
 
-    should "allow configuring non-nil content caches" do
+    should "configure non-nil content caches" do
       cache = Dassets::Cache::MemCache.new
       subject.content_cache(cache)
       assert_equal cache, subject.content_cache
@@ -65,7 +74,7 @@ class Dassets::Config
       assert_instance_of Dassets::Cache::NoCache, subject.fingerprint_cache
     end
 
-    should "allow configuring non-nil fingerprint caches" do
+    should "configure non-nil fingerprint caches" do
       cache = Dassets::Cache::MemCache.new
       subject.fingerprint_cache(cache)
       assert_equal cache, subject.fingerprint_cache

data/test/unit/server/response_tests.rb

@@ -149,7 +149,7 @@ class Dassets::Server::Response
   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
+      range = [nil, 'bytes=', 'bytes=0-1,2-3', 'bytes=3-2', 'bytes=abc'].sample
       env = range.nil? ? {} : { 'HTTP_RANGE' => range }
       @body = Body.new(env, @asset_file)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-02-23 00:00:00 Z
+date: 2016-06-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "2.15"
+        version: 2.16.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
-      - &id005 !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version 
+        version: 1.0.4
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,24 +43,15 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ns-options
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: "1.0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - *id005
-  type: :runtime
-  version_requirements: *id006
 description: Digest and serve HTML asset files
 email: 
 - kelly@kellyredding.com
@@ -76,7 +67,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - dassets.gemspec
 - lib/dassets.rb
 - lib/dassets/asset_file.rb
@@ -135,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id007 
+  - &id005 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id007
+  - *id005
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Digested asset files

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"