sprite 0.1.1 → 0.1.2

data/README.md

@@ -90,9 +90,10 @@ Configuration of `sprite` is done via `config/sprite.yml`. It allows you to set
   
 * `config:` section defines all the global properties for sprite generation. Such as how it generates the styles, where it looks for images, where it writes it output file to, and what image file format it uses by default
   - `style:` defines how the style rules are outputted. built in options are `css`, `sass`, and `sass_mixin`. (defaults to `css`)
-  - `output_path:` defines the file path where your style settings get written (defaults to `public/stylesheets/sprites`). the file extension not needed as it will be set based on the `style:` setting 
-  - `image_output_path:` defines the folder path where the combined sprite images files are written (defaults to `public/images/sprites/`)
-  - `source_path:` defines the folder where source image files are read from (defaults to `public/images/`)
+  - `style_output_path:` defines the file path where your style settings get written (defaults to `stylesheets/sprites`). the file extension not needed as it will be set based on the `style:` setting 
+  - `image_output_path:` defines the folder path where the combined sprite images files are written (defaults to `images/sprites/`)
+  - `image_source_path:` defines the folder where source image files are read from (defaults to `images/`)
+  - `public_path:` defines the root folder where static assets live (defaults to `public/`)
   - `sprites_class:` defines the class name that gets added to all sprite stylesheet rules (defaults to `sprites`)
   - `default_format:` defines the default file image format of the generated files. (defaults to `png`)
   - `class_separator:` used to generated the class name by separating the image name and sprite name (defaults to `-`)
@@ -104,7 +105,7 @@ Configuration of `sprite` is done via `config/sprite.yml`. It allows you to set
   - `spaced_by:` spacing (in pixels) between the combined images. (defaults to `0`)
   - `format:` define what image file format gets created (optional, uses `default_format` setting if not set)
 
-you can define any number of destination image files.
+All image and style paths should be set relative to the public folder (which is configurable via public_path setting).
 
 ### Sample Configuration `config/sprite.yml` ###
 
@@ -112,9 +113,10 @@ you can define any number of destination image files.
 
     config:
       style: css
-      output_path: public/sass/mixins/sprites.sass
-      image_output_path: public/images/sprites/
-      source_path: public/images/
+      style_output_path: sass/mixins/sprites.sass
+      image_output_path: images/sprites/
+      image_source_path: images/
+      public_path: public/
       sprites_class: 'sprites'
       class_separator: '-'
       default_format: png

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/sprite/builder.rb

@@ -8,16 +8,19 @@ module Sprite
     attr_reader :output
     
     def self.from_config(path = nil) 
-
       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
+      config_path = File.join(Sprite.root, path || DEFAULT_CONFIG_PATH)
       
+      # read configuration
+      if File.exists?(config_path) 
+        begin
+          results = File.open(config_path) {|f| YAML::load(f)} || {}
+        rescue => e
+          puts "Error reading sprite config: #{config_path}"
+          puts e.to_s
+        end
+      end
+
       new(results["config"], results["images"])
     end
 
@@ -26,12 +29,9 @@ module Sprite
       set_config_defaults
       
       @images = images || []
+      set_image_defaults
       expand_image_paths
       
-      # freeze hashes
-      @config = @config.dup.freeze
-      @images = @images.dup.freeze
-
       # initialize output
       @output = {}
     end
@@ -49,7 +49,8 @@ module Sprite
         output_file
       end
     end
-  
+    
+    protected
     def output_image(image)
       results = []
       sources = image['sources'].to_a
@@ -74,19 +75,19 @@ module Sprite
         results << combiner.image_properties(source_image).merge(:x => x, :y => y, :group => name)
         dest_image = combiner.composite_images(dest_image, source_image, x, y)
       end
-      @output[name] = results
       
       # set up path
-      path = image_path(name, image['format'])
+      path = image_output_path(name, image['format'] || config["default_format"])
       FileUtils.mkdir_p(File.dirname(path))
       
       # write sprite image file to disk
       dest_image.write(path)
+      @output[name] = results
     end
-    
+
     def output_file
       # set up path
-      path = output_path("css")
+      path = style_output_path("css")
       FileUtils.mkdir_p(File.dirname(path))
       
       # set up class_name to append to each rule
@@ -97,7 +98,7 @@ module Sprite
         @output.each do |dest, results|
           results.each do |result|
             f.puts "#{sprites_class}.#{result[:group]}#{config['class_separator']}#{result[:name]} {"
-            f.puts "  background: url('/images/#{dest}') no-repeat #{result[:x]}px #{result[:y]}px;"
+            f.puts "  background: url('/#{config['image_output_path']}#{dest}') no-repeat #{result[:x]}px #{result[:y]}px;"
             f.puts "  width: #{result[:width]}px;"
             f.puts "  height: #{result[:height]}px;"
             f.puts "}"
@@ -106,25 +107,75 @@ module Sprite
       end
     end
     
-    protected
+    # get the disk path for the style output file
+    def style_output_path(file_ext)
+      path = config['style_output_path']
+      unless path.include?(".#{file_ext}")
+        path = "#{path}.#{file_ext}"
+      end
+      public_path(path)
+    end
     
-    def output_path(file_ext)
-      "#{Sprite.root}/#{config['output_path']}.#{file_ext}"
+    # get the disk path for a location within the image output folder
+    def image_output_path(name, format)
+      path_parts = []
+      path_parts << chop_trailing_slash(config['image_output_path'])
+      path_parts << "#{name}.#{format}"
+      public_path(File.join(*path_parts))
     end
     
-    def image_path(name, format)
-      "#{Sprite.root}/#{config['image_output_path']}#{name}.#{format}"
+    # get the disk path for a location within the public folder (if set)
+    def public_path(location)
+      path_parts = []
+      path_parts << Sprite.root
+      path_parts << chop_trailing_slash(config['public_path']) if config['public_path'] and config['public_path'].length > 0
+      path_parts << location
+      
+      File.join(*path_parts)
+    end
+    
+    # chop off the trailing slash on a directory path (if it exists)
+    def chop_trailing_slash(path)
+      path = path[0...-1] if path[-1] == File::SEPARATOR
+      path
     end
     
     # sets all the default values on the config
     def set_config_defaults
       @config['style']              ||= 'css'
-      @config['output_path']        ||= 'public/stylesheets/sprites'
-      @config['image_output_path']  ||= 'public/images/sprites/'
-      @config['source_path']        ||= 'public/images/'
+      @config['style_output_path']        ||= 'stylesheets/sprites'
+      @config['image_output_path']  ||= 'images/sprites/'
+      @config['image_source_path']        ||= 'images/'
+      @config['public_path']        ||= 'public/'
       @config['default_format']     ||= 'png'
       @config['class_separator']    ||= '-'
-      @config["sprites_class"] ||= 'sprites'
+      @config["sprites_class"]      ||= 'sprites'
+    end
+    
+    # if no image configs are detected, set some intelligent defaults
+    def set_image_defaults
+      return unless @images.size == 0
+      
+      sprites_path = File.join(Sprite.root, config['public_path'], config['image_source_path'], "sprites")
+      
+      if File.exists?(sprites_path)
+        Dir.glob(File.join(sprites_path, "*")) do |dir|
+          next unless File.directory?(dir)
+          source_name = File.basename(dir)
+
+          # default to finding all png, gif, jpg, and jpegs within the directory
+          images << {
+            "name" => source_name,
+            "sources" => [
+              File.join("sprites", source_name, "*.png"),
+              File.join("sprites", source_name, "*.gif"),
+              File.join("sprites", source_name, "*.jpg"),
+              File.join("sprites", source_name, "*.jpeg"),
+            ]
+          }
+        end
+      end
+      
     end
     
     # expands out sources, taking the Glob paths and turning them into separate entries in the array
@@ -133,7 +184,7 @@ module Sprite
       @images.each do |image|
         # expand out all the globs
         image['sources'] = image['sources'].to_a.map{ |source|
-          Dir.glob(File.join(Sprite.root, @config['source_path'], source))
+          Dir.glob(File.join(Sprite.root, config['public_path'], @config['image_source_path'], source))
         }.flatten.compact
       end
     end

data/sprite.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sprite}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacques Crocker", "Richard Huang"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprite
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jacques Crocker