falu 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4df7374b394281ccf58ca3834914be2341b12e6
-  data.tar.gz: ae16e01cf378501cd2d36bb7092b6abcb798e27c
+  metadata.gz: 45629076a1ecd71f5f580fe62e6f503e3bbdad71
+  data.tar.gz: 470d8543f3627d8698f5254da48e542275914cab
 SHA512:
-  metadata.gz: feaf26e05189fd0db64511826450a55dbf55f8ad4bc69de20e483e332a3e495d1226bf7ab91fa37c606ccd835b873f379e1111cef3c733b303dacd6c59c86094
-  data.tar.gz: 4191f7a9fbe5650d25e4ef193e79bccbe9b584306b9c5c315a9316c2f7930e24152dd27cb381d0675a861041a42a32ff4178fb0057ba91c0487338423b50fa30
+  metadata.gz: 8fcae3ff34fb7e624d1a3b906e6a99be7ebb4e3dc6f8ac2ed2f4a7b51f421988625c78600865896bda94af25a7513641a5b94cb88c34633a52d30c78c23c5702
+  data.tar.gz: 3fa2eb9f1aa7e4499f9a1073777d16fade254d2d21082514a9411058a7b24a4caea3bfd3abe44de4318b6771169a366d47f36d5825acfc9857240bc40994e83b

data/lib/falu/palette.rb

@@ -110,7 +110,11 @@ module Falu
 
     def primary=(pri)
       # TODO check that the color exists in the palette
-      @primary = pri
+      if pri.nil?
+        @primary = pri
+      else
+        @primary = pri.is_a?(Falu::Swatch) ? pri : Falu::Swatch.new(*pri)
+      end
     end
 
     def primary
@@ -119,22 +123,33 @@ module Falu
 
     def secondary=(sec)
       # TODO check that the color exists in the palette
-      @secondary = sec
+      if sec.nil?
+        @secondary = sec
+      else
+        @secondary = sec.is_a?(Falu::Swatch) ? sec : Falu::Swatch.new(*sec)
+      end
     end
 
     def secondary
       @secondary ||= begin
-        dominant(3).last(2).sort_by { |swtch| (swtch.color.rgb.colors.sum - primary.color.rgb.colors.sum).abs }.last
+        dominant(3).sort_by { |swtch| (swtch.color.hsl.lightness - primary.color.hsl.lightness).abs }.last
       end
     end
 
     def accent=(acc)
       # TODO check that the color exists in the palette
-      @accent = acc
+      if acc.nil?
+        @accent = acc
+      else
+        @accent = acc.is_a?(Falu::Swatch) ? acc : Falu::Swatch.new(*acc)
+      end
     end
 
     def accent
-      @accent ||= dominant(3).find { |swtch| ![primary.color.to_s, secondary.color.to_s].include?(swtch.color.to_s) }
+      @accent ||= begin
+        #dominant(5).select { |swtch| ![primary.color.to_s, secondary.color.to_s].include?(swtch.color.to_s) }.sort_by { |swtch| (swtch.color.hsl.lightness - primary.color.hsl.lightness).abs + (swtch.color.hsl.lightness - secondary.color.hsl.lightness).abs }.last
+        dominant(3).find { |swtch| ![primary.color.to_s, secondary.color.to_s].include?(swtch.color.to_s) }
+      end
     end
 
     def as_json(options={})

data/lib/falu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canfig