sugarcube 0.20.0 → 0.20.1

data/lib/sugarcube/symbol.rb

@@ -498,187 +498,187 @@ class Symbol
   }
 
   private
-  def look_in(here)
+  def sugarcube_look_in(here)
     return here[self] if here.has_key? self
     raise SugarNotFoundException.new(self.inspect)
   end
 
   public
   def uidevice
-    look_in(Symbol.devices)
+    sugarcube_look_in(Symbol.devices)
   end
 
   def uideviceorientation
-    look_in(Symbol.device_orientations)
+    sugarcube_look_in(Symbol.device_orientations)
   end
 
   def uiinterfaceorientation
-    look_in(Symbol.interface_orientations)
+    sugarcube_look_in(Symbol.interface_orientations)
   end
 
   def uiinterfacemask
-    look_in(Symbol.interface_masks)
+    sugarcube_look_in(Symbol.interface_masks)
   end
 
   def uitextalignment
-    look_in(Symbol.textalignments)
+    sugarcube_look_in(Symbol.textalignments)
   end
   alias uialignment uitextalignment
 
 
   def uilinebreakmode
-    look_in(Symbol.linebreakmodes)
+    sugarcube_look_in(Symbol.linebreakmodes)
   end
 
   def uibaselineadjustment
-    look_in(Symbol.baselineadjustments)
+    sugarcube_look_in(Symbol.baselineadjustments)
   end
   alias uibaseline uibaselineadjustment
 
 
   def uiinterfaceorientation
-    look_in(Symbol.orientations)
+    sugarcube_look_in(Symbol.orientations)
   end
   alias uiorientation uiinterfaceorientation
 
   def uibuttontype
-    look_in(Symbol.buttontypes)
+    sugarcube_look_in(Symbol.buttontypes)
   end
 
   def uibordertype
-    look_in(Symbol.border_types)
+    sugarcube_look_in(Symbol.border_types)
   end
   alias uiborderstyle uibordertype
 
   def uicontrolstate
-    look_in(Symbol.control_states)
+    sugarcube_look_in(Symbol.control_states)
   end
   alias uistate uicontrolstate
 
 
   def uicontrolevent
-    look_in(Symbol.control_events)
+    sugarcube_look_in(Symbol.control_events)
   end
 
   def uireturnkey
-    look_in(Symbol.returnkeys)
+    sugarcube_look_in(Symbol.returnkeys)
   end
 
   def uiactivityindicatorstyle
-    look_in(Symbol.activityindicator_styles)
+    sugarcube_look_in(Symbol.activityindicator_styles)
   end
   alias uiactivityindicatorviewstyle uiactivityindicatorstyle
 
 
   def uisegmentedstyle
-    look_in(Symbol.segmented_styles)
+    sugarcube_look_in(Symbol.segmented_styles)
   end
   alias uisegmentedcontrolstyle uisegmentedstyle
 
 
   def uidatepickermode
-    look_in(Symbol.datepicker_modes)
+    sugarcube_look_in(Symbol.datepicker_modes)
   end
 
   def uicontentmode
-    look_in(Symbol.content_modes)
+    sugarcube_look_in(Symbol.content_modes)
   end
   alias uiviewcontentmode uicontentmode
 
   def uitablestyle
-    look_in(Symbol.tableview_styles)
+    sugarcube_look_in(Symbol.tableview_styles)
   end
   alias uitableviewstyle uitablestyle
 
   def uitablerowanimation
-    look_in(Symbol.tableview_rowanimation)
+    sugarcube_look_in(Symbol.tableview_rowanimation)
   end
   alias uitableviewrowanimation uitablerowanimation
 
   def uitablecellstyle
-    look_in(Symbol.tableview_cellstyles)
+    sugarcube_look_in(Symbol.tableview_cellstyles)
   end
   alias uitableviewcellstyle uitablecellstyle
 
   def uitablecellaccessory
-    look_in(Symbol.tableview_cellaccessorytype)
+    sugarcube_look_in(Symbol.tableview_cellaccessorytype)
   end
   alias uitableviewcellaccessorytype uitablecellaccessory
 
   def uitablecellselectionstyle
-    look_in(Symbol.tableview_cellselectionstyle)
+    sugarcube_look_in(Symbol.tableview_cellselectionstyle)
   end
   alias uitableviewcellselectionstyle uitablecellselectionstyle
 
   def uitablecellseparatorstyle
-    look_in(Symbol.tableview_cellseparatorstyle)
+    sugarcube_look_in(Symbol.tableview_cellseparatorstyle)
   end
 
   def uistatusbarstyle
-    look_in(Symbol.statusbar_styles)
+    sugarcube_look_in(Symbol.statusbar_styles)
   end
 
   def uibarmetrics
-    look_in(Symbol.barmetrics)
+    sugarcube_look_in(Symbol.barmetrics)
   end
 
   def uibarbuttonitem
-    look_in(Symbol.barbuttonitems)
+    sugarcube_look_in(Symbol.barbuttonitems)
   end
 
   def uibarbuttonstyle
-    look_in(Symbol.barbuttonstyles)
+    sugarcube_look_in(Symbol.barbuttonstyles)
   end
 
   def uikeyboardtype
-    look_in(Symbol.keyboardtypes)
+    sugarcube_look_in(Symbol.keyboardtypes)
   end
 
   def uiautoresizemask
-    look_in(Symbol.autoresizemasks)
+    sugarcube_look_in(Symbol.autoresizemasks)
   end
   alias uiviewautoresizing uiautoresizemask
   alias uiautoresizingmask uiautoresizemask
   alias uiautoresize uiautoresizemask
 
   def uiimagesource
-    look_in(Symbol.image_sourcetypes)
+    sugarcube_look_in(Symbol.image_sourcetypes)
   end
   alias uiimagesourcetype uiimagesource
 
   def uiimagecapture
-    look_in(Symbol.image_capturemode)
+    sugarcube_look_in(Symbol.image_capturemode)
   end
   alias uiimagecapturemode uiimagecapture
 
   def uiimagecamera
-    look_in(Symbol.image_cameradevice)
+    sugarcube_look_in(Symbol.image_cameradevice)
   end
   alias uiimagecameradevice uiimagecamera
   alias uiimagedevice uiimagecamera
 
   def uiimagequality
-    look_in(Symbol.image_quality)
+    sugarcube_look_in(Symbol.image_quality)
   end
   alias uiimagequalitytype uiimagequality
 
   def catimingfunction
-    look_in(Symbol.ca_timingfunctions)
+    sugarcube_look_in(Symbol.ca_timingfunctions)
   end
   alias catiming catimingfunction
 
   def cglinecap
-    look_in(Symbol.cg_linecapstyles)
+    sugarcube_look_in(Symbol.cg_linecapstyles)
   end
   alias cglinecapstyle cglinecap
 
   def cglinejoin
-    look_in(Symbol.cg_linejoinstyles)
+    sugarcube_look_in(Symbol.cg_linejoinstyles)
   end
   alias cglinejoinstyle cglinejoin
 
   def uigesturerecognizerstate
-    look_in(Symbol.gesture_recognizer_states)
+    sugarcube_look_in(Symbol.gesture_recognizer_states)
   end
   alias uigesturestate uigesturerecognizerstate
 
@@ -686,7 +686,7 @@ class Symbol
     size ||= UIFont.systemFontSize
     # system fonts
     if Symbol.system_fonts.has_key? self
-      font = look_in(Symbol.system_fonts)
+      font = sugarcube_look_in(Symbol.system_fonts)
       if size.is_a?(Symbol)
         size = size.uifontsize
       end
@@ -705,7 +705,7 @@ class Symbol
   end
 
   def uifontsize
-    size = look_in(Symbol.font_sizes)
+    size = sugarcube_look_in(Symbol.font_sizes)
     if size.is_a?(Symbol)
       return UIFont.send(size)
     end
@@ -713,12 +713,12 @@ class Symbol
   end
 
   def nsdatestyle
-    look_in(Symbol.date_styles)
+    sugarcube_look_in(Symbol.date_styles)
   end
   alias nsdateformatterstyle nsdatestyle
 
   def nsnumberstyle
-    look_in(Symbol.number_styles)
+    sugarcube_look_in(Symbol.number_styles)
   end
   alias nsnumberformatterstyle nsnumberstyle
 

data/lib/sugarcube/symbol/symbol_uicolor.rb

@@ -7,14 +7,14 @@ class Symbol
   def uicolor(alpha=nil)
     if Symbol.uicolors.has_key? self
       # iOS colors
-      color = UIColor.send(look_in(Symbol.uicolors))
+      color = UIColor.send(sugarcube_look_in(Symbol.uicolors))
 
       if not alpha.nil?
         color = color.colorWithAlphaComponent(alpha.to_f)
       end
     else
       # css colors
-      color = look_in(Symbol.css_colors).uicolor(alpha)
+      color = sugarcube_look_in(Symbol.css_colors).uicolor(alpha)
     end
 
     color

data/lib/sugarcube/to_s/uicolor.rb

@@ -18,10 +18,10 @@ class UIColor
     alpha_s = ((alpha || 1) < 1 ? "(#{alpha})" : '')
     if system_name
       return "UIColor.#{system_name}#{alpha_s}"
-    elsif hex
-      return "'#{hex}'.uicolor#{alpha_s}"
     elsif css_name
       return ":#{css_name}.uicolor#{alpha_s}"
+    elsif hex
+      return "'#{hex}'.uicolor#{alpha_s}"
     else
       super
     end

data/lib/sugarcube/uicolor.rb

@@ -16,13 +16,15 @@ class UIColor
   # @example
   #     :white.uicolor + :black.uicolor == :gray.uicolor
   def +(color)
-    mix_with(color, 0.5)
+    mix_with(color.uicolor, 0.5)
   end
 
   # a more generic color mixing method.  mixes two colors, but a second
   # parameter determines how much of each.  0.5 means equal parts, 0.0 means use
   # all of the first, and 1.0 means use all of the second
   def mix_with(color, amount)
+    color = color.uicolor
+
     # make amount between 0 and 1
     amount = [[0, amount].max, 1].min
     # start with precise amounts: 0, 0.5, and 1.

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.0'
+  Version = '0.20.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description