dassets 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6276fedfd2895a526ed5a1593dae1a3a1d0ae726
-  data.tar.gz: 248ce8d0a5548d7454fb5675296df73e52c0ad3f
+  metadata.gz: 244a7ebdc3e3946a77738679d15461540e10fdf4
+  data.tar.gz: f9139f0feab58b8ec02fdb7f65741e1066e13968
 SHA512:
-  metadata.gz: 9428c6ed5707756a0bd9e3e81197548394d1da94735d1ccd66d4cf837a024de745bd94db73e0452fd4fdc41053aca798177bc0692cb8cc569da4e9786ed0fc95
-  data.tar.gz: dfa8a1d4831ba49d293650a363ac71020bb6d62cf9d54e09d3c6c9791b2b5acdb9ec9c4f7b9d4c61b85fff82b39840a35c1e838ba58bcc052af31239cc9f4a0e
+  metadata.gz: d0986dc632093cc8960fb505c67bfec57e760e25c51a5023a307cb628ce45e4bc1939cf24afa756dd81d74a313e214f99671704d5d6ca900c9bfb8eba8a570f1
+  data.tar.gz: af99765ab02de4783213f347106fe2fff5d863120b0a687f17c84e47a7a66d1e16a1539e00348447bea0ff3d307df5a114fc0bba8de92cdd7045eb9f1a978752

data/dassets.gemspec

@@ -18,10 +18,9 @@ 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.12"])
+  gem.add_development_dependency("assert",           ["~> 2.15"])
   gem.add_development_dependency('assert-rack-test', ["~> 1.0"])
-  gem.add_development_dependency("sinatra", ["~> 1.4"])
-
+  gem.add_development_dependency("sinatra",          ["~> 1.4"])
 
   gem.add_dependency('ns-options', ["~> 1.1"])
   gem.add_dependency("rack",       ["~> 1.0"])

data/lib/dassets/asset_file.rb

@@ -17,18 +17,20 @@ class Dassets::AssetFile
 
   def digest!
     return if !self.exists?
-    Dassets.config.file_store.save(self.url){ self.content }
+    Dassets.config.file_store.save(self.path){ self.content }
   end
 
-  def url
-    url_basename = "#{@basename}-#{self.fingerprint}#{@extname}"
-    File.join(@dirname, url_basename).sub(/^\.\//, '').sub(/^\//, '')
+  def path
+    path_basename = "#{@basename}-#{self.fingerprint}#{@extname}"
+    File.join(@dirname, path_basename).sub(/^\.\//, '').sub(/^\//, '')
   end
 
-  def href
-    "/#{self.url}"
+  def url
+    "#{dassets_base_url}/#{self.path}"
   end
 
+  alias_method :href, :url
+
   def fingerprint
     return nil if !self.exists?
     @source_proxy.fingerprint
@@ -64,4 +66,10 @@ class Dassets::AssetFile
     self.fingerprint == other_asset_file.fingerprint
   end
 
+  private
+
+  def dassets_base_url
+    Dassets.config.base_url.to_s
+  end
+
 end

data/lib/dassets/config.rb

@@ -21,10 +21,14 @@ module Dassets
     end
 
     def base_url(value = nil)
-      @base_url = value if !value.nil?
+      set_base_url(value) if !value.nil?
       @base_url
     end
 
+    def set_base_url(value)
+      @base_url = value
+    end
+
     def source(path, &block)
       @sources << Source.new(path).tap{ |s| block.call(s) if block }
     end

data/lib/dassets/version.rb

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

data/test/unit/asset_file_tests.rb

@@ -15,8 +15,8 @@ class Dassets::AssetFile
     subject{ @asset_file }
 
     should have_readers :digest_path, :dirname, :extname, :basename, :source_proxy
-    should have_imeths  :digest!, :url, :fingerprint, :content
-    should have_imeths  :href, :mtime, :size, :mime_type, :exists?, :==
+    should have_imeths  :digest!, :path, :url, :href, :fingerprint, :content
+    should have_imeths  :mtime, :size, :mime_type, :exists?, :==
 
     should "know its digest path, dirname, extname, and basename" do
       assert_equal 'file1.txt', subject.digest_path
@@ -68,29 +68,40 @@ class Dassets::AssetFile
       assert_equal exp_content, without_output.content
     end
 
-    should "build it's url from the path and the fingerprint" do
-      assert_match /^file1-[a-f0-9]{32}\.txt$/, subject.url
+    should "build it's path from the file and the fingerprint" do
+      assert_match /^file1-[a-f0-9]{32}\.txt$/, subject.path
 
       nested = Dassets::AssetFile.new('nested/file1.txt')
-      assert_equal "nested/file1-.txt", nested.url
+      assert_equal "nested/file1-.txt", nested.path
     end
 
-    should "build it's href from the url" do
-      assert_match /^\/file1-[a-f0-9]{32}\.txt$/, subject.href
+    should "build it's url/href from the path and any configured base url" do
+      assert_match /^\/file1-[a-f0-9]{32}\.txt$/, subject.url
+      assert_match subject.url, subject.href
 
       nested = Dassets::AssetFile.new('nested/file1.txt')
-      assert_equal "/nested/file1-.txt", nested.href
+      assert_equal "/nested/file1-.txt", nested.url
+      assert_equal nested.url, nested.href
+
+      base_url = Factory.url
+      Dassets.config.base_url base_url
+
+      assert_match /^#{base_url}\/file1-[a-f0-9]{32}\.txt$/, subject.url
+      assert_match subject.url, subject.href
+
+      assert_equal "#{base_url}/nested/file1-.txt", nested.url
+      assert_equal nested.url, nested.href
     end
 
     should "not memoize its attributes" do
+      path1 = subject.path
+      path2 = subject.path
+      assert_not_same path2, path1
+
       url1 = subject.url
       url2 = subject.url
       assert_not_same url2, url1
 
-      href1 = subject.href
-      href2 = subject.href
-      assert_not_same href2, href1
-
       fingerprint1 = subject.fingerprint
       fingerprint2 = subject.fingerprint
       assert_not_same fingerprint2, fingerprint1
@@ -111,7 +122,7 @@ class Dassets::AssetFile
     setup do
       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)
+      @outfile = Dassets.config.file_store.store_path(@asset_file.path)
     end
     teardown do
       Dassets.config.file_store = Dassets::FileStore::NullStore.new

data/test/unit/config_tests.rb

@@ -18,19 +18,31 @@ class Dassets::Config
 
     should have_options :file_store, :cache
     should have_readers :combinations
-    should have_imeths :base_url, :source, :combination, :combination?
+    should have_imeths :base_url, :set_base_url
+    should have_imeths :source, :combination, :combination?
 
     should "have no base url by default" do
       assert_nil subject.base_url
     end
 
-    should "set a base url" do
+    should "set non-nil base urls" do
       url = Factory.url
       subject.base_url url
+      assert_equal url, subject.base_url
 
+      subject.base_url(nil)
       assert_equal url, subject.base_url
     end
 
+    should "force set any base urls" do
+      url = Factory.url
+      subject.set_base_url url
+      assert_equal url, subject.base_url
+
+      subject.set_base_url(nil)
+      assert_nil 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
     end

data/test/unit/server/request_tests.rb

@@ -85,11 +85,11 @@ class Dassets::Server::Request
     desc "when a base url is configured"
     setup do
       @orig_base_url = Dassets.config.base_url
-      @new_base_url = Factory.url
+      @new_base_url  = Factory.url
       Dassets.config.base_url(@new_base_url)
     end
     teardown do
-      Dassets.config.base_url(@orig_base_url)
+      Dassets.config.set_base_url(@orig_base_url)
     end
 
     should "have the same base url as is configured" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dassets
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: assert
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: assert-rack-test
   requirement: !ruby/object:Gem::Requirement