dassets 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 27368bfd4202c312aa66d309d27517a6704f9bca
-  metadata.gz: 78fc0e7996a2a58dac2402129e53bc692d6ee24a
+  data.tar.gz: 8dbe44e69f1cd555b3d4530bf6776c93ee6adc45
+  metadata.gz: 25630a550508870191515317a401c64a3afa28ac
 SHA512: 
-  data.tar.gz: d86da74bebfd5c5799768c1c449348d9da0015ec948af9bd0aa706206a61b93e89e941804368683b275bcba6345fe008f7a7f86a7bd2908df8646fcb49c36c6b
-  metadata.gz: 0c6e6fde12b20fbb9614e7510a8b09a6f6fb78a3084e037cb6b94f9340e1a9caf63e9364d1c48066c6e9ff8e04cd3a56ad561775bf214da646f5f08c82c19be7
+  data.tar.gz: 42a5cb8ee86ff57a117107491c25d7fbc3d813978bb17d0ac67b15e61aa3ced203e6e9fe03b1b7d7d4c0c708f14011021b65401e27bdddf7156be32e7e6b2c48
+  metadata.gz: f11ead1c8a44cf0988602f2fb9ae08ca7c5cc2d7f587c679f504f68bf6f46f838395ce906b491b156565c5ac5c65067aaaa068f870a4228b53b150e741911857

data/dassets.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency("assert",           ["~> 2.16.3"])
-  gem.add_development_dependency('assert-rack-test', ["~> 1.0.4"])
+  gem.add_development_dependency('assert-rack-test', ["~> 1.0.5"])
   gem.add_development_dependency("sinatra",          ["~> 1.4"])
 
   gem.add_dependency("rack", ["~> 1.0"])

data/lib/dassets/file_store.rb

@@ -10,17 +10,17 @@ module Dassets
       @save_mutex = ::Mutex.new
     end
 
-    def save(url, &block)
+    def save(url_path, &block)
       @save_mutex.synchronize do
-        store_path(url).tap do |path|
+        store_path(url_path).tap do |path|
           FileUtils.mkdir_p(File.dirname(path))
           File.open(path, "w"){ |f| f.write(block.call) }
         end
       end
     end
 
-    def store_path(url)
-      File.join(@root, url)
+    def store_path(url_path)
+      File.join(@root, url_path)
     end
 
     class NullStore < FileStore
@@ -28,8 +28,9 @@ module Dassets
         super('')
       end
 
-      def save(url, &block)
-        store_path(url) # no-op, just return the store path like the base does
+      def save(url_path, &block)
+        # no-op, just return the store path like the base does
+        store_path(url_path)
       end
     end
 

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.14.2"
+  VERSION = "0.14.3"
 end

data/test/unit/asset_file_tests.rb

@@ -122,7 +122,7 @@ class Dassets::AssetFile
       @outfile = Dassets.config.file_store.store_path(@asset_file.url)
     end
     teardown do
-      FileUtils.rm(@outfile)
+      FileUtils.rm_rf(Dassets.config.file_store.root.to_s)
       Dassets.config.file_store Dassets::FileStore::NullStore.new
     end
 

data/test/unit/config_tests.rb

@@ -69,7 +69,7 @@ class Dassets::Config
       subject.file_store(store)
       assert_equal store, subject.file_store
 
-      subject.content_cache(nil)
+      subject.file_store(nil)
       assert_equal store, subject.file_store
     end
 

data/test/unit/file_store_tests.rb

@@ -6,35 +6,37 @@ class Dassets::FileStore
   class UnitTests < Assert::Context
     desc "Dassets::FileStore"
     setup do
-      @root = TEST_SUPPORT_PATH.join('public')
-      @url = 'some/url'
-      @url_path = @root.join(@url).to_s
-      FileUtils.rm_f(@url_path)
+      @root      = TEST_SUPPORT_PATH.join('public')
+      @url_path  = Factory.url
+      @root_path = File.join(@root, @url_path).to_s
+      FileUtils.rm_f(@root_path)
 
       @store = Dassets::FileStore.new(@root.to_s)
     end
     teardown do
-      FileUtils.rm_f(@url_path)
+      FileUtils.rm_rf(@root.to_s)
     end
     subject{ @store }
 
     should have_readers :root
     should have_imeths :save, :store_path
 
-    should "know its root path" do
+    should "know its root" do
       assert_equal @root.to_s, subject.root
     end
 
-    should "build the store path based on a given url" do
-      assert_equal @url_path, subject.store_path(@url)
+    should "build the store path based on a given url path" do
+      assert_equal @root_path, subject.store_path(@url_path)
     end
 
-    should "return write a file and return the store path on save" do
-      assert_not_file_exists @url_path
-      path = subject.save(@url){ 'some contents' }
+    should "write a file and return the store path on save" do
+      content = Factory.text
+      assert_not_file_exists @root_path
+      path = subject.save(@url_path){ content }
 
-      assert_equal @url_path, path
-      assert_file_exists @url_path
+      assert_equal @root_path, path
+      assert_file_exists @root_path
+      assert_equal content, File.read(@root_path)
     end
 
   end
@@ -49,12 +51,13 @@ class Dassets::FileStore
       assert_kind_of Dassets::FileStore, subject
     end
 
-    should "know its root path" do
+    should "know its root" do
       assert_equal '', subject.root
     end
 
-    should "return the store path on save" do
-      assert_equal "/#{@url}", subject.save(@url)
+    should "return the store path on save but not save a file" do
+      assert_equal File.join('', @url_path), subject.save(@url_path)
+      assert_not_file_exists @root_path
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-05-10 00:00:00 Z
+date: 2017-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -29,7 +29,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.5
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -91,10 +91,6 @@ files:
 - test/support/app/assets/nested/file3.txt
 - test/support/empty/.gitkeep
 - test/support/factory.rb
-- test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
-- test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg
-- test/support/public/nested/a-thing.txt-7413d18f2eba9c695a880aff67fde135.no-use
-- test/support/public/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt
 - test/support/source_files/_ignored.txt
 - test/support/source_files/nested/_nested_ignored.txt
 - test/support/source_files/nested/test2.txt
@@ -149,10 +145,6 @@ test_files:
 - test/support/app/assets/nested/file3.txt
 - test/support/empty/.gitkeep
 - test/support/factory.rb
-- test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
-- test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg
-- test/support/public/nested/a-thing.txt-7413d18f2eba9c695a880aff67fde135.no-use
-- test/support/public/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt
 - test/support/source_files/_ignored.txt
 - test/support/source_files/nested/_nested_ignored.txt
 - test/support/source_files/nested/test2.txt

data/test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt

@@ -1 +0,0 @@
-file2.txt

data/test/support/public/nested/a-thing.txt-7413d18f2eba9c695a880aff67fde135.no-use

@@ -1,4 +0,0 @@
-thing
-
-DUMB
-USELESS