lib/wp_fire/compiler.rb in wp-fire-0.0.6 vs lib/wp_fire/compiler.rb in wp-fire-0.0.7

@@ -2,11 +2,11 @@
 require 'sass'
 
 module WpFire
   class Compiler
 
-    def self.compile(filename, build_path)
+    def self.compile(filename, build_path, root_path)
       extname = File.extname(filename)
       basename = File.basename(filename, extname)
       if not basename[0].eql?"_" and extname.eql?".scss"
         sass_engine = Sass::Engine.for_file filename, {}
         File.open File.join(build_path, basename), "w" do |f|
@@ -14,11 +14,11 @@
         end
       elsif basename[0].eql?"_" and extname.eql?".scss"
         parents_filename = []
         find_scss_parents(filename,parents_filename)
         parents_filename.uniq.each do |parent|
-          compile parent, build_path
+          compile parent, build_path, root_path
         end
       elsif extname.eql?".css"
         FileUtils.cp filename, File.join(build_path, File.basename(filename))
       elsif extname.eql?".coffee"
         File.open File.join(build_path, basename), "w" do |f|
@@ -26,31 +26,33 @@
         end
       elsif extname.eql?".js"
         FileUtils.cp filename, File.join(build_path, File.basename(filename))
       elsif extname.eql?".php"
         FileUtils.cp filename, File.join(build_path, File.basename(filename))
-      elsif [".jpg",".jpeg",".png",".gif",".ico"].include?(extname)
-        Dir.mkdir File.join(build_path, "images") unless File.directory?(File.join(build_path, "images"))
-        FileUtils.cp filename, File.join(build_path, "images", File.basename(filename))
-      elsif [".ttf",".eot",".woff",".svg",".otf"].include?(extname)
-        Dir.mkdir File.join(build_path, "fonts") unless File.directory?(File.join(build_path, "fonts"))
-        FileUtils.cp filename, File.join(build_path, "fonts", File.basename(filename))
+      else
+        dir = File.dirname(filename)
+        dir = dir.sub(File.join(root_path,"source"),'')
+        #unwrap from assets path for backward compatibility
+        dir = dir.sub("assets",'')
+        FileUtils.mkdir_p File.join(build_path, dir) unless File.directory?(File.join(build_path, dir))
+        FileUtils.cp filename, File.join(build_path, dir, File.basename(filename))
       end
+
     end
 
-    def self.compile_all(filenames, build_path)
+    def self.compile_all(filenames, build_path, root_path)
       files = []
       filenames.each do |filename|
         if(File.directory?(filename))
           files = files + find(filename)
         end
         if(File.file?(filename))
           files << filename
         end
       end
       files.each do |f|
-        compile f, build_path
+        compile f, build_path, root_path
       end
     end
 
     private
 
@@ -64,10 +66,10 @@
         if open(f).grep(/@import ["']#{File.basename(filename).gsub(/(_|\.scss)/,'')}["']/).any?
           if File.basename(f)[0].eql?"_" and not f.eql? filename
             find_scss_parents(f,parents_array)
           elsif not File.basename(f)[0].eql?"_"
             parents_array << f
-          end 
+          end
         end
       end
     end
 
   end
\ No newline at end of file