active_assets 1.1.2 → 1.1.3

data/active_assets.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "active_assets"
-  s.version     = '1.1.2'
+  s.version     = '1.1.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sam Woodard"]
   s.email       = ["sam@wildfireapp.com"]

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

@@ -7,8 +7,7 @@ require 'fileutils'
 module ActiveAssets
   module ActiveSprites
     class AbstractRunner
-      class AssetContext < ActionView::Base
-      end
+      class FileNotFound < StandardError; end
 
       def initialize(railtie, sprites)
         @railtie = railtie
@@ -85,6 +84,11 @@ module ActiveAssets
         $stdout << "#{Time.now}: ActiveSprites \"I finished my run in #{Time.now - t} seconds.\"\n" if verbose
       end
 
+      protected
+        def file_exists!(file_path)
+          raise FileNotFound.new("The file you are attempting to add to your sprite, #{file_path}, does not exists.") unless File.exists?(file_path)
+        end
+
       private
         def image_computed_path(path)
           File.join('images', path)

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

@@ -13,6 +13,7 @@ module ActiveAssets
 
           image_list = sprite_pieces.map do |sp|
             sprite_piece_path = image_computed_full_path(sp.path)
+            file_exists!(sprite_piece_path)
             sp_image =  ChunkyPNG::Image.from_file(sprite_piece_path)
             sp.details = SpritePiece::Details.new(
               sprite_url(sprite, sprite_path),

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

@@ -9,6 +9,7 @@ module ActiveAssets
 
           image_list = sprite_pieces.map do |sp|
             sp_path = image_computed_full_path(sp.path)
+            file_exists!(sp_path)
             image = MiniMagick::Image.open(sp_path)
             sp.details = SpritePiece::Details.new(
               sprite_url(sprite, sprite_path),

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

@@ -10,7 +10,9 @@ module ActiveAssets
       private
         def set_sprite_details_and_return_image_list(sprite, sprite_path, sprite_pieces, orientation)
           sprite_piece_paths = sprite_pieces.map do |sp|
-            image_computed_full_path(sp.path)
+            path = image_computed_full_path(sp.path)
+            file_exists!(path)
+            path
           end
           image_list = ImageList.new(*sprite_piece_paths)
 

data/lib/active_assets/active_sprites/sprite_piece.rb

@@ -22,8 +22,8 @@ module ActiveAssets
 
       Details = Struct.new(:sprite_path, :x, :y, :width, :height)
 
-      GEOMETRY_PROPS = [:x, :y, :width, :height]
-      attr_reader(*GEOMETRY_PROPS)
+      CSS_PROPS = [:x, :y, :repeat, :width, :height, :important]
+      attr_reader(*CSS_PROPS)
       attr_accessor :details
       delegate :path, :css_selector, :to => :mapping
 
@@ -42,7 +42,7 @@ module ActiveAssets
 {
   width:#{width || "#{details.width}px"};
   height:#{height || "#{details.height}px"};
-  background:url('#{details.sprite_path}?#{Time.now.to_i}') no-repeat #{x || "#{-details.x}px"} #{y || "#{-details.y}px"};
+  background:url('#{details.sprite_path}?#{Time.now.to_i}') #{repeat || "no-repeat"} #{x || "#{-details.x}px"} #{y || "#{-details.y}px"}#{" !important" if important};
   display:block;
 }
         CSS
@@ -52,7 +52,7 @@ module ActiveAssets
         "|\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|
+      CSS_PROPS.each do |prop|
         eval <<-METH
           def #{prop}(*args)
             #{prop}, *_ = args

data/test/active_assets/active_sprites/sprite_piece_test.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'css_parser'
 
 class SpritePiecetest < Test::Unit::TestCase
   def setup
@@ -6,9 +7,66 @@ class SpritePiecetest < 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
 
+  def important_rendered(important = false)
+    sp_options = {"sprite_images/sprite3/1.png" => ".klass_1"}
+    sp_options.update(:important => important) if important
+
+    Rails.application.sprites do
+      sprite :sprite2 do
+        sp sp_options
+      end
+    end
+  
+    ENV['SPRITE'] = 'sprite2'
+  
+    Rails.application.sprites.generate!
+  
+    parser = CssParser::Parser.new
+    stylesheet_path = Rails.root.join('public/stylesheets/sprites/sprite2.css')
+    parser.load_file!(File.basename(stylesheet_path), File.dirname(stylesheet_path), :screen)
+
+    important = ''
+    parser.each_rule_set do |rs|
+      next unless rs.selectors.include?('.klass_1')
+      background = rs['background'][%r{\s*([^;]+)}, 1]
+      important = background[%r{\s+(!important)$}, 1]
+    end
+    important
+  end
+
+  def repeat_rendered(repeat = nil)
+    sp_options = {"sprite_images/sprite3/1.png" => ".klass_1"}
+    sp_options.update(:repeat => repeat) unless repeat.nil?
+
+    Rails.application.sprites do
+      sprite :sprite2 do
+        sp sp_options
+      end
+    end
+  
+    ENV['SPRITE'] = 'sprite2'
+  
+    Rails.application.sprites.generate!
+  
+    parser = CssParser::Parser.new
+    stylesheet_path = Rails.root.join('public/stylesheets/sprites/sprite2.css')
+    parser.load_file!(File.basename(stylesheet_path), File.dirname(stylesheet_path), :screen)
+
+    repeat = ''
+    parser.each_rule_set do |rs|
+      next unless rs.selectors.include?('.klass_1')
+      background = rs['background'][%r{\s*([^;]+)}, 1]
+      repeat = background[%r{\)\s*([^\s]+)}, 1]
+    end
+    repeat
+  end
+
   def test_configure_with_block
     Rails.application.sprites do
       sprite :sprite1 do
@@ -62,4 +120,20 @@ class SpritePiecetest < Test::Unit::TestCase
 
     assert_equal paths, Rails.application.sprites['sprites/4.png'].sprite_pieces.map(&:path)
   end
+
+  def test_set_repeat
+    assert_equal 'repeat-y', repeat_rendered('repeat-y')
+  end
+
+  def test_do_not_set_repeat
+    assert_equal 'no-repeat', repeat_rendered
+  end
+
+  def test_set_important
+    assert_equal '!important', important_rendered(true)
+  end
+
+  def test_do_not_set_important
+    assert_equal nil, important_rendered
+  end
 end

data/test/support/abstract_runner.rb

@@ -29,6 +29,18 @@ module AbstractRunnerTest
 
   Selector = Struct.new(:selector, :x, :y, :width, :height)
 
+  def test_file_does_not_exist
+    Rails.application.sprites do
+      sprite 'sprites/fail.png' do
+        _"sprite_images/sprite3/3.png" => ".klass_1"
+      end
+    end
+
+    assert_raises(ActiveAssets::ActiveSprites::AbstractRunner::FileNotFound) do
+      Rails.application.sprites.generate!
+    end
+  end
+
   def test_generate
     sprite = Rails.application.sprites['sprites/4.png']
     orientation = sprite.orientation

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_assets
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 1.1.2
+  segments: 
+  - 1
+  - 1
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Sam Woodard
@@ -10,97 +15,128 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-24 00:00:00 -07:00
+date: 2011-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oily_png
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  name: oily_png
   prerelease: false
-  version_requirements: *id001
+  type: :development
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: chunky_png
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  name: chunky_png
   prerelease: false
-  version_requirements: *id002
+  type: :development
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: rmagick
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  name: rmagick
   prerelease: false
-  version_requirements: *id003
+  type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: mini_magick
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
+  name: mini_magick
   prerelease: false
-  version_requirements: *id004
+  type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: css_parser
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
-  type: :development
+  name: css_parser
   prerelease: false
-  version_requirements: *id005
+  type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
         version: 3.0.3
-  type: :development
+  name: rails
   prerelease: false
-  version_requirements: *id006
+  type: :development
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: test-unit
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
         version: "2.0"
-  type: :development
+  name: test-unit
   prerelease: false
-  version_requirements: *id007
+  type: :development
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: ZenTest
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 4
+        - 2
         version: 4.4.2
-  type: :development
+  name: ZenTest
   prerelease: false
-  version_requirements: *id008
+  type: :development
+  requirement: *id008
 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
@@ -240,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 5489205130638636
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -249,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 5489205130638636
+      hash: 3
       segments: 
       - 0
       version: "0"