Reorganizing Sass Mixin Generators

Author: merbjedi

VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

lib/sprite/styles.rb

@@ -1,14 +1,14 @@
 require 'sprite/styles/sass_generator'
 require 'sprite/styles/css_generator'
+require 'sprite/styles/sass_yml_generator'
 require 'sprite/styles/sass_mixin_generator'
-require 'sprite/styles/sass_if_generator'
 
 module Sprite::Styles
   GENERATORS = {
     "css" => "CssGenerator",
     "sass" => "SassGenerator",
     "sass_mixin" => "SassMixinGenerator",
-    "sass_if" => "SassIfGenerator"
+    "sass_yml" => "SassYmlGenerator"
   }
 
   def self.get(config)

lib/sprite/styles/sass_if_generator.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 module Sprite
   module Styles
     # renders a yml file that is later parsed by a sass extension when generating the mixins
@@ -7,44 +6,30 @@ def initialize(builder)
         @builder = builder
       end
 
-      def write(path, sprite_files)        
-        # build the yml file
-        config_location = write_config(path, sprite_files)
-        
+      def write(path, sprite_files)    
         # write the sass mixins to disk
         File.open(File.join(Sprite.root, path), 'w') do |f|
-          f.puts "!sprite_data = '#{config_location}'"
-          f.puts ""
+          add_else = false
+
           f.puts "= sprite(!group_name, !image_name)"
-          f.puts "  background= sprite_background(!group_name, !image_name)"
-          f.puts "  width= sprite_width(!group_name, !image_name)"
-          f.puts "  height= sprite_height(!group_name, !image_name)"
-          f.puts ""
-        end
-      end
-      
-      # write the sprite configuration file (used by the yml extension)
-      def write_config(path, sprite_files)
-        # build a grouped hash with all the sprites in it
-        result = {}
-        sprite_files.each do |sprite_file, sprites|
-          sprites.each do |sprite|
-            if sprite[:group]
-              result[sprite[:group]] ||= {}
-              result[sprite[:group]][sprite[:name]] = sprite
+          sprite_files.each do |sprite_file, sprites|
+            sprites.each do |sprite|
+              
+              f << "  @"
+              if add_else
+                f << "else "
+              end
+              add_else = true
+              
+              f.puts %{if !group_name == "#{sprite[:group]}" and !image_name == "#{sprite[:name]}"}
+              f.puts "    background: url(http://github.com/'/%3Cspan%20class=pl-s1%3E%3Cspan%20class=pl-kos%3E#{%3C/span%3E%3Cspan%20class=pl-c1%3E@builder%3C/span%3E%3Cspan%20class=pl-kos%3E.%3C/span%3E%3Cspan%20class=pl-en%3Econfig%3C/span%3E%3Cspan%20class=pl-kos%3E[%3C/span%3E%3Cspan%20class=pl-s%3E'image_output_path'%3C/span%3E%3Cspan%20class=pl-kos%3E]%3C/span%3E%3Cspan%20class=pl-kos%3E}%3C/span%3E%3C/span%3E%3Cspan%20class=pl-s1%3E%3Cspan%20class=pl-kos%3E#{%3C/span%3E%3Cspan%20class=pl-s1%3Esprite_file%3C/span%3E%3Cspan%20class=pl-kos%3E}%3C/span%3E%3C/span%3E') no-repeat #{sprite[:x]}px #{sprite[:y]}px"
+              f.puts "    width: #{sprite[:width]}px"
+              f.puts "    height: #{sprite[:height]}px"
             end
           end
         end
-        
-        # write the config yml to disk
-        config_path = path.gsub(".sass", ".yml")
-        File.open(File.join(Sprite.root, config_path), 'w') do |f|
-          YAML.dump(result, f)
-        end
-        
-        config_path
       end
-      
+
       def extension
         "sass"
       end

lib/sprite/styles/sass_mixin_generator.rb

@@ -0,0 +1,54 @@
+require 'yaml'
+module Sprite
+  module Styles
+    # renders a yml file that is later parsed by a sass extension when generating the mixins
+    class SassYmlGenerator
+      def initialize(builder)
+        @builder = builder
+      end
+      
+      def write(path, sprite_files)        
+        # build the yml file
+        config_location = write_config(path, sprite_files)
+        
+        # write the sass mixins to disk
+        File.open(File.join(Sprite.root, path), 'w') do |f|
+          f.puts "!sprite_data = '#{config_location}'"
+          f.puts ""
+          f.puts "= sprite(!group_name, !image_name)"
+          f.puts "  background= sprite_background(!group_name, !image_name)"
+          f.puts "  width= sprite_width(!group_name, !image_name)"
+          f.puts "  height= sprite_height(!group_name, !image_name)"
+          f.puts ""
+        end
+      end
+      
+      # write the sprite configuration file (used by the yml extension)
+      def write_config(path, sprite_files)
+        # build a grouped hash with all the sprites in it
+        result = {}
+        sprite_files.each do |sprite_file, sprites|
+          sprites.each do |sprite|
+            if sprite[:group]
+              result[sprite[:group]] ||= {}
+              result[sprite[:group]][sprite[:name]] = sprite
+            end
+          end
+        end
+        
+        # write the config yml to disk
+        config_path = path.gsub(".sass", ".yml")
+        File.open(File.join(Sprite.root, config_path), 'w') do |f|
+          YAML.dump(result, f)
+        end
+        
+        config_path
+      end
+      
+      def extension
+        "sass"
+      end
+  
+    end
+  end
+end

lib/sprite/styles/sass_yml_generator.rb

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sprite}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacques Crocker", "Richard Huang"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2009-11-18}
   s.default_executable = %q{sprite}
   s.description = %q{sprite is a rails/merb plugin that generates sprites for css, sass}
   s.email = %q{[email protected]}
@@ -27,6 +27,12 @@ Gem::Specification.new do |s|
      "lib/sprite/builder.rb",
      "lib/sprite/image_combiner.rb",
      "lib/sprite/runner.rb",
+     "lib/sprite/sass_extensions.rb",
+     "lib/sprite/styles.rb",
+     "lib/sprite/styles/css_generator.rb",
+     "lib/sprite/styles/sass_generator.rb",
+     "lib/sprite/styles/sass_if_generator.rb",
+     "lib/sprite/styles/sass_mixin_generator.rb",
      "rails/init.rb",
      "sprite.gemspec",
      "tasks/sprite_tasks.rake"