sprites 0.0.1.pre2 → 0.0.1.pre3

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 tmp
 coverage
 *.gem

data/Rakefile

@@ -14,8 +14,6 @@ RSpec::Core::RakeTask.new(:coverage) do |t|
   t.rcov_opts = ['--exclude', 'spec']
 end
 
-desc 'Default: run specs.'
-task :default => :spec
 
 namespace :spec do
   desc 'Create spec'
@@ -38,3 +36,9 @@ EOS
     puts spec_doc
   end
 end
+
+desc "Run cucumber"
+task(:cucumber) { sh 'cucumber' }
+
+desc 'Default: run specs.'
+task :default => [:spec, :cucumber]

data/lib/sprites/cli.rb

@@ -1,4 +1,2 @@
-module Sprites
-  autoload :CommandLineOptionParser, "sprites/cli/command_line_option_parser"
-  autoload :CliApplication, "sprites/cli/cli_application"
-end
+require 'sprites/cli/cli_application'
+require 'sprites/cli/command_line_option_parser'

data/lib/sprites/configuration.rb

@@ -1,9 +1,8 @@
 module Sprites
   class Configuration
-    FIELDS = %w{backend sprites_path sprite_stylesheets_path sprite_pieces_path}
+    FIELDS = %w{sprites_path sprite_stylesheets_path sprite_pieces_path}
 
     DEFAULT_CONFIGURATION = {
-      'backend' => :rmagick,
       'sprites_path' => 'public/images/sprites',
       'sprite_stylesheets_path' => 'public/stylesheets/sprites',
       'sprite_pieces_path' => 'public/images/sprite_images'
@@ -39,19 +38,6 @@ module Sprites
       EVAL
     end
 
-    alias_method :backend_without_override, :backend
-    def backend_with_override(*args)
-      val, *_ = args
-
-      if val
-        backend_without_override(val)
-        return self
-      end
-
-      backend_without_override && backend_without_override.to_sym
-    end
-    alias_method :backend, :backend_with_override
-
     def self.new_for_command_line_options(options)
       config = new
       options.each do |k, v|

data/lib/sprites/notifier.rb

@@ -1,9 +1,4 @@
 module Sprites
   class Notifier
-    def self.no_configured_or_imlicit_backend(print = true)
-      msg = "We were unable to load your configured backend or any supported backends"
-      $stdout << msg if print
-      msg
-    end
   end
 end

data/lib/sprites/rails/railtie.rb

@@ -4,24 +4,7 @@ require 'sprites'
 module Sprites
   class Railtie < Rails::Railtie
     rake_tasks do
-      desc "Generate sprites and stylesheets"
-      task :sprites => :environment do
-        assets_root = Rails.application.config.assets[:enabled] ? 'app/assets' : 'public'
-
-        ::Sprites.configure do
-          sprites_path Rails.root.join(assets_root, 'images/sprites')
-          sprite_stylesheets_path Rails.root.join(assets_root, 'stylesheets/sprites')
-          sprite_pieces_path Rails.root.join(assets_root, 'images/sprite_images')
-        end unless ::Sprites.configuration.configured?
-
-        unless (def_file_path = Rails.root.join('config/sprites.rb')).exist?
-          raise CliApplication::DefinitionFileNotFound
-        end
-
-        load def_file_path
-        sprite_generator = ChunkyPngGenerator.new(::Sprites.configuration)
-        sprite_generator.generate(::Sprites.application.sprites)
-      end
+      load File.expand_path('../sprites.rake', __FILE__)
     end
   end
 end

data/lib/sprites/rails/sprites.rake

@@ -0,0 +1,23 @@
+require 'sprites'
+
+include Rake::DSL if defined?(Rake::DSL)
+include Sprites
+
+desc "Generate sprites and stylesheets"
+task :sprites => :environment do
+  assets_root = Rails.application.config.assets[:enabled] ? 'app/assets' : 'public'
+
+  ::Sprites.configure do
+    sprites_path Rails.root.join(assets_root, 'images/sprites')
+    sprite_stylesheets_path Rails.root.join(assets_root, 'stylesheets/sprites')
+    sprite_pieces_path Rails.root.join(assets_root, 'images/sprite_images')
+  end unless ::Sprites.configuration.configured?
+
+  unless (def_file_path = Rails.root.join('config/sprites.rb')).exist?
+    raise CliApplication::DefinitionFileNotFound
+  end
+
+  load def_file_path
+  sprite_generator = ChunkyPngGenerator.new(::Sprites.configuration)
+  sprite_generator.generate(::Sprites.application.sprites)
+end

data/lib/sprites/version.rb

@@ -1,3 +1,3 @@
 module Sprites
-  VERSION = "0.0.1.pre2"
+  VERSION = "0.0.1.pre3"
 end

data/spec/fixtures/rails_project1/Rakefile

@@ -1 +1,5 @@
 require File.expand_path('../config/application', __FILE__)
+
+require 'rake'
+include Rake::DSL
+SpritesRailsTestApp::Application.load_tasks

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

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

data/spec/lib/sprites/configuration_spec.rb

@@ -6,20 +6,6 @@ describe Configuration do
     Configuration.new
   end
 
-  context "#backend" do
-    it 'should be rmagick by default' do
-      config.backend.should be(:rmagick)
-    end
-
-    it 'should set the backend' do
-      config.backend(:mini_magick).backend.should == :mini_magick
-    end
-
-    it 'should coerse backend into a symbol' do
-      config.backend('mini_magick').backend.should == :mini_magick
-    end
-  end
-
   context '#sprites_path' do
     it 'should return the default' do
       config.sprites_path.should == 'public/images/sprites'
@@ -49,4 +35,18 @@ describe Configuration do
       config.sprite_pieces_path('foo').sprite_pieces_path.should == 'foo'
     end
   end
+
+  context '#configured?' do
+    it 'should not be configured if no defaults have changed' do
+      Configuration.new.should_not be_configured
+    end
+    
+    Configuration::FIELDS.each do |field|
+      it "should be configured if the #{field} has changed" do
+        config = Configuration.new
+        config.send(field, 'foo')
+        config.should be_configured
+      end
+    end
+  end
 end

data/spec/lib/sprites_spec.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sprites
 version: !ruby/object:Gem::Version 
-  hash: 1923831973
+  hash: 1923831975
   prerelease: 6
   segments: 
   - 0
   - 0
   - 1
   - pre
-  - 2
-  version: 0.0.1.pre2
+  - 3
+  version: 0.0.1.pre3
 platform: ruby
 authors: 
 - Sam Woodard
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -07:00
+date: 2011-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -176,6 +176,7 @@ files:
 - lib/sprites/notifier.rb
 - lib/sprites/rails.rb
 - lib/sprites/rails/railtie.rb
+- lib/sprites/rails/sprites.rake
 - lib/sprites/sprite.rb
 - lib/sprites/sprite_generators/chunky_png_generator.rb
 - lib/sprites/sprite_piece.rb