sprite-factory 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3869041a63a98b286f265b18d7248c3c398ba33
-  data.tar.gz: 3d2d321ea52948892ecde2f0662489e963e4d90a
+  metadata.gz: 097ca4bb60eba921f4f50b9aa01f4637f76aac8d
+  data.tar.gz: f4270a2b011d8abe87e92ad99146766aad37eee8
 SHA512:
-  metadata.gz: 96dfd8bf61c580fcc4508d28c308192d7bdaff6fa00bf015b9dacf1e5f5f71778228c3d6b698477838c018bca68011e1bf4f75189d5817531d9523da3adf74b5
-  data.tar.gz: a1801ebe861de312bf212c1a5a5d95fbe0f2696620bc0c2e8819a5e8f237f0df3de031eb5d245a31f92db167d016a66c6218e72a6b257ccc38918b805d87fb68
+  metadata.gz: b23043b30ce92ee88cc2450fa88934ae7e26f2bc9e62ddc7f0bbf77fa9c6e5858816bacd55da3ff2e4d2d303c9f11548cfe8e99d0d89fe6eb093584248744f63
+  data.tar.gz: 4fb30bc756f357ace50ea35ec3a584c2e0b33daee1a5d5ab0d54901be2cdb9ba04490ee6d8840e93d05b2a8fd09f3d0073423e370b7192307007183d20bbc7cc

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011, 2012, 2013, 2014 Jake Gordon and contributors
+Copyright (c) 2011, 2012, 2013, 2014, 2015, Jake Gordon and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-Sprite Factory (v1.6.1)
+Sprite Factory (v1.6.2)
 =======================
 
 The sprite factory is a ruby library that can be used to generate

data/RELEASE_NOTES.md

@@ -1,3 +1,9 @@
+January 17th 2015 - v1.6.2
+--------------------------
+
+ * replace deprecated Magick::MaxRGB with Magick::QuantumRange (courtesy of @kenmicles)
+ * add option to override default directory separator (courtesy of @cotampanie)
+
 August 8th 2014 - v1.6.1
 ------------------------
 

data/lib/sprite_factory.rb

@@ -2,7 +2,7 @@ module SpriteFactory
   
   #----------------------------------------------------------------------------
 
-  VERSION     = "1.6.1"
+  VERSION     = "1.6.2"
   SUMMARY     = "Automatic CSS sprite generator"
   DESCRIPTION = "Combines individual images from a directory into a single sprite image file and creates an appropriate CSS stylesheet"
   LIB         = File.dirname(__FILE__)
@@ -27,6 +27,7 @@ module SpriteFactory
     attr_accessor :cssurl
     attr_accessor :pngcrush
     attr_accessor :nocomments
+    attr_accessor :directory_separator
   end
 
   #----------------------------------------------------------------------------

data/lib/sprite_factory/library/rmagick.rb

@@ -20,7 +20,7 @@ module SpriteFactory
 
       def self.create(filename, images, width, height)
         target = Magick::Image.new(width,height)
-        target.opacity = Magick::MaxRGB
+        target.opacity = Magick::QuantumRange
         images.each do |image|
           target.composite!(image[:image], image[:x], image[:y], Magick::SrcOverCompositeOp)
         end

data/lib/sprite_factory/runner.rb

@@ -24,12 +24,12 @@ module SpriteFactory
       @config[:report]     ||= SpriteFactory.report
       @config[:pngcrush]   ||= SpriteFactory.pngcrush
       @config[:nocomments] ||= SpriteFactory.nocomments
+      @config[:directory_separator] ||= SpriteFactory.directory_separator || '_'
     end
   
     #----------------------------------------------------------------------------
 
     def run!(&block)
-
       raise RuntimeError, "unknown layout #{layout_name}"     if !Layout.respond_to?(layout_name)
       raise RuntimeError, "unknown style #{style_name}"       if !Style.respond_to?(style_name)
       raise RuntimeError, "unknown library #{library_name}"   if !Library.respond_to?(library_name)
@@ -139,6 +139,10 @@ module SpriteFactory
       config[:nocomments] # set true if you dont want any comments in the output style file
     end
 
+    def directory_separator
+      config[:directory_separator]
+    end
+
     def custom_style_file
       File.join(input, File.basename(input) + ".#{style_name}")
     end
@@ -174,6 +178,7 @@ module SpriteFactory
 
     def load_images
       input_path = Pathname.new(input)
+
       images = library.load(image_files)
       images.each do |i|
         i[:name], i[:ext] = map_image_filename(i[:filename], input_path)
@@ -184,7 +189,7 @@ module SpriteFactory
     end
 
     def map_image_filename(filename, input_path)
-      name = Pathname.new(filename).relative_path_from(input_path).to_s.gsub(File::SEPARATOR, "_")
+      name = Pathname.new(filename).relative_path_from(input_path).to_s.gsub(File::SEPARATOR, directory_separator)
       name = name.gsub('--', ':')
       name = name.gsub('__', ' ')
       ext  = File.extname(name)

data/test/runner_test.rb

@@ -18,6 +18,7 @@ module SpriteFactory
         assert_equal(:horizontal,             r.layout_name)
         assert_equal(:css,                    r.style_name)
         assert_equal(:rmagick,                r.library_name)
+        assert_equal(DIRECTORY_SEPARATOR,     r.directory_separator)
 
         r = Runner.new(IRREGULAR_PATH)
         assert_equal(IRREGULAR_PATH,          r.input)
@@ -28,6 +29,18 @@ module SpriteFactory
         assert_equal(:horizontal,             r.layout_name)
         assert_equal(:css,                    r.style_name)
         assert_equal(:rmagick,                r.library_name)
+        assert_equal(DIRECTORY_SEPARATOR,     r.directory_separator)
+
+        r = Runner.new(IRREGULAR_PATH, :directory_separator => '.')
+        assert_equal(IRREGULAR_PATH,          r.input)
+        assert_equal(IRREGULAR_PATH,          r.output)
+        assert_equal(IRREGULAR_PATH + ".png", r.output_image_file)
+        assert_equal(IRREGULAR_PATH + ".css", r.output_style_file)
+        assert_equal(IRREGULAR,               r.image_files)
+        assert_equal(:horizontal,             r.layout_name)
+        assert_equal(:css,                    r.style_name)
+        assert_equal(:rmagick,                r.library_name)
+        assert_equal('.',     r.directory_separator)
 
         r = Runner.new(REGULAR_PATH, :output => IRREGULAR_PATH)
         assert_equal(REGULAR_PATH,            r.input)
@@ -38,6 +51,7 @@ module SpriteFactory
         assert_equal(:horizontal,             r.layout_name)
         assert_equal(:css,                    r.style_name)
         assert_equal(:rmagick,                r.library_name)
+        assert_equal(DIRECTORY_SEPARATOR,     r.directory_separator)
 
         r = Runner.new(REGULAR_PATH, :output_image => "foo.png", :output_style => "bar.css.sass.erb")
         assert_equal(REGULAR_PATH,            r.input)
@@ -48,6 +62,7 @@ module SpriteFactory
         assert_equal(:horizontal,             r.layout_name)
         assert_equal(:css,                    r.style_name)
         assert_equal(:rmagick,                r.library_name)
+        assert_equal(DIRECTORY_SEPARATOR,     r.directory_separator)
 
         r = Runner.new(REGULAR_PATH, :layout => :vertical, :library => :chunkypng, :style => :sass)
         assert_equal(REGULAR_PATH,            r.input)
@@ -58,6 +73,7 @@ module SpriteFactory
         assert_equal(:vertical,               r.layout_name)
         assert_equal(:sass,                   r.style_name)
         assert_equal(:chunkypng,              r.library_name)
+        assert_equal(DIRECTORY_SEPARATOR,     r.directory_separator)
 
       end
     
@@ -223,6 +239,14 @@ module SpriteFactory
       end
     end
 
+    def test_use_specified_directory_separator
+      Runner.publicize_methods do
+        expected = %w(england.amy england.bob france.bob usa.amy usa.bob)
+        actual = Runner.new(SUBFOLDERS_PATH, :directory_separator => '.').load_images.map{|i| i[:name]}
+        assert_equal(expected, actual)
+      end
+    end
+
     #----------------------------------------------------------------------------
 
   end

data/test/test_case.rb

@@ -36,6 +36,8 @@ module SpriteFactory
       { :filename => IRREGULAR[4], :width => 46, :height => 25 }
     ]
 
+    DIRECTORY_SEPARATOR = '_'
+
     def output_path(name)
       File.join(IMAGES_PATH, name)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprite-factory
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Jake Gordon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick