dassets 0.8.0 → 0.9.0

data/Gemfile

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

data/dassets.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |gem|
   gem.description = %q{Digest and serve HTML asset files}
   gem.summary     = %q{Digested asset files}
   gem.homepage    = "http://github.com/redding/dassets"
+  gem.license     = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.4"])
+  gem.add_development_dependency("assert", ["~> 2.12"])
   gem.add_development_dependency('assert-rack-test', ["~> 1.0"])
   gem.add_development_dependency("sinatra", ["~> 1.4"])
 

data/lib/dassets/config.rb

@@ -20,6 +20,11 @@ module Dassets
       @combinations = Hash.new{ |h, k| [k] } # digest pass-thru if none defined
     end
 
+    def base_url(value = nil)
+      @base_url = value if !value.nil?
+      @base_url
+    end
+
     def source(path, &block)
       @sources << Source.new(path).tap{ |s| block.call(s) if block }
     end

data/lib/dassets/server/request.rb

@@ -10,7 +10,14 @@ class Dassets::Server
     # the behavior to respect POST tunnel method specifiers. We always want
     # the real request method.
     def request_method; @env['REQUEST_METHOD']; end
-    def path_info;      @env['PATH_INFO'];      end
+
+    def path_info
+      @env['PATH_INFO'].sub(dassets_base_url, '')
+    end
+
+    def dassets_base_url
+      Dassets.config.base_url.to_s
+    end
 
     # Determine if the request is for an asset file
     # This will be called on every request so speed is an issue

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/test/helper.rb

@@ -7,6 +7,8 @@ $LOAD_PATH.unshift(File.expand_path("../..", __FILE__))
 # require pry for debugging (`binding.pry`)
 require 'pry'
 
+require 'test/support/factory'
+
 require 'pathname'
 TEST_SUPPORT_PATH = Pathname.new(File.expand_path('../support', __FILE__))
 

data/test/support/factory.rb

@@ -0,0 +1,6 @@
+require 'assert/factory'
+
+module Factory
+  extend Assert::Factory
+
+end

data/test/unit/config_tests.rb

@@ -17,8 +17,19 @@ class Dassets::Config
     subject{ @config }
 
     should have_options :file_store, :cache
-    should have_reader :combinations
-    should have_imeth :source, :combination, :combination?
+    should have_readers :combinations
+    should have_imeths :base_url, :source, :combination, :combination?
+
+    should "have no base url by default" do
+      assert_nil subject.base_url
+    end
+
+    should "set a base url" do
+      url = Factory.url
+      subject.base_url url
+
+      assert_equal url, subject.base_url
+    end
 
     should "default the file store option to a null file store" do
       assert_kind_of Dassets::FileStore::NullStore, subject.file_store

data/test/unit/engine_tests.rb

@@ -4,7 +4,7 @@ require 'dassets/engine'
 class Dassets::Engine
 
   class UnitTests < Assert::Context
-    desc "the base Dassets::Engine"
+    desc "Dassets::Engine"
     setup do
       @engine = Dassets::Engine.new
     end
@@ -31,7 +31,7 @@ class Dassets::Engine
   end
 
   class NullEngineTests < Assert::Context
-    desc "the NullEngine"
+    desc "Dassets::NullEngine"
     setup do
       @engine = Dassets::NullEngine.new('some' => 'opts')
     end

data/test/unit/server/request_tests.rb

@@ -8,12 +8,22 @@ class Dassets::Server::Request
   class UnitTests < Assert::Context
     desc "Dassets::Server::Request"
     setup do
-      @req = file_request('GET', '/file1-daa05c683a4913b268653f7a7e36a5b4.txt')
+      @path = '/file1-daa05c683a4913b268653f7a7e36a5b4.txt'
+      @req = file_request('GET', @path)
     end
     subject{ @req }
 
+    should have_imeths :dassets_base_url
     should have_imeths :for_asset_file?, :asset_path, :asset_file
 
+    should "know its base url" do
+      assert_equal Dassets.config.base_url.to_s, subject.dassets_base_url
+    end
+
+    should "know its path info" do
+      assert_equal @path, subject.path_info
+    end
+
     should "know its asset_path" do
       assert_equal 'file1.txt', subject.asset_path
     end
@@ -71,4 +81,26 @@ class Dassets::Server::Request
 
   end
 
+  class BaseUrlTests < UnitTests
+    desc "when a base url is configured"
+    setup do
+      @orig_base_url = Dassets.config.base_url
+      @new_base_url = Factory.url
+      Dassets.config.base_url(@new_base_url)
+    end
+    teardown do
+      Dassets.config.base_url(@orig_base_url)
+    end
+
+    should "have the same base url as is configured" do
+      assert_equal @new_base_url.to_s, subject.dassets_base_url
+    end
+
+    should "remove the configured base url from the path info" do
+      assert_equal @path, file_request('GET', @path).path_info
+      assert_equal @path, file_request('GET', "#{@new_base_url}#{@path}").path_info
+    end
+
+  end
+
 end

data/test/unit/server_tests.rb

@@ -3,7 +3,7 @@ require 'dassets/server'
 
 class Dassets::Server
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Dassets::Server"
     setup do
       @server = Dassets::Server.new('a rack app goes here')

data/test/unit/source_tests.rb

@@ -5,7 +5,7 @@ require 'dassets/engine'
 
 class Dassets::Source
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Dassets::Source"
     setup do
       @source_path = TEST_SUPPORT_PATH.join("source_files")
@@ -51,7 +51,7 @@ class Dassets::Source
 
   end
 
-  class EmptySourceTests < Assert::Context
+  class EmptySourceTests < UnitTests
     desc "with no source files"
     setup do
       @empty_source_path = TEST_SUPPORT_PATH.join("empty")
@@ -80,7 +80,7 @@ class Dassets::Source
 
   end
 
-  class EngineRegistrationTests < BaseTests
+  class EngineRegistrationTests < UnitTests
     desc "when registering an engine"
     setup do
       @empty_engine = Class.new(Dassets::Engine) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,26 +16,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-05 00:00:00 Z
+date: 2014-08-01 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: 11
+        hash: 27
         segments: 
         - 2
-        - 4
-        version: "2.4"
+        - 12
+        version: "2.12"
   type: :development
+  name: assert
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: assert-rack-test
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,10 +45,10 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
+  name: assert-rack-test
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,10 +60,10 @@ dependencies:
         - 4
         version: "1.4"
   type: :development
+  name: sinatra
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ns-options
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +75,10 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
+  name: ns-options
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,7 +90,9 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
+  name: rack
   version_requirements: *id005
+  prerelease: false
 description: Digest and serve HTML asset files
 email: 
 - kelly@kellyredding.com
@@ -132,6 +132,7 @@ files:
 - test/support/app/assets/nested/a-thing.txt.useless.dumb
 - test/support/app/assets/nested/file3.txt
 - test/support/empty/.gitkeep
+- test/support/factory.rb
 - test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
 - test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg
@@ -156,8 +157,8 @@ files:
 - test/unit/source_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/dassets
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Digested asset files
@@ -197,6 +198,7 @@ test_files:
 - test/support/app/assets/nested/a-thing.txt.useless.dumb
 - test/support/app/assets/nested/file3.txt
 - test/support/empty/.gitkeep
+- test/support/factory.rb
 - test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
 - test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg