sugarcube 0.13.2 → 0.13.3

data/lib/sugarcube/to_s/uicolor.rb

@@ -13,23 +13,29 @@ class UIColor
     end
     return system_color if system_color
 
-    red = (self.red * 255).round << 16
-    green = (self.green * 255).round << 8
-    blue = (self.blue * 255).round
-    my_color = red + green + blue
+    if self.red && self.green && self.blue
+      red = (self.red * 255).round << 16
+      green = (self.green * 255).round << 8
+      blue = (self.blue * 255).round
+      my_color = red + green + blue
 
-    inside = "0x#{my_color.to_s(16)}"
-    Symbol.css_colors.each_pair do |color, hex|
-      if hex == my_color
-        inside = color.inspect
-        break
+      inside = my_color.to_s(16)
+      inside = '0x' + '0' * (6 - inside.length)
+
+      Symbol.css_colors.each_pair do |color, hex|
+        if hex == my_color
+          inside = color.inspect
+          break
+        end
       end
-    end
 
-    if self.alpha < 1
-      return "UIColor.color(#{inside}, #{alpha})"
+      if self.alpha < 1
+        return "UIColor.color(#{inside}, #{alpha})"
+      else
+        return "UIColor.color(#{inside})"
+      end
     else
-      return "UIColor.color(#{inside})"
+      super
     end
   end
 end

data/lib/sugarcube/uicolor.rb

@@ -2,7 +2,7 @@ class UIColor
   def uicolor ; self ; end
 
   def red
-    _sugarcube_colors[:red]
+    _sugarcube_colors && _sugarcube_colors[:red]
   end
 
   def cgcolor
@@ -10,15 +10,15 @@ class UIColor
   end
 
   def green
-    _sugarcube_colors[:green]
+    _sugarcube_colors && _sugarcube_colors[:green]
   end
 
   def blue
-    _sugarcube_colors[:blue]
+    _sugarcube_colors && _sugarcube_colors[:blue]
   end
 
   def alpha
-    _sugarcube_colors[:alpha]
+    _sugarcube_colors && _sugarcube_colors[:alpha]
   end
 
 private
@@ -43,6 +43,8 @@ private
           blue: white[0],
           alpha: alpha[0],
         }
+      else
+        nil
       end
     end
   end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.13.2'
+  Version = '0.13.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
   prerelease: 
 platform: ruby
 authors: