dassets 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 42a4505c113f65ab11aba8c4eb4b8e8ffc6ad909
-  metadata.gz: fe45e83de311469fdb752d0d002c99a458ec4391
+  metadata.gz: 89a17e9e4689219cffdda2b968a4c481f9813591
+  data.tar.gz: 2a74fdbbc78e44ec82d23f1aabbc284d70f03397
 SHA512: 
-  data.tar.gz: 43319a4222a6daefb725ce87b9d8c0c8dc6169a518f5cef67176ef8f9acae20cfe60f360bbef5f6e29dc138e4047d3797f9950de5728ae91b2aa4fb5ca74d96a
-  metadata.gz: b648a9c3df1e2f01196aba0aaf3add9a967fb93fee069f54c714b419f34d82117671a43740b68143759de8e9e580db0c2f1f7cd3a47e061a88be0a8c96d509c6
+  metadata.gz: d19a0f7587afb5d0d19a9878a0667973474ef55a3d684d363a66cb750394249a97cf957cac9e99df6662fd72d32be6e9eb46794c7d121c7d7b45558f85dd0dd7
+  data.tar.gz: bf6bfb399f0ab12d21f50d58db6b6e39b22da71768660236ae21f287ebf3470477598dc95a397a39395c960980fd428bf6cf1968145975a65ab7db67da28041b

data/dassets.gemspec

@@ -18,7 +18,7 @@ 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.16.1"])
+  gem.add_development_dependency("assert",           ["~> 2.16.3"])
   gem.add_development_dependency('assert-rack-test', ["~> 1.0.4"])
   gem.add_development_dependency("sinatra",          ["~> 1.4"])
 

data/lib/dassets.rb

@@ -1,6 +1,7 @@
 require 'dassets/version'
 require 'dassets/asset_file'
 require 'dassets/config'
+require 'dassets/source_file'
 
 module Dassets
 
@@ -10,21 +11,33 @@ module Dassets
   end
 
   def self.init
-    @asset_files ||= {}
+    @asset_files  ||= {}
+    @source_files   = SourceFiles.new(self.config.sources)
   end
 
   def self.[](digest_path)
     @asset_files[digest_path] ||= AssetFile.new(digest_path)
   end
 
-  def self.source_list
-    SourceList.new(self.config.sources)
+  def self.source_files
+    @source_files
   end
 
-  module SourceList
+  module SourceFiles
+
     def self.new(sources)
-      sources.inject([]){ |list, source| list += source.files }
+      # use a hash to store the source files so in the case two source files
+      # have the same digest path, the last one *should* be correct since it
+      # was last to be configured
+      sources.inject({}) do |hash, source|
+        source.files.each do |file_path|
+          s = SourceFile.new(file_path)
+          hash[s.digest_path] = s
+        end
+        hash
+      end
     end
+
   end
 
 end

data/lib/dassets/asset_file.rb

@@ -8,10 +8,10 @@ class Dassets::AssetFile
   attr_reader :digest_path, :dirname, :extname, :basename, :source_proxy
 
   def initialize(digest_path)
-    @digest_path = digest_path
-    @dirname  = File.dirname(@digest_path)
-    @extname  = File.extname(@digest_path)
-    @basename = File.basename(@digest_path, @extname)
+    @digest_path  = digest_path
+    @dirname      = File.dirname(@digest_path)
+    @extname      = File.extname(@digest_path)
+    @basename     = File.basename(@digest_path, @extname)
     @source_proxy = Dassets::SourceProxy.new(@digest_path, {
       :content_cache     => Dassets.config.content_cache,
       :fingerprint_cache => Dassets.config.fingerprint_cache

data/lib/dassets/file_store.rb

@@ -6,7 +6,7 @@ module Dassets
     attr_reader :root
 
     def initialize(root)
-      @root = root
+      @root       = root
       @save_mutex = ::Mutex.new
     end
 

data/lib/dassets/source.rb

@@ -6,9 +6,9 @@ class Dassets::Source
   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 }
+    @path             = path.to_s
+    @filter           = proc{ |paths| paths }
+    @engines          = Hash.new{ |h,k| Dassets::NullEngine.new }
     @response_headers = Hash.new
   end
 

data/lib/dassets/source_file.rb

@@ -8,19 +8,14 @@ module Dassets
   class SourceFile
 
     def self.find_by_digest_path(path, options = nil)
-      # look in the configured source list
-      source_files = Dassets.source_list.map{ |p| self.new(p) }
-
-      # get the last matching one (in case two source files have the same digest
-      # path the last one *should* be correct since it was last to be configured)
-      source_files.select{ |s| s.digest_path == path }.last || NullSourceFile.new(path, options)
+      Dassets.source_files[path] || NullSourceFile.new(path, options)
     end
 
     attr_reader :file_path
 
     def initialize(file_path)
       @file_path = file_path.to_s
-      @ext_list = File.basename(@file_path).split('.').reverse
+      @ext_list  = File.basename(@file_path).split('.').reverse
     end
 
     # get the last matching one (in the case two sources with the same path are

data/lib/dassets/version.rb

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

data/test/helper.rb

@@ -41,3 +41,5 @@ Dassets.configure do |c|
     s.response_headers[Factory.string] = Factory.string
   end
 end
+
+Dassets.init

data/test/unit/dassets_tests.rb

@@ -11,7 +11,7 @@ module Dassets
     subject{ Dassets }
 
     should have_imeths :config, :configure, :init, :[]
-    should have_imeths :source_list
+    should have_imeths :source_files
 
     should "return a `Config` instance with the `config` method" do
       assert_kind_of Config, subject.config
@@ -38,8 +38,8 @@ module Dassets
     end
 
     should "know its list of configured source files" do
-      exp_configured_list = Dassets::SourceList.new(Dassets.config.sources)
-      assert_equal exp_configured_list, subject.source_list
+      exp = Dassets::SourceFiles.new(Dassets.config.sources)
+      assert_equal exp, subject.source_files
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-06-14 00:00:00 Z
+date: 2017-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.16.1
+        version: 2.16.3
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Digested asset files