falu 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f08793b49c9cd82d6a486fd2903dc1041a1a2f73
-  data.tar.gz: 309a1a89a69629163ad945f854c1577dd6607d34
+  metadata.gz: a4df7374b394281ccf58ca3834914be2341b12e6
+  data.tar.gz: ae16e01cf378501cd2d36bb7092b6abcb798e27c
 SHA512:
-  metadata.gz: b2ed04569779b47dddf8782a6bc08aba512300bb13b111abbf5ab890844d0bc906ee3b8e2db9537381a3d80d0594a04c0548b7ab4068d5e40487af9f2e203db1
-  data.tar.gz: 704decaa5d473ee1c5516a332b70d211896ec8af94396c7f9bdd7a77de207491853b4e0ad610a532ccdf99069d37be63bfa95c563bc43c68a7209090dc0ddb94
+  metadata.gz: feaf26e05189fd0db64511826450a55dbf55f8ad4bc69de20e483e332a3e495d1226bf7ab91fa37c606ccd835b873f379e1111cef3c733b303dacd6c59c86094
+  data.tar.gz: 4191f7a9fbe5650d25e4ef193e79bccbe9b584306b9c5c315a9316c2f7930e24152dd27cb381d0675a861041a42a32ff4178fb0057ba91c0487338423b50fa30

data/lib/falu.rb

@@ -1,5 +1,6 @@
 require 'canfig'
 require 'active_support/core_ext/module'
+require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/object/json'
 require 'mini_magick'
 require 'falu/image'

data/lib/falu/palette.rb

@@ -114,7 +114,7 @@ module Falu
     end
 
     def primary
-      @primary ||= dominant
+      @primary ||= dominant#(3).sort_by { |swtch| swtch.color.rgb.colors.sum }.first
     end
 
     def secondary=(sec)
@@ -123,7 +123,9 @@ module Falu
     end
 
     def secondary
-      @secondary ||= dominant(2).last
+      @secondary ||= begin
+        dominant(3).last(2).sort_by { |swtch| (swtch.color.rgb.colors.sum - primary.color.rgb.colors.sum).abs }.last
+      end
     end
 
     def accent=(acc)
@@ -132,7 +134,7 @@ module Falu
     end
 
     def accent
-      @accent ||= dominant(3).last
+      @accent ||= dominant(3).find { |swtch| ![primary.color.to_s, secondary.color.to_s].include?(swtch.color.to_s) }
     end
 
     def as_json(options={})

data/lib/falu/version.rb

@@ -2,7 +2,7 @@ module Falu
   module Version
     MAJOR = '0'
     MINOR = '0'
-    PATCH = '3'
+    PATCH = '4'
     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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mark Rebec