slice_rename 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9ccdfae67abd4149444be16e8d5ab35f8c34ff2
-  data.tar.gz: 09649ed5652c83d1b4554bc39565574daae3d2eb
+  metadata.gz: 7a30f22e2c72925fe806e794b4da03e2ce8ee51b
+  data.tar.gz: 11a40905eddc45d4cc4e3a6cf3f5917c3a92ca7f
 SHA512:
-  metadata.gz: 0e62eda7b7534ac40c6ec42099c947c262fa299730eb78b4dd294de4f85ea7f6bedd2c5f39c7065c8537ff2507c5aaea5fae0faded4ab5f74fd7fe8c18a2a8bf
-  data.tar.gz: 1bdafecf17d09c8a739fab7d9aeff36bd6e3b73fe203483305771f521d5ec8d863bb16bfe194c88778f5d53be172330bae6fb6857ed7ddfcf7e4d9199c9e8ede
+  metadata.gz: a787e7d28d6acf3261455194ce80bc1db732feef67babec7d9e0f31c6c4baa13c1f4371bf20abe8623e25980490c7ebcc115b68a6643b4fc71aed382076fdace
+  data.tar.gz: dbee5b26778837f1a34cb83731eea93313b5980b2fbba6bcf92d44025e2e43e536a0f18d1ac64bd4848fc9732d09d59144a4d8f3b4c3d2a26e96d6bce64f341f

data/Gemfile.lock

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

data/README.md

@@ -9,6 +9,7 @@ which aren't useful for anything.
 
 ```
 -c, --config MANDATORY  Configuration file (see below)
+-k, --combine           Combine all slices to one image
 -d, --debug             Output debug info
 -v, --version           Display the version
 -h, --help              Display this message
@@ -19,6 +20,17 @@ See the example which is located at `spec/fixtures/config_example.yml`. The
 suffixes aren't mandatory, if you skip them or don't provide enough it will use
 an auto generated suffix instead (`_00`).
 
+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.
+
+Images created by slice_rename do not collapse the padding so
+`collapse_padding` defaults to `false`. If you need the old behaviour simply
+set it to `true` in your config file.
+
 The sample image is part of a duty free asset pack from
 [kenney.nl](http://kenney.nl/).
 

data/Rakefile

@@ -24,4 +24,12 @@ namespace :run do
   task :missing do
     ruby '-I ./lib bin/slice_rename'
   end
+
+  task :combine do
+    ruby '-I ./lib bin/slice_rename --combine --debug spec/fixtures/animals.png -c spec/fixtures/config_example.yml'
+  end
+
+  task :char do
+    ruby '-I ./lib bin/slice_rename spec/fixtures/char4/char4.png -d -c spec/fixtures/config_new.yml'
+  end
 end

data/lib/slice_rename.rb

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

data/lib/slice_rename/cli.rb

@@ -2,11 +2,13 @@ require 'optparse'
 
 require 'slice_rename/config'
 require 'slice_rename/slicer'
+require 'slice_rename/combiner'
 
 module SliceRename
   class Cli
     def self.perform
       config = SliceRename::Config.new
+      combine = false
 
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: file [options]"
@@ -15,6 +17,10 @@ module SliceRename
           config.load v
         end
 
+        opts.on("-k", "--combine", "Combine the images instead of slicing them") do |v|
+          combine = true
+        end
+
         opts.on("-d", "--debug", "Output debug info") do |v|
           config.debug = true
         end
@@ -46,7 +52,11 @@ module SliceRename
         config.path = arguments.first
       end
 
-      SliceRename::Slicer.slice_image config
+      if combine
+        SliceRename::Combiner.combine_images config
+      else
+        SliceRename::Slicer.slice_image config
+      end
     end
   end
 end

data/lib/slice_rename/combiner.rb

@@ -0,0 +1,54 @@
+require 'mini_magick'
+
+module SliceRename
+  class Combiner
+    def self.combine_images(config)
+      extension = File.extname config.path
+      name = File.basename config.path, extension
+      path = File.dirname config.path
+
+      images = []
+      output_name = "#{path}/#{name}#{extension}"
+      geometry = "#{config.width}x#{config.height}\>+0+0"
+      border = "#{config.padding}x#{config.padding}"
+      tile = "#{config.columns}x#{config.rows}"
+
+      config.suffixes.each do |suffix|
+        if suffix != nil
+          images << "#{path}/#{name}#{suffix}#{extension}"
+        else
+          images << 'null:'
+        end
+      end
+
+      if config.debug
+        puts "Input: #{images.join(', ')}"
+        puts "Output: #{output_name}"
+        puts "Geometry: #{geometry}"
+      end
+
+      save_combination(images, output_name, geometry, tile, border)
+    end
+
+    private
+
+    def self.open_image(path)
+      MiniMagick::Image.open path
+    end
+
+    def self.save_combination(input_names, output_name, geometry, tile, border)
+      MiniMagick::Tool::Montage.new do |montage|
+        input_names.each do |file_name|
+          montage << file_name
+        end
+
+        montage.geometry geometry
+        montage.tile tile
+        montage.border border
+        montage.bordercolor "none"
+        montage.background "none"
+        montage << output_name
+      end
+    end
+  end
+end

data/lib/slice_rename/config.rb

@@ -3,7 +3,7 @@ require 'yaml'
 module SliceRename
   class Config
     attr_accessor :path, :debug
-    attr_reader :rows, :columns, :width, :height, :padding
+    attr_reader :rows, :columns, :width, :height, :padding, :collapse_padding
 
     def initialize
       @path = ''
@@ -14,6 +14,7 @@ module SliceRename
       @height = 16
       @padding = 0
       @suffixes = []
+      @collapse_padding = false
     end
 
     def load(config_path)
@@ -25,12 +26,13 @@ module SliceRename
       @height = config.fetch('height', @height)
       @padding = config.fetch('padding', @padding)
       @suffixes = config.fetch('suffixes', @suffixes)
+      @collapse_padding = config.fetch('collapse_padding', @collapse_padding)
     end
 
     def suffixes
       count = @rows * @columns
 
-      if @suffixes.count < count
+      if @suffixes.empty?
         @suffixes = []
 
         for i in 0..(count - 1)

data/lib/slice_rename/slicer.rb

@@ -3,7 +3,6 @@ require 'mini_magick'
 module SliceRename
   class Slicer
     def self.slice_image(config)
-
       extension = File.extname config.path
       name = File.basename config.path, extension
       path = File.dirname config.path
@@ -14,15 +13,25 @@ module SliceRename
           # Not sure why we need to reload the image each time.
           image = open_image config.path
 
-          crop = "#{config.width}x#{config.height}+#{x * config.width + (x + 1) * config.padding}+#{y * config.height + (y + 1) * config.padding}"
-          output_name = "#{path}/#{name}#{config.suffixes[i]}#{extension}"
+          unless config.suffixes[i].nil?
+            pos_x = (x * config.width) + (x * config.padding) + ((x + 1) * config.padding)
+            pos_y = (y * config.height) + (y * config.padding) + ((y + 1) * config.padding)
 
-          if config.debug
-            puts crop
-            puts output_name
-          end
+            if config.collapse_padding
+              pos_x -= (x * config.padding)
+              pos_y -= (y * config.padding)
+            end
+
+            crop = "#{config.width}x#{config.height}+#{pos_x}+#{pos_y}"
+            output_name = "#{path}/#{name}#{config.suffixes[i]}#{extension}"
 
-          save_slice image, output_name, crop
+            if config.debug
+              puts "Output: #{output_name}"
+              puts "Crop: #{crop}"
+            end
+
+            save_slice image, output_name, crop
+          end
 
           i += 1
         end

data/spec/fixtures/config_example.yml

@@ -4,6 +4,7 @@ slice_rename_config:
   width: 175
   height: 175
   padding: 2
+  collapse_padding: true
   suffixes:
     - _elephant
     - _giraffe

data/spec/slice_rename/combiner_spec.rb

@@ -0,0 +1,36 @@
+require 'slice_rename/combiner'
+
+RSpec.describe SliceRename::Combiner do
+  let(:config) { SliceRename::Config.new }
+  let(:suffixes) {
+    [
+      'apples',
+      'oranges',
+      'pears',
+      'bananas'
+    ]
+  }
+
+  before do
+    config.instance_variable_set :@path, 'fruits.png'
+    config.instance_variable_set :@rows, 2
+    config.instance_variable_set :@columns, 2
+    config.instance_variable_set :@suffixes, suffixes
+  end
+
+  describe '.combine_images' do
+    it 'combines the images and saves them as a single image' do
+      expect(SliceRename::Combiner).to(
+        receive(:save_combination).exactly(1).times do |input_names, output_name, geometry, tile, border|
+          input_names.each_with_index do |name, index|
+            expect(name).to include suffixes[index]
+          end
+
+          expect(output_name).to include config.path
+        end
+      )
+
+      SliceRename::Combiner.combine_images config
+    end
+  end
+end

data/spec/slice_rename/slicer_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe SliceRename::Slicer do
       'potatoes',
       'carrots',
       'onions',
-      'selery'
+      'celery'
     ]
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slice_rename
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Zoee Silcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies: []
 description: Slice an image and give each slice a specific name.
 email: mrzoee@gmail.com
@@ -30,11 +30,13 @@ files:
 - bin/slice_rename
 - lib/slice_rename.rb
 - lib/slice_rename/cli.rb
+- lib/slice_rename/combiner.rb
 - lib/slice_rename/config.rb
 - lib/slice_rename/slicer.rb
 - slice_rename.gemspec
 - spec/fixtures/animals.png
 - spec/fixtures/config_example.yml
+- spec/slice_rename/combiner_spec.rb
 - spec/slice_rename/config_spec.rb
 - spec/slice_rename/sanity_spec.rb
 - spec/slice_rename/slicer_spec.rb