falu 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a596b1571462637d99273b711c2489641d3f1409
-  data.tar.gz: 91424364b332d0ea3b345bf53c9406ef65c2db0f
+  metadata.gz: f08793b49c9cd82d6a486fd2903dc1041a1a2f73
+  data.tar.gz: 309a1a89a69629163ad945f854c1577dd6607d34
 SHA512:
-  metadata.gz: ed9b2293b5f5efb04d6d65597f47ea15773011138d4705dd056879c6e367fd7966ab531e996c22d3318fea9d2e5a349811ae4f2c60a78b178d935debf3304297
-  data.tar.gz: f3642a9ec4e03309a3ab1ea6e15216f3d09b7128d932c1d61deef1a7c399145480143d2ae2ea28ac3fca56aed7e2f5a8809f80e970632d0f63e9c64e8ee35aea
+  metadata.gz: b2ed04569779b47dddf8782a6bc08aba512300bb13b111abbf5ab890844d0bc906ee3b8e2db9537381a3d80d0594a04c0548b7ab4068d5e40487af9f2e203db1
+  data.tar.gz: 704decaa5d473ee1c5516a332b70d211896ec8af94396c7f9bdd7a77de207491853b4e0ad610a532ccdf99069d37be63bfa95c563bc43c68a7209090dc0ddb94

data/lib/falu/dithered_palette.rb

@@ -1,5 +1,6 @@
 module Falu
   class DitheredPalette < ImagePalette
+
     delegate :colors, to: :configuration
 
     def initialize(image, swatches=nil, **opts)
@@ -8,8 +9,31 @@ module Falu
     end
 
     def swatches
-      @swatches = image.scale(scale).dither(colors).sample(0, 0, size: size, sample: sample).map { |swatch| Falu::Swatch.new(*swatch) } if @swatches.empty?
+      if @swatches.empty?
+        @swatches = image.dither(colors, scale: (colors*10), unique: true).sample(0, 0, size: 10, sample: true).map { |swatch| Falu::Swatch.new(swatch[0], 0) }
+        image.dither(colors, scale: scale).sample(0, 0, size: size, sample: sample).each do |clr|
+          color = Falu::Color.new(clr[0])
+          exact = @swatches.index { |s| s.color.hex.to_s == color.hex.to_s }
+          unless exact.nil?
+            @swatches[exact] += clr[1]
+            next
+          end
+
+          @swatches.sort { |a,b| b.count <=> a.count }.each_with_index do |swatch, s|
+            if [:red, :green, :blue].all? { |c| (swatch.color.rgb.send(c) - color.rgb.send(c)).abs <= 10 }
+              @swatches[s] += clr[1]
+              break
+            end
+          end
+        end
+      end
       @swatches
     end
+
+    def as_json(options={})
+      super(options).merge({
+        colors: colors
+      })
+    end
   end
 end

data/lib/falu/image_palette.rb

@@ -1,5 +1,17 @@
 module Falu
   class ImagePalette < Palette
+    class << self
+      def dump(palette)
+        palette.as_json
+      end
+
+      def load(json)
+        return if json.nil?
+        json.symbolize_keys!
+        new(json.delete(:image), json.delete(:swatches), **json)
+      end
+    end
+
     delegate :sample, :scale, :size, to: :configuration
 
     def initialize(image, swatches=nil, **opts)
@@ -17,5 +29,13 @@ module Falu
       @swatches = image.scale(scale).sample(0, 0, size: size, sample: sample).map { |swatch| Falu::Swatch.new(*swatch) } if @swatches.empty?
       @swatches
     end
+
+    def as_json(options={})
+      super(options).merge({
+        sample: sample,
+        scale: scale,
+        size: size
+      })
+    end
   end
 end

data/lib/falu/version.rb

@@ -2,7 +2,7 @@ module Falu
   module Version
     MAJOR = '0'
     MINOR = '0'
-    PATCH = '2'
+    PATCH = '3'
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mark Rebec