active_assets 0.2.8 → 0.3.0

data/Rakefile

@@ -13,6 +13,4 @@ task :environment do
   load 'test/fixtures/rails_root/config/environment.rb'
 end
 
-Dir['lib/tasks/**/*.rake'].each {|f| load f}
-
 task :default => :test

data/active_assets.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "active_assets"
-  s.version     = '0.2.8'
+  s.version     = '0.3.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sam Woodard"]
   s.email       = ["sam@wildfireapp.com"]
@@ -16,12 +16,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency "activesupport", "~>2.3.5"
+
+  s.add_development_dependency 'rails', "~>2.3.5"
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'oily_png'
   s.add_development_dependency 'chunky_png'
   s.add_development_dependency 'rmagick'
   s.add_development_dependency 'mini_magick'
   s.add_development_dependency 'css_parser', '~>1.1.5'
-  s.add_development_dependency "rails", "~>3.0.3"
   s.add_development_dependency "test-unit", "> 2.0"
   s.add_development_dependency "ZenTest", "~>4.4.2"
 end

data/lib/active_assets.rb

@@ -1,8 +1,16 @@
 require 'active_support'
 
 module ActiveAssets
-  extend ActiveSupport::Autoload
+  autoload :ActiveExpansions, 'active_assets/active_expansions'
+  autoload :ActiveSprites, 'active_assets/active_sprites'
 
-  autoload :ActiveExpansions
-  autoload :ActiveSprites
+  def self.rails2?
+    rv = Rails.version rescue nil
+    rv ||= RAILS_GEM_VERSION rescue nil
+    rv ||= Gem.loaded_specs.find { |n,spec| n == 'rails' }[1].version.to_s
+
+    Gem::Version.new(rv) < Gem::Version.new('3.0.0.beta')
+  end
 end
+
+require 'active_assets/rails2_support' if ActiveAssets.rails2?

data/lib/active_assets/active_expansions.rb

@@ -2,16 +2,23 @@ require 'active_support'
 
 module ActiveAssets
   module ActiveExpansions
-    extend ActiveSupport::Autoload
+    autoload :Asset, 'active_assets/active_expansions/asset'
+    autoload :AssetScope, 'active_assets/active_expansions/asset_scope'
+    autoload :TypeInferrable, 'active_assets/active_expansions/type_inferrable'
+    autoload :Configurable, 'active_assets/active_expansions/configurable'
+    autoload :Expansion, 'active_assets/active_expansions/expansion'
+    autoload :Assets, 'active_assets/active_expansions/assets'
+    autoload :Javascripts, 'active_assets/active_expansions/javascripts'
+    autoload :Stylesheets, 'active_assets/active_expansions/stylesheets'
+    autoload :Expansions, 'active_assets/active_expansions/expansions'
 
-    autoload :Asset
-    autoload :AssetScope
-    autoload :TypeInferrable
-    autoload :Configurable
-    autoload :Expansion
-    autoload :Assets
-    autoload :Javascripts
-    autoload :Stylesheets
-    autoload :Expansions
+    def self.define_tasks
+      namespace :activeexpansions do
+        desc "Cache the active expansions to the {stylesheets,javascripts} cache directory"
+        task :cache => :environment do
+          Rails.application.expansions.javascripts.cache! and Rails.application.expansions.stylesheets.cache!
+        end
+      end
+    end
   end
 end

data/lib/active_assets/active_expansions/expansion.rb

@@ -1,5 +1,4 @@
 require 'active_support'
-require 'active_support/hash_with_indifferent_access'
 
 module ActiveAssets
   module ActiveExpansions

data/lib/active_assets/active_expansions/expansions.rb

@@ -1,13 +1,13 @@
-require 'active_support/configurable'
-
 module ActiveAssets
   module ActiveExpansions
     class Expansions
       include AssetScope
       include TypeInferrable
-      include ActiveSupport::Configurable
-      include Configurable
-      ActiveSupport.run_load_hooks(:active_expansions, self)
+
+      @@precache_assets = false
+      cattr_accessor :precache_assets
+
+      ActiveSupport.run_load_hooks(:active_expansions, self) if ActiveSupport.respond_to?(:run_load_hooks)
 
       def initialize
         @expansions = Hash.new(&method(:build_expansions_hash_with_defaults))
@@ -71,6 +71,14 @@ module ActiveAssets
         @expansions.clear
       end
 
+      def precache_assets
+        @@precache_assets
+      end
+
+      def precache_assets=(val)
+        @@precache_assets = val
+      end
+
       private
         def defer_expansion(name, options, &blk)
           @deferred_expansion_config = [name, options]

data/lib/active_assets/active_expansions/railtie.rb

@@ -6,7 +6,7 @@ module ActiveAssets
   module ActiveExpansions
     class Railtie < Rails::Railtie
       rake_tasks do
-        Dir[File.expand_path("../../../tasks/active_expansions/*.rake", __FILE__)].each {|f| load f}
+        ActiveAssets::ActiveExpansions.define_tasks
       end
 
       config.active_expansions = ActiveSupport::OrderedOptions.new

data/lib/active_assets/active_sprites.rb

@@ -2,38 +2,21 @@ require 'active_support'
 
 module ActiveAssets
   module ActiveSprites
-    extend ActiveSupport::Autoload
-
-    autoload :SpritePiece
-    autoload :Sprite
-    autoload :Sprites
-    autoload :Configurable
-    autoload :SpriteStylesheet
-    autoload_under "runners" do
-      autoload :AbstractRunner
-      autoload :RmagickRunner
-      autoload :MiniMagickRunner
-      autoload :ChunkyPngRunner
-    end
-
-    def self.load_engine_tasks(engine_class)
-      desc "Generate sprites"
-      task :sprites do
-        require 'rails'
-        require 'rails/active_sprites'
-
+    autoload :SpritePiece, 'active_assets/active_sprites/sprite_piece'
+    autoload :Sprite, 'active_assets/active_sprites/sprite'
+    autoload :Sprites, 'active_assets/active_sprites/sprites'
+    autoload :Configurable, 'active_assets/active_sprites/configurable'
+    autoload :SpriteStylesheet, 'active_assets/active_sprites/sprite_stylesheet'
+    autoload :AbstractRunner, 'active_assets/active_sprites/runners/abstract_runner'
+    autoload :RmagickRunner, 'active_assets/active_sprites/runners/rmagick_runner'
+    autoload :MiniMagickRunner, 'active_assets/active_sprites/runners/mini_magick_runner'
+    autoload :ChunkyPngRunner, 'active_assets/active_sprites/runners/chunky_png_runner'
+
+    def self.define_tasks
+      desc "Generate sprites."
+      task :sprites => :environment do
         ENV['VERBOSE'] ||= 'true'
-
-        Rails.application ||= Class.new(Rails::Application)
-        Rails.application.extend Rails::ActiveSprites
-
-        engine = engine_class.new
-        sprite_path = File.join(engine.config.paths.config.paths.first, 'sprites.rb')
-
-        if File.exists?(sprite_path)
-          load sprite_path
-          Rails.application.sprites.generate!(engine)
-        end
+        Rails.application.sprites.generate!
       end
     end
 

data/lib/active_assets/active_sprites/railtie.rb

@@ -9,7 +9,7 @@ module ActiveAssets
       config.active_sprites = ActiveSupport::OrderedOptions.new
 
       rake_tasks do
-        Dir[File.expand_path("../../../tasks/active_sprites/*.rake", __FILE__)].each {|f| load f}
+        ActiveAssets::ActiveSprites.define_tasks
       end
 
       initializer 'active_sprites-extend-application' do

data/lib/active_assets/active_sprites/runners/abstract_runner.rb

@@ -1,6 +1,5 @@
 require 'action_controller'
 require 'action_view'
-require 'rack/mount'
 require 'action_view'
 require 'fileutils'
 
@@ -10,15 +9,14 @@ module ActiveAssets
       class AssetContext < ActionView::Base
       end
 
-      def initialize(railtie, sprites)
-        @railtie = railtie
+      def initialize(sprites)
         @sprites = if ENV['SPRITE']
           sprites.select do |name, sprite|
             ENV['SPRITE'].split(',').map(&:strip).any? do |sp|
               # were going to be very forgiving
               name == sp ||
               name == sp.to_sym ||
-              name == ::Rack::Mount::Utils.normalize_path(sp)
+              name == self.normalize_path(sp)
             end
           end.map(&:last)
         else
@@ -61,7 +59,7 @@ module ActiveAssets
             end
 
             stylesheet = SpriteStylesheet.new(sprite_pieces)
-            stylesheet_file_path = File.join(@railtie.config.paths.public.to_a.first, sprite_stylesheet_path)
+            stylesheet_file_path = File.join(Rails.public_path, sprite_stylesheet_path)
             $stdout << "Writing stylesheet to #{stylesheet_file_path} ... " if verbose
             stylesheet.write stylesheet_file_path
             $stdout << "done.\n" if verbose
@@ -70,7 +68,7 @@ module ActiveAssets
             create_sprite(sprite, sprite_path, sprite_pieces, image_list, width, height, orientation, verbose)
             $stdout << "Success!\n" if verbose
 
-            sprite_file_path = File.join(@railtie.config.paths.public.to_a.first, sprite_path)
+            sprite_file_path = File.join(Rails.public_path, sprite_path)
             $stdout << "Writing sprite to #{sprite_file_path} ... " if verbose
             write sprite_file_path, sprite.quality
             $stdout << "done.\n" if verbose
@@ -91,13 +89,11 @@ module ActiveAssets
         end
 
         def image_computed_full_path(path)
-          File.join(@railtie.config.paths.public.to_a.first, image_computed_path(path))
+          File.join(Rails.public_path, image_computed_path(path))
         end
 
         def stylesheet_computed_path(path)
-          stylesheet_full_path = @railtie.config.respond_to?(:action_controller) && @railtie.config.paths.public.stylesheets.to_a.first
-          stylesheet_path = stylesheet_full_path ? stylesheet_full_path[%r{public/(.*)}, 1] : 'stylesheets'
-          File.join(stylesheet_path, path)
+          File.join('stylesheets', path)
         end
 
         def sanitize_asset_path(path)
@@ -105,9 +101,25 @@ module ActiveAssets
         end
 
         def sprite_url(sprite, sprite_path)
-          sprite.url.present? ? sprite.url : ::Rack::Mount::Utils.normalize_path(sprite_path)
+          sprite.url.present? ? sprite.url : normalize_path(sprite_path)
         end
 
+        # Rack::Mount::Utils#normalize_path from rack-mount 0.6.13
+        # Normalizes URI path.
+        #
+        # Strips off trailing slash and ensures there is a leading slash.
+        #
+        #   normalize_path("/foo")  # => "/foo"
+        #   normalize_path("/foo/") # => "/foo"
+        #   normalize_path("foo")   # => "/foo"
+        #   normalize_path("")      # => "/"
+        def normalize_path(path)
+          path = "/#{path}"
+          path.squeeze!('/')
+          path.sub!(%r{/+\Z}, '')
+          path = '/' if path == ''
+          path
+        end
     end
   end
 end

data/lib/active_assets/active_sprites/sprite_piece.rb

@@ -1,5 +1,3 @@
-require 'rack/mount'
-
 module ActiveAssets
   module ActiveSprites
     class SpritePiece

data/lib/active_assets/active_sprites/sprites.rb

@@ -1,11 +1,7 @@
-require 'active_support/configurable'
-
 module ActiveAssets
   module ActiveSprites
     class Sprites
-      include ActiveSupport::Configurable
-      include Configurable
-      ActiveSupport.run_load_hooks(:active_sprites, self)
+      cattr_accessor :sprite_backend
 
       def initialize
         @sprites = Hash.new do |sprites, name|
@@ -49,39 +45,39 @@ module ActiveAssets
         @sprites.clear
       end
 
-      def generate!(railtie = Rails.application)
+      def generate!
         begin
           case sprite_backend
           when :rmagick
             require 'rmagick'
-            RmagickRunner.new(railtie, @sprites).generate!
+            RmagickRunner.new(@sprites).generate!
           when :mini_magick
             require 'mini_magick'
-            MiniMagickRunner.new(railtie, @sprites).generate!
+            MiniMagickRunner.new(@sprites).generate!
           when :chunky_png, :oily_png
             begin
               require 'oily_png'
-              ChunkyPngRunner.new(railtie, @sprites).generate!
+              ChunkyPngRunner.new(@sprites).generate!
             rescue LoadError
               require 'chunky_png'
-              ChunkyPngRunner.new(railtie @sprites).generate!
+              ChunkyPngRunner.new(@sprites).generate!
             end
           else
             begin
               require 'rmagick'
-              RmagickRunner.new(railtie, @sprites).generate!
+              RmagickRunner.new(@sprites).generate!
             rescue LoadError
               begin
                 begin
                   require 'oily_png'
-                  ChunkyPngRunner.new(railtie, @sprites).generate!
+                  ChunkyPngRunner.new(@sprites).generate!
                 rescue LoadError
                   require 'chunky_png'
-                  ChunkyPngRunner.new(railtie, @sprites).generate!
+                  ChunkyPngRunner.new(@sprites).generate!
                 end
               rescue LoadError
                 require 'mini_magick'
-                MiniMagickRunner.new(railtie, @sprites).generate!
+                MiniMagickRunner.new(@sprites).generate!
               end
             end
           end
@@ -93,6 +89,16 @@ module ActiveAssets
           $stdout << msg
         end
       end
+
+      def sprite_backend
+        @@sprite_backend
+      end
+
+      def sprite_backend=(val)
+        @@sprite_backend = val
+      end
+
+      ActiveSupport.run_load_hooks(:active_sprites, self) if ActiveSupport.respond_to?(:run_load_hooks)
     end
   end
 end

data/lib/active_assets/rails2_support.rb

@@ -0,0 +1,32 @@
+gem 'rails', '< 3.0.0.beta' # Prevent mistakes loading this against rails 3
+
+require 'initializer'
+require 'active_support/ordered_hash'
+require 'active_support/ordered_options'
+
+module Rails
+
+  class Application
+    def config
+      Rails.configuration
+    end unless methods.grep(/^config$/).any? # Use grep + regexp for 1.8 + 1.9
+  end
+
+  class << self
+    alias config configuration unless respond_to?(:config)
+  end
+
+  def self.application
+    @application ||= Application.new
+  end
+
+  class Configuration
+    def active_expansions
+      @active_expansions ||= ActiveSupport::OrderedOptions.new
+    end
+
+    def active_sprites
+      @active_sprites ||= ActiveSupport::OrderedOptions.new
+    end
+  end
+end

data/rails_generators/active_assets/active_assets_generator.rb

@@ -0,0 +1,8 @@
+class ActiveAssetsGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      m.file 'active_assets.rb', 'config/initializers/active_assets.rb'
+      m.file 'active_assets.rake', 'lib/tasks/active_assets.rake'
+    end
+  end
+end

data/rails_generators/active_assets/templates/active_assets.rake

@@ -0,0 +1,4 @@
+require 'active_assets'
+
+ActiveAssets::ActiveExpansions.define_tasks
+ActiveAssets::ActiveSprites.define_tasks

data/rails_generators/active_assets/templates/active_assets.rb

@@ -0,0 +1,57 @@
+require 'active_assets'
+require 'rails/active_assets'
+
+Rails.application.extend Rails::ActiveAssets
+
+module ActiveAssets
+  module ActiveExpansions
+    def self.boot!
+      if Rails.application.config.active_expansions.respond_to?(:precache_assets)
+        Expansions.precache_assets = Rails.application.config.active_expansions.precache_assets
+      end
+
+      options = Rails.application.config.active_expansions
+      options.each { |k,v| send("#{k}=", v) }
+
+      load_active_expansions(Rails.root)
+
+      Rails.application.expansions.javascripts.register!
+      Rails.application.expansions.stylesheets.register!
+
+      if Expansions.precache_assets
+        Rails.application.expansions.javascripts.cache!
+        Rails.application.expansions.stylesheets.cache!
+      end
+    end
+
+    private
+      def self.load_active_expansions(root)
+        if File.exists?(File.join(root, 'config/assets.rb'))
+          load File.join(root, 'config/assets.rb')
+        elsif File.directory?(File.join(root, 'config/assets'))
+          Dir[File.join(root, 'config/assets/*.rb')].each do |f|
+            load f
+          end
+        end
+      end
+  end
+
+  module ActiveSprites
+    def self.boot!
+      if Rails.application.config.active_sprites.respond_to?(:sprite_backend)
+        Sprites.sprite_backend = Rails.application.config.active_sprites.sprite_backend
+      end
+
+      load_sprite_definition
+    end
+
+    private
+      def self.load_sprite_definition
+        config_path = File.join(Rails.root, 'config')
+        load File.join(config_path, 'sprites.rb') if File.exists?(File.join(config_path, 'sprites.rb'))
+      end
+  end
+end
+
+ActiveAssets::ActiveExpansions.boot!
+ActiveAssets::ActiveSprites.boot!