lib/dassets.rb in dassets-0.5.0 vs lib/dassets.rb in dassets-0.6.0

@@ -1,14 +1,13 @@
 require 'pathname'
 require 'set'
 require 'ns-options'
 
 require 'dassets/version'
-require 'dassets/root_path'
 require 'dassets/file_store'
 require 'dassets/default_cache'
-require 'dassets/engine'
+require 'dassets/source'
 require 'dassets/asset_file'
 
 ENV['DASSETS_ASSETS_FILE'] ||= 'config/assets'
 
 module Dassets
@@ -21,58 +20,54 @@
   def self.init
     begin
       require self.config.assets_file
     rescue LoadError
     end
-    raise 'no Dassets `root_path` specified' if !self.config.required_set?
   end
 
   def self.[](digest_path)
     AssetFile.new(digest_path)
   end
 
+  def self.source_list
+    SourceList.new(self.config.sources)
+  end
+
   # Cmds
 
   def self.digest_source_files(paths=nil)
     require 'dassets/digest_cmd'
     DigestCmd.new(paths).run
   end
 
   class Config
     include NsOptions::Proxy
 
-    option :root_path,     Pathname,  :required => true
     option :assets_file,   Pathname,  :default => ENV['DASSETS_ASSETS_FILE']
-    option :source_path,   RootPath,  :default => proc{ "app/assets" }
-    option :source_filter, Proc,      :default => proc{ |paths| paths }
     option :file_store,    FileStore, :default => proc{ NullFileStore.new }
 
-    attr_reader :engines
+    attr_reader :sources, :combinations
     attr_accessor :cache
 
     def initialize
       super
-      @engines = Hash.new{ |k,v| Dassets::NullEngine.new }
+      @sources = []
+      @combinations = Hash.new{ |h,k| [k] } # digest pass-thru if none defined
       @cache = DefaultCache.new
     end
 
-    def source(path=nil, &filter)
-      self.source_path   = path  if path
-      self.source_filter = filter if filter
+    def source(path, &block)
+      @sources << Source.new(path).tap{ |s| block.call(s) if block }
     end
 
-    def engine(input_ext, engine_class, opts=nil)
-      @engines[input_ext.to_s] = engine_class.new(opts)
+    def combination(key_digest_path, value_digest_paths)
+      @combinations[key_digest_path.to_s] = [*value_digest_paths]
     end
   end
 
   module SourceList
-    def self.new(config)
-      paths = Set.new
-      paths += Dir.glob(File.join(config.source_path, "**/*"))
-      paths.reject!{ |path| !File.file?(path) }
-
-      config.source_filter.call(paths).sort
+    def self.new(sources)
+      sources.inject([]){ |list, source| list += source.files }
     end
   end
 
 end