sprite-generator 0.1.10 → 0.1.11

data/README.md

@@ -72,7 +72,7 @@ Configuration of `sprite-generator` is done via `config/sprite.yml`. It allows y
   - `default_format:` defines the default file image format of the generated files. (defaults to `png`)
   - `default_spacing:` defines the default pixel spacing between sprites (defaults to 0)
   - `class_separator:` used to generated the class name by separating the image name and sprite name (defaults to `-`)
-  - `pseudo_classes`: array of strings. Example: if some image name will end with `_hover` and `pseudo_classes` will equal `['hover']`, then the style for that picture will end with `:hover` instead of `_hover`. (defaults to ['hover'])
+  - `pseudo_classes`: array of strings. Example: if some image name will end with `_hover` and `pseudo_classes` will equal `['hover']`, then the style for that picture will end with `:hover` instead of `_hover`. (defaults to ['hover']). Supported only for CSS files
   - `parameters`: hash of parameters that will be substituted in other options. In order to be used parameter must be declared in parameters hash and have a default value. Parameter can be overriden in command line: `sprite -p param_name=new_param_value`. (defaults to `{}`)
 
 * `images:` section provides an array of configurations which define which image files are built, and where they get their sprites from. each image setup provides the following config options:

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/sprite/styles/css_generator.rb

@@ -14,20 +14,49 @@ module Sprite
         File.open(File.join(Sprite.root, path), 'w') do |f|
           # write stylesheet file to disk
           sprite_files.each do |sprite_file, sprites|
+            sprites_with_pseudo_classes = []
+            print_style_body = lambda do |sprite|
+              f.puts " {"
+              f.puts "  background: url('/#{@builder.config['image_output_path']}#{sprite_file}') no-repeat #{sprite[:x]}px #{sprite[:y]}px;"
+              f.puts "  width: #{sprite[:width]}px;"
+              f.puts "  height: #{sprite[:height]}px;"
+              f.puts "}"
+            end
+
+            # first all the styles without pseudo classes are printed
+            # styles with pseudo classes are copied to separate array
             sprites.each do |sprite|
+              if sprite[:name] =~ /_(#{@builder.config['pseudo_classes'].join "|"})$/
+                sprites_with_pseudo_classes << sprite
+              else
+                f.print "#{sprites_class}.#{sprite[:group]}#{@builder.config['class_separator']}#{sprite[:name]}"
+                print_style_body.call sprite
+              end
+            end
+
+            # sort styles by pseudo class name
+            # this ensures that the order of styles with pseudo classes is the same
+            # as the order of pseudo classes supplied in config
+            #
+            # for example if pseudo_classes = ['hover', 'active'] then
+            # styles with pseudo class 'active' will always be printed into CSS file
+            # after the styles with pseudo class 'hover'
+            # this addresses issue #1 ( http://github.com/iast/sprite-generator/issues/1/find )
+            sprites_with_pseudo_classes.sort! do |s1, s2|
+              @builder.config['pseudo_classes'].index(s1[:name].scan(/[^_]+$/)[0]) <=>
+              @builder.config['pseudo_classes'].index(s2[:name].scan(/[^_]+$/)[0])
+            end
+            # print styles with pseudo classes into file
+            sprites_with_pseudo_classes.each do |sprite|
               # if sprite name ends with some of acceptable pseudo classes, add selector for pseudoclass also
               # for example if the sprite name is 'image_hover' and 'hover' is among acceptable pseudo classes,
               # also add selector for image:hover
-              sprite_name = sprite[:name].gsub /(.*)(_)(#{@builder.config['pseudo_classes'].join "|"})$/, '\1:\3'
+              rule_with_pc = sprite[:name].gsub /(.*)(_)(#{@builder.config['pseudo_classes'].join "|"})$/, '\1:\3'
               selector_prefix = "#{sprites_class}.#{sprite[:group]}#{@builder.config['class_separator']}"
               selector = selector_prefix + sprite[:name]
-              selector += ", #{selector_prefix}#{sprite_name}" if sprite_name != sprite[:name]
-
-              f.puts "#{selector} {"
-              f.puts "  background: url('/#{@builder.config['image_output_path']}#{sprite_file}') no-repeat #{sprite[:x]}px #{sprite[:y]}px;"
-              f.puts "  width: #{sprite[:width]}px;"
-              f.puts "  height: #{sprite[:height]}px;"
-              f.puts "}"
+              selector += ", #{selector_prefix}#{rule_with_pc}" if rule_with_pc != sprite[:name]
+              f.print selector
+              print_style_body.call sprite
             end
           end
         end

data/sprite-generator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sprite-generator}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacques Crocker", "Anton Styagun"]
-  s.date = %q{2009-12-01}
+  s.date = %q{2010-07-29}
   s.default_executable = %q{sprite}
   s.description = %q{sprite-generator is a rails/merb plugin that generates sprites for css, sass}
   s.email = %q{astyagun@gmail.com}
@@ -40,14 +40,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/iast/sprite-generator}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{generate your css sprites automagically}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprite-generator
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  hash: 13
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 +02:00
+date: 2010-07-29 00:00:00 +03:00
 default_executable: sprite
 dependencies: []
 
@@ -51,21 +57,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: generate your css sprites automagically