active_assets 0.2.3 → 0.2.4

data/lib/active_assets/active_sprites/sprite_piece.rb

@@ -32,7 +32,7 @@ module ActiveAssets
         self
       end
 
-      def to_s
+      def to_css
         return '' if details.nil?
         <<-CSS
 #{css_selector}
@@ -45,6 +45,10 @@ module ActiveAssets
         CSS
       end
 
+      def to_s
+        "|\t#{path}\t|\t#{css_selector}\t|\t#{details.x}\t|\t#{details.y}\t|\t#{details.width}\t|\t#{details.height}\t|\n"
+      end
+
       GEOMETRY_PROPS.each do |prop|
         eval <<-METH
           def #{prop}(*args)

data/lib/active_assets/active_sprites/sprite_stylesheet.rb

@@ -8,16 +8,15 @@ module ActiveAssets
       end
 
       def write(path)
-        to_s!
         FileUtils.mkdir_p(File.dirname(path))
         File.open(path, 'w+') do |f|
-          f.write @as_string
+          f.write to_s
         end
       end
 
       private
-        def to_s!
-          @as_string ||= @sprite_pieces.map(&:to_s).join("\n")
+        def to_s
+          @as_string ||= @sprite_pieces.map(&:to_css).join("\n")
         end
     end
   end

data/lib/active_assets/active_sprites/sprites.rb

@@ -54,18 +54,43 @@ module ActiveAssets
           case sprite_backend
           when :rmagick
             require 'rmagick'
-            RmagickRunner.new(@sprites).generate!(railtie)
-          when :chunky_png
+            RmagickRunner.new(railtie, @sprites).generate!
+          when :mini_magick
+            require 'mini_magick'
+            MiniMagickRunner.new(railtie, @sprites).generate!
+          when :chunky_png, :oily_png
             begin
               require 'oily_png'
-              ChunkyPngRunner.new(@sprites).generate!(railtie)
+              ChunkyPngRunner.new(railtie, @sprites).generate!
             rescue LoadError
               require 'chunky_png'
-              ChunkyPngRunner.new(@sprites).generate!(railtie)
-              raise
+              ChunkyPngRunner.new(railtie @sprites).generate!
+            end
+          else
+            begin
+              require 'rmagick'
+              RmagickRunner.new(railtie, @sprites).generate!
+            rescue LoadError
+              begin
+                begin
+                  require 'oily_png'
+                  ChunkyPngRunner.new(railtie, @sprites).generate!
+                rescue LoadError
+                  require 'chunky_png'
+                  ChunkyPngRunner.new(railtie, @sprites).generate!
+                end
+              rescue LoadError
+                require 'mini_magick'
+                MiniMagickRunner.new(railtie, @sprites).generate!
+              end
             end
           end
-        rescue LoadError
+        rescue LoadError => e
+          msg = ''
+          msg << "You have not specified any sprite runtime in your configuration.  We tried to load all supported runtimes, but failed to load any." if !sprite_backend
+          msg << "Your requested backend, #{sprite_backend}, was not found." if sprite_backend
+          msg << " Supported sprite backends include :rmagick, :chunky_png, and :mini_magick.  To use oily_png, install oily_png and configure with :chunky_png.\n"
+          $stdout << msg
         end
       end
     end

data/lib/tasks/active_sprites/sprites.rake

@@ -1,4 +1,5 @@
 desc "Generate sprites."
 task :sprites => :environment do
+  ENV['VERBOSE'] ||= 'true'
   Rails.application.sprites.generate!
 end

data/test/active_assets/active_sprites/runners/chunky_png_runner_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class ChunkyPngRunnerTest < Test::Unit::TestCase
+  include AbstractRunnerTest
+
+  def setup
+    ActiveAssets::ActiveSprites::Sprites.sprite_backend = :chunky_png
+    runner_setup
+  end
+end

data/test/active_assets/active_sprites/runners/mini_magick_runner_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class MiniMagickRunnerTest < Test::Unit::TestCase
+  include AbstractRunnerTest
+
+  def setup
+    ActiveAssets::ActiveSprites::Sprites.sprite_backend = :mini_magick
+    runner_setup
+  end
+end

data/test/active_assets/active_sprites/runners/rmagick_runner_test.rb

@@ -0,0 +1,10 @@
+require 'helper'
+
+class RmagickRunnerTest < Test::Unit::TestCase
+  include AbstractRunnerTest
+
+  def setup
+    ActiveAssets::ActiveSprites::Sprites.sprite_backend = :rmagick
+    runner_setup
+  end
+end

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

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

data/test/helper.rb

@@ -9,8 +9,6 @@ require 'active_assets'
 require 'socket'
 require 'timeout'
 
-require 'raster_graphics'
-
 TEST_RAILS_ROOT = File.expand_path('../fixtures/rails_root', __FILE__)
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| load f }
@@ -20,12 +18,6 @@ load File.join(TEST_RAILS_ROOT, 'config/application.rb')
 class Test::Unit::TestCase
   include RailsHelper
 
-  include(Module.new do
-    def percent_difference(image_1_path, image_2_path)
-      Pixmap.open(image_1_path) - Pixmap.open(image_2_path)
-    end
-  end)
-
   def sprites
     Rails.application.sprites
   end

data/test/{active_assets/active_sprites/runner_test.rb → support/abstract_runner.rb}

@@ -1,11 +1,10 @@
-require 'helper'
 require 'fileutils'
 require 'rmagick'
 require 'css_parser'
 
-class RunnerTest < Test::Unit::TestCase
+module AbstractRunnerTest
   include Magick
-  def setup
+  def runner_setup
     initialize_application_or_load_sprites!
 
     assert_false Rails.application.sprites.all.empty?
@@ -13,6 +12,12 @@ class RunnerTest < Test::Unit::TestCase
     assert_nothing_raised do
       Rails.application.sprites.generate!
     end
+
+    assert File.exists?(Rails.root.join('public/images/sprites/3.png'))
+    assert File.exists?(Rails.root.join('public/images/sprites/4.png'))
+
+    assert File.exists?(Rails.root.join('public/stylesheets/sprites/3.css'))
+    assert File.exists?(Rails.root.join('public/stylesheets/sprites/4.css'))
   end
 
   def teardown
@@ -36,14 +41,14 @@ class RunnerTest < Test::Unit::TestCase
 
     sprite_pieces_with_selector_data = []
 
-    parser.each_selector do |selectors, declarations, specificity|
-      sprite_piece = sprite_pieces.find {|sp| sp.css_selector == selectors }
-      width = declarations[%r{width:\s*(\d+)(?:px)?;}, 1].to_i
-      height = declarations[%r{height:\s*(\d+)(?:px)?;}, 1].to_i
-      background = declarations[%r{background:\s*([^;]+)}, 1]
+    parser.each_rule_set do |rs|
+      sprite_piece = sprite_pieces.find {|sp| rs.selectors.include?(sp.css_selector) }
+      width = rs['width'][%r{\s*(\d+)(?:px)?;?$}, 1].to_i
+      height = rs['height'][%r{\s*(\d+)(?:px)?;?$}, 1].to_i
+      background = rs['background'][%r{\s*([^;]+)}, 1]
       x = background[%r{\s-?(\d+)(?:px)?\s}, 1].to_i
       y = background[%r{\s-?(\d+)(?:px)?$}, 1].to_i
-      sprite_pieces_with_selector_data << [sprite_piece, Selector.new(selectors, x, y, width, height)]
+      sprite_pieces_with_selector_data << [sprite_piece, Selector.new(rs.selectors, x, y, width, height)]
     end
 
     sprite_pieces_with_selector_data.each do |sp, selector_data|
@@ -56,19 +61,11 @@ class RunnerTest < Test::Unit::TestCase
           selector_data.width,
           selector_data.height
         )
-        curr_sprite_image_file = Tempfile.new("curr_sprite_img.ppm")
-        curr_sprite_image.write "ppm:#{curr_sprite_image_file.path}"
-        curr_sprite_piece_image_bmp = Tempfile.new("curr_sprite_piece_image_bmp.ppm")
-        sprite_piece_image.write "ppm:#{curr_sprite_piece_image_bmp.path}"
-        pd = percent_difference(curr_sprite_image_file.path, curr_sprite_piece_image_bmp.path)
-        assert pd <= 0.25
+        pd = curr_sprite_image.compare_channel(sprite_piece_image, MeanSquaredErrorMetric).last
+        assert_equal 0, pd
       ensure
         sprite_piece_image.destroy! if sprite_piece_image
         curr_sprite_image.destroy! if curr_sprite_image
-        curr_sprite_image_file.close if curr_sprite_image_file
-        curr_sprite_piece_image_bmp.close if curr_sprite_piece_image_bmp
-        curr_sprite_piece_image_bmp = nil
-        curr_sprite_image_file = nil
         curr_sprite_image = nil
         sprite_piece_image = nil
       end
@@ -77,14 +74,4 @@ class RunnerTest < Test::Unit::TestCase
     sprite_image.destroy! if sprite_image
     sprite_image = nil
   end
-  
-  def test_sprite_exists
-    assert File.exists?(Rails.root.join('public/images/sprites/3.png'))
-    assert File.exists?(Rails.root.join('public/images/sprites/4.png'))
-  end
-  
-  def test_stylesheets_exists
-    assert File.exists?(Rails.root.join('public/stylesheets/sprites/3.css'))
-    assert File.exists?(Rails.root.join('public/stylesheets/sprites/4.css'))
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_assets
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Sam Woodard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -08:00
+date: 2011-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,20 @@ dependencies:
   prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  requirement: *id004
+  name: mini_magick
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,11 +87,11 @@ dependencies:
         - 5
         version: 1.1.5
   type: :development
-  requirement: *id004
+  requirement: *id005
   name: css_parser
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,11 +103,11 @@ dependencies:
         - 3
         version: 3.0.3
   type: :development
-  requirement: *id005
+  requirement: *id006
   name: rails
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -104,11 +118,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  requirement: *id006
+  requirement: *id007
   name: test-unit
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -120,10 +134,10 @@ dependencies:
         - 2
         version: 4.4.2
   type: :development
-  requirement: *id007
+  requirement: *id008
   name: ZenTest
   prerelease: false
-description: A Railtie that provides a full asset management system, including support for development and deployment.  It is comprised of two libraries, ActiveSprites and ActiveExpansions.  ActiveSprites generates sprites and their corresponding stylesheet from dsl definition. ActiveExpansions manages javascript and css, including concatenation support for deployment, using Rails expansions plus a dsl.
+description: A Railtie that provides an asset management system for css, javascript, and sprites in your Rails applications and engines. ActiveAssets includes two libraries, ActiveExpansions and ActiveSprites. ActiveSprites generates sprites defined by a dsl similar to a route definition. Similarly, ActiveExpansions' dsl creates ActionView::Helpers::AssetTagHelper javascript and stylesheet expansions, and adds additional features
 email: 
 - sam@wildfireapp.com
 executables: []
@@ -153,10 +167,12 @@ files:
 - lib/active_assets/active_expansions/stylesheets.rb
 - lib/active_assets/active_expansions/type_inferrable.rb
 - lib/active_assets/active_sprites.rb
-- lib/active_assets/active_sprites/chunky_png_runner.rb
 - lib/active_assets/active_sprites/configurable.rb
 - lib/active_assets/active_sprites/railtie.rb
-- lib/active_assets/active_sprites/rmagick_runner.rb
+- lib/active_assets/active_sprites/runners/abstract_runner.rb
+- lib/active_assets/active_sprites/runners/chunky_png_runner.rb
+- lib/active_assets/active_sprites/runners/mini_magick_runner.rb
+- lib/active_assets/active_sprites/runners/rmagick_runner.rb
 - lib/active_assets/active_sprites/sprite.rb
 - lib/active_assets/active_sprites/sprite_piece.rb
 - lib/active_assets/active_sprites/sprite_stylesheet.rb
@@ -170,7 +186,9 @@ files:
 - script/console
 - test/active_assets/active_expansions/asset_test.rb
 - test/active_assets/active_expansions/expansions_test.rb
-- test/active_assets/active_sprites/runner_test.rb
+- test/active_assets/active_sprites/runners/chunky_png_runner_test.rb
+- test/active_assets/active_sprites/runners/mini_magick_runner_test.rb
+- test/active_assets/active_sprites/runners/rmagick_runner_test.rb
 - test/active_assets/active_sprites/sprite_piece_test.rb
 - test/active_assets/active_sprites/sprite_test.rb
 - test/active_assets/active_sprites/sprites_test.rb
@@ -236,8 +254,7 @@ files:
 - test/fixtures/rails_root/public/stylesheets/bar/bas.css
 - test/fixtures/rails_root/public/stylesheets/bas/bar.css
 - test/helper.rb
-- test/raster_graphics.rb
-- test/raster_graphics_test.rb
+- test/support/abstract_runner.rb
 - test/support/rails_helper.rb
 has_rdoc: true
 homepage: http://github.com/shwoodard/active_assets
@@ -272,11 +289,13 @@ rubyforge_project: activeassets
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: A Railtie that provides a full asset management system, including support for development and deployment.
+summary: A Railtie that provides an asset management system for css, javascript, and sprites in your Rails applications and engines.
 test_files: 
 - test/active_assets/active_expansions/asset_test.rb
 - test/active_assets/active_expansions/expansions_test.rb
-- test/active_assets/active_sprites/runner_test.rb
+- test/active_assets/active_sprites/runners/chunky_png_runner_test.rb
+- test/active_assets/active_sprites/runners/mini_magick_runner_test.rb
+- test/active_assets/active_sprites/runners/rmagick_runner_test.rb
 - test/active_assets/active_sprites/sprite_piece_test.rb
 - test/active_assets/active_sprites/sprite_test.rb
 - test/active_assets/active_sprites/sprites_test.rb
@@ -342,6 +361,5 @@ test_files:
 - test/fixtures/rails_root/public/stylesheets/bar/bas.css
 - test/fixtures/rails_root/public/stylesheets/bas/bar.css
 - test/helper.rb
-- test/raster_graphics.rb
-- test/raster_graphics_test.rb
+- test/support/abstract_runner.rb
 - test/support/rails_helper.rb

data/lib/active_assets/active_sprites/chunky_png_runner.rb

@@ -1,119 +0,0 @@
-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