slice_rename 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac69eaad8ffe87dfad9544205cabbc910fdf99d
-  data.tar.gz: 3450638f1bb048993031bd9ff8e912d4c6a0b108
+  metadata.gz: b904682be754cd62856bc95c8ed2c2324dc6b9c9
+  data.tar.gz: 854a7644760d3bbe45c5f32da9cad82de618b152
 SHA512:
-  metadata.gz: 4bf959f753e60da6758a368b222c744f39b84113ffade1fdd0bd948c565ffeb67936e7104313fc60f67622c3b16a96ea91ac5f0303f38f31fb2e43d776e0c24c
-  data.tar.gz: d0245a15c94568ed488dc653e0a143f5ec910ec2795780e922bfeda75f06c31a34d776d145d2a077fa3e6c649d4986c83e633cbb64390c9362995c63ba6b1d4f
+  metadata.gz: 9f3ae0a13ddfa223431cd443fef54b08263ec6559ade5cc42af1d7b1626f5dd8456efb866b2d6b65fc4ab23c0940bac5a72aa75ab0c30298a48c8c29c2f0c129
+  data.tar.gz: 6b771932d174d1d87a0210fbc3ac7f656732063189f81f062b3a6813e09446584446d400093d2889eea41415f204b88df8cfc8219b2bd8bc4ed84f068d20196d

data/Gemfile.lock

@@ -1,6 +1,7 @@
 PATH
   remote: .
   specs:
+    slice_rename (0.7.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -49,12 +49,11 @@ for more details on how the padding works.
 
 * `collapse_padding` - defaults to `false`
 
-	The option called `collapse_padding` specifies if the padding between
-images are collapsed into eachother. Meaning that if the `padding` setting is 2
-and `collapse_padding` is true then it expects all images to be separated by 2
-pixels. If `collapse_padding` is false it will instead expect 2 pixels around
-each image resulting in 4 pixels between images but only 2 around the whole
-image.
+	This specifies if the padding between images are collapsed into
+eachother. Meaning that if the `padding` setting is 2 and `collapse_padding` is
+true then it expects all images to be separated by 2 pixels. If
+`collapse_padding` is false it will instead expect 2 pixels around each image
+resulting in 4 pixels between images but only 2 around the whole image.
 
 	Images created by slice_rename do not collapse the padding so
 `collapse_padding` defaults to `false`. If you need the old behaviour simply
@@ -66,6 +65,13 @@ set it to `true` in your config file.
 transparent, if you want a color pass a hex color code. Keep in mind that you
 need quotes since the `#` character is reserved for comments in YAML.
 
+* `full_grid` - defaults to `true`
+
+	This option decides if it should draw padding around empty images when
+combining. When this is false empty spaces are filled with background color.
+It defaults to true since that generates a grid that covers the whole image
+however many empty images it has.
+
 * `background_color` - defaults to `none`
 
 	The color of the background behind your individual slices. The default

data/lib/slice_rename.rb

@@ -1,5 +1,5 @@
 require 'slice_rename/cli'
 
 module SliceRename
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/slice_rename/combiner.rb

@@ -12,6 +12,11 @@ module SliceRename
       geometry = "#{config.width}x#{config.height}\>+0+0"
       border = "#{config.padding}x#{config.padding}"
       tile = "#{config.columns}x#{config.rows}"
+      empty_image = config.full_grid ? "#{path}/empty.png" : 'null:'
+
+      if config.full_grid
+        generate_empty_image config
+      end
 
       config.suffixes.each do |suffix|
         if suffix != nil
@@ -19,12 +24,12 @@ module SliceRename
 
           if !Pathname.new(input_path).file?
             input_path = "#{path}/#{config.fallback}#{suffix}#{extension}"
-            input_path = 'null:' if !Pathname.new(input_path).file?
+            input_path = empty_image if !Pathname.new(input_path).file?
           end
 
           images << input_path
         else
-          images << 'null:'
+          images << empty_image
         end
       end
 
@@ -35,6 +40,10 @@ module SliceRename
       end
 
       save_combination(config, images, output_name, geometry, tile, border)
+
+      if config.full_grid
+        File.delete "#{path}/empty.png"
+      end
     end
 
     private
@@ -57,5 +66,13 @@ module SliceRename
         montage << output_name
       end
     end
+
+    def self.generate_empty_image(config)
+      MiniMagick::Tool::Convert.new do |convert|
+        convert.size "#{config.width}x#{config.height}"
+        convert << 'xc:transparent'
+        convert << "#{File.dirname(config.path)}/empty.png"
+      end
+    end
   end
 end

data/lib/slice_rename/config.rb

@@ -4,7 +4,7 @@ module SliceRename
   class Config
     attr_accessor :path, :debug, :fallback
     attr_reader :rows, :columns, :width, :height, :padding, :collapse_padding,
-                :padding_color, :background_color
+                :padding_color, :background_color, :full_grid
 
     def initialize
       @path = ''
@@ -17,6 +17,7 @@ module SliceRename
       @suffixes = []
       @collapse_padding = false
       @padding_color = 'none'
+      @full_grid = true
       @background_color = 'none'
       @fallback = ''
     end
@@ -32,6 +33,7 @@ module SliceRename
       @suffixes = config.fetch('suffixes', @suffixes)
       @collapse_padding = config.fetch('collapse_padding', @collapse_padding)
       @padding_color = config.fetch('padding_color', @padding_color)
+      @full_grid = config.fetch('full_grid', @full_grid)
       @background_color = config.fetch('background_color', @background_color)
     end
 

data/spec/slice_rename/combiner_spec.rb

@@ -20,8 +20,10 @@ RSpec.describe SliceRename::Combiner do
 
   describe '.combine_images' do
     it 'combines the images and saves them as a single image' do
+      allow_any_instance_of(Pathname).to receive(:file?).and_return(true)
+
       expect(SliceRename::Combiner).to(
-        receive(:save_combination).exactly(1).times do |input_names, output_name, geometry, tile, border|
+        receive(:save_combination).exactly(1).times do |config, input_names, output_name, geometry, tile, border|
           input_names.each_with_index do |name, index|
             expect(name).to include suffixes[index]
           end

data/spec/slice_rename/config_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe SliceRename::Config do
       expect(config.suffixes).to be_an Array
     end
 
-    it 'exposes the wether to collapse padding or not' do
+    it 'exposes wether to collapse padding or not' do
       expect(config.collapse_padding).to be_falsy
     end
 
@@ -69,6 +69,10 @@ RSpec.describe SliceRename::Config do
       expect(config.padding_color).to be_a String
     end
 
+    it 'exposes wether to draw padding around empty images' do
+      expect(config.full_grid).to be_truthy
+    end
+
     it 'exposes the background color' do
       expect(config.background_color).to be_a String
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slice_rename
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Zoee Silcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies: []
 description: Slice an image and give each slice a specific name.
 email: mrzoee@gmail.com