shattered_machine 0.0.6 → 0.1.0

data/lib/shattered_machine.rb

@@ -3,11 +3,12 @@
 require 'shattered_machine/converter'
 require 'shattered_machine/glitcher'
 require 'shattered_machine/io'
+require 'shattered_machine/progressive_pixel_sorter'
 require 'shattered_machine/sampler'
 
 # main file for ShatteredMachine gem
 module ShatteredMachine
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 
   class << self
   end

data/lib/shattered_machine/glitcher.rb

@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'brush'
+require_relative 'change_byte'
+require_relative 'defect'
+require_relative 'exchange'
+require_relative 'pixel_sorter'
+require_relative 'slim'
+require_relative 'transpose'
+require_relative 'wrong_filter'
 module ShatteredMachine
   # Main class to call from glitching image.
   class Glitcher

data/lib/shattered_machine/io.rb

@@ -6,10 +6,6 @@ module ShatteredMachine
   class Io
     attr_accessor :output_filename
 
-    PNG_EXTENSIONS = ['.png', '.PNG'].freeze
-    JPG_EXTENSIONS = ['.jpg', '.jpeg', '.JPG', '.JPEG'].freeze
-    Paths = Struct.new(:input, :output)
-
     # @param input_path [string] input file or directory
     # @param output_folder [string] output directory
     # @param output_filename [string] output file name
@@ -39,6 +35,10 @@ module ShatteredMachine
 
     private
 
+    PNG_EXTENSIONS = ['.png', '.PNG'].freeze
+    JPG_EXTENSIONS = ['.jpg', '.jpeg', '.JPG', '.JPEG'].freeze
+    Paths = Struct.new(:input, :output)
+
     def single_image_io
       [Paths.new(@input_path, generate_output_filename)]
     end

data/lib/shattered_machine/pixel_sorter.rb

@@ -43,7 +43,7 @@ module ShatteredMachine
     end
 
     def rust_formatted_sorting_by
-      ruby_to_rust_sorting_by = { hue: '0', staturation: '1' }
+      ruby_to_rust_sorting_by = { hue: '0', saturation: '1' }
       ruby_to_rust_sorting_by[@sorting_by]
     end
   end

data/lib/shattered_machine/progressive_pixel_sorter.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative 'pixel_sorter'
+module ShatteredMachine
+  # Call the pixel sorter multiple time in steps for given png image(s)
+  class ProgressivePixelSorter
+    # @param io [ShatteredMachine::Io] Io containing paths for images to glitch
+    # @param options [Hash] options for the pixel sorting algorithm
+    def initialize(io, options)
+      @io = io
+      @options = options
+      @images_count = @io.png_images.count
+      @steps = define_steps
+    end
+
+    def call
+      @io.png_images.sort_by { |path| [path.input[/\d+/].to_i, path.input] }.each_with_index do |item, index|
+        PixelSorter.new(sorter_options(index)).call(item.input, item.output)
+      end
+    end
+
+    private
+
+    def sorter_options(index)
+      return @options unless @options[:smart_sorting]
+
+      step_options = @options.clone
+      step_options[:multiple_ranges] = false
+      step_options[:detection_min] = (define_new_min_limit(index)).round.to_s
+      step_options[:detection_max] = (define_new_max_limit(index)).round.to_s
+      step_options
+    end
+
+    def define_steps
+      { min: min_step, max: max_step }
+    end
+
+    def min_step
+      positive_subtraction(@options[:detection_min].to_f, @options[:detection_min_two].to_f) / (@images_count - 1)
+    end
+
+    def max_step
+      positive_subtraction(@options[:detection_max].to_f, @options[:detection_max_two].to_f) / (@images_count - 1)
+    end
+
+    def positive_subtraction(value1, value2)
+      value1 > value2 ? value1 - value2 : value2 - value1
+    end
+
+    def define_new_min_limit(index)
+      if @options[:detection_min].to_f > @options[:detection_min_two].to_f
+        (@options[:detection_min].to_f - (index * @steps[:min]))
+      else
+        (@options[:detection_min].to_f + (index * @steps[:min]))
+      end
+    end
+
+    def define_new_max_limit(index)
+      if @options[:detection_max].to_f > @options[:detection_max_two].to_f
+        (@options[:detection_max].to_f - (index * @steps[:max]))
+      else
+        (@options[:detection_max].to_f + (index * @steps[:max]))
+      end
+    end
+  end
+end

data/lib/shattered_machine/sampler.rb

@@ -11,7 +11,7 @@ module ShatteredMachine
     # @param options [Hash] options for specifying which
     def initialize(io, options = {})
       @io = io
-      @base_output_filename = options[:base_output_filename] || 'sample'
+      @base_output_filename = io.output_filename.empty? ? 'sample' : io.output_filename
       @algorithms_to_sample = options[:algorithms_to_sample] || ALL_ALGORITHMS
     end
 
@@ -30,8 +30,7 @@ module ShatteredMachine
     private
 
     FILTERS = %w[none sub up average paeth].freeze
-    SLIM_DIRECTION = %w[up_to_down down_to_up left_to_right right_to_left].freeze
-    BRUSH_DIRECTION = %w[vertical vertical_inverted horizontal horizontal_inverted].freeze
+    DIRECTION = %w[vertical vertical_inverted horizontal horizontal_inverted].freeze
 
     def update_io(output_filename_appendix)
       @io.output_filename = "#{@base_output_filename}_#{output_filename_appendix}"
@@ -65,7 +64,7 @@ module ShatteredMachine
     def sample_slim
       return unless @algorithms_to_sample.include? 'slim'
 
-      SLIM_DIRECTION.each do |direction|
+      DIRECTION.each do |direction|
         update_io("slim_#{direction}")
         slim_options = { direction: direction.to_sym }
         Glitcher.new('Slim', @io, slim_options).call
@@ -75,7 +74,7 @@ module ShatteredMachine
     def sample_brush
       return unless @algorithms_to_sample.include? 'brush'
 
-      BRUSH_DIRECTION.each do |direction|
+      DIRECTION.each do |direction|
         update_io("brush_#{direction}")
         brush_options = { direction: direction.to_sym }
         Glitcher.new('Brush', @io, brush_options).call

data/lib/shattered_machine/slim.rb

@@ -11,7 +11,7 @@ module ShatteredMachine
     # @param options [Hash] options for slim algorithm
     def initialize(options = {})
       @colors = options[:colors] || ALL_COLORS
-      @direction = options[:direction] || :up_to_down
+      @direction = options[:direction] || :vertical_inverted
       @probability = (options[:probability] || 95).to_s
       @probability_area = options[:probability_area] || 'global'
       @colors_with_proba = colors_with_proba(options[:colors_with_proba])
@@ -38,7 +38,9 @@ module ShatteredMachine
 
     def rust_formatted_direction
       ruby_to_rust_directions = { up_to_down: '1', down_to_up: '2',
-                                  left_to_right: '3', right_to_left: '4' }
+                                  left_to_right: '3', right_to_left: '4',
+                                  vertical: '1', vertical_inverted: '2',
+                                  horizontal: '3', horizontal_inverted: '4' }
       ruby_to_rust_directions[@direction]
     end
 

data/lib/shattered_machine/transpose.rb

@@ -47,11 +47,11 @@ module ShatteredMachine
     end
 
     def half_transpose(data, qis)
-      data[0, qis] + data[qis * 2, qis] + data[qis * 1, qis] + data[qis * 3..]
+      data[0, qis] + data[qis * 2, qis] + data[qis * 1, qis] + data[qis * 3..-1]
     end
 
     def full_transpose(data, qis)
-      data[qis * 2, qis] + data[0, qis] + data[qis * 3..] + data[qis * 1, qis]
+      data[qis * 2, qis] + data[0, qis] + data[qis * 3..-1] + data[qis * 1, qis]
     end
   end
 end

data/shattered_machine.gemspec

@@ -1,17 +1,23 @@
+# frozen_string_literal: true
+
+require 'English'
+
 Gem::Specification.new do |s|
   s.name          = 'shattered_machine'
-  s.version       = '0.0.6'
+  s.version       = '0.1.0'
   s.required_ruby_version     = '>= 2.0.0'
   s.required_rubygems_version = '>= 1.8.11'
   s.summary       = 'Shattered Machine core engine'
   s.description   = 'Shattered Machine is an easy way to glitch PNG images using different algorithms'
   s.authors       = ['Flo Girardo']
   s.email         = 'florian@barbrousse.net'
-  s.files         = `git ls-files`.split($/)
+  s.files = `git ls-files`.split($RS).reject do |file|
+    file =~ %r{^spec/}
+  end
   s.test_files    = ['spec']
   s.require_paths = ['lib']
   s.homepage      =
-    'https://framagit.org/Radoteur/shattered-machine'
+    'https://git.sr.ht/~pouet/shattered_machine'
   s.license       = 'MIT'
   s.add_dependency 'rusty_engine_ffi', '>=0.0.2'
   s.add_development_dependency('rspec', '~> 3')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shattered_machine
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Flo Girardo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rusty_engine_ffi
@@ -75,6 +75,7 @@ files:
 - doc/ShatteredMachine/Io.html
 - doc/ShatteredMachine/Io/Paths.html
 - doc/ShatteredMachine/PixelSorter.html
+- doc/ShatteredMachine/ProgressivePixelSorter.html
 - doc/ShatteredMachine/Sampler.html
 - doc/ShatteredMachine/Slim.html
 - doc/ShatteredMachine/Transpose.html
@@ -92,6 +93,8 @@ files:
 - doc/js/jquery.js
 - doc/method_list.html
 - doc/top-level-namespace.html
+- icon.png
+- icon.svg
 - lib/shattered_machine.rb
 - lib/shattered_machine/brush.rb
 - lib/shattered_machine/change_byte.rb
@@ -101,31 +104,13 @@ files:
 - lib/shattered_machine/glitcher.rb
 - lib/shattered_machine/io.rb
 - lib/shattered_machine/pixel_sorter.rb
+- lib/shattered_machine/progressive_pixel_sorter.rb
 - lib/shattered_machine/sampler.rb
 - lib/shattered_machine/slim.rb
 - lib/shattered_machine/transpose.rb
 - lib/shattered_machine/wrong_filter.rb
 - shattered_machine.gemspec
-- spec/brush_spec.rb
-- spec/change_byte_spec.rb
-- spec/converter_spec.rb
-- spec/defect_spec.rb
-- spec/exchange_spec.rb
-- spec/glitcher_spec.rb
-- spec/images/bar.PNG
-- spec/images/bar.jpeg
-- spec/images/foo.jpg
-- spec/images/foo.png
-- spec/images/fuzz.JPG
-- spec/images/pouet.JPEG
-- spec/io_spec.rb
-- spec/pixel_sorter_spec.rb
-- spec/sampler_spec.rb
-- spec/slim_spec.rb
-- spec/spec_helper.rb
-- spec/transpose_spec.rb
-- spec/wrong_filter_spec.rb
-homepage: https://framagit.org/Radoteur/shattered-machine
+homepage: https://git.sr.ht/~pouet/shattered_machine
 licenses:
 - MIT
 metadata: {}

data/spec/brush_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ShatteredMachine::Brush do
-  describe '#call' do
-    let(:output_file) { 'spec/images/brush.png' }
-    let(:input_file) { 'spec/images/foo.png' }
-    let(:io) do
-      ShatteredMachine::Io.new(input_file, 'spec/images', 'brush')
-    end
-    let(:in_img) { io.png_images.first.input }
-    let(:out_img) { io.png_images.first.output }
-    subject { ShatteredMachine::Brush.new.call(in_img, out_img) }
-
-    after do
-      File.delete(output_file) if File.exist?(output_file)
-    end
-
-    it 'brush image' do
-      subject
-      expect(File.exist?(output_file)).to be true
-    end
-  end
-end

data/spec/change_byte_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ShatteredMachine::ChangeByte do
-  describe '#call' do
-    let(:output_file) { 'spec/images/change_byte.png' }
-    let(:input_file) { 'spec/images/foo.png' }
-    let(:io) do
-      ShatteredMachine::Io.new(input_file, 'spec/images', 'change_byte')
-    end
-    let(:in_img) { io.png_images.first.input }
-    let(:out_img) { io.png_images.first.output }
-    subject { ShatteredMachine::ChangeByte.new.call(in_img, out_img) }
-
-    after do
-      File.delete(output_file) if File.exist?(output_file)
-    end
-
-    it 'change byte on image' do
-      subject
-      expect(File.exist?(output_file)).to be true
-    end
-  end
-end

data/spec/converter_spec.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ShatteredMachine::Converter do
-  describe '#call' do
-    let(:converted_file) { 'spec/images/converted.png' }
-    let(:input_file) { 'spec/images/foo.jpg' }
-    let(:io) do
-      ShatteredMachine::Io.new(input_file, 'spec/images', 'converted')
-    end
-    subject { ShatteredMachine::Converter.new(io).call }
-
-    after do
-      File.delete(converted_file) if File.exist?(converted_file)
-    end
-
-    it 'convert image' do
-      subject
-      expect(File.exist?(converted_file)).to be true
-    end
-  end
-end

data/spec/defect_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ShatteredMachine::Defect do
-  describe '#call' do
-    let(:output_file) { 'spec/images/defect.png' }
-    let(:input_file) { 'spec/images/foo.png' }
-    let(:io) do
-      ShatteredMachine::Io.new(input_file, 'spec/images', 'defect')
-    end
-    let(:in_img) { io.png_images.first.input }
-    let(:out_img) { io.png_images.first.output }
-    subject { ShatteredMachine::Defect.new.call(in_img, out_img) }
-
-    after do
-      File.delete(output_file) if File.exist?(output_file)
-    end
-
-    it 'defect image' do
-      subject
-      expect(File.exist?(output_file)).to be true
-    end
-  end
-end

data/spec/exchange_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ShatteredMachine::Exchange do
-  describe '#call' do
-    let(:output_file) { 'spec/images/exchange.png' }
-    let(:input_file) { 'spec/images/foo.png' }
-    let(:io) do
-      ShatteredMachine::Io.new(input_file, 'spec/images', 'exchange')
-    end
-    let(:in_img) { io.png_images.first.input }
-    let(:out_img) { io.png_images.first.output }
-    subject { ShatteredMachine::Exchange.new.call(in_img, out_img) }
-
-    after do
-      File.delete(output_file) if File.exist?(output_file)
-    end
-
-    it 'exchange image' do
-      subject
-      expect(File.exist?(output_file)).to be true
-    end
-  end
-end

data/spec/glitcher_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ShatteredMachine::Glitcher do
-  describe '#call' do
-    let(:output_file) { 'spec/images/glitch.png' }
-    let(:input_file) { 'spec/images/foo.png' }
-    let(:io) do
-      ShatteredMachine::Io.new(input_file, 'spec/images', 'glitch')
-    end
-    subject do
-      ShatteredMachine::Glitcher.new('Slim', io).call
-    end
-
-    after do
-      File.delete(output_file) if File.exist?(output_file)
-    end
-
-    it 'slim image' do
-      subject
-      expect(File.exist?(output_file)).to be true
-    end
-  end
-end