montage 0.2.1 → 0.3.0

data/spec/montage/sprite_spec.rb

@@ -3,6 +3,52 @@ require File.expand_path('../../spec_helper', __FILE__)
 describe Montage::Sprite do
   subject { Montage::Sprite }
 
+  # --- initialization -------------------------------------------------------
+
+  describe 'when initialized' do
+    before(:all) do
+      @helper = Montage::Spec::ProjectHelper.new
+      @helper.write_simple_config
+    end
+
+    it 'should set the name' do
+      sprite = Montage::Sprite.new('wheee', [], '_', @helper.project)
+      sprite.name.should == 'wheee'
+    end
+
+    it 'should set the padding' do
+      sprite = Montage::Sprite.new('_', [], '_', @helper.project)
+      sprite.padding.should == @helper.project.padding
+    end
+
+    it 'should set the save_path' do
+      sprite = Montage::Sprite.new('_', [],
+        @helper.path_to_file('bye'), @helper.project)
+
+      sprite.save_path.should == @helper.path_to_file('bye')
+    end
+
+    it 'should set the url' do
+      sprite = Montage::Sprite.new('_', [], '_', @helper.project)
+      sprite.url.should == @helper.project.paths.url
+    end
+
+    describe 'with custom options' do
+      before(:all) do
+        @sprite = Montage::Sprite.new('wheee', [], '_', @helper.project,
+          :padding => 50, :url => '/omicron_persei_8')
+      end
+
+      it 'should set the custom padding' do
+        @sprite.padding.should == 50
+      end
+
+      it 'should set the url' do
+        @sprite.url.should == '/omicron_persei_8'
+      end
+    end
+  end
+
   # --- images ---------------------------------------------------------------
 
   it { should have_public_method_defined(:images) }
@@ -10,23 +56,17 @@ describe Montage::Sprite do
   describe '#images' do
     before(:each) do
       @helper = Montage::Spec::ProjectHelper.new
-      @helper.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-          - two
-      CONFIG
+      @helper.write_simple_config
 
-      @helper.write_source('one', 100, 25)
-      @helper.write_source('two', 100, 25)
+      @helper.write_source('sprite_one/one', 100, 25)
+      @helper.write_source('sprite_one/two', 100, 25)
 
       @sprite = @helper.project.sprite('sprite_one')
     end
 
     describe 'when the sprite contains no sources' do
       before(:each) do
-        @sprite = Montage::Sprite.new('sprite', [],
-          @helper.project.paths.sources)
+        @sprite = Montage::Sprite.new('sprite', [], 'path', @helper.project)
       end
 
       it 'should return an array' do
@@ -57,15 +97,10 @@ describe Montage::Sprite do
   describe '#position_of' do
     before(:each) do
       @helper = Montage::Spec::ProjectHelper.new
-      @helper.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-          - two
-      CONFIG
+      @helper.write_simple_config
 
-      @helper.write_source('one', 100, 25)
-      @helper.write_source('two', 100, 25)
+      @helper.write_source('sprite_one/one', 100, 25)
+      @helper.write_source('sprite_one/two', 100, 25)
 
       @sprite = @helper.project.sprite('sprite_one')
     end
@@ -97,56 +132,22 @@ describe Montage::Sprite do
   describe '#digest' do
     before(:each) do
       @helper = Montage::Spec::ProjectHelper.new
-      @helper.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-          - two
-
-        sprite_two:
-          - three
-      CONFIG
+      @helper.write_simple_config
 
-      @helper.write_source('one',   100, 25)
-      @helper.write_source('two',   100, 25)
-      @helper.write_source('three', 100, 25)
+      @helper.write_source('sprite_one/one',   100, 25)
+      @helper.write_source('sprite_one/two',   100, 25)
+      @helper.write_source('sprite_two/three', 100, 25)
     end
 
     it 'should return a string' do
       @helper.project.sprites.first.digest.should be_a(String)
     end
 
-    context 'when changing the source order for a sprite' do
-      before(:each) do
-        @sprite_one_digest = @helper.project.sprite('sprite_one').digest
-        @sprite_two_digest = @helper.project.sprite('sprite_two').digest
-        @helper.write_config <<-CONFIG
-        ---
-          sprite_one:
-            - two
-            - one
-
-          sprite_two:
-            - three
-        CONFIG
-      end
-
-      it 'should return something different when it is affected' do
-        @helper.project.sprite('sprite_one').digest.should_not ==
-          @sprite_one_digest
-      end
-
-      it 'should return the same value when unaffected' do
-        @helper.project.sprite('sprite_two').digest.should ==
-          @sprite_two_digest
-      end
-    end # when changing the source order for a sprite
-
     context 'when changing the image for a source' do
       before(:each) do
         @sprite_one_digest = @helper.project.sprite('sprite_one').digest
         @sprite_two_digest = @helper.project.sprite('sprite_two').digest
-        @helper.write_source('one', 100, 30)
+        @helper.write_source('sprite_one/one', 100, 30)
       end
 
       it 'should return something different when it is affected' do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Anthony Williams
@@ -14,28 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +01:00
+date: 2010-04-12 00:00:00 +01:00
 default_executable: montage
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta
-        version: 3.0.0.beta
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,11 +29,11 @@ dependencies:
         - 12
         version: "2.12"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -57,11 +42,11 @@ dependencies:
         - 5
         version: "1.5"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -71,24 +56,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-  type: :development
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -97,11 +69,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -113,11 +85,11 @@ dependencies:
         - 1
         version: 3.0.0.beta.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -126,7 +98,7 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 description: Even Rocky had a montage.
 email: hi@antw.me
 executables: 
@@ -154,36 +126,24 @@ files:
 - lib/montage/sass_builder.rb
 - lib/montage/source.rb
 - lib/montage/sprite.rb
+- lib/montage/sprite_definition.rb
 - lib/montage/templates/montage.yml
 - lib/montage/templates/sass_mixins.erb
-- lib/montage/templates/sources/book.png
-- lib/montage/templates/sources/box-label.png
-- lib/montage/templates/sources/calculator.png
-- lib/montage/templates/sources/calendar-month.png
-- lib/montage/templates/sources/camera.png
-- lib/montage/templates/sources/eraser.png
+- lib/montage/templates/sources/one/book.png
+- lib/montage/templates/sources/one/box-label.png
+- lib/montage/templates/sources/one/calculator.png
+- lib/montage/templates/sources/one/calendar-month.png
+- lib/montage/templates/sources/one/camera.png
+- lib/montage/templates/sources/one/eraser.png
+- lib/montage/templates/sources/two/inbox-image.png
+- lib/montage/templates/sources/two/magnet.png
+- lib/montage/templates/sources/two/newspaper.png
+- lib/montage/templates/sources/two/television.png
+- lib/montage/templates/sources/two/wand-hat.png
+- lib/montage/templates/sources/two/wooden-box-label.png
 - lib/montage/version.rb
 - montage.gemspec
-- spec/fixtures/custom_dirs/montage.yml
-- spec/fixtures/default/montage.yml
-- spec/fixtures/default/public/images/sprites/src/one.png
-- spec/fixtures/default/public/images/sprites/src/three.png
-- spec/fixtures/default/public/images/sprites/src/two.png
-- spec/fixtures/directory_config/config/montage.yml
-- spec/fixtures/missing_source/montage.yml
-- spec/fixtures/missing_source_dir/montage.yml
-- spec/fixtures/root_config/montage.yml
-- spec/fixtures/root_config/public/images/sprites/src/source_one.png
-- spec/fixtures/root_config/public/images/sprites/src/source_three.jpg
-- spec/fixtures/root_config/public/images/sprites/src/source_two
-- spec/fixtures/sources/hundred.png
-- spec/fixtures/sources/mammoth.png
-- spec/fixtures/sources/other.png
-- spec/fixtures/sources/twenty.png
-- spec/fixtures/subdirs/montage.yml
-- spec/fixtures/subdirs/sub/sub/keep
 - spec/lib/command_runner.rb
-- spec/lib/fixtures.rb
 - spec/lib/have_public_method_defined.rb
 - spec/lib/project_helper.rb
 - spec/lib/shared_project_specs.rb
@@ -195,6 +155,7 @@ files:
 - spec/montage/sass_builder_spec.rb
 - spec/montage/source_spec.rb
 - spec/montage/spec/have_public_method_defined_spec.rb
+- spec/montage/sprite_definition_spec.rb
 - spec/montage/sprite_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
@@ -233,7 +194,6 @@ specification_version: 3
 summary: Montage
 test_files: 
 - spec/lib/command_runner.rb
-- spec/lib/fixtures.rb
 - spec/lib/have_public_method_defined.rb
 - spec/lib/project_helper.rb
 - spec/lib/shared_project_specs.rb
@@ -245,5 +205,6 @@ test_files:
 - spec/montage/sass_builder_spec.rb
 - spec/montage/source_spec.rb
 - spec/montage/spec/have_public_method_defined_spec.rb
+- spec/montage/sprite_definition_spec.rb
 - spec/montage/sprite_spec.rb
 - spec/spec_helper.rb

data/spec/fixtures/custom_dirs/montage.yml

@@ -1,8 +0,0 @@
----
-  config.sources:    "custom/sources"
-  config.sprites:    "custom/output"
-  config.sass:       "custom/sass"
-  config.sprite_url: "custom/images"
-
-  sprite_one:
-    - source_one

data/spec/fixtures/default/montage.yml

@@ -1,7 +0,0 @@
----
-  sprite_one:
-    - one
-    - two
-
-  sprite_two:
-    - three

data/spec/fixtures/directory_config/config/montage.yml

@@ -1,5 +0,0 @@
----
-  sprite_one:
-    - source_one
-    - source_two
-    - source_three

data/spec/fixtures/missing_source/montage.yml

@@ -1,3 +0,0 @@
----
-  sprite_one:
-    - source_one

data/spec/fixtures/missing_source_dir/montage.yml

@@ -1,5 +0,0 @@
----
-  sprite_one:
-    - source_one
-    - source_two
-    - source_three

data/spec/fixtures/root_config/montage.yml

@@ -1,5 +0,0 @@
----
-  sprite_one:
-    - source_one
-    - source_two
-    - source_three

data/spec/fixtures/subdirs/montage.yml

@@ -1,5 +0,0 @@
----
-  sprite_one:
-    - source_one
-    - source_two
-    - source_three

data/spec/lib/fixtures.rb

@@ -1,7 +0,0 @@
-Spec::Runner.configure do |config|
-  config.include(Module.new do
-    def fixture_path(name, *segments)
-      File.join(File.expand_path("../../fixtures/#{name}", __FILE__), *segments)
-    end
-  end)
-end