active_assets 0.2.2 → 0.2.3

data/README.md

@@ -3,12 +3,30 @@ Active Assets
 
 A Railtie that provides a full asset management system, including support for development and deployment.  This includes building sprites, concatenating javascript and css via expansion definitions.  Active Assets includes two libraries, Active Expansions and Active Sprites.
 
+    gem install rmagick
+    ... OR ...
+    gem install oily_png
+    ... OR ...
+    gem install chunky_png
+
     gem install active_assets
 
 Gemfile
 -------
 
+    ...
     gem 'active_assets'
+    ...
+    group :development do
+      ...
+      gem 'rmagick'
+      ... OR ...
+      gem 'oily_png'
+      ... OR ...
+      gem 'chunky_png'
+      ...
+    end
+    ...
 
 In your rails app
 -----------------
@@ -19,7 +37,67 @@ In your rails app
     require 'active_assets/railtie'
     ...
 
+You can also include only ActiveSprites or only ActiveExpansions in your application
+
+### application.rb
+    ...
+    require 'rails/all'
+    require 'active\_assets/active\_expansions/railtie'
+    ... OR ...
+    require 'active\_assets/active\_sprites/railtie'
+    ...
+
 ## The dsls
+
+### Introduction to Active Sprites
+
+ActiveSprites allows you to generate sprites within your Rails apps with `rake sprites`!  All you need is rmagick and you are on your way. If you don't have rmagick installed, ActiveSprites will just fail silently when you try to generate the sprites. Store the images that make up your sprites in your rails project, use the dsl below to tell ActiveSprites which images to include in your sprites, the css selector the corresponds to each image in the sprite, the location to write the sprite, and the location to write the stylesheet.
+
+#### config/sprites.rb
+    Rails.application.sprites do
+      sprite 'sprites/world_flags.png' => 'sprites/world_flags.css'
+        _"sprite_images/world_flags/Argentina.gif" => ".flags.argentina"
+        _"sprite_images/world_flags/Australia.gif" => ".flags.australia"
+        ...
+      end
+    end
+
+#### To generate
+    rake sprites
+    
+or
+
+    Rails.application.sprites.generate!
+
+### More on Active Sprites
+
+It is possible to add all of the world flags!  Haha, see the following example,
+
+    Rails.application.sprites do
+      sprite :world_flags
+        Dir[Rails.root.join('public/images/sprite_images/world_flags/*.{png,gif,jpg}')].each do |path|
+          image_path = path[%r{^.*/public/images/(.*)$}, 1]
+          klass_name = ".flag.#{File.basename(image_path, File.extname(image_path)).split(' ').join('_')}"
+
+          sp image_path => klass_name
+        end
+      end
+    end
+`_` and `sp` are aliases for `sprite_piece`
+
+Also, you will notice that I gave a symbol for the sprite instead of a mapping.  This will assume that you wish to store your sprite at `path/to/your/public/images/sprites/world_flags.png` and you wish to store your stylesheet at `path/to/your/public/stylesheets/sprites/world_flags.css`.
+
+#### ActiveSprites configuration 
+Rmagick is used by default.  To switch to `oily_png`, which is a c extension for `chunky_png` and has the same api as `chunky_png`, apply the configuration below. 
+
+##### config/application.rb
+
+    ...
+    config.active_sprites.sprite_backend = :chunky_png
+    ...
+
+In summary, if `rmagick` is installed, it will used by default. If `oily_png` is installed AND the `sprite_backend` is set to `:chunky_png` (see below), then `oliy_png` will be used.  If `oily_png` is not installed but `chunky_png` is, AND the `sprite_backend` is set to `:chunky_png`, then `chunky_png` will be used. 
+
 ### Introduction to Active Expansions
 
 ActiveExpansions allow you to register Rails javascript and stylesheet expansions via a simple dsl.  Addionally, the assets in the expansion are concatenated when appropriate and the expansion delivers the concatenated (or 'cached') assets' path in the appropriate environments.  Also, files can be specified as deploy only or only for a specific environment.  For example, you may wish to include jQuery or Prototype src files in development and use minified libraries from cdn sources in production.  This is supported.
@@ -91,26 +169,6 @@ ActiveExpansions allow you to register Rails javascript and stylesheet expansion
       end
     end
 
-### Introduction to Active Sprites
-
-ActiveSprites allows you to generate sprites within your Rails apps with `rake sprites`!  All you need is rmagick and you are on your way. If you don't have rmagick installed, ActiveSprites will just fail silently when you try to generate the sprites. Store the images that make up your sprites in your rails project, use the dsl below to tell ActiveSprites which images to include in your sprites, the css selector the corresponds to each image in the sprite, the location to write the sprite, and the location to write the stylesheet.
-
-#### config/sprites.rb
-    Rails.application.sprites do
-      sprite 'sprites/world_flags.png' => 'sprites/world_flags.css'
-        _"sprite_images/world_flags/Argentina.gif" => ".flags.argentina"
-        _"sprite_images/world_flags/Australia.gif" => ".flags.australia"
-        ...
-      end
-    end
-
-#### To generate
-    rake sprites
-    
-or
-
-    Rails.application.sprites.generate!
-
 ### More on Active Expansions
 You can specify certain assets only be used in a deployment setting or only be used in a production setting.  The example below illustrates how to include a library in development and the same library from a cdn in production.  The net result will be that the library will not get cached (concatenated) along with all of the other files because it is specified for use only in development and test.  Hence, the cache file will only be comprised of the other assets in the expansion.  Similarly, the cdn resort will not get cached either but instead will be used directly.  The resulting expansion in production will include two paths, the cdn url to jquery and the path the cache file, in this case, public/{javascript,stylesheets}/cache/global.{js,css}.
 
@@ -145,21 +203,3 @@ To enable your application to cache assets when the application is initialized,
     ...
     config.active_expansions.precache_assets = true
     ...
-
-### More on Active Sprites
-
-It is possible to add all of the world flags!  Haha, see the following example,
-
-    Rails.application.sprites do
-      sprite :world_flags
-        Dir[Rails.root.join('public/images/sprite_images/world_flags/*.{png,gif,jpg}')].each do |path|
-          image_path = path[%r{^.*/public/images/(.*)$}, 1]
-          klass_name = ".flag.#{File.basename(image_path, File.extname(image_path)).split(' ').join('_')}"
-
-          sp image_path => klass_name
-        end
-      end
-    end
-`_` and `sp` are aliases for `sprite_piece`
-
-Also, you will notice that I gave a symbol for the sprite instead of a mapping.  This will assume that you wish to store your sprite at `path/to/your/public/images/sprites/world_flags.png` and you wish to store your stylesheet at `path/to/your/public/stylesheets/sprites/world_flags.css`.

data/active_assets.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "active_assets"
-  s.version     = '0.2.2'
+  s.version     = '0.2.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sam Woodard"]
   s.email       = ["sam@wildfireapp.com"]
@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency 'oily_png'
+  s.add_development_dependency 'chunky_png'
   s.add_development_dependency 'rmagick'
   s.add_development_dependency 'css_parser', '~>1.1.5'
   s.add_development_dependency "rails", "~>3.0.3"

data/lib/active_assets/active_sprites/chunky_png_runner.rb

@@ -0,0 +1,119 @@
+require 'action_controller'
+require 'action_view'
+require 'rack/mount'
+require 'action_view'
+require 'fileutils'
+begin
+  require 'oily_png'
+rescue LoadError
+  require 'chunky_png'
+end
+
+module ActiveAssets
+  module ActiveSprites
+    class ChunkyPngRunner
+      class AssetContext < ActionView::Base
+      end
+
+      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)
+            end
+          end.map(&:last)
+        else
+          sprites.values
+        end
+      end
+
+      def generate!(railtie = Rails.application, debug = ENV['DEBUG'])
+        p "Engine Class Name:  #{railtie.class.name}" if debug
+
+        context = setup_context(railtie)
+
+        @sprites.each do |sprite|
+          next if sprite.sprite_pieces.empty?
+          sprite_path = sanitize_asset_path(context.image_path(sprite.path))
+          p "Sprite Path: #{sprite_path}" if debug
+          sprite_stylesheet_path = sanitize_asset_path(context.stylesheet_path(sprite.stylesheet_path))
+          p "Sprite Stylesheet Path: #{sprite_stylesheet_path}" if debug
+
+          orientation = sprite.orientation.to_s
+          sprite_pieces = sprite.sprite_pieces
+
+          begin
+            width, height = 0, 0
+            image_list = []
+
+            sprite_pieces.each do |sp|
+              sprite_piece_path = File.join(railtie.config.paths.public.to_a.first, sanitize_asset_path(context.image_path(sp.path)))
+              sp_image =  ChunkyPNG::Image.from_file(sprite_piece_path)
+              image_list << sp_image
+              sp.details = SpritePiece::Details.new(
+                sprite.url.present? ? sprite.url : sprite_path,
+                orientation == Sprite::Orientation::VERTICAL ? 0 : width,
+                orientation == Sprite::Orientation::VERTICAL ? height : 0,
+                sp_image.width,
+                sp_image.height
+              )
+
+              width = orientation == Sprite::Orientation::HORIZONTAL ? width + sp_image.width : [width, sp_image.width].max
+              height = orientation == Sprite::Orientation::VERTICAL ? height + sp_image.height : [height, sp_image.height].max
+            end
+
+            @sprite = ChunkyPNG::Image.new(width, height, ChunkyPNG::Color::TRANSPARENT)
+
+            image_list.each_with_index do |image, i|
+              @sprite.replace(image, sprite_pieces[i].details.x, sprite_pieces[i].details.y)
+            end
+
+            stylesheet = SpriteStylesheet.new(sprite_pieces)
+            stylesheet.write File.join(railtie.config.paths.public.to_a.first, sprite_stylesheet_path)
+            write File.join(railtie.config.paths.public.to_a.first, sprite_path), sprite.quality
+          ensure
+            finish
+          end
+        end
+      end
+
+      private
+        def write(path, quality = nil)
+          FileUtils.mkdir_p(File.dirname(path))
+          @sprite.save(path)
+        end
+
+        def finish
+          @sprite = nil
+        end
+
+        def sanitize_asset_path(path)
+          path.split('?').first
+        end
+
+        def setup_context(railtie)
+          unless railtie.config.respond_to?(:action_controller)
+            railtie.config.action_controller = ActiveSupport::OrderedOptions.new
+
+            paths   = railtie.config.paths
+            options = railtie.config.action_controller
+
+            options.assets_dir           ||= paths.public.to_a.first
+            options.javascripts_dir      ||= paths.public.javascripts.to_a.first
+            options.stylesheets_dir      ||= paths.public.stylesheets.to_a.first
+
+            ActiveSupport.on_load(:action_controller) do
+              options.each { |k,v| send("#{k}=", v) }
+            end
+          end
+
+          controller = ActionController::Base.new
+          AssetContext.new(railtie.config.action_controller, {}, controller)
+        end
+
+    end
+  end
+end

data/lib/active_assets/active_sprites/configurable.rb

@@ -0,0 +1,14 @@
+require 'active_support/concern'
+
+module ActiveAssets
+  module ActiveSprites
+    module Configurable
+      extend ActiveSupport::Concern
+
+      included do
+        config_accessor :sprite_backend
+        self.sprite_backend = :rmagick if sprite_backend.nil?
+      end
+    end
+  end
+end

data/lib/active_assets/active_sprites/railtie.rb

@@ -6,6 +6,8 @@ require 'active_assets/active_sprites'
 module ActiveAssets
   module ActiveSprites
     class Railtie < Rails::Railtie
+      config.active_sprites = ActiveSupport::OrderedOptions.new
+
       rake_tasks do
         Dir[File.expand_path("../../../tasks/active_sprites/*.rake", __FILE__)].each {|f| load f}
       end
@@ -21,6 +23,13 @@ module ActiveAssets
         end
       end
 
+      initializer 'active_sprites-set-configs' do
+        options = config.active_sprites
+        ActiveSupport.on_load(:active_sprites) do
+          options.each { |k,v| send("#{k}=", v) }
+        end
+      end
+
       private
         def load_sprite_definition(config_path)
           load File.join(config_path, 'sprites.rb') if File.exists?(File.join(config_path, 'sprites.rb'))

data/lib/active_assets/active_sprites/{runner.rb → rmagick_runner.rb}

@@ -7,11 +7,10 @@ require 'fileutils'
 
 module ActiveAssets
   module ActiveSprites
-    class Runner
+    class RmagickRunner
       class AssetContext < ActionView::Base
       end
-      SpriteDetails = Struct.new(:sprite_path, :x, :y, :width, :height)
-      
+
       include Magick
 
       DEFAULT_SPRITE = Image.new(0,0).freeze
@@ -19,13 +18,13 @@ module ActiveAssets
       def initialize(sprites)
         @sprites = if ENV['SPRITE']
           sprites.select do |name, sprite|
-            ENV['SPRITE'].split(',').map(&:compact).each do |sp|
+            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)
             end
-          end
+          end.map(&:last)
         else
           sprites.values
         end
@@ -55,12 +54,12 @@ module ActiveAssets
             offset = 0
 
             image_list.each_with_index do |image, i|
-              sprite_pieces[i].details = SpriteDetails.new(
+              sprite_pieces[i].details = SpritePiece::Details.new(
                 sprite.url.present? ? sprite.url : sprite_path,
-                orientation == Sprite::Orientation::VERTICAL ? 0 : "#{-offset}px",
-                orientation == Sprite::Orientation::VERTICAL ? "#{-offset}px" : 0,
-                "#{image.columns}px",
-                "#{image.rows}px"
+                orientation == Sprite::Orientation::VERTICAL ? 0 : offset,
+                orientation == Sprite::Orientation::VERTICAL ? offset : 0,
+                image.columns,
+                image.rows
               )
               offset += orientation == Sprite::Orientation::VERTICAL ? image.rows : image.columns
             end
@@ -74,7 +73,7 @@ module ActiveAssets
 
             @sprite.strip!
 
-            stylesheet = SpriteStylesheet.new(sprite_path, sprite_pieces)
+            stylesheet = SpriteStylesheet.new(sprite_pieces)
             stylesheet.write File.join(railtie.config.paths.public.to_a.first, sprite_stylesheet_path)
             write File.join(railtie.config.paths.public.to_a.first, sprite_path), sprite.quality
           ensure

data/lib/active_assets/active_sprites/sprite_piece.rb

@@ -18,6 +18,8 @@ module ActiveAssets
         end
       end
 
+      Details = Struct.new(:sprite_path, :x, :y, :width, :height)
+
       GEOMETRY_PROPS = [:x, :y, :width, :height]
       attr_reader(*GEOMETRY_PROPS)
       attr_accessor :details
@@ -35,9 +37,9 @@ module ActiveAssets
         <<-CSS
 #{css_selector}
 {
-  width:#{width || details.width};
-  height:#{height || details.height};
-  background:url('#{details.sprite_path}') no-repeat #{x || details.x} #{y || details.y};
+  width:#{width || "#{details.width}px"};
+  height:#{height || "#{details.height}px"};
+  background:url('#{details.sprite_path}') no-repeat #{x || "#{-details.x}px"} #{y || "#{-details.y}px"};
   display:block;
 }
         CSS

data/lib/active_assets/active_sprites/sprite_stylesheet.rb

@@ -3,8 +3,8 @@ require 'fileutils'
 module ActiveAssets
   module ActiveSprites
     class SpriteStylesheet
-      def initialize(sprite_path, sprite_pieces)
-        @sprite_path, @sprite_pieces = sprite_path, sprite_pieces
+      def initialize(sprite_pieces)
+        @sprite_pieces = sprite_pieces
       end
 
       def write(path)

data/lib/active_assets/active_sprites/sprites.rb

@@ -1,6 +1,12 @@
+require 'active_support/configurable'
+
 module ActiveAssets
   module ActiveSprites
     class Sprites
+      include ActiveSupport::Configurable
+      include Configurable
+      ActiveSupport.run_load_hooks(:active_sprites, self)
+
       def initialize
         @sprites = Hash.new do |sprites, name|
           sprites[name] = Sprite.new
@@ -45,8 +51,20 @@ module ActiveAssets
 
       def generate!(railtie = Rails.application)
         begin
-          require 'rmagick'
-          Runner.new(@sprites).generate!(railtie)
+          case sprite_backend
+          when :rmagick
+            require 'rmagick'
+            RmagickRunner.new(@sprites).generate!(railtie)
+          when :chunky_png
+            begin
+              require 'oily_png'
+              ChunkyPngRunner.new(@sprites).generate!(railtie)
+            rescue LoadError
+              require 'chunky_png'
+              ChunkyPngRunner.new(@sprites).generate!(railtie)
+              raise
+            end
+          end
         rescue LoadError
         end
       end

data/lib/active_assets/active_sprites.rb

@@ -7,8 +7,10 @@ module ActiveAssets
     autoload :SpritePiece
     autoload :Sprite
     autoload :Sprites
+    autoload :Configurable
     autoload :SpriteStylesheet
-    autoload :Runner
+    autoload :RmagickRunner
+    autoload :ChunkyPngRunner
 
     def self.load_engine_tasks(engine_class)
       desc "Generate sprites"

data/test/active_assets/active_sprites/sprite_test.rb

@@ -7,6 +7,9 @@ class SpriteTest < Test::Unit::TestCase
   end
 
   def teardown
+    FileUtils.rm_rf(Rails.root.join('public/images/sprites'))
+    FileUtils.rm_rf(Rails.root.join('public/stylesheets/sprites'))
+
     tear_down_assets
   end
 
@@ -71,8 +74,8 @@ class SpriteTest < Test::Unit::TestCase
   def test_url
     Rails.application.sprites do
       sprite :foobar, :url => "activecodebase.com" do
-        _"sprite_images/sprite3/1.gif" => ".klass_1"
-        _"sprite_images/sprite3/2.gif" => ".klass_2"
+        _"sprite_images/sprite3/1.png" => ".klass_1"
+        _"sprite_images/sprite3/2.png" => ".klass_2"
       end
     end
 

data/test/fixtures/rails_root/config/application.rb

@@ -7,4 +7,5 @@ module ActiveAssetsTest
   end
 end
 
+Rails.application.config.active_sprites.sprite_backend = :rmagick
 Rails.application.config.active_support.deprecation = :stderr

data/test/fixtures/rails_root/config/sprites.rb

@@ -1,7 +1,7 @@
 Rails.application.sprites do
   sprite 'sprites/3.png' => 'sprites/3.css' do
-    _"sprite_images/sprite3/1.gif" => ".klass_1"
-    _"sprite_images/sprite3/2.gif" => ".klass_2"
+    _"sprite_images/sprite3/1.png" => ".klass_1"
+    _"sprite_images/sprite3/2.png" => ".klass_2"
   end
 
   sprite 'sprites/4.png' do