gradient 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c198e094a820d5824d667fc1c32ab3c6e5521d4
-  data.tar.gz: 7e7571355ef7e64e10ffa6ff6b0fab6440fde133
+  metadata.gz: 89ea4e065588742732ec1adee2b95bbee71e80e6
+  data.tar.gz: 64aff1fdd843d4aae818c65b44ccfe88cc0d4f06
 SHA512:
-  metadata.gz: eb0e346f524916b6110a60b143f49b53654eda7b7e8b10e5272c937096daa44df2c6ad4d3192204a8b8145a837a162e3ae941bf5b90b97cc1d32940e8078d003
-  data.tar.gz: a06de11eafc91cfa4f7d2ba0261dcbbc66a95e1c3aa3c6b4c917ae81be2697ee730b6044ced303037fd17e529c682bb6f94b79f2382ba2544fb3b26fb1a81f79
+  metadata.gz: 529165c3d1ae1890d664b593cf2a830ef05c01465e7f6a3831aaa35400ef34eb1855047d2cb719e541c93c6f1e820f41d7514d12ffae9c46ce1962a2b2b68891
+  data.tar.gz: 652bf1bf09cb2d368370dda36be71286e4400222419d74579823da7b579539c1469bbed2580d65576325e86d4d00d8914b86dcb32bf6a953ac9b42e060e199e6

data/README.md

@@ -2,26 +2,17 @@
 Library for dealing with color gradients in ruby
 
 ## Usage
-Gradient works by placing points along two one dimensional planes.
-One for color and one for opacity.
-Start by creating a few points and use them to create a gradient map.
+Gradient works by placing point vectors along a one dimensional plane.
+Start by creating a few points and pass them to a gradient map.
 
 ```ruby
-color_points = [
-  Gradient::ColorPoint.new(0, Color::RGB.new(30, 87, 153)),
-  Gradient::ColorPoint.new(0.49, Color::RGB.new(41, 137, 216)),
-  Gradient::ColorPoint.new(0.51, Color::RGB.new(32, 124, 202)),
-  Gradient::ColorPoint.new(1, Color::RGB.new(125, 185, 232)),
-]
-
-opacity_points = [
-  Gradient::OpacityPoint.new(0, 1),
-  Gradient::OpacityPoint.new(0.5, 0),
-  Gradient::OpacityPoint.new(1, 1)
-]
-
-gradient = Gradient::Map.new(color_points, opacity_points)
-# => #<Gradient Map #<Point 0 #1e5799ff> #<Point 49.0 #2989d805> #<Point 50.0 #2583d100> #<Point 51.0 #207cca05> #<Point 100 #7db9e8ff>>
+gradient = Gradient::Map.new(
+  Gradient::Point.new(0, Color::RGB.new(32, 36, 196), 1.0),
+  Gradient::Point.new(0.49, Color::RGB.new(14, 250, 211), 0.1),
+  Gradient::Point.new(0.50, Color::RGB.new(171, 25, 12), 0.7),
+  Gradient::Point.new(1, Color::RGB.new(15, 212, 162), 0.3)
+)
+# => #<Gradient Map #<Point 0 #2024c4ff> #<Point 49.0 #0efad31a> #<Point 50.0 #ab190cb3> #<Point 100 #0fd4a24d>>
 ```
 
 ### Convert to CSS
@@ -60,6 +51,29 @@ Gradient::GRD.read("./kiwi.grd")
 # }
 ```
 
+### Separate point vectors for opacity and color
+You're able to control the point vectors for color and opacity separately by using a point merger.
+
+```ruby
+color_points = [
+  Gradient::ColorPoint.new(0, Color::RGB.new(30, 87, 153)),
+  Gradient::ColorPoint.new(0.49, Color::RGB.new(41, 137, 216)),
+  Gradient::ColorPoint.new(0.51, Color::RGB.new(32, 124, 202)),
+  Gradient::ColorPoint.new(1, Color::RGB.new(125, 185, 232)),
+]
+
+opacity_points = [
+  Gradient::OpacityPoint.new(0, 1),
+  Gradient::OpacityPoint.new(0.5, 0),
+  Gradient::OpacityPoint.new(1, 1)
+]
+
+points = Gradient::PointMerger.new(color_points, opacity_points).call
+
+gradient = Gradient::Map.new(points)
+# => #<Gradient Map #<Point 0 #1e5799ff> #<Point 49.0 #2989d805> #<Point 50.0 #2583d100> #<Point 51.0 #207cca05> #<Point 100 #7db9e8ff>>
+```
+
 ## Installation
 Add this line to your application's Gemfile:
 

data/lib/gradient.rb

@@ -2,6 +2,7 @@ require "gradient/version"
 require "gradient/color_point"
 require "gradient/opacity_point"
 require "gradient/point"
+require "gradient/point_merger"
 require "gradient/map"
 require "gradient/grd"
 require "gradient/css_printer"

data/lib/gradient/color_point.rb

@@ -4,5 +4,8 @@ module Gradient
     def initialize(location, color)
       @color, @location = color, location
     end
+    def <=>(other)
+      self.location <=> other.location
+    end
   end
 end

data/lib/gradient/grd.rb

@@ -75,7 +75,7 @@ module Gradient
       end
 
       gradients = color_gradients.zip(transparency_gradients).map do |color_points|
-        Gradient::Map.new(*color_points)
+        Gradient::Map.new(Gradient::PointMerger.new(*color_points).call)
       end
 
       @maps = Hash[ @gradient_names.zip(gradients) ]

data/lib/gradient/map.rb

@@ -1,16 +1,11 @@
 module Gradient
   class Map
 
-    attr_reader :color_points, :opacity_points, :points
+    attr_reader :points, :locations
 
-    def initialize(color_points=[], opacity_points=[])
-      color_points << Gradient::ColorPoint.new(0, Color::RGB.new(255, 255, 255)) if color_points.empty?
-      opacity_points << Gradient::OpacityPoint.new(0, 1) if opacity_points.empty?
-      @color_points = sort_points(Array(color_points))
-      @opacity_points = sort_points(Array(opacity_points))
-      @all_points = sort_points(@color_points + @opacity_points)
-      @locations = @all_points.map { |point| point.location }.uniq
-      @points ||= merge_color_and_opacity_points
+    def initialize(*points)
+      @points = points.flatten.sort
+      @locations = @points.map { |point| point.location }
     end
 
     def inspect
@@ -22,58 +17,5 @@ module Gradient
       @css_printer.css(**args)
     end
 
-    private def merge_color_and_opacity_points
-      @locations.map do |location|
-        selected_points = @all_points.select { |point| point.location == location }
-        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)
-          [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_difference(fraction, a, b), point.opacity]
-        end
-
-        Gradient::Point.new(location, *rgba)
-      end
-    end
-
-    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 triage_point(a, b)
-      a.location < b.location ? :less : (a.location > b.location ? :more : :same)
-    end
-
-    private def color_difference(fraction, a, b)
-      red = a.color.red + fraction * (b.color.red - a.color.red)
-      green = a.color.green + fraction * (b.color.green - a.color.green)
-      blue = a.color.blue + fraction * (b.color.blue - a.color.blue)
-      Color::RGB.new(red, green, blue)
-    end
-
-    private def opacity_difference(fraction, a, b)
-      a.opacity + fraction * (b.opacity - a.opacity)
-    end
-
-    private def location_fraction(a, b, x)
-      return 0 if a.location == b.location
-      (x.location - a.location) / (b.location - a.location)
-    end
-
-    private def sort_points(points)
-      points.sort { |a, b| a.location <=> b.location }
-    end
-
   end
 end

data/lib/gradient/opacity_point.rb

@@ -4,5 +4,8 @@ module Gradient
     def initialize(location, opacity)
       @location, @opacity = location, opacity
     end
+    def <=>(other)
+      self.location <=> other.location
+    end
   end
 end

data/lib/gradient/point.rb

@@ -11,5 +11,9 @@ module Gradient
       "#<Point #{location * 100} ##{color.hex}#{"%02x" % (opacity * 255).round}>"
     end
 
+    def <=>(other)
+      self.location <=> other.location
+    end
+
   end
 end

data/lib/gradient/point_merger.rb

@@ -0,0 +1,70 @@
+module Gradient
+  class PointMerger
+
+    attr_accessor :color_points, :opacity_points
+
+    def initialize(color_points=[], opacity_points=[])
+      color_points << Gradient::ColorPoint.new(0, Color::RGB.new(255, 255, 255)) if color_points.empty?
+      opacity_points << Gradient::OpacityPoint.new(0, 1) if opacity_points.empty?
+
+      @color_points = sort_points(Array(color_points))
+      @opacity_points = sort_points(Array(opacity_points))
+      @all_points = sort_points(@color_points + @opacity_points)
+      @locations = @all_points.map { |point| point.location }.uniq
+    end
+
+    def call
+      @locations.map do |location|
+        selected_points = @all_points.select { |point| point.location == location }
+        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)
+          [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_difference(fraction, a, b), point.opacity]
+        end
+
+        Gradient::Point.new(location, *rgba)
+      end
+    end
+
+    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 triage_point(a, b)
+      a.location < b.location ? :less : (a.location > b.location ? :more : :same)
+    end
+
+    private def color_difference(fraction, a, b)
+      red = a.color.red + fraction * (b.color.red - a.color.red)
+      green = a.color.green + fraction * (b.color.green - a.color.green)
+      blue = a.color.blue + fraction * (b.color.blue - a.color.blue)
+      Color::RGB.new(red, green, blue)
+    end
+
+    private def opacity_difference(fraction, a, b)
+      a.opacity + fraction * (b.opacity - a.opacity)
+    end
+
+    private def location_fraction(a, b, x)
+      return 0 if a.location == b.location
+      (x.location - a.location) / (b.location - a.location)
+    end
+
+    private def sort_points(points)
+      points.sort { |a, b| a.location <=> b.location }
+    end
+
+  end
+end

data/lib/gradient/version.rb

@@ -1,3 +1,3 @@
 module Gradient
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gradient
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Philip Vieira
@@ -118,6 +118,7 @@ files:
 - lib/gradient/map.rb
 - lib/gradient/opacity_point.rb
 - lib/gradient/point.rb
+- lib/gradient/point_merger.rb
 - lib/gradient/version.rb
 homepage: https://github.com/zeeraw/gradient
 licenses: