pxlsrt 1.6 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eddc063a560a8420871b095ee6e56c96d1b3b66b
-  data.tar.gz: dcfb8606b9c47d43402e6030a80d274b83d3a4e0
+  metadata.gz: 6ef9f339272ae1b0a3e64f18977fbff964134b27
+  data.tar.gz: 7b2b1da4aed79741292035875de61a5021e914be
 SHA512:
-  metadata.gz: e4b768476d0bda214468c888b1357396d4c62bc5d60aa45546c8d283f73b1957a3e11112589ae689c6a67a2ec0ca37609b94c55b77d70f118949894fb976655c
-  data.tar.gz: 9afbf4b2e3515a51d95143d7d30e031788f7de39ade4870e98f17938b4026b5c9a687a840c493c58641669db04b7ff6dad3b0f045ed5f07fbe3baf513b593111
+  metadata.gz: 806ffa517135b62506f57c4f25f000c6850318474241090da870e9778ac112da2216ec31f131bcc2b766a9313f73add3523c409889f04903cbaac58382945a6c
+  data.tar.gz: e50c87887ec75c396874dedb234521b6eeff6e3440ffb44f4a243ebbbaddd116e7eb0e58f6f4f61c8dd55d16c99c9d9bf5284b582d028c7375af65b8e7f974ad

data/bin/pxlsrt

@@ -14,7 +14,7 @@ require 'thor'
 # * verbose - Have pxlsrt tell you what it's working on.
 # * help - More in depth commands.
 class CLI < Thor
-	class_option :reverse, :type => :string, :default => "no", :banner => "[no | reverse | either]", :aliases => "-r", :enum => ["no", "reverse", "either"]
+	class_option :reverse, :default => false, :aliases => "-r"
 	class_option :vertical, :type => :boolean, :default => false, :aliases => "-v"
 	class_option :diagonal, :type => :boolean, :default => false, :aliases => "-d"
 	class_option :smooth, :type => :boolean, :default => false, :aliases => "-s"

data/lib/pxlsrt/brute.rb

@@ -19,7 +19,7 @@ module Pxlsrt
 		def self.brute(input, o={})
 			startTime=Time.now
 			defOptions={
-				:reverse => "no",
+				:reverse => false,
 				:vertical => false,
 				:diagonal => false,
 				:smooth => false,
@@ -31,7 +31,7 @@ module Pxlsrt
 				:middle => false
 			}
 			defRules={
-				:reverse => ["no", "reverse", "either"],
+				:reverse => :anything,
 				:vertical => [false, true],
 				:diagonal => [false, true],
 				:smooth => [false, true],

data/lib/pxlsrt/colors.rb

@@ -52,18 +52,19 @@ module Pxlsrt
 			if ca.length==1
 				return ca.first
 			end
+			Pxlsrt::Helpers.verbose(ca) if ca.length == 0
 			if !chunky
 				r=((ca.collect { |c| c[0] }).inject{ |sum, el| sum+el }).to_f / ca.size
 				g=((ca.collect { |c| c[1] }).inject{ |sum, el| sum+el }).to_f / ca.size
 				b=((ca.collect { |c| c[2] }).inject{ |sum, el| sum+el }).to_f / ca.size
 				a=((ca.collect { |c| c[3] }).inject{ |sum, el| sum+el }).to_f / ca.size
-				return [r,g,b,a]
+				return [r.to_i, g.to_i, b.to_i, a.to_i]
 			else
 				r=((ca.collect { |c| ChunkyPNG::Color.r(c) }).inject{ |sum, el| sum+el }).to_f / ca.size
 				g=((ca.collect { |c| ChunkyPNG::Color.g(c) }).inject{ |sum, el| sum+el }).to_f / ca.size
 				b=((ca.collect { |c| ChunkyPNG::Color.b(c) }).inject{ |sum, el| sum+el }).to_f / ca.size
 				a=((ca.collect { |c| ChunkyPNG::Color.a(c) }).inject{ |sum, el| sum+el }).to_f / ca.size
-				return ChunkyPNG::Color.rgba(r,g,b,a)
+				return ChunkyPNG::Color.rgba(r.to_i, g.to_i, b.to_i, a.to_i)
 			end
 		end
 		##
@@ -102,6 +103,7 @@ module Pxlsrt
 		# * alpha
 		def self.pixelSort(list, how, reverse)
 			mhm=[]
+			Pxlsrt::Helpers.error(list) if list.length == 0
 			case how.downcase
 				when "sum-rgb"
 					mhm= list.sort_by { |c| ChunkyPNG::Color.r(c)+ChunkyPNG::Color.g(c)+ChunkyPNG::Color.b(c) }

data/lib/pxlsrt/helpers.rb

@@ -59,9 +59,9 @@ module Pxlsrt
 		##
 		# Pixel sorting helper to eliminate repetition.
 		def self.handlePixelSort(band, o)
-			if o[:reverse].downcase == "reverse"
+			if (o[:reverse].class == String and (o[:reverse].downcase == "reverse" or o[:reverse] == "")) or o[:reverse] == true
 				reverse = 1
-			elsif o[:reverse].downcase == "either"
+			elsif o[:reverse].class == String and o[:reverse].downcase == "either"
 				reverse = -1
 			else
 				reverse = 0

data/lib/pxlsrt/lines.rb

@@ -88,32 +88,32 @@ module Pxlsrt
 		# Because of the requirements of pxlsrt, it doesn't actually slice the array, but returns a range-like array. Example:
 		# [[0, 5], [6, 7], [8, 10]]
 		def self.randomSlices(mainLength, minLength, maxLength)
-			len=mainLength-1
-			if len!=0
-				min=[minLength, maxLength].min
-				max=[maxLength, minLength].max
-				if min > len
-					min=len
-				end
-				if max > len
-					max=len
-				end
-				nu=[[0, rand(min..max)]]
-				last=nu.first[1]
-				sorting=true
+			if mainLength <= 1
+				return [[0, 0]]
+			else
+				min = [minLength, maxLength].min
+				max = [minLength, maxLength].max
+				min = mainLength if min > mainLength
+				max = mainLength if max > mainLength
+				min = 1 if min < 1
+				max = 1 if max < 1
+				nu = [[0, rand(min..max) - 1]]
+				last = nu.last.last
+				sorting = true
+				i = 0
 				while sorting do
-					if (len-last) <= max
-						nu.push([last+1, len])
-						sorting=false
+					if (mainLength - last) <= max
+						if last + 1 <= mainLength - 1
+							nu.push([last + 1, mainLength - 1])
+						end
+						sorting = false
 					else
-						nu.push([last+1, last+1+rand(min..max)])
-						last=nu.last[1]
+						nu.push([last+1, last + rand(min..max)])
 					end
+					last = nu.last.last
 				end
-			else
-				nu=[[0,0]]
+				return nu
 			end
-			return nu
 		end
 		##
 		# Uses math to turn an array into an array of diagonals.

data/lib/pxlsrt/smart.rb

@@ -20,7 +20,7 @@ module Pxlsrt
 		def self.smart(input, o={})
 			startTime=Time.now
 			defOptions={
-				:reverse => "no",
+				:reverse => false,
 				:vertical => false,
 				:diagonal => false,
 				:smooth => false,
@@ -32,7 +32,7 @@ module Pxlsrt
 				:middle => false
 			}
 			defRules={
-				:reverse => ["no", "reverse", "either"],
+				:reverse => :anything,
 				:vertical => [false, true],
 				:diagonal => [false, true],
 				:smooth => [false, true],

data/lib/pxlsrt/version.rb

@@ -1,5 +1,5 @@
 ##
 # The main module, your best friend.
 module Pxlsrt
-  VERSION = "1.6"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pxlsrt
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: 1.6.1
 platform: ruby
 authors:
 - EVA-01
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Pixel sort PNG files.