sprites 0.0.1.pre3 → 0.0.1.rc1

data/spec/fixtures/rails_project2/config/application.rb

@@ -0,0 +1,61 @@
+require File.expand_path('../boot', __FILE__)
+
+# Pick the frameworks you want:
+require "active_record/railtie"
+require "action_controller/railtie"
+# require "action_mailer/railtie"
+# require "active_resource/railtie"
+require "sprockets/railtie"
+require 'sprites/rails'
+require 'sprites/rails/autoload'
+
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
+module SpritesRailsTestApp
+  class Application < Rails::Application
+    config.root = File.expand_path('../..', __FILE__)
+    config.cache_classes = false
+
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/lib)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password, :password_confirmation]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
+    config.active_support.deprecation = :log
+  end
+end
+
+SpritesRailsTestApp::Application.load_tasks

data/spec/fixtures/rails_project2/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/fixtures/rails_project2/config/environment.rb

@@ -0,0 +1,7 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+require 'rake'
+include Rake::DSL
+
+SpritesRailsTestApp::Application.initialize!

data/spec/fixtures/rails_project2/config/sprites.rb

@@ -0,0 +1,93 @@
+Sprites.application.define do
+  sprite :bas
+
+  sprite :buttons, :path => "buttons.png", :stylesheet_path => "buttons.css", :auto_define => false do
+    sprite_piece 'buttons/btn-black-default-28.png', 'a.black.wf_button > span, button.black.wf_submit span'
+    sprite_piece 'buttons/btn-black-default-cap-28.png', 'a.black.wf_button, button.black.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-black-rollover-28.png', 'a.black.wf_button:hover > span, button.black.wf_submit:hover span'
+    sprite_piece 'buttons/btn-black-rollover-cap-28.png', 'a.black.wf_button:hover, button.black.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-black-onclick-28.png', 'a.black.wf_button:active > span, button.black.wf_submit:active span, a.black.wf_button.active span'
+    sprite_piece 'buttons/btn-black-onclick-cap-28.png', 'a.black.wf_button:active, button.black.wf_submit:active, a.black.wf_button.active', :x => 'right'
+    sprite_piece 'buttons/btn-green-default.png', 'a.green.wf_button > span, button.green.wf_submit span'
+    sprite_piece 'buttons/btn-green-default-cap.png', 'a.green.wf_button, button.green.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-green-rollover.png', 'a.green.wf_button:hover > span, button.green.wf_submit:hover span'
+    sprite_piece 'buttons/btn-green-rollover-cap.png', 'a.green.wf_button:hover, button.green.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-green-onclick.png', 'a.green.wf_button:active > span, button.green.wf_submit:active span'
+    sprite_piece 'buttons/btn-green-onclick-cap.png', 'a.green.wf_button:active, button.green.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-green-default-edge.png', 'a.right_edge.green.wf_button, button.right_edge.green.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-green-rollover-edge.png', 'a.right_edge.green.wf_button:hover button.right_edge.green.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-green-onclick-edge.png', 'a.right_edge.green.wf_button:active, button.right_edge.green.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-green-default-drop.png', 'a.green.wf_menu_button'
+    sprite_piece 'buttons/btn-green-rollover-drop.png', 'a.green.wf_menu_button:hover'
+    sprite_piece 'buttons/btn-green-onclick-drop.png', 'a.green.wf_menu_button:active'
+    sprite_piece 'buttons/btn-black-default.png', 'a.tall.black.wf_button > span, button.tall.black.wf_submit span'
+    sprite_piece 'buttons/btn-black-default-cap-long.png', 'a.tall.black.wf_button, button.tall.black.wf_submit, a.black.back_arrow.wf_button', :x => 'right'
+    sprite_piece 'buttons/btn-black-rollover.png', 'a.tall.black.wf_button:hover > span, button.tall.black.wf_submit:hover span'
+    sprite_piece 'buttons/btn-black-rollover-cap-long.png', 'a.tall.black.wf_button:hover, button.tall.black.wf_submit:hover, a.black.back_arrow.wf_button:hover', :x => 'right'
+    sprite_piece 'buttons/btn-black-onclick.png', 'a.tall.black.wf_button:active > span, button.tall.black.wf_submit:active span, a.black.tall.wf_button.active span'
+    sprite_piece 'buttons/btn-black-onclick-cap-long.png', 'a.tall.black.wf_button:active, button.tall.black.wf_submit:active, a.black.back_arrow.wf_button:active, a.black.tall.wf_button.active', :x => 'right'
+    sprite_piece 'buttons/btn-red-default.png', 'a.red.wf_button > span, button.red.wf_submit span'
+    sprite_piece 'buttons/btn-red-default-cap.png', 'a.red.wf_button, button.red.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-red-rollover.png', 'a.red.wf_button:hover > span, button.red.wf_submit:hover span'
+    sprite_piece 'buttons/btn-red-rollover-cap.png', 'a.red.wf_button:hover, button.red.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-red-onclick.png', 'a.red.wf_button:active > span, button.red.wf_submit:active span'
+    sprite_piece 'buttons/btn-red-onclick-cap.png', 'a.red.wf_button:active, button.red.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-yellow-default.png', 'a.yellow.wf_button > span, button.yellow.wf_submit span'
+    sprite_piece 'buttons/btn-yellow-default-cap.png', 'a.yellow.wf_button, button.yellow.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-yellow-rollover.png', 'a.yellow.wf_button:hover > span, button.yellow.wf_submit:hover span'
+    sprite_piece 'buttons/btn-yellow-rollover-cap.png', 'a.yellow.wf_button:hover, button.yellow.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-yellow-onclick.png', 'a.yellow.wf_button:active > span, button.yellow.wf_submit:active span'
+    sprite_piece 'buttons/btn-yellow-onclick-cap.png', 'a.yellow.wf_button:active, button.yellow.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-white-default.png', 'a.white.wf_button > span, button.white.wf_submit span'
+    sprite_piece 'buttons/btn-white-default-cap.png', 'a.white.wf_button, button.white.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-white-rollover.png', 'a.white.wf_button:hover > span, button.white.wf_submit:hover span'
+    sprite_piece 'buttons/btn-white-rollover-cap.png', 'a.white.wf_button:hover, button.white.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-white-onclick.png', 'a.white.wf_button:active > span, button.white.wf_submit:active span'
+    sprite_piece 'buttons/btn-white-onclick-cap.png', 'a.white.wf_button:active, button.white.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-trans-default.png', 'a.trans.wf_button > span, button.trans.wf_submit span'
+    sprite_piece 'buttons/btn-trans-default-cap.png', 'a.trans.wf_button, button.trans.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-trans-rollover.png', 'a.trans.wf_button:hover > span, button.trans.wf_submit:hover span'
+    sprite_piece 'buttons/btn-trans-rollover-cap.png', 'a.trans.wf_button:hover, button.trans.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-trans-onclick.png', 'a.trans.wf_button:active > span, button.trans.wf_submit:active span'
+    sprite_piece 'buttons/btn-trans-onclick-cap.png', 'a.trans.wf_button:active, button.trans.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-blue-default.png', 'a.blue.wf_button > span, button.blue.wf_submit span'
+    sprite_piece 'buttons/btn-blue-default-cap.png', 'a.blue.wf_button, button.blue.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-blue-rollover.png', 'a.blue.wf_button:hover > span, button.blue.wf_submit:hover span'
+    sprite_piece 'buttons/btn-blue-rollover-cap.png', 'a.blue.wf_button:hover, button.blue.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-blue-onclick.png', 'a.blue.wf_button:active > span, button.blue.wf_submit:active span'
+    sprite_piece 'buttons/btn-blue-onclick-cap.png', 'a.blue.wf_button:active, button.blue.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-red-default-edge.png', 'a.right_edge.red.wf_button, button.right_edge.red.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-red-rollover-edge.png', 'a.right_edge.red.wf_button:hover, button.right_edge.red.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-red-onclick-edge.png', 'a.right_edge.red.wf_button:active, button.right_edge.red.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-red-default-drop.png', 'a.red.wf_menu_button'
+    sprite_piece 'buttons/btn-red-rollover-drop.png', 'a.red.wf_menu_button:hover'
+    sprite_piece 'buttons/btn-red-onclick-drop.png', 'a.red.wf_menu_button:active'
+    sprite_piece 'buttons/btn-yellow-default-edge.png', 'a.right_edge.yellow.wf_button, button.right_edge.yellow.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-yellow-rollover-edge.png', 'a.right_edge.yellow.wf_button:hover, button.right_edge.yellow.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-yellow-onclick-edge.png', 'a.right_edge.yellow.wf_button:active, button.right_edge.yellow.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-yellow-default-drop.png', 'a.yellow.wf_menu_button'
+    sprite_piece 'buttons/btn-yellow-rollover-drop.png', 'a.yellow.wf_menu_button:hover'
+    sprite_piece 'buttons/btn-yellow-onclick-drop.png', 'a.yellow.wf_menu_button:active'
+    sprite_piece 'buttons/btn-blue-default-edge.png', 'a.right_edge.blue.wf_button, button.right_edge.blue.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-blue-rollover-edge.png', 'a.right_edge.blue.wf_button:hover, button.right_edge.blue.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-blue-onclick-edge.png', 'a.right_edge.blue.wf_button:active, button.right_edge.blue.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-blue-default-drop.png', 'a.blue.wf_menu_button'
+    sprite_piece 'buttons/btn-blue-rollover-drop.png', 'a.blue.wf_menu_button:hover'
+    sprite_piece 'buttons/btn-blue-onclick-drop.png', 'a.blue.wf_menu_button:active'
+    sprite_piece 'buttons/btn-white-default-edge.png', 'a.right_edge.white.wf_button, button.right_edge.white.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-white-rollover-edge.png', 'a.right_edge.white.wf_button:hover, button.right_edge.white.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-white-onclick-edge.png', 'a.right_edge.white.wf_button:active, button.right_edge.white.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-white-default-drop.png', 'a.white.wf_menu_button'
+    sprite_piece 'buttons/btn-white-rollover-drop.png', 'a.white.wf_menu_button:hover'
+    sprite_piece 'buttons/btn-white-onclick-drop.png', 'a.white.wf_menu_button:active'
+    sprite_piece 'buttons/btn-trans-default-edge.png', 'a.right_edge.trans.wf_button, button.right_edge.trans.wf_submit', :x => 'right'
+    sprite_piece 'buttons/btn-trans-rollover-edge.png', 'a.right_edge.trans.wf_button:hover, button.right_edge.trans.wf_submit:hover', :x => 'right'
+    sprite_piece 'buttons/btn-trans-onclick-edge.png', 'a.right_edge.trans.wf_button:active, button.right_edge.trans.wf_submit:active', :x => 'right'
+    sprite_piece 'buttons/btn-trans-default-drop.png', 'a.trans.wf_menu_button'
+    sprite_piece 'buttons/btn-trans-rollover-drop.png', 'a.trans.wf_menu_button:hover'
+    sprite_piece 'buttons/btn-trans-onclick-drop.png', 'a.trans.wf_menu_button:active'
+    sprite_piece 'buttons/btn-blackarrow-default.png', 'a.black.back_arrow.wf_button > span'
+    sprite_piece 'buttons/btn-blackarrow-rollover.png', 'a.black.back_arrow.wf_button:hover > span'
+    sprite_piece 'buttons/btn-blackarrow-onclick.png', 'a.black.back_arrow.wf_button:active > span'
+  end
+end

data/spec/integration/rails/rails_spec.rb

@@ -1,8 +1,10 @@
 ENV['RAILS_ENV'] ||= 'test'
+require 'rake'
 require 'spec_helper'
 require 'rails/all'
-require 'fixtures/rails_project1/config/environment'
+require 'fixtures/rails_project1/config/application'
 require 'rspec-rails'
+require 'sprites/test/sprite_generator_tester'
 
 describe "When creating sprites and stylesheets in a rails app" do
   it 'should create the sprites when rake is executed' do
@@ -13,5 +15,11 @@ describe "When creating sprites and stylesheets in a rails app" do
 
     FileUtils.rm Sprite.sprite_full_path(Sprites.configuration, Sprites.application.sprites[:buttons])
     FileUtils.rm Stylesheet.stylesheet_full_path(Sprites.configuration, Sprites.application.sprites[:buttons].stylesheet)
+
+    tester = SpriteGeneratorTester.new(Sprites.application.sprites[:bas], Sprites.configuration)
+    tester.should be_accurate
+
+    FileUtils.rm Sprite.sprite_full_path(Sprites.configuration, Sprites.application.sprites[:bas])
+    FileUtils.rm Stylesheet.stylesheet_full_path(Sprites.configuration, Sprites.application.sprites[:bas].stylesheet)
   end
 end

data/spec/lib/sprites/application_spec.rb

@@ -11,7 +11,7 @@ describe Application do
     end
 
     it 'should allow access to the api when defining a sprite with a symbol' do
-      @app.sprite(:foo) {}
+      @app.sprite(:foo)
 
       @app.sprites[:foo].should be_a(Sprite)
       @app.sprites[:foo].name.should be(:foo)
@@ -20,17 +20,7 @@ describe Application do
     end
 
     it 'should allow access to the api when defining a sprite with a hash' do
-      @app.sprite('sprites/foo.png' => 'sprites/foo.css') {}
-      @app.sprites[:foo].should be_a(Sprite)
-      @app.sprites[:foo].name.should be(:foo)
-      @app.sprites[:foo].path.to_s.should == "sprites/foo.png"
-      @app.sprites[:foo].stylesheet_path.should == "sprites/foo.css"
-    end
-
-
-    it 'should allow access to the api when defining a sprite with a string' do
-      @app.sprite('sprites/foo.png') {}
-
+      @app.sprite(:foo, :path => 'sprites/foo.png', :stylesheet_path => 'sprites/foo.css')
       @app.sprites[:foo].should be_a(Sprite)
       @app.sprites[:foo].name.should be(:foo)
       @app.sprites[:foo].path.to_s.should == "sprites/foo.png"

data/spec/lib/sprites/autoloader_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'sprites/autoloader'
+
+describe Autoloader do
+  it 'should autoload sprites' do
+    Sprites.configure do
+      config.sprite_pieces_path = File.join(GEM_ROOT, 'spec/fixtures/rails_project1/app/assets/images/sprite_images')
+    end
+
+    Sprites.application.sprites[:buttons].should be_nil
+    Sprites.application.sprites[:bas].should be_nil
+
+    Sprites::Autoloader.new.autoload
+
+    Sprites.application.sprites[:buttons].should_not be_nil
+    Sprites.application.sprites[:bas].should_not be_nil
+
+    Sprites.application.sprites[:buttons].sprite_pieces.count.should == 87
+    Sprites.application.sprites[:bas].sprite_pieces.count.should == 5
+  end
+end

data/spec/lib/sprites/configuration_spec.rb

@@ -12,7 +12,8 @@ describe Configuration do
     end
 
     it 'should accept an override' do
-      config.sprites_path('foo').sprites_path.should == 'foo'
+      config.sprites_path = 'foo'
+      config.sprites_path.should == 'foo'
     end
   end
 
@@ -22,7 +23,8 @@ describe Configuration do
     end
 
     it 'should accept an override' do
-      config.sprite_stylesheets_path('foo').sprite_stylesheets_path.should == 'foo'
+      config.sprite_stylesheets_path = 'foo'
+      config.sprite_stylesheets_path.should == 'foo'
     end
   end
 
@@ -32,7 +34,8 @@ describe Configuration do
     end
 
     it 'should accept an override' do
-      config.sprite_pieces_path('foo').sprite_pieces_path.should == 'foo'
+      config.sprite_pieces_path = 'foo'
+      config.sprite_pieces_path.should == 'foo'
     end
   end
 
@@ -44,7 +47,7 @@ describe Configuration do
     Configuration::FIELDS.each do |field|
       it "should be configured if the #{field} has changed" do
         config = Configuration.new
-        config.send(field, 'foo')
+        config.send(:"#{field}=", 'foo')
         config.should be_configured
       end
     end

data/spec/lib/sprites/sprite_generators/chunky_png_generator_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
+require 'sprites/test/sprite_generator_tester'
 
 describe ChunkyPngGenerator do
   it 'should generate a sprite and a stylesheet' do
     Sprites.configure do
-      sprites_path 'tmp/images/sprites/foo2'
-      sprite_stylesheets_path 'tmp/images/stylesheets/foo2'
-      sprite_pieces_path File.join(Sprites.gem_root, 'spec/fixtures/known_good/sprite_images')
+      config.sprites_path = 'tmp/images/sprites/foo2/sprites'
+      config.sprite_stylesheets_path = 'tmp/images/stylesheets/foo2/sprites'
+      config.sprite_pieces_path = File.join(GEM_ROOT, 'spec/fixtures/known_good/sprite_images')
     end
 
     define_buttons_sprite

data/spec/lib/sprites/sprite_piece_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
+require 'sprites/sprite_piece'
 
 describe SpritePiece do
   context 'self.sprite_piece_full_path' do
     it 'should return the full sprite piece path' do
       config = Configuration.new
-      config.sprite_pieces_path('tmp/images/sprite_images')
+      config.sprite_pieces_path = 'tmp/images/sprite_images'
 
       sprite_piece = SpritePiece.new('foo/bar.png')
 
@@ -15,15 +16,15 @@ describe SpritePiece do
   context '#css' do
     it 'should return the css for the sprite piece' do
       config = Configuration.new
-      config.sprites_path('tmp/images/sprites')
+      config.sprites_path = 'tmp/images/sprites'
       
-      sprite = Sprite.new(:foo).define do
-        sprite_piece 'foo/bar.png' => '.foo'
+      sprite = Sprite.new(:foo).configure do
+        sprite_piece 'foo/bar.png', '.foo'
       end
 
       sprite_piece = sprite.sprite_pieces['foo/bar.png']
-      sprite_piece.x = 0
-      sprite_piece.y = 345
+      sprite_piece.left = 0
+      sprite_piece.top = 345
       sprite_piece.width = 40
       sprite_piece.height = 50
 
@@ -38,4 +39,27 @@ describe SpritePiece do
       CSS
     end
   end
+
+  context 'when overriding the default x and y background-position settings' do
+    it 'should allow you to override the x setting' do
+      config = Configuration.new
+      config.sprites_path ='tmp/images/sprites'
+      config.sprite_stylesheets_path = 'tmp/stylesheets/sprites'
+      config.sprite_pieces_path = 'spec/fixtures/project1/public/images/sprite_images'
+      
+      sprite = Sprite.new(:foo).configure do
+        sprite_piece 'foo/bar.png', '.foo', :x => 'right'
+      end
+      sprite_piece = sprite.sprite_pieces['foo/bar.png']
+
+      generator = ChunkyPngGenerator.new(config)
+      sprites = Sprites::Sprites.new(config)
+      sprites.add(sprite)
+
+      generator.generate(sprites)
+
+      sprite_piece.x.should == 'right'
+      sprite_piece.css(config, sprite).should include('right')
+    end
+  end
 end

data/spec/lib/sprites/sprite_pieces_spec.rb

@@ -6,20 +6,22 @@ describe SpritePieces do
   before do
     @sprite_pieces = SpritePieces.new
 
-    @sprite_piece_definitions = [
-      {'foo.png' => 'foo.css'},
-      {'bar.png' => 'bar.css'},
-      {'bas.png' => 'bas.css'}
+    sprite_pieces = [
+      ['foo.png', 'foo.css'],
+      ['bar.png', 'bar.css'],
+      ['bas.png', 'bas.css']
     ]
 
-    @sprite_piece_definitions.each do |spd|
-      @sprite_pieces.add(spd)
+    @sprite_piece_definitions = sprite_pieces.map(&:clone)
+
+    sprite_pieces.each do |sp|
+      @sprite_pieces.add(*sp)
     end
   end
 
   context '#map' do
     it 'should allow access to the @sprite_pieces OrderedHash values and allow them to be mapped' do
-      @sprite_pieces.map {|sp| {sp.path => sp.selector} }.should == @sprite_piece_definitions
+      @sprite_pieces.map {|sp| [sp.path, sp.selector] }.should == @sprite_piece_definitions
     end
   end
 

data/spec/lib/sprites/sprite_spec.rb

@@ -14,77 +14,23 @@ describe Sprite do
 
   context '#path' do
     it 'should retrieve the path' do
-      @sprite.define(:foo) {}
       @sprite.path.to_s.should == "foo.png"
     end
   end
 
-  context "#define", "a method to further initialize the Sprite, e.g. with spite pieces" do
-    shared_examples "a sprite definition with no options" do
-      it 'the options should be a hash' do
-        @sprite.instance_variable_get(:@options).should be_a(Hash)
-      end
-
-      it 'should set the path' do
-        @sprite.path.should be_a(Pathname)
-        @sprite.path.to_s.should == 'sprites/foo.png'
-      end
-
-      it 'should set the create the Stylesheet' do
-        @sprite.stylesheet.should be_a(Stylesheet)
-      end
-    end
-
-    context 'when defining with a symbol and no options' do
-      before do
-        @sprite.define(:foo) {}
-      end
-
-      it 'the options should be a hash' do
-        @sprite.instance_variable_get(:@options).should be_a(Hash)
-      end
-
-      it 'should set the path' do
-        @sprite.path.should be_a(Pathname)
-        @sprite.path.to_s.should == 'foo.png'
-      end
-
-      it 'should set the create the Stylesheet' do
-        @sprite.stylesheet.should be_a(Stylesheet)
-      end
-    end
-
-    context 'when defining with hash but no extra options' do
-      before do
-        @sprite.define('sprites/foo.png' => 'stylesheets/sprites/foo.css') {}
-      end
-
-      it_behaves_like("a sprite definition with no options")
-    end
-
-    context 'when defining with a string and no options' do
-      before do
-        @sprite.define('sprites/foo.png') {}
-      end
-
-      it_behaves_like("a sprite definition with no options")
-    end
-    
-  end
-
   context "#sprite_piece" do
     it 'should respond_to sprite_piece' do
       Sprite.new(:foo).should respond_to(:sprite_piece)
     end
 
-    it 'should return a Sprites::SpritePiece' do
+    it 'should return a Sprites::SpritePieces' do
       sprite = Sprite.new(:foo)
-      sprite.sprite_piece('sprite_images/foo.png' => '.foo').should be_a(SpritePiece)
+      sprite.sprite_piece('sprite_images/foo.png', '.foo').should be_a(SpritePieces)
     end
 
     it 'should add a sprite piece to the collection' do
       sprite = Sprite.new(:foo)
-      sprite.sprite_piece('sprite_images/foo.png' => '.foo')
+      sprite.sprite_piece('sprite_images/foo.png', '.foo')
       sprite.sprite_pieces.should_not be_empty
       sprite.sprite_pieces.count.should be(1)
       sprite.sprite_pieces['sprite_images/foo.png'].selector.should == '.foo'
@@ -99,25 +45,25 @@ describe Sprite do
 
   context '#stylesheet' do
     it 'should return a Stylesheet' do
-      @sprite.define(:foo) {}
       @sprite.stylesheet.should be_a(Stylesheet)
     end
   end
 
   context '#stylesheet_path' do
     it 'should return the stylesheet path' do
-      @sprite.define(:foo) {}
       @sprite.stylesheet_path.to_s.should == 'foo.css'
     end
   end
 
-  context '#orientation' do
+  context '#orientation=' do
     it 'should set the orientation' do
-      @sprite.orientation(Sprite::Orientations::HORIZONTAL)
+      @sprite.orientation = Sprite::Orientations::HORIZONTAL
       @sprite.orientation.should be(Sprite::Orientations::HORIZONTAL)
     end
+  end
 
-    it 'should set and return the default orientation' do
+  context '#orientation' do
+    it 'should return the default orientation' do
       @sprite.orientation.should be(Sprite::Orientations::VERTICAL)
     end
   end
@@ -125,7 +71,7 @@ describe Sprite do
   context "self.sprite_full_path(configuration, sprite)" do
     it 'should return the sprite full path' do
       config = Configuration.new
-      config.sprites_path('tmp/images/sprites')
+      config.sprites_path = 'tmp/images/sprites'
 
       sprite = Sprite.new(:foo)
 
@@ -136,7 +82,7 @@ describe Sprite do
   context 'self.sprite_css_path(configuration, sprite)' do
     it 'should return the path for use in the url in the background style attribute' do
       config = Configuration.new
-      config.sprites_path('tmp/images/sprites')
+      config.sprites_path = 'tmp/images/sprites'
 
       sprite = Sprite.new(:foo)
 

data/spec/lib/sprites/sprites_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Sprites do
   before do
-    @sprites = Sprites::Sprites.new
+    @sprites = Sprites::Sprites.new(::Sprites.configuration)
   end
 
   context 'initialize' do
@@ -14,21 +14,7 @@ describe Sprites do
   context '#add' do
     context 'with the sprite identified by a symbol' do
       it 'should add a sprite to the collection' do
-        @sprites.add(:foo) {}
-        @sprites[:foo].should be_a(Sprite)
-      end
-    end
-
-    context 'with the sprite identified by a string--the path to the sprite image' do
-      it 'should add a sprite to the collection' do
-        @sprites.add('images/sprites/foo.png') {}
-        @sprites[:foo].should be_a(Sprite)
-      end
-    end
-
-    context 'with the sprite identified by a hash--the mapping between the sprite image file and its stylesheet' do
-      it 'should add a sprite to the collection' do
-        @sprites.add('images/sprites/foo.png' => 'stylesheets/sprites/foo.css') {}
+        @sprites.add(:foo)
         @sprites[:foo].should be_a(Sprite)
       end
     end
@@ -38,6 +24,20 @@ describe Sprites do
       @sprites.add(sprite)
       @sprites[:foo].should be(sprite)
     end
+
+    it 'should add a sprite defined by only a symbol by using directory conventions and filenames for classes' do
+      config = Configuration.new
+      config.configure do
+        config.sprites_path = File.join(GEM_ROOT, 'spec/fixtures/project2/public/images/sprites')
+        config.sprite_stylesheets_path = File.join(GEM_ROOT, 'spec/fixtures/project2/public/stylesheets/sprites')
+        config.sprite_pieces_path = File.join(GEM_ROOT, 'spec/fixtures/project2/public/images/sprite_images')
+      end
+
+      sprites = Sprites::Sprites.new(config)
+      sprites.add(:bas)
+      sprites[:bas].sprite_pieces.count.should be(5)
+      sprites[:bas].sprite_pieces.all.map(&:css_selector).should == %w(.bar .bas .bkgd_main_copy .foo .fubar)
+    end
   end
 
   context '#clear' do

data/spec/lib/sprites/stylesheet_spec.rb

@@ -5,10 +5,9 @@ describe Stylesheet do
   context "self.sprite_full_path(configuration, sprite)" do
     it 'should return the stylesheet full path' do
       config = Configuration.new
-      config.sprite_stylesheets_path('tmp/stylesheets')
-      sprite = Sprite.new(:foo)
-      stylesheet = Stylesheet.new('sprites/foo.css', sprite)
-
+      config.sprite_stylesheets_path = 'tmp/stylesheets/sprites'
+      sprite = Sprite.new(:foo, config)
+      stylesheet = Stylesheet.new(sprite)
       Stylesheet.stylesheet_full_path(config, stylesheet).should == 'tmp/stylesheets/sprites/foo.css'
     end
   end
@@ -16,7 +15,7 @@ describe Stylesheet do
   context '#sprite_pieces, #sprite_pieces=' do
     it 'should allow access to and setting of sprite_pieces' do
       sprite = Sprite.new(:foo)
-      stylesheet = Stylesheet.new('foo/bar.css', sprite)
+      stylesheet = Stylesheet.new(sprite)
       sprite_pieces = SpritePieces.new
       stylesheet.sprite_pieces = sprite_pieces
       stylesheet.sprite_pieces.should be(sprite_pieces)

data/spec/lib/sprites/test/sprite_generator_tester_spec.rb

@@ -5,9 +5,9 @@ describe SpriteGeneratorTester do
   describe "#test_generator" do
     it 'should return 0 for known good sprite' do
       Sprites.configure do
-        sprites_path 'spec/fixtures/known_good/sprites'
-        sprite_stylesheets_path 'spec/fixtures/known_good/stylesheets'
-        sprite_pieces_path 'spec/fixtures/known_good/sprite_images'
+        config.sprites_path = 'spec/fixtures/known_good/sprites'
+        config.sprite_stylesheets_path = 'spec/fixtures/known_good/stylesheets'
+        config.sprite_pieces_path = 'spec/fixtures/known_good/sprite_images'
       end
       define_buttons_sprite
       tester = SpriteGeneratorTester.new(Sprites.application.sprites[:buttons], Sprites.configuration)

data/spec/lib/sprites_spec.rb

@@ -10,7 +10,7 @@ describe Sprites do
   context 'self.configure' do
     it 'should congfigure the application' do
       Sprites.configure do
-        sprites_path 'public/sprites'
+        config.sprites_path = 'public/sprites'
       end
 
       Sprites.configuration.sprites_path.should == 'public/sprites'

data/spec/spec_helper.rb

@@ -3,10 +3,11 @@ require 'sprites'
 
 include Sprites
 
-ROOT = Sprites.gem_root
+GEM_ROOT = Pathname(File.expand_path('../..', __FILE__))
 
 Dir['spec/support/*.rb'].each {|support_file| load support_file}
 
 RSpec.configure do |config|
   config.include SpritesHelper
+  config.after { ::Sprites.application.sprites.clear }
 end