assets_booster 0.0.1 → 0.0.2

data/lib/assets_booster/merger/base.rb

@@ -0,0 +1,26 @@
+module AssetsBooster
+  module Merger
+    class Base
+      attr_accessor :assets
+
+      def initialize(sources)
+        self.assets = []
+        sources.each do |source|
+          load_source(source)
+        end
+      end
+
+      def mtime
+        assets.map{ |asset| File.mtime(asset[:source]) }.max
+      end        
+
+      def load_source(source)
+        assets << {
+          :source => source, 
+          :css => File.read(source),
+        }
+      end
+    end
+  end
+end
+

data/lib/assets_booster/merger/css.rb

@@ -1,40 +1,27 @@
+require 'assets_booster/merger/base'
 module AssetsBooster
   module Merger
-    class CSS
-      cattr_accessor :assets
-
-      def self.name
+    class CSS < Base
+      def name
         "CSS Merger"
       end
-                  
-      def self.merge(sources, target)
-        self.assets = []
-        sources.each do |source|
-          load_source(source)
-        end
-
-        target_folder = File.dirname(target)
+      
+      def merge(target)
+        target_folder = dirname(target)
         assets.inject("") do |code, asset|
-          source_folder = File.dirname(asset[:source])
-          rewrite_urls!(asset[:css], source_folder, target_folder)
-          code << asset[:css]+"\n"
+          source_folder = dirname(asset[:source])
+          asset[:css]= rewrite_urls(asset[:css], source_folder, target_folder)
+          code << asset[:css]
+          code << "\n"
         end.strip
       end
 
-      def self.mtime(sources)
-        self.assets = []
-        sources.each do |source|
-          load_source(source)
-        end
-        assets.map{ |asset| File.mtime(asset[:source]) }.max
-      end        
-      
-      private
-      
-      def self.load_source(source)
-        css = File.read(source)
-        source_folder = File.dirname(source)
-        css.gsub!(/@import\s+([^;\n\s]+)/).each do |import|
+      def load_source(source)
+        super(source)
+        asset = assets.pop
+        source_folder = dirname(asset[:source])
+        source_folder << "/" unless source_folder == ""
+        asset[:css].gsub!(/@import\s+([^;\n\s]+)/).each do |import|
           url = $1.gsub(/^url\((.+)\)/i, '\1')
           url, quotes = extract_url(url.strip)
 
@@ -42,21 +29,17 @@ module AssetsBooster
           next import if absolute_url?(url)
 
           # recursively process the imported css
-          load_source(source_folder+"/"+url)
+          load_source(source_folder+url)
           ""
         end
-        self.assets << {
-          :source => source, 
-          :css => css
-        }
+        assets << asset
       end
-      
-      def self.rewrite_urls!(css, source_folder, target_folder)
-        # difference between the source and target location
-        url_prepend = source_folder[target_folder.length+1..-1]
-        return unless url_prepend 
+
+      def rewrite_urls(css, source_folder, target_folder)
+        url_prepend = path_difference(source_folder, target_folder)
+        return css if url_prepend == ""
   
-        css.gsub!(/url\(([^)]+)\)/i) do |match|
+        css.gsub(/url\(([^)]+)\)/i) do |match|
           url, quotes = extract_url($1.strip)
 
           # we don't want to change references to external assets
@@ -66,12 +49,24 @@ module AssetsBooster
         end
       end
       
-      def self.extract_url(quoted_url)
+      def extract_url(quoted_url)
         (quoted_url[0].chr =~ /["']/) ? [quoted_url.slice(1, quoted_url.length-2), quoted_url[0].chr] : [quoted_url, ""]
       end
       
-      def self.absolute_url?(url)
-        url[0].chr =~ /^(\/|https?:\/\/)/i
+      def absolute_url?(url)
+        !!(url =~ /^(\/|https?:\/\/)/i)
+      end
+      
+      def dirname(path)
+        path.include?("/") ? File.dirname(path) : ""
+      end
+      
+      def path_difference(source, target)
+        return source if target == ""
+        if source[0..target.length-1] != target
+          raise ArgumentError, "source and target to not share a common base path [#{source}, #{target}]"
+        end
+        source[target.length+1..-1] || ""
       end
     end
   end

data/lib/assets_booster/merger/simple.rb

@@ -1,21 +1,17 @@
+require 'assets_booster/merger/base'
 module AssetsBooster
   module Merger
-    class Simple
-      def self.name
+    class Simple < Base
+      def name
         "Simple Merger"
       end
                   
-      def self.merge(sources, target)
-        sources.inject("") do |code, source|
-          File.open(source, "r") do |file|
-            code << file.read.strip+"\n"
-          end
+      def merge(target)
+        assets.inject("") do |code, asset|
+          code << asset[:css]
+          code << "\n"
         end.strip
       end
-
-      def self.mtime(sources)
-        sources.map{ |source| File.mtime(source) }.max
-      end        
     end
   end
 end

data/lib/assets_booster/package/base.rb

@@ -1,27 +1,37 @@
+require "assets_booster/packager"
 module AssetsBooster
   module Package
     class Base
       attr_accessor :name
-      attr_accessor :filename
       attr_accessor :assets
-      attr_accessor :mtime
+      attr_accessor :filename
+      attr_accessor :merger_class
+      attr_accessor :compiler_class
       
       def initialize(name, assets)
         self.name = name+"_packaged"
         self.assets = assets
-        self.filename = self.class.asset_path(self.name)
+        self.filename = asset_path(self.name)
       end
 
       def exists?
         File.exists?(filename)
       end
       
+      def merger
+        @merger ||= merger_class.new(sources)
+      end
+      
+      def compiler
+        @compiler ||= compiler_class.new
+      end
+
       def mtime
-        @mtime ||= self.class.merger.mtime(sources) 
+        @mtime ||= merger.mtime 
       end
       
       def sources
-        assets.each.map{ |asset| self.class.asset_path(asset) }
+        @sources ||= assets.each.map{ |asset| asset_path(asset) }
       end
 
       def delete
@@ -29,20 +39,20 @@ module AssetsBooster
       end
 
       def merge
-        AssetsBooster.log("Merging assets using #{self.class.merger.name} to #{relative_filename}...")
-        save(self.class.merger.merge(sources, filename))
+        AssetsBooster.log("Merging assets using #{merger.name} to #{relative_filename}...")
+        save(merger.merge(filename))
       end
 
       def compile
-        merged = merge
-        AssetsBooster.log("Compiling #{relative_filename} using #{self.class.compiler.name}...")
-        code = self.class.compiler.compile(merged)
-        AssetsBooster.log("Compilation finished: %5.2f%% saved." % [(1-code.size.to_f/merged.size)*100])
+        merged_code = merge
+        AssetsBooster.log("Compiling #{relative_filename} using #{compiler.name}...")
+        code = compiler.compile(merged_code)
+        AssetsBooster.log("Compilation finished: %5.2f%% saved." % [(1-code.size.to_f/merged_code.size)*100])
         save(code)
       end
 
-      def view_helper
-        sources = AssetsBooster::Configuration.boosted_environment? ? [name] : assets
+      def view_helper(packager)
+        sources = packager.boosted_environment? ? [name] : assets
         [view_helper_method, sources]
       end
 
@@ -63,7 +73,7 @@ module AssetsBooster
       end
       
       def relative_filename
-        filename.sub(Rails.root, ".")
+        filename.sub("#{Rails.root}/", "")
       end
     end
   end

data/lib/assets_booster/package/javascript.rb

@@ -1,17 +1,13 @@
 module AssetsBooster
   module Package
     class Javascript < Base
-      def self.compiler
-        AssetsBooster::Configuration.compiler_for_type(:javascript)
-      end
-      
-      def self.merger
+      def merger_class
         require "assets_booster/merger/simple"
         AssetsBooster::Merger::Simple
       end
       
-      def self.asset_path(name)
-        path = AssetsBooster::Configuration.asset_path("javascripts")
+      def asset_path(name)
+        path = AssetsBooster::Packager.asset_path("javascripts")
         path = File.join(path, name+".js") if name
       end
       

data/lib/assets_booster/package/stylesheet.rb

@@ -1,17 +1,13 @@
 module AssetsBooster
   module Package
     class Stylesheet < Base
-      def self.compiler
-        AssetsBooster::Configuration.compiler_for_type(:stylesheet)
-      end
-      
-      def self.merger
+      def merger_class
         require "assets_booster/merger/css"
         AssetsBooster::Merger::CSS
       end
       
-      def self.asset_path(name)
-        path = AssetsBooster::Configuration.asset_path("stylesheets")
+      def asset_path(name)
+        path = AssetsBooster::Packager.asset_path("stylesheets")
         path = File.join(path, name+".css") if name
       end
       

data/lib/assets_booster/packager.rb

@@ -1,33 +1,124 @@
+require 'yaml'
 module AssetsBooster 
   class Packager
-    cattr_accessor :packages
+    attr_accessor :config
+    attr_accessor :configuration_filename
+    attr_accessor :packages
 
-    def self.init
-      require "assets_booster/configuration"
-      Configuration.load
+    def self.asset_path(file)
+      File.join(Rails.root, "public", file)    
     end
 
-    def self.merge_all
-      each_package { |package| package.merge }
+    def initialize(config_filename = nil)
+      self.configuration_filename = config_filename || File.join(Rails.root, "config", "assets_booster.yml")
+    end
+    
+    def config
+      @config ||= YAML.load_file(configuration_filename)
+    end
+    
+    def packages
+      @packages ||= begin
+        packages = {}
+        config['packages'].each_pair do |type, type_packages|
+          type = type.to_sym
+          packages[type] = {}
+          type_packages.each_pair do |name, assets|
+            package = get_package_class(type).new(name, assets)
+            package.compiler_class = get_compiler_class_for_type(type)
+            packages[type][name] = package
+          end
+        end
+        packages
+      end
     end
 
-    def self.compile_all
-      each_package { |package| package.compile }
+    def boosted_environment?
+      @boosted_environment ||= config['options']['environments'].include?(Rails.env)
+    end
+
+    def merge_all
+      each_package{ |package| package.merge }
+    end
+
+    def compile_all
+      each_package{ |package| package.compile }
     end
     
-    def self.delete_all
-      each_package { |package| package.delete }
+    def delete_all
+      each_package{ |package| package.delete }
     end
+
+    def create_configuration
+      if File.exists?(configuration_filename)
+        AssetsBooster.log("#{configuration_filename} already exists. Aborting task...")
+        return
+      end
     
+      config = {
+        'packages' => {
+          'javascript' => {
+            'base' => file_list("#{Rails.root}/public/javascripts", "js"),
+          },
+          'stylesheet' => {
+            'base' => file_list("#{Rails.root}/public/stylesheets", "css"),
+          },
+        },
+        'options' => {
+          'javascript' => {
+            'compiler' => "closure",
+          },
+          'stylesheet' => {
+            'compiler' => "rainpress",
+          },
+          'environments' => %w(staging production),
+        }
+      }
+
+      File.open(configuration_filename, "w") do |file|
+        YAML.dump(config, file)
+      end
+
+      AssetsBooster.log("Configuration file #{configuration_filename} created!")
+      AssetsBooster.log("Please check the generates packages so dependencies are loaded in correct order.")
+    end
+
     private
+
+    def file_list(path, extension)
+      Dir[File.join(path, "*.#{extension}")].map do |file| 
+        file[path.length+1..-1].chomp(".#{extension}")
+      end
+    end
     
-    def self.each_package(&block)
+    def each_package(&block)
       packages.each_value do |packages|
         packages.each_value do |package|
           block.call(package)
         end
       end
     end
+
+    def get_package_class(type)
+      require "assets_booster/package/base"
+      require "assets_booster/package/#{type}"
+      klass = "AssetsBooster::Package::#{type.to_s.camelize}"
+      klass.constantize
+    rescue LoadError => e
+      raise "You've specified an invalid package type '#{type}'"
+    end
+
+    def get_compiler_class(name)
+      require "assets_booster/compiler/#{name}"
+      klass = "AssetsBooster::Compiler::#{name.to_s.camelize}"
+      klass.constantize
+    rescue LoadError => e
+      raise "You've specified an invalid compiler '#{name}'"
+    end
+
+    def get_compiler_class_for_type(type)
+      get_compiler_class(config['options'][type.to_s]['compiler'])
+    end
   end
 end
 

data/lib/assets_booster/railtie.rb

@@ -1,12 +1,14 @@
 require 'rails'
+require "assets_booster/packager"
+require 'assets_booster/view_helper'
 
 module AssetsBooster
   class Railtie < Rails::Railtie
+    cattr_accessor :packager
+
     config.after_initialize do
-      require "assets_booster/packager"
-      AssetsBooster::Packager.init
+      self.packager = AssetsBooster::Packager.new
       ActiveSupport.on_load :action_view do
-        require 'assets_booster/view_helper'
         ActionView::Base.send(:include, AssetsBooster::ViewHelper)
       end
     end