palettetown 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebd987e257be862399b70f73fcb1cc13bdb3bbd2
-  data.tar.gz: c104fc0972568bfc59de43316bc82009ffa0ca6b
+  metadata.gz: 7d70cf361a1952993a74a5563cfd577852410a3a
+  data.tar.gz: 5c58590d55cce79f56c796c3685f768595b18704
 SHA512:
-  metadata.gz: 0be59beace5d2c8055ada9a2e796453c718af84129058716f306aaa34ef624d15282d56344498b4d7e627cb8a892b62e57f007b0f9a4fa192b87e8f400c7b990
-  data.tar.gz: 063ab5cc23866dddc2457a693b83eb6c121e5ddc28937b7860414a7a47fc6f5147a719f0f264eaa762bfa381bd2ed1bc8c47cb42a452aab2fcf5d9c9da8b0ff8
+  metadata.gz: 86c9ae9f8f737f0c36bd59996efbfc2eed048c8e0312f20f8e0fb509416c4417149840c2d57f4a5d2183656aac067604bf5c39c488481b4b088480a8485098a1
+  data.tar.gz: d878ba6111e4e00c705115434ea5b31e4d4b5c6d02738fb34dd6f67689a5749372b77521d134b4a086d83cfde597d3388b0a1344fb1aec5e67e15fe1e930cbda

data/README.md

@@ -16,16 +16,21 @@ description 'the most super kawaii theme ever'
 main_bg = "00FF00"
 
 hi :Normal, "0000FF", main_bg
-hi :LineNr, darker(hi[:Normal][:fg], 10)
+hi :LineNr, darker(hi[:Normal][:fg], 10.percent)
+hi :String, spin(hi[:Normal][:bg], 90.degrees)
 hi :Boolean, :bg => main_bg
 ```
 
 ### Helpers
- * `lighter(color, amount)` - Increases luminosity of a color by `amount`%.
- * `darker(color, amount)` - Decreases luminosity of a color by `amount`%.
- * `saturate(color, amount)` - Increases saturation of a color by `amount`%.
- * `desaturate(color, amount)` - Decreases saturation of a color by `amount`%.
- * `spin(color, amount)` - shifts the hue by `amount` degrees.
+ * `lighter(color, amount)` - Increases luminosity of a color by `amount`.
+ * `darker(color, amount)` - Decreases luminosity of a color by `amount`.
+ * `saturate(color, amount)` - Increases saturation of a color by `amount`.
+ * `desaturate(color, amount)` - Decreases saturation of a color by `amount`.
+ * `spin(color, amount)` - shifts the hue by `amount` radians.
+
+#### Monkeypatches
+ * `Fixnum#degrees` - provides a simple expression of degrees, returned in radians
+ * `Fixnum#percent` - provides a simple expression of percent, returned as a decimal
 
 ## Building a palette file
 Once you've written a palette file, you build it into a proper vim theme with 

data/lib/palettetown.rb

@@ -8,3 +8,4 @@ require "palettetown/color"
 require "palettetown/rule"
 require "palettetown/scheme"
 require "palettetown/cli"
+require "palettetown/monkeypatches"

data/lib/palettetown/color.rb

@@ -4,6 +4,8 @@ module PaletteTown
     def initialize color
       if color.is_a? String
         color = self.class.from_hex(color)
+      elsif color.is_a? Fixnum
+        color = self.class.from_hex("%06x" % color)
       elsif color.is_a? PaletteTown::Color
         color = color.to_h
       elsif color.is_a? Hash
@@ -25,9 +27,10 @@ module PaletteTown
           @lum + @sat - (@lum * @sat)
         end
         x = @lum * 2.0 - y
-        r = self.class.hue_to_rgb(x, y, @hue + 1.0/3.0)
-        g = self.class.hue_to_rgb(x, y, @hue)
-        b = self.class.hue_to_rgb(x, y, @hue - 1.0/3.0)
+        # Why are we using 2pi here?  Because we're using Radians, bitch.
+        r = self.class.hue_to_rgb(x, y, @hue * Math::PI * 2 + 1.0/3.0)
+        g = self.class.hue_to_rgb(x, y, @hue * Math::PI * 2)
+        b = self.class.hue_to_rgb(x, y, @hue * Math::PI * 2 - 1.0/3.0)
       end
       return {
         :r => (r * 255).to_i,
@@ -52,9 +55,9 @@ module PaletteTown
     private
     def self.from_hex color
       color.shift if color[0] == '#'
-      r = color[0...2].to_i 16
-      g = color[2...4].to_i 16
-      b = color[4...6].to_i 16
+      r = color[0..1].to_i 16
+      g = color[2..3].to_i 16
+      b = color[4..5].to_i 16
 
       from_rgb(r, g, b)
     end
@@ -92,6 +95,7 @@ module PaletteTown
           hue += 4
         end
         hue /= 6
+        hue *= Math::PI * 2  # Convert 0..1 into radians
       end
       return {hue: hue, sat: sat, lum: lum}
     end

data/lib/palettetown/monkeypatches.rb

@@ -0,0 +1,8 @@
+class Fixnum
+  def percent
+    return self / 100.0
+  end
+  def degrees
+    return self * (Math::PI / 180.0)
+  end
+end

data/lib/palettetown/scheme.rb

@@ -24,26 +24,26 @@ module PaletteTown
       end
       def lighter color, amount
         color = PaletteTown::Color.new color unless color.is_a? PaletteTown::Color
-        color.lum += amount / 100.0
+        color.lum *= 1.0 - amount
         color
       end
       def darker color, amount
         color = PaletteTown::Color.new color unless color.is_a? PaletteTown::Color
-        color.lum -= amount / 100.0
+        color.lum *= 1.0 - amount
         color
       end
       def saturate color, amount
         color = PaletteTown::Color.new color unless color.is_a? PaletteTown::Color
-        color.sat += amount / 100.0
+        color.sat *= 1.0 + amount
         color
       end
       def desaturate color, amount
         color = PaletteTown::Color.new color unless color.is_a? PaletteTown::Color
-        color.sat -= amount / 100.0
+        color.sat *= 1.0 - amount
       end
       def spin color, amount
         color = PaletteTown::Color.new color unless color.is_a? PaletteTown::Color
-        color.hue += amount / 360.0
+        color.hue += amount
         color
       end
       def hi *options

data/lib/palettetown/version.rb

@@ -1,3 +1,3 @@
 module Palettetown
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: palettetown
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Peter Lejeck
@@ -69,6 +69,7 @@ files:
 - lib/palettetown.rb
 - lib/palettetown/cli.rb
 - lib/palettetown/color.rb
+- lib/palettetown/monkeypatches.rb
 - lib/palettetown/rule.rb
 - lib/palettetown/scheme.rb
 - lib/palettetown/version.rb