Code cleanup and Builder fixes

Author: merbjedi

README.md

@@ -6,7 +6,7 @@
 
 ### Install the `rmagick` gem ###
 
-sprite currently requires the rmagick gem. to install it, use
+`sprite` currently requires the rmagick gem. to install it, use
 
     gem install rmagick
 
@@ -19,7 +19,7 @@ or via installer: http://github.com/maddox/magick-installer/tree/master
 
 ### Install the `sprite` gem ###
 
-Install the sprite gem from gemcutter
+Install the `sprite` gem from gemcutter
 
     gem sources -a http://gemcutter.org
     gem install sprite

lib/sprite/builder.rb

@@ -1,40 +1,37 @@
 module Sprite
   class Builder  
     DEFAULT_CONFIG_PATH = 'config/sprite.yml'
-    DEFAULT_IMAGE_PATH = 'public/images/'
-    DEFAULT_FILE_PATH = 'tmp/sprite.css'
 
     attr_reader :config
     attr_reader :images
     attr_reader :output
 
-    def self.from_config(path)
-      results = read_config(path)
+    def self.from_config(path) 
+      
+      # look up file
+      results = {}
+      config_path = File.join(Sprite.root, path || DEFAULT_CONFIG_PATH)
+      begin
+        results = File.open(config_path) {|f| YAML::load(f)}
+      rescue => e
+        puts "Unable to read sprite config: #{Sprite.root+"/"+config_path}"
+        puts e.to_s
+      end
+      
       new(results["config"], results["images"])
     end
 
     def initialize(config = nil, images = nil)
-      results = self.class.read_config unless config.is_a?(Hash) and images.is_a?(Array)
-
-      # use the override
-      if config.is_a?(Hash)
-        @config = config
-      else
-        @config = results["config"] || {}
-      end
-      
-      # set defaults
+      @config = config || {}
       set_config_defaults
-
-      # default image list
-      if images.is_a?(Array)
-        @images = images
-      else
-        @images = results["images"] || []
-      end
 
+      @images = images || []
       expand_image_paths
 
+      # freeze hashes
+      @config = @config.dup.freeze
+      @images = @images.dup.freeze
+
       # initialize output
       @output = {}
     end
@@ -95,21 +92,8 @@ def output_file(configuration)
         end
       end
     end
-
+    
     protected
-  
-    # reads config config from the given path
-    def self.read_config(path = nil)
-      config_results = {}
-      config_path = File.join(Sprite.root, path || DEFAULT_CONFIG_PATH)
-      begin
-        config_results = File.open(config_path) {|f| YAML::load(f)}
-      rescue => e
-        puts "Unable to read sprite config: #{Sprite.root+"/"+config_path}"
-        puts e.to_s
-      end
-      config_results
-    end
 
     # sets all the default values on the config
     def set_config_defaults

spec/sprite/builder_spec.rb

@@ -5,7 +5,7 @@
   context "configuration parsing" do
     before(:all) do
       @sprite = Sprite::Builder.from_config("resources/configs/full_config.yml")
-    end
+    end 
 
     it "should load the settings keys from file" do
       @sprite.config.keys.size.should == 6
@@ -34,14 +34,21 @@
       @sprite.config['output_path'].should == "public/stylesheets/sprites"
     end
 
-    it "'image_output_path:' setting should default to 'public/images/sprites/" do
+    it "'image_output_path:' setting should default to 'public/images/sprites/'" do
       @sprite.config['image_output_path'].should == "public/images/sprites/"
     end
 
-    it "'source_path:' setting should default to 'public/images/" do
+    it "'source_path:' setting should default to 'public/images/'" do
       @sprite.config['source_path'].should == "public/images/"
     end
-        
+
+    it "'default_format:' setting should default to 'png'" do
+      @sprite.config['default_format'].should == "png"
+    end
+
+    it "'class_separator:' setting should default to '_'" do
+      @sprite.config['class_separator'].should == "_"
+    end
 
   end