gradient 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c90b95d6eda4af13387ef56d48ee13c135ae97dd
-  data.tar.gz: ce7e64d799a4587190a79d3934f023aa4c8908c5
+  metadata.gz: b8a4cda55417c291a922c291959867947aa8b93a
+  data.tar.gz: a5a1564b1ae76f25ebb4eed1f804123fa9cf6102
 SHA512:
-  metadata.gz: 8169e8ba9be408feb1007d7bbfc0f7627613f3632091df5635b1aa126036813c28c35a26d764c1304315579dbc45bd8c4e579a814b6bcac390498fa7b5642cbc
-  data.tar.gz: ebc81c832dc63be8435c7fad298e1f1ad41f467c762e25e86ae9be57686681f2dbb01024c8a34c9f1dde880a35b9124080aaee0ae0e058898b98961d04c4cfba
+  metadata.gz: edf334904f263f9bfd9274d5f4cec5712c309c5b9a41e0032b982eee016edb76292da173dd2fb6cecedca30dd1ca963669b6c396e34d61d7ce0aa8742424980a
+  data.tar.gz: 68cc22eacc507b58b6d40bbc4bfca6919f328e53a0dfa06ced5f378e3dd0a576566e0e7034e6114369b5fbbd9c950ecbff8990d04daac8f586122b7ed3024a57

data/lib/gradient/grd.rb

@@ -115,13 +115,13 @@ module Gradient
 
     private def convert_to_color(color_data)
       case format = color_data["palette"]
-      when "CMYC" then Color::CMYK.from_percent(*color_data.values_at("Cyn", "Mgnt", "Ylw", "Blck").map(&:round))
+      when "CMYC" then Color::CMYK.from_percent(*color_data.values_at("Cyn", "Mgnt", "Ylw", "Blck").map(&:round)).to_rgb
       when "RGBC" then Color::RGB.new(*color_data.values_at("Rd", "Grn", "Bl").map(&:round))
       when "HSBC"
         h = color_data.fetch("H")
         s = color_data.fetch("Strt") / 100.0
         l = color_data.fetch("Brgh") / 100.0
-        Color::HSL.from_fraction(h, s, l)
+        Color::HSL.from_fraction(h, s, l).to_rgb
       else
         raise NotImplementedError.new("The color #{format} is not supported")
       end

data/lib/gradient/map.rb

@@ -10,7 +10,7 @@ module Gradient
       @opacity_points = sort_points(Array(opacity_points))
       @all_points = sort_points(@color_points + @opacity_points)
       @locations = @all_points.map { |point| point.location }.uniq
-      @points ||= expand_points
+      @points ||= merge_color_and_opacity_points
     end
 
     def inspect
@@ -22,43 +22,37 @@ module Gradient
       @css_printer.css(**args)
     end
 
-    private def expand_points
-      new_points = @locations.map do |location|
+    private def merge_color_and_opacity_points
+      @locations.map do |location|
         selected_points = @all_points.select { |point| point.location == location }
-        colored_points, opacity_points = selected_points.group_by(&:class).values_at(ColorPoint, OpacityPoint)
-        if colored_points && opacity_points
-          Gradient::Point.new(location, colored_points.first.color, opacity_points.first.opacity)
-        elsif colored_points
-          point = colored_points.first
-          a, b = previous_and_next_in(@opacity_points, point)
+        colored, opaque = selected_points.group_by(&:class).values_at(ColorPoint, OpacityPoint)
+        rgba = if colored && opaque
+          [colored.first.color, opaque.first.opacity]
+        elsif colored
+          point = colored.first
+          a, b = adjacent_points(@opacity_points, point)
           fraction = location_fraction(a, b, point)
-          opacity = opacity_difference(fraction, a, b)
-          Gradient::Point.new(location, point.color, opacity)
-        elsif opacity_points
-          point = opacity_points.first
-          a, b = previous_and_next_in(@color_points, point)
+          [point.color, opacity_difference(fraction, a, b)]
+        elsif opaque
+          point = opaque.first
+          a, b = adjacent_points(@color_points, point)
           fraction = location_fraction(a, b, point)
-          color = color_difference(fraction, a, b)
-          Gradient::Point.new(location, color, point.opacity)
+          [color_difference(fraction, a, b), point.opacity]
         end
+
+        Gradient::Point.new(location, *rgba)
       end
     end
 
-    private def previous_and_next_in(bucket, point)
-      groups = bucket.group_by { |p| point_group(p, point) }
+    private def adjacent_points(bucket, point)
+      groups = bucket.group_by { |p| triage_point(p, point) }
       a = groups.fetch(:same) { groups.fetch(:less) { groups.fetch(:more) } }.max { |p| p.location }
       b = groups.fetch(:same) { groups.fetch(:more) { groups.fetch(:less) } }.min { |p| p.location }
       return a, b
     end
 
-    private def point_group(a, b)
-      if a.location < b.location
-        :less
-      elsif a.location > b.location
-        :more
-      else
-        :same
-      end
+    private def triage_point(a, b)
+      a.location < b.location ? :less : (a.location > b.location ? :more : :same)
     end
 
     private def color_difference(fraction, a, b)

data/lib/gradient/version.rb

@@ -1,3 +1,3 @@
 module Gradient
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gradient
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Philip Vieira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: color