montage 0.2.1 → 0.3.0

data/spec/montage/commands/generate_spec.rb

@@ -5,14 +5,9 @@ require File.expand_path('../../../spec_helper', __FILE__)
 context 'Generating a single sprite with two sources' do
   before(:all) do
     @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-          - two
-    CONFIG
-    @runner.write_source('one')
-    @runner.write_source('two')
+    @runner.write_simple_config
+    @runner.write_source('sprite_one/one')
+    @runner.write_source('sprite_one/two')
     @runner.run!
   end
 
@@ -33,18 +28,10 @@ end
 context 'Generating multiple sprites' do
   before(:all) do
     @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-
-        sprite_two:
-          - two
-          - three
-    CONFIG
-    @runner.write_source('one')
-    @runner.write_source('two')
-    @runner.write_source('three', 200, 200)
+    @runner.write_simple_config
+    @runner.write_source('sprite_one/one')
+    @runner.write_source('sprite_two/two')
+    @runner.write_source('sprite_two/three', 200, 200)
     @runner.run!
   end
 
@@ -72,47 +59,19 @@ context 'Generating a single sprite with custom padding' do
       ---
         config.padding: 50
 
-        sprite_one:
-          - one
-          - two
-    CONFIG
-    @runner.write_source('one')
-    @runner.write_source('two')
-    @runner.run!
-  end
-
-  it { @runner.should be_success }
-  it { @runner.stdout.should =~ /Generating "sprite_one": Done/ }
-  it { @runner.path_to_sprite('sprite_one').should be_file }
-  it { @runner.dimensions_of('sprite_one').should == [50, 90] }
-end
-
-# ----------------------------------------------------------------------------
+        "public/images/sprites/:name/*.{png,jpg,jpeg,gif}":
+          to: "public/images/:name.png"
 
-context 'Generating a single sprite using custom directories' do
-  before(:all) do
-    @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.sources_path = 'img/sources'
-    @runner.sprites_path = 'img/sprites'
-
-    @runner.write_config <<-CONFIG
-      ---
-        config.sources: img/sources
-        config.sprites: img/sprites
-
-        sprite_one:
-          - one
-          - two
     CONFIG
-
-    @runner.write_source('one')
-    @runner.write_source('two')
+    @runner.write_source('sprite_one/one')
+    @runner.write_source('sprite_one/two')
     @runner.run!
   end
 
   it { @runner.should be_success }
   it { @runner.stdout.should =~ /Generating "sprite_one": Done/ }
   it { @runner.path_to_sprite('sprite_one').should be_file }
+  it { @runner.dimensions_of('sprite_one').should == [50, 90] }
 end
 
 # ----------------------------------------------------------------------------
@@ -128,58 +87,21 @@ end
 
 # ----------------------------------------------------------------------------
 
-context 'Trying to generate sprites when a source is missing' do
-  before(:all) do
-    @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-    CONFIG
-    @runner.mkdir('public/images/sprites/src')
-    @runner.run!
-  end
-
-  it { @runner.should be_failure }
-  it { @runner.stdout.should =~ /Couldn't find a matching file for source image `one'/ }
-end
-
-# ----------------------------------------------------------------------------
-
-context 'Trying to generate sprites when the source directory does not exist' do
-  before(:all) do
-    @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-    CONFIG
-    @runner.run!
-  end
-
-  it { @runner.should be_failure }
-  it { @runner.stdout.should =~ /Couldn't find the source directory/ }
-end
-
-# ----------------------------------------------------------------------------
-
 context 'Trying to generate sprites when the sprite directory is not writable' do
   before(:all) do
     @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-    CONFIG
-    @runner.write_source('one')
+    @runner.write_simple_config
+    @runner.write_source('sprite_one/one')
+
+    output_dir = @runner.path_to_file('public/images')
 
-    old_mode = @runner.project.paths.sprites.stat.mode
-    @runner.project.paths.sprites.chmod(040555)
+    old_mode = output_dir.stat.mode
+    output_dir.chmod(040555)
 
     begin
       @runner.run!
     ensure
-      @runner.project.paths.sprites.chmod(old_mode)
+      output_dir.chmod(old_mode)
     end
   end
 
@@ -192,22 +114,14 @@ end
 context 'Generating two sprites, one of which is unchanged' do
   before(:all) do
     @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-          - two
-
-        sprite_two:
-          - three
-    CONFIG
-    @runner.write_source('one')
-    @runner.write_source('two')
-    @runner.write_source('three')
+    @runner.write_simple_config
+    @runner.write_source('sprite_one/one')
+    @runner.write_source('sprite_one/two')
+    @runner.write_source('sprite_two/three')
     @runner.run!
 
     # Change the 'one' source.
-    @runner.write_source('one', 100, 25)
+    @runner.write_source('sprite_one/one', 100, 25)
     @runner.run!
   end
 
@@ -231,18 +145,10 @@ end
 context 'Generating two sprites, one of which is unchanged when using the --force option' do
   before(:all) do
     @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-          - two
-
-        sprite_two:
-          - three
-    CONFIG
-    @runner.write_source('one')
-    @runner.write_source('two')
-    @runner.write_source('three')
+    @runner.write_simple_config
+    @runner.write_source('sprite_one/one')
+    @runner.write_source('sprite_one/two')
+    @runner.write_source('sprite_two/three')
     @runner.run!
 
     # Change the 'one' source.
@@ -264,13 +170,8 @@ end
 context 'Generating an unchanged sprite which has been deleted' do
   before(:all) do
     @runner = Montage::Spec::CommandRunner.new('montage')
-    @runner.write_config <<-CONFIG
-      ---
-        sprite_one:
-          - one
-
-    CONFIG
-    @runner.write_source('one')
+    @runner.write_simple_config
+    @runner.write_source('sprite_one/one')
     @runner.run!
 
     # Remove the generated sprite.
@@ -296,13 +197,66 @@ context 'Generating sprites with a project which disables Sass' do
       ---
         config.sass: false
 
-        sprite_one:
-          - one
+        "public/images/sprites/:name/*.{png,jpg,jpeg,gif}":
+          to: "public/images/:name.png"
 
     CONFIG
-    @runner.write_source('one')
+    @runner.write_source('sprite_one/one')
     @runner.run!
   end
 
   it { @runner.path_to_file('public/stylesheets/sass/_montage.sass').should_not be_file }
 end
+
+# ----------------------------------------------------------------------------
+
+context 'Generating sprites when specifying a custom config file' do
+  before(:all) do
+    @runner = Montage::Spec::CommandRunner.new('montage settings/sprites.yml')
+    @runner.write_config 'settings/sprites.yml', <<-CONFIG
+      ---
+        config.root: '..'
+
+        "public/images/sprites/:name/*.{png,jpg,jpeg,gif}":
+          to: "public/images/:name.png"
+
+    CONFIG
+    @runner.write_source('sprite_one/one')
+    @runner.run!
+  end
+
+  it { @runner.should be_success }
+  it { @runner.stdout.should =~ /Generating "sprite_one": Done/ }
+  it { @runner.path_to_sprite('sprite_one').should be_file }
+  it { @runner.path_to_file('public/stylesheets/sass/_montage.sass').should be_file }
+end
+
+# ----------------------------------------------------------------------------
+
+context 'Generating sprites when specifying an invalid custom config file' do
+  before(:all) do
+    @runner = Montage::Spec::CommandRunner.new('montage invalid.yml')
+    @runner.run!
+  end
+
+  it { @runner.should be_failure }
+  it { @runner.stdout.should =~ /Couldn't find `invalid.yml' configuration file/ }
+end
+
+# ----------------------------------------------------------------------------
+
+context 'Generating a sprite with wildly varying source widths' do
+  before(:all) do
+    @runner = Montage::Spec::CommandRunner.new('montage')
+    @runner.write_simple_config
+    @runner.write_source('sprite/one')
+    @runner.write_source('sprite/two')
+    @runner.write_source('sprite/three')
+    @runner.write_source('sprite/four')
+    @runner.write_source('sprite/five', 500, 1)
+    @runner.run!
+  end
+
+  it { @runner.should be_success }
+  it { @runner.stdout.should =~ %r{The "five" source image in the "sprite" sprite deviates significantly from the average width} }
+end

data/spec/montage/commands/init_spec.rb

@@ -9,45 +9,33 @@ context 'Generating a new project in the current directory' do
 
   it { @runner.should be_success }
   it { @runner.stdout.should =~ /Your project was created/ }
-  it { @runner.path_to_file('montage.yml').should be_file }
+  it { @runner.path_to_file('.montage').should be_file }
 
   # Example sources?
 
   it 'should copy the sample source images' do
-    %w( book box-label calculator calendar-month camera eraser ).each do |source|
-      (@runner.project.paths.sources + "#{source}.png").should be_file
+    %w( one/book one/box-label one/calculator
+        one/calendar-month one/camera one/eraser
+        two/inbox-image two/magnet two/newspaper
+        two/wand-hat two/wooden-box-label ).each do |source|
+      @runner.path_to_source(source).should be_file
     end
   end
 
   # Config
 
-  describe 'the montage.yml file' do
+  describe 'the .montage file' do
     before(:all) do
       @config = File.read(@runner.project.paths.config)
     end
 
-    it { @config.should =~ %r{^  config.sprites:\s+"public/images/sprites"$} }
-    it { @config.should =~ %r{^  config.sources:\s+"public/images/sprites/src"$} }
+    it { @config.should =~ %r|^  "public/images/sprites/:name/\*\.\{png,jpg,jpeg,gif\}":$| }
+    it { @config.should =~ %r|^    to: "public/images/:name\.png"$| }
   end
 end
 
 # ----------------------------------------------------------------------------
 
-context 'Generating a new project in a path which has a ./config directory' do
-  before(:all) do
-    @runner = Montage::Spec::InitCommandRunner.new
-    @runner.mkdir('config')
-    @runner.run!
-  end
-
-  it { @runner.should be_success }
-  it { @runner.stdout.should =~ /Your project was created/ }
-  it { @runner.path_to_file('config/montage.yml').should be_file }
-  it { @runner.path_to_file('montage.yml').should_not be_file }
-end
-
-# ----------------------------------------------------------------------------
-
 context 'Generating a new project in an existing project directory' do
   before(:all) do
     @runner = Montage::Spec::InitCommandRunner.new
@@ -60,21 +48,8 @@ end
 
 # ----------------------------------------------------------------------------
 
-context 'Generating a new project in an existing project which has a ./config directory' do
-  before(:all) do
-    @runner = Montage::Spec::InitCommandRunner.new
-    @runner.mkdir('config')
-    2.times { @runner.run! }
-  end
-
-  it { @runner.should be_failure }
-  it { @runner.stdout.should =~ /A Montage project already exists in the current directory/ }
-end
-
-# ----------------------------------------------------------------------------
-
 context 'Generating a new project with a custom sprites directory' do
-  describe 'the montage.yml file' do
+  describe 'the .montage file' do
     before(:all) do
       @runner = Montage::Spec::InitCommandRunner.new(
         :sprites => 'public/other').run!
@@ -82,15 +57,15 @@ context 'Generating a new project with a custom sprites directory' do
       @config = File.read(@runner.project.paths.config)
     end
 
-    it { @config.should =~ %r{^  config.sprites:\s+"public/other"$} }
-    it { @config.should =~ %r{^  config.sources:\s+"public/other/src"$} }
+    it { @config.should =~ %r|^  "public/other/sprites/:name/\*\.\{png,jpg,jpeg,gif\}":$| }
+    it { @config.should =~ %r|^    to: "public/other/:name\.png"$| }
   end
 end
 
 # ----------------------------------------------------------------------------
 
 context 'Generating a new project with an absolute custom sprites directory' do
-  describe 'the montage.yml file' do
+  describe 'the .montage file' do
     before(:all) do
       @runner = Montage::Spec::InitCommandRunner.new(
         :sprites => '/tmp').run!
@@ -98,15 +73,15 @@ context 'Generating a new project with an absolute custom sprites directory' do
       @config = File.read(@runner.project.paths.config)
     end
 
-    it { @config.should =~ %r{^  config.sprites:\s+"/tmp"$} }
-    it { @config.should =~ %r{^  config.sources:\s+"/tmp/src"$} }
+    it { @config.should =~ %r|^  "/tmp/sprites/:name/\*\.\{png,jpg,jpeg,gif\}":$| }
+    it { @config.should =~ %r|^    to: "/tmp/:name\.png"$| }
   end
 end
 
 # ----------------------------------------------------------------------------
 
 context 'Generating a new project with a custom sprites and sources directory' do
-  describe 'the montage.yml file' do
+  describe 'the .montage file' do
     before(:all) do
       @runner = Montage::Spec::InitCommandRunner.new(
         :sprites => 'public/other', :sources => 'src/sprites').run!
@@ -114,7 +89,7 @@ context 'Generating a new project with a custom sprites and sources directory' d
       @config = File.read(@runner.project.paths.config)
     end
 
-    it { @config.should =~ %r{^  config.sprites:\s+"public/other"$} }
-    it { @config.should =~ %r{^  config.sources:\s+"src/sprites"$} }
+    it { @config.should =~ %r|^  "src/sprites/:name/\*\.\{png,jpg,jpeg,gif\}":$| }
+    it { @config.should =~ %r|^    to: "public/other/:name\.png"$| }
   end
 end

data/spec/montage/project_spec.rb

@@ -10,32 +10,26 @@ describe Montage::Project do
   it { should respond_to(:find) }
 
   describe '.find' do
-    describe 'when given a project root with montage.yml in the root' do
+    describe 'when given a project root with .montage in the root' do
       before(:all) do
-        @project = Montage::Project.find(fixture_path(:root_config))
-        @root    = Pathname.new(fixture_path(:root_config))
-        @config  = Pathname.new(fixture_path(:root_config, 'montage.yml'))
-      end
-
-      it_should_behave_like 'a project with correct paths'
-    end # when given a project root with montage.yml in the root
+        @helper = Montage::Spec::ProjectHelper.new
+        @helper.write_simple_config
 
-    describe 'when given a project root with montage.yml in ./config' do
-      before(:all) do
-        @project = Montage::Project.find(fixture_path(:directory_config))
-        @root    = Pathname.new(fixture_path(:directory_config))
-        @config  = Pathname.new(
-          fixture_path(:directory_config, 'config/montage.yml'))
+        @project = Montage::Project.find(@helper.project_dir)
+        @config  = @helper.path_to_file('.montage')
       end
 
       it_should_behave_like 'a project with correct paths'
-    end # when given a project root with montage.yml in ./config
+    end # when given a project root with .montage in the root
 
     describe 'when given a project subdirectory' do
       before(:all) do
-        @project = Montage::Project.find(fixture_path(:subdirs, 'sub/sub'))
-        @root    = Pathname.new(fixture_path(:subdirs))
-        @config  = Pathname.new(fixture_path(:subdirs, 'montage.yml'))
+        @helper = Montage::Spec::ProjectHelper.new
+        @helper.mkdir('sub/sub')
+        @helper.write_simple_config
+
+        @project = Montage::Project.find(@helper.project_dir + 'sub/sub')
+        @config  = @helper.path_to_file('.montage')
       end
 
       it_should_behave_like 'a project with correct paths'
@@ -43,45 +37,76 @@ describe Montage::Project do
 
     describe 'when given a configuration file in the root' do
       before(:all) do
-        @project = Montage::Project.find(
-          fixture_path(:root_config, 'montage.yml'))
+        @helper = Montage::Spec::ProjectHelper.new
+        @helper.write_simple_config('montage.yml')
 
-        @root    = Pathname.new(fixture_path(:root_config))
-        @config  = Pathname.new(fixture_path(:root_config, 'montage.yml'))
+        @project = Montage::Project.find(@helper.path_to_file('montage.yml'))
+        @config  = @helper.path_to_file('montage.yml')
       end
 
       it_should_behave_like 'a project with correct paths'
     end # when given a configuration file in the root
 
-    describe 'when given a configuration file in ./config' do
+    describe 'when the config file specifies custom directories' do
       before(:all) do
+        @helper = Montage::Spec::ProjectHelper.new
+        @helper.write_config <<-CONFIG
+        ---
+          config.sass: "custom/sass"
+          config.url:  "custom/images/:name"
+
+        CONFIG
+
+        @project = Montage::Project.find(@helper.project_dir)
+        @config  = @helper.path_to_file('.montage')
+        @base    = @helper.path_to_file('custom')
+      end
+
+      it 'should set the SASS output path' do
+        @project.paths.sass.should == @base + 'sass'
+      end
+
+      it 'should set the URL' do
+        @project.paths.url.should == 'custom/images/:name'
+      end
+    end
+
+    describe 'when the config file specifies a custom root' do
+      before(:all) do
+        @helper = Montage::Spec::ProjectHelper.new
+        @helper.write_config 'settings/sprites.yml', <<-CONFIG
+        ---
+          config.root: "../custom_root"
+
+        CONFIG
+
         @project = Montage::Project.find(
-          fixture_path(:directory_config, 'config/montage.yml'))
-        @root    = Pathname.new(fixture_path(:directory_config))
-        @config  = Pathname.new(
-          fixture_path(:directory_config, 'config/montage.yml'))
+          @helper.path_to_file('settings/sprites.yml'))
+
+        @config  = @helper.path_to_file('settings/sprites.yml')
+        @root    = @helper.path_to_file('custom_root')
       end
 
       it_should_behave_like 'a project with correct paths'
-    end # when given a configuration file in ./config
+    end
 
-    describe 'when the config file specifies custom directories' do
+    describe 'when the config file specifies a custom absolute root' do
       before(:all) do
-        @project = Montage::Project.find(fixture_path(:custom_dirs))
-        @base = Pathname.new(fixture_path(:custom_dirs)) + 'custom'
-      end
+        @helper = Montage::Spec::ProjectHelper.new
+        @helper.write_config 'settings/sprites.yml', <<-CONFIG
+        ---
+          config.root: "#{@helper.path_to_file('custom_root')}"
 
-      it 'should set the sources path' do
-        @project.paths.sources.should == @base + 'sources'
-      end
+        CONFIG
 
-      it 'should set the sprites path' do
-        @project.paths.sprites.should == @base + 'output'
-      end
+        @project = Montage::Project.find(
+          @helper.path_to_file('settings/sprites.yml'))
 
-      it 'should set the SASS output path' do
-        @project.paths.sass.should == @base + 'sass'
+        @config  = @helper.path_to_file('settings/sprites.yml')
+        @root    = @helper.path_to_file('custom_root')
       end
+
+      it_should_behave_like 'a project with correct paths'
     end
 
     describe 'when the config file specifies not to generate Sass' do
@@ -99,8 +124,12 @@ describe Montage::Project do
     end
 
     describe 'when given an empty directory' do
+      before(:all) do
+        @helper = Montage::Spec::ProjectHelper.new
+      end
+
       it 'should raise an error' do
-        running = lambda { Montage::Project.find(fixture_path(:empty)) }
+        running = lambda { Montage::Project.find(@helper.project_dir) }
         running.should raise_exception(Montage::MissingProject)
       end
     end # when given an empty directory
@@ -125,15 +154,9 @@ describe Montage::Project do
     context "when the project has one sprite with two sources" do
       before(:each) do
         @helper = Montage::Spec::ProjectHelper.new
-        @helper.write_config <<-CONFIG
-        ---
-          sprite_one:
-            - one
-            - two
-        CONFIG
-
-        @helper.write_source('one', 100, 25)
-        @helper.write_source('two', 100, 25)
+        @helper.write_simple_config
+        @helper.write_source('sprite_one/one', 100, 25)
+        @helper.write_source('sprite_one/two', 100, 25)
       end
 
       it 'should return an array with one element' do
@@ -148,19 +171,10 @@ describe Montage::Project do
     context "when the project has two sprites with 2/1 sources" do
       before(:each) do
         @helper = Montage::Spec::ProjectHelper.new
-        @helper.write_config <<-CONFIG
-        ---
-          sprite_one:
-            - one
-            - two
-
-          sprite_two:
-            - three
-        CONFIG
-
-        @helper.write_source('one',   100, 25)
-        @helper.write_source('two',   100, 25)
-        @helper.write_source('three', 100, 25)
+        @helper.write_simple_config
+        @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 an array with two elements' do