sprite-factory-custom 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2ecbb8bb1a7ec8be758af9d13a03ce6b1959276
-  data.tar.gz: c52c5bfc4a5d35d4baf4b6e4baef9ba896da1822
+  metadata.gz: 01d3b01280973bccc764b752828e05df00aec623
+  data.tar.gz: f72a6e66a2418e791de99c2958f2d83b2863a625
 SHA512:
-  metadata.gz: 8732914483a9497b38074802e423b845b8474cd278fac7ae37dd038a06ba2f9226cd4c39a06ae03aaaeb5e54b8eca8cef8bf9621a5de68b1fff4fc5777651c25
-  data.tar.gz: dd3ee2dde1633ebb0a4d83758423d3ecdaf9abce7fdd9053b2cd6205bef13dbeebb8e19a5f351aac1f92e62c2d472a54942ba2f832107fae646a07af299c1438
+  metadata.gz: df91210723d163fb6a5638627d8e21094b46f389723a077f9a5001c1a02b7dc384e4d46783a4599ce0069ecf4a0163aa0150723f0d214cc3f31103f5cef2e669
+  data.tar.gz: 77904ece1613fa8ca9c673c8dae89b5556b8248d2f3d40cd39bb8089e5aace7a4983fa1123371dc02a1b9a314fcb8500ae728b627f742d50094ff20d2d90f9a1

data/bin/sf

@@ -31,6 +31,7 @@ padding_help      = "add padding to each sprite"
 margin_help       = "add margin to each sprite"
 nocomments_help   = "suppress comments in generated stylesheet"
 custom_styles_help   = "Add custom styles for each sprites (E.g.: --custom-styles='display: inline-block;'"
+retina_help       = "create 50% smaller images & css as well"
 
 op.on("--layout       [ORIENTATION]", layout_help)       {|value| options[:layout]       = value }
 op.on("--style        [STYLE]",       style_help)        {|value| options[:style]        = value }
@@ -44,6 +45,7 @@ op.on("--pngcrush",                   pngcrush_help)     {|value| options[:pngcr
 op.on("--padding [PIXELS]",           padding_help)      {|value| options[:padding]      = value.to_i }
 op.on("--margin [PIXELS]",            margin_help)       {|value| options[:margin]       = value.to_i }
 op.on("--nocomments",                 nocomments_help)   {|value| options[:nocomments]   = true  }
+op.on("--retina",                     retina_help)       {|value| options[:retina]       = true  }
 
 begin
   op.parse!(ARGV)

data/lib/sprite_factory.rb

@@ -2,9 +2,9 @@ module SpriteFactory
 
   #----------------------------------------------------------------------------
 
-  VERSION     = "1.6.1"
+  VERSION     = "1.6.2"
   SUMMARY     = "Automatic CSS sprite generator"
-  DESCRIPTION = "[tam-vo/sprite-factory] Combines individual images from a directory into a single sprite image file and creates an appropriate CSS stylesheet"
+  DESCRIPTION = "[tam-vo/sprite-factory v#{VERSION}] Combines individual images from a directory into a single sprite image file and creates an appropriate CSS stylesheet"
   LIB         = File.dirname(__FILE__)
 
   autoload :Runner,  File.join(LIB, 'sprite_factory/runner')  # controller that glues everything together

data/lib/sprite_factory/runner.rb

@@ -12,7 +12,7 @@ module SpriteFactory
 
     attr :input
     attr :config
-
+  
     def initialize(input, config = {})
       @input  = input.to_s[-1] == "/" ? input[0...-1] : input # gracefully ignore trailing slash on input directory name
       @config = config
@@ -25,7 +25,7 @@ module SpriteFactory
       @config[:pngcrush]   ||= SpriteFactory.pngcrush
       @config[:nocomments] ||= SpriteFactory.nocomments
     end
-
+  
     #----------------------------------------------------------------------------
 
     def run!(&block)
@@ -55,7 +55,9 @@ module SpriteFactory
 
       css = []
       css << style_comment(header) unless nocomments?                       # header comment
-      css << style(selector, css_url, images, &block)                       # generated styles
+      css << retina_wrapper_start() if retina?                                    # if retina images
+      css << style(selector, css_url, images, max,  &block)                       # generated styles
+      css << retina_wrapper_end() if retina?                                    # if retina images
       css << IO.read(custom_style_file) if File.exists?(custom_style_file)  # custom styles
       css = css.join("\n")
 
@@ -67,6 +69,8 @@ module SpriteFactory
         css_file.close
       end
 
+
+
       if config[:return] == :images
         images # if caller explicitly asked for detailed images hash instead of generated CSS
       else
@@ -76,9 +80,13 @@ module SpriteFactory
     end
 
     #----------------------------------------------------------------------------
-
+  
     private
 
+    def retina?
+      config[:retina]
+    end
+
     def selector
       config[:selector]
     end
@@ -227,8 +235,8 @@ module SpriteFactory
 
     #----------------------------------------------------------------------------
 
-    def style(selector, url, images, &block)
-      defaults = Style.generate(style_name, selector, url, images, custom_styles) # must call, even if custom block is given, because it stashes generated css style into image[:style] attributes
+    def style(selector, url, images, max, &block)
+      defaults = Style.generate(style_name, selector, url, images, custom_styles, config, max) # must call, even if custom block is given, because it stashes generated css style into image[:style] attributes
       if block_given?
         yield images.inject({}) {|h,i| h[i[:name].to_sym] = i; h} # provide custom rule builder a hash by image name
       else
@@ -240,6 +248,14 @@ module SpriteFactory
       Style.comment(style_name, comment)
     end
 
+    def retina_wrapper_start
+      Style.retina_wrapper_start
+    end
+
+    def retina_wrapper_end
+      Style.retina_wrapper_end
+    end
+
     #----------------------------------------------------------------------------
 
     SUPPORTS_PNGCRUSH = !`which pngcrush`.empty? rescue false # rescue on environments without `which` (windows)
@@ -248,7 +264,7 @@ module SpriteFactory
       if SUPPORTS_PNGCRUSH && config[:pngcrush]
         crushed = "#{image}.crushed"
         `pngcrush -rem alla -reduce -brute #{image} #{crushed}`
-        FileUtils.mv(crushed, image)
+        FileUtils.mv(crushed, image) 
       end
     end
 

data/lib/sprite_factory/style.rb

@@ -15,6 +15,14 @@ module SpriteFactory
       return "/*\n#{comment}\n*/"
     end
 
+    def self.retina_style_start
+      "@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-device-pixel-ratio: 2) {"
+    end
+
+    def self.retina_style_end
+      "}"
+    end
+
     #----------------------------------------------------------------------------
 
     def self.scss(selector, name, attributes)
@@ -45,18 +53,21 @@ module SpriteFactory
 
     #----------------------------------------------------------------------------
 
-    def self.generate(style_name, selector, url, images, custom_styles="")
+    def self.generate(style_name, selector, url, images, custom_styles, config, max)
       styles = []
+      divider = config[:retina] ? 2 : 1
       images.each do |image|
+        puts "DIV #{divider}"
         attr = [
-          "width: #{image[:cssw]}px",
-          "height: #{image[:cssh]}px",
-          "background: #{url} #{-image[:cssx]}px #{-image[:cssy]}px no-repeat",
+          "width: #{image[:cssw] / divider}px",
+          "height: #{image[:cssh] / divider}px",
+          "background: #{url} #{-image[:cssx] / divider}px #{-image[:cssy] / divider}px no-repeat",
           custom_styles
         ]
+        attr << "background-size: #{max[:width]/2}px #{max[:height]/2}px" if config[:retina]
         image[:selector] = selector                          # make selector available for (optional) custom rule generators
         image[:style]    = send("#{style_name}_style", attr) # make pure style available for (optional) custom rule generators (see usage of yield inside Runner#style)
-        styles << send(style_name, selector, image[:name], attr)
+        styles << send(style_name, selector, image[:name].gsub('@2x', ''), attr)
       end
       styles << ""
       styles.join("\n")
@@ -70,5 +81,13 @@ module SpriteFactory
 
     #----------------------------------------------------------------------------
 
+    def self.retina_wrapper_start
+      send('retina_style_start')
+    end
+
+    def self.retina_wrapper_end
+      send('retina_style_end')
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprite-factory-custom
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jake Gordon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -39,7 +39,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: '[tam-vo/sprite-factory] Combines individual images from a directory
+description: '[tam-vo/sprite-factory v1.6.2] Combines individual images from a directory
   into a single sprite image file and creates an appropriate CSS stylesheet'
 email:
 - jake@codeincomplete.com