compass 0.11.2 → 0.11.3

data/test/units/sprites/engine_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class EngineTest < Test::Unit::TestCase
+  
+  def setup
+    sprite_filename = 'squares/ten-by-ten.png'
+    @images = [
+       Compass::SassExtensions::Sprites::Image.new(nil, File.join(sprite_filename), {}) 
+      ]
+    @engine = Compass::SassExtensions::Sprites::Engine.new(100, 100, @images)
+  end
+  
+  
+  test "should have width of 100" do
+    assert_equal 100, @engine.width
+  end
+  
+  test "should have height of 100" do
+    assert_equal 100, @engine.height
+  end
+  
+  test "should have correct images" do
+    assert_equal @images, @engine.images
+  end
+  
+  test "raises Compass::Error when calling save" do
+    begin 
+      @engine.save('foo')
+      assert false, '#save did not raise an exception'
+    rescue Compass::Error
+      assert true
+    end
+  end
+  
+  test "raises Compass::Error when calling construct_sprite" do
+    begin 
+      @engine.construct_sprite
+      assert false, '#construct_sprite did not raise an exception'
+    rescue Compass::Error
+      assert true
+    end
+  end
+end

data/test/units/sprites/image_test.rb

@@ -19,8 +19,8 @@ class SpritesImageTest < Test::Unit::TestCase
   let(:sprite_name) { File.basename(sprite_filename, '.png') }
   
   def parent
-    map = Compass::SpriteMap.new("selectors/*.png", options)
-    @parent ||= Compass::SassExtensions::Sprites::Base.new(map.sprite_names.map{|n| "selectors/#{n}.png"}, map, map.sass_engine, map.options)
+    importer = Compass::SpriteImporter.new(:uri => "selectors/*.png", :options => options)
+    @parent ||= Compass::SassExtensions::Sprites::SpriteMap.new(importer.sprite_names.map{|n| "selectors/#{n}.png"}, importer.path, importer.name, importer.sass_engine, importer.options)
   end
   
   let(:options) do

data/test/units/sprites/importer_test.rb

@@ -0,0 +1,66 @@
+require 'test_helper'
+require 'timecop'
+class ImporterTest < Test::Unit::TestCase
+  URI = "selectors/*.png"
+  
+  def setup
+    @images_src_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images')
+    file = StringIO.new("images_path = #{@images_src_path.inspect}\n")
+    Compass.add_configuration(file, "sprite_config")
+    @importer = Compass::SpriteImporter.new(:uri => URI, :options => options)
+  end
+
+  def teardown
+    Compass.reset_configuration!
+  end
+  
+  def options
+    {:foo => 'bar'}
+  end
+  
+  test "load should return an instance of SpriteImporter" do
+    assert Compass::SpriteImporter.load(URI, options).is_a?(Compass::SpriteImporter)
+  end
+  
+  test "name should return the sprite name" do
+    assert_equal 'selectors', @importer.name
+  end
+  
+  test "path should return the sprite path" do
+    assert_equal 'selectors', @importer.path
+  end
+  
+  test "should return all the sprite names" do
+    assert_equal ["ten-by-ten", "ten-by-ten_active", "ten-by-ten_hover", "ten-by-ten_target"], @importer.sprite_names
+  end
+  
+  test "should have correct mtime" do
+    thirtydays = Time.now.to_i + (60*60*24*30)
+    file = Dir[File.join(@images_src_path, URI)].sort.first
+    File.utime(thirtydays, thirtydays, file)
+    assert_equal thirtydays, File.mtime(file).to_i
+    assert_equal thirtydays, @importer.mtime(URI, {}).to_i
+  end
+  
+  test "should return sass engine on find" do
+    assert @importer.find(URI, {}).is_a?(Sass::Engine)
+  end
+  
+  test "sass options should contain options" do
+    assert_equal 'bar', @importer.sass_options[:foo]
+  end
+  
+  test "should fail given bad sprite extensions" do
+    @images_src_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images')
+    file = StringIO.new("images_path = #{@images_src_path.inspect}\n")
+    Compass.add_configuration(file, "sprite_config")
+    importer = Compass::SpriteImporter.new(:uri => 'bad_extensions/*.jpg', :options => options)
+    begin
+      importer.sass_engine
+      assert false, "An invalid sprite file made it past validation."
+    rescue Compass::Error => e
+      assert e.message.include?('.png')
+    end
+  end
+  
+end

data/test/units/sprites/sprite_command_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+class SpriteCommandTest < Test::Unit::TestCase
+  attr_reader :test_dir
+  
+  def setup
+    @images_src_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images')
+    @images_tmp_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images-tmp')
+    @before_dir = ::Dir.pwd
+    create_temp_cli_dir
+    create_sprite_temp
+    File.open(File.join(@test_dir, 'config.rb'), 'w') do |f|
+      f << config_data
+    end
+  end
+  
+  def create_sprite_temp
+    ::FileUtils.cp_r @images_src_path, @images_tmp_path
+  end
+
+  def clean_up_sprites
+    ::FileUtils.rm_r @images_tmp_path
+  end
+  
+  def config_data
+    return <<-CONFIG
+      images_path = #{@images_tmp_path.inspect}
+    CONFIG
+  end
+
+  def create_temp_cli_dir
+    directory = File.join(File.expand_path('../', __FILE__), 'test')
+    ::FileUtils.mkdir_p directory
+     @test_dir = directory
+  end
+
+  def run_compass_with_options(options)
+    output = 'foo'
+    ::Dir.chdir @test_dir
+    %x{compass #{options.join(' ')}}
+  end
+
+  def options_to_cli(options)
+    options.map.flatten!
+  end
+
+  def teardown
+    ::Dir.chdir @before_dir
+    clean_up_sprites
+    if File.exists?(@test_dir)
+      ::FileUtils.rm_r @test_dir
+    end
+  end
+
+  it "should create sprite file" do
+    assert_equal 0, run_compass_with_options(['sprite', "-f", 'stylesheet.scss', "'#{@images_tmp_path}/*.png'"]).to_i
+    assert File.exists?(File.join(test_dir, 'stylesheet.scss'))
+  end
+
+end

data/test/units/sprites/{base_test.rb → sprite_map_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SpritesBaseTest < Test::Unit::TestCase
+class SpriteMapTest < Test::Unit::TestCase
   
   def setup
     Hash.send(:include, Compass::SassExtensions::Functions::Sprites::VariableReader)
@@ -16,8 +16,8 @@ class SpritesBaseTest < Test::Unit::TestCase
   end
   
   def setup_map
-    @map = Compass::SpriteMap.new("selectors/*.png", @options)
-    @base = Compass::SassExtensions::Sprites::Base.new(@map.sprite_names.map{|n| "selectors/#{n}.png"}, @map, @map.sass_engine, @map.options)
+    @importer = Compass::SpriteImporter.new(:uri => "selectors/*.png", :options => @options)
+    @base = Compass::SassExtensions::Sprites::SpriteMap.new(@importer.sprite_names.map{|n| "selectors/#{n}.png"}, @importer.path, @importer.name, @importer.sass_engine, @importer.options)
   end
 
   def teardown
@@ -29,7 +29,7 @@ class SpritesBaseTest < Test::Unit::TestCase
   end
   
   it "should have the sprite names" do
-    assert_equal @map.sprite_names, @base.sprite_names
+    assert_equal @importer.sprite_names, @base.sprite_names
   end
   
   it 'should have image filenames' do
@@ -49,7 +49,7 @@ class SpritesBaseTest < Test::Unit::TestCase
   end
 
   it 'should have correct filename' do
-    assert_equal File.join(@images_tmp_path, "#{@base.path}-#{@base.uniqueness_hash}.png"), @base.filename
+    assert_equal File.join(@images_tmp_path, "#{@base.path}-s#{@base.uniqueness_hash}.png"), @base.filename
   end
   
   it "should return the 'ten-by-ten' image" do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: compass
 version: !ruby/object:Gem::Version 
-  hash: 55
   prerelease: 
-  segments: 
-  - 0
-  - 11
-  - 2
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -19,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-10 00:00:00 -07:00
+date: 2011-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,10 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
         version: "3.1"
   type: :runtime
   version_requirements: *id001
@@ -45,11 +36,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+        version: "1.2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -60,11 +47,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 2
-        - 7
         version: 0.2.7
   type: :runtime
   version_requirements: *id003
@@ -642,6 +624,7 @@ files:
 - lib/compass/browser_support.rb
 - lib/compass/browser_support.rbc
 - lib/compass/commands/base.rb
+- lib/compass/commands/clean_project.rb
 - lib/compass/commands/create_project.rb
 - lib/compass/commands/default.rb
 - lib/compass/commands/generate_grid_background.rb
@@ -744,7 +727,6 @@ files:
 - lib/compass/sass_extensions/monkey_patches/traversal.rbc
 - lib/compass/sass_extensions/monkey_patches.rb
 - lib/compass/sass_extensions/monkey_patches.rbc
-- lib/compass/sass_extensions/sprites/base.rb
 - lib/compass/sass_extensions/sprites/base.rbc
 - lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rb
 - lib/compass/sass_extensions/sprites/engines/chunky_png_engine.rbc
@@ -752,14 +734,17 @@ files:
 - lib/compass/sass_extensions/sprites/engines.rbc
 - lib/compass/sass_extensions/sprites/image.rb
 - lib/compass/sass_extensions/sprites/image.rbc
+- lib/compass/sass_extensions/sprites/image_methods.rb
 - lib/compass/sass_extensions/sprites/sprite_map.rb
 - lib/compass/sass_extensions/sprites/sprite_map.rbc
-- lib/compass/sass_extensions/sprites/sprites.rb
+- lib/compass/sass_extensions/sprites/sprite_methods.rb
 - lib/compass/sass_extensions/sprites/sprites.rbc
 - lib/compass/sass_extensions/sprites.rb
 - lib/compass/sass_extensions/sprites.rbc
 - lib/compass/sass_extensions.rb
 - lib/compass/sass_extensions.rbc
+- lib/compass/sprite_importer.rb
+- lib/compass/sprite_importer.rbc
 - lib/compass/stats.rb
 - lib/compass/test_case.rb
 - lib/compass/util.rb
@@ -769,6 +754,8 @@ files:
 - lib/compass/version.rbc
 - lib/compass.rb
 - lib/compass.rbc
+- test/fixtures/sprites/public/images/bad_extensions/ten-by-ten.gif
+- test/fixtures/sprites/public/images/bad_extensions/twenty-by-twenty.jpg
 - test/fixtures/sprites/public/images/colors/blue.png
 - test/fixtures/sprites/public/images/colors/yellow.png
 - test/fixtures/sprites/public/images/ko/default_background.png
@@ -832,6 +819,13 @@ files:
 - test/fixtures/stylesheets/blueprint/sass/single-imports/scaffolding.scss
 - test/fixtures/stylesheets/blueprint/sass/single-imports/typography.scss
 - test/fixtures/stylesheets/blueprint/sass/single-imports/utilities.scss
+- test/fixtures/stylesheets/busted_image_urls/config.rb
+- test/fixtures/stylesheets/busted_image_urls/css/screen.css
+- test/fixtures/stylesheets/busted_image_urls/images/feed.png
+- test/fixtures/stylesheets/busted_image_urls/images/flags/dk.png
+- test/fixtures/stylesheets/busted_image_urls/images/grid.png
+- test/fixtures/stylesheets/busted_image_urls/sass/screen.sass
+- test/fixtures/stylesheets/busted_image_urls/tmp/screen.css
 - test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
 - test/fixtures/stylesheets/compass/css/border_radius.css
@@ -1108,7 +1102,7 @@ files:
 - test/fixtures/stylesheets/compass/images/flag/za.png
 - test/fixtures/stylesheets/compass/images/flag/zm.png
 - test/fixtures/stylesheets/compass/images/flag/zw.png
-- test/fixtures/stylesheets/compass/images/flag-03c3b29b35.png
+- test/fixtures/stylesheets/compass/images/flag-s03c3b29b35.png
 - test/fixtures/stylesheets/compass/sass/border_radius.scss
 - test/fixtures/stylesheets/compass/sass/box.sass
 - test/fixtures/stylesheets/compass/sass/box_shadow.scss
@@ -1131,6 +1125,8 @@ files:
 - test/fixtures/stylesheets/compass/sass/transform.scss
 - test/fixtures/stylesheets/compass/sass/utilities.scss
 - test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss
+- test/fixtures/stylesheets/error/config.rb
+- test/fixtures/stylesheets/error/sass/screen.sass
 - test/fixtures/stylesheets/image_urls/config.rb
 - test/fixtures/stylesheets/image_urls/css/screen.css
 - test/fixtures/stylesheets/image_urls/images/grid.png
@@ -1155,12 +1151,16 @@ files:
 - test/integrations/sprites_test.rb
 - test/integrations/test_rails_helper.rb
 - test/test_helper.rb
+- test/units/actions_test.rb
 - test/units/command_line_test.rb
 - test/units/compass_png_test.rb
 - test/units/configuration_test.rb
 - test/units/sass_extensions_test.rb
-- test/units/sprites/base_test.rb
+- test/units/sprites/engine_test.rb
 - test/units/sprites/image_test.rb
+- test/units/sprites/importer_test.rb
+- test/units/sprites/sprite_command_test.rb
+- test/units/sprites/sprite_map_test.rb
 - features/command_line.feature
 - features/extensions.feature
 - features/rails_integration.feature
@@ -1180,27 +1180,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A Real Stylesheet Framework
 test_files: 
+- test/fixtures/sprites/public/images/bad_extensions/ten-by-ten.gif
+- test/fixtures/sprites/public/images/bad_extensions/twenty-by-twenty.jpg
 - test/fixtures/sprites/public/images/colors/blue.png
 - test/fixtures/sprites/public/images/colors/yellow.png
 - test/fixtures/sprites/public/images/ko/default_background.png
@@ -1264,6 +1260,13 @@ test_files:
 - test/fixtures/stylesheets/blueprint/sass/single-imports/scaffolding.scss
 - test/fixtures/stylesheets/blueprint/sass/single-imports/typography.scss
 - test/fixtures/stylesheets/blueprint/sass/single-imports/utilities.scss
+- test/fixtures/stylesheets/busted_image_urls/config.rb
+- test/fixtures/stylesheets/busted_image_urls/css/screen.css
+- test/fixtures/stylesheets/busted_image_urls/images/feed.png
+- test/fixtures/stylesheets/busted_image_urls/images/flags/dk.png
+- test/fixtures/stylesheets/busted_image_urls/images/grid.png
+- test/fixtures/stylesheets/busted_image_urls/sass/screen.sass
+- test/fixtures/stylesheets/busted_image_urls/tmp/screen.css
 - test/fixtures/stylesheets/compass/100x150.jpg
 - test/fixtures/stylesheets/compass/config.rb
 - test/fixtures/stylesheets/compass/css/border_radius.css
@@ -1540,7 +1543,7 @@ test_files:
 - test/fixtures/stylesheets/compass/images/flag/za.png
 - test/fixtures/stylesheets/compass/images/flag/zm.png
 - test/fixtures/stylesheets/compass/images/flag/zw.png
-- test/fixtures/stylesheets/compass/images/flag-03c3b29b35.png
+- test/fixtures/stylesheets/compass/images/flag-s03c3b29b35.png
 - test/fixtures/stylesheets/compass/sass/border_radius.scss
 - test/fixtures/stylesheets/compass/sass/box.sass
 - test/fixtures/stylesheets/compass/sass/box_shadow.scss
@@ -1563,6 +1566,8 @@ test_files:
 - test/fixtures/stylesheets/compass/sass/transform.scss
 - test/fixtures/stylesheets/compass/sass/utilities.scss
 - test/fixtures/stylesheets/compass/sass/vertical_rhythm.scss
+- test/fixtures/stylesheets/error/config.rb
+- test/fixtures/stylesheets/error/sass/screen.sass
 - test/fixtures/stylesheets/image_urls/config.rb
 - test/fixtures/stylesheets/image_urls/css/screen.css
 - test/fixtures/stylesheets/image_urls/images/grid.png
@@ -1587,12 +1592,16 @@ test_files:
 - test/integrations/sprites_test.rb
 - test/integrations/test_rails_helper.rb
 - test/test_helper.rb
+- test/units/actions_test.rb
 - test/units/command_line_test.rb
 - test/units/compass_png_test.rb
 - test/units/configuration_test.rb
 - test/units/sass_extensions_test.rb
-- test/units/sprites/base_test.rb
+- test/units/sprites/engine_test.rb
 - test/units/sprites/image_test.rb
+- test/units/sprites/importer_test.rb
+- test/units/sprites/sprite_command_test.rb
+- test/units/sprites/sprite_map_test.rb
 - features/command_line.feature
 - features/extensions.feature
 - features/rails_integration.feature

data/lib/compass/sass_extensions/sprites/sprites.rb

@@ -1,62 +0,0 @@
-module Compass
-  class Sprites < Sass::Importers::Base
-    attr_accessor :name, :path
-    
-    def self.path_and_name(uri)
-      if uri =~ %r{((.+/)?([^\*.]+))/(.+?)\.png}
-        [$1, $3]
-      end
-    end
-    
-    def self.discover_sprites(uri)
-      self.load_map(uri, {}).files
-    end
-
-    def self.sprite_name(file)
-      File.basename(file, '.png')
-    end
-  
-    def self.load_map(uri, options)
-      Compass.quick_cache("spritemap:#{uri}", 5) do
-        SpriteMap.new(uri, options)
-      end
-    end
-  
-  
-    # Called by the sass engine to build a new SpriteMap
-    def find(uri, options)
-      if uri =~ /\.png$/
-        map = Compass::Sprites.load_map(uri, options)
-        self.path, self.name = map.path, map.name
-        return map.sass_engine
-      end
-    end
-  
-    # Called by the sass engine to identify the SpriteMap
-    def self.key(uri, options={})
-     [self.class.name + ":" + File.dirname(File.expand_path(uri)), File.basename(uri)]
-    end
-
-    def self.mtime(uri, options)
-      Compass.quick_cache("mtime:#{uri}") do
-        map = Compass::Sprites.load_map(uri, options)
-        map.files.inject(Time.at(0)) do |max_time, file|
-          (t = File.mtime(file)) > max_time ? t : max_time
-        end
-      end
-    end
-  
-    def to_s
-      ""
-    end
-
-    def hash
-      self.class.name.hash
-    end
-
-    def eql?(other)
-      other.class == self.class
-    end
-
-  end
-end