lib/rack/less/source.rb in rack-less-0.1.0 vs lib/rack/less/source.rb in rack-less-1.0.0

@@ -17,23 +17,22 @@
     def initialize(css_name, options={})
       @css_name = css_name
       @compress = options[:compress]
       @cache    = options[:cache]
       @folder   = get_required_path(options, :folder)
-      @combine  = options[:combine] || {}
     end
     
     def compress?
       !!@compress
     end
     def cache?
       !@cache.nil?
     end
     
-    # Use named css sources before using combine directive sources
+    # Use named css sources before using combination sources
     def files
-      @files ||= (css_sources.empty? ? combined_sources : css_sources)
+      @files ||= (css_sources.empty? ? combination_sources : css_sources)
     end
     
     def compiled
       @compiled ||= begin
         compiled_css = files.collect do |file_path|
@@ -60,12 +59,12 @@
     def css_sources
       @css_sources ||= preferred_sources([@css_name])
     end
     
     # Preferred, existing source files matching a corresponding
-    # combine directive, if any
-    def combined_sources
-      @combined_sources ||= preferred_sources(@combine[@css_name] || [])
+    # Rack::Less::Base combination directive, if any
+    def combination_sources
+      @combination_sources ||= preferred_sources(Base.combinations[@css_name] || [])
     end
     
     private
     
     # Given a list of file names, return a list of