sugarcube 0.9.3 → 0.9.4

data/README.md

@@ -833,9 +833,67 @@ Assume I ran `include SugarCube::Adjust` in these examples.
 
 # if you forget what view you are adjusting, run `adjust` again
 > a
-=> {UITextField @ x: 46.0 y:214.0, 280.0×33.0} child of UIView
+=> UITextField(#9ce6470, {{46, 214}, {280, 33}},  child of UIView(#10a6da20)
 ```
 
+The most useful feature of the REPL adjustment is the ability to quickly
+position and size your UI elements __visually__ and then paste the final values
+into your code.  In order to better accomodate that, `adjust` has an option to
+modify the output format.
+
+This better facilitates copy/paste of the values.  Currently supported is:
+* Default (RubyMotion) (`nil`, `:default`)
+* Objective-C (`:objc`)
+* JSON (`:json`)
+
+#### Objective-C style
+
+```
+(UIImageView(#8d67e00, {{0, 0},...)> tree
+  0: . UIWindow(#6e27180: {{0, 0}, {320, 480}})
+  1: `-- UIView(#8d631b0: {{0, 20}, {320, 460}})
+  2:     +-- UIButton(#6d6c090: {{10, 10}, {320, 463.401}})
+  3:     |   `-- UIImageView(#8d67e00: {{0, 0}, {320, 463.401}})
+  4:     `-- UIRoundedRectButton(#8d68170: {{10, 30}, {30, 200}})
+  5:         `-- UIButtonLabel(#8d69c30: {{2, 90}, {26, 19}})
+=> UIWindow(#6e27180, {{0, 0}, {320, 480}},
+
+# you can pass the format into the adjust method:
+(UIImageView(#8d67e00, {{0, 0},...)> a 4, :objc
+=> "UIRoundedRectButton(#8d68170: [[10.0, 30.0], [200.0, 30.0]])"
+
+# or you can assign repl_format explicitly (adjust does this for you when you hand it a format)
+(UIImageView(#8d67e00, {{0, 0},...)> repl_format :objc
+=> :objc
+
+# either way, it will continue to be used in subsequent calls
+(UIImageView(#8d67e00, {{0, 0},...)> wider 15
+[[10.0, 30.0], [200.0, 45.0]]
+=> "UIRoundedRectButton(#8d68170: [[10.0, 30.0], [200.0, 45.0]]) child of UIView(#8d631b0)"
+```
+
+#### JSON (or GeoMotion)
+
+```
+(UIImageView(#8d67e00, {{0, 0},...)> a 1, :json
+=> "UIView(#8d631b0: [x: 0.0, y: 20.0, height: 460.0, width: 320.0])"
+(UIImageView(#8d67e00, {{0, 0},...)> wider 30
+=> "CGRect(#6e9c9f0: [x: 0.0, y: 20.0, height: 460.0, width: 350.0])"
+(UIImageView(#8d67e00, {{0, 0},...)> right 130
+=> "CGRect(#8dc6a40: [x: 130.0, y: 20.0, height: 460.0, width: 350.0])"
+(UIImageView(#8d67e00, {{0, 0},...)> tree
+  0: . UIWindow(#6e27180: [x: 0.0, y: 0.0, height: 480.0, width: 320.0])
+  1: `-- UIView(#8d631b0: [x: 130.0, y: 20.0, height: 460.0, width: 350.0])
+  2:     +-- UIButton(#6d6c090: [x: 10.0, y: 10.0, height: 463.400512695312, width: 320.0])
+  3:     |   `-- UIImageView(#8d67e00: [x: 0.0, y: 0.0, height: 463.400512695312, width: 320.0])
+  4:     `-- UIRoundedRectButton(#8d68170: [x: 10.0, y: 30.0, height: 200.0, width: 45.0])
+  5:         `-- UIButtonLabel(#8d69c30: [x: 4.0, y: 90.0, height: 19.0, width: 37.0])
+=> UIWindow(#6e27180, {{0, 0}, {320, 480}},
+```
+
+Note: The `format` parameter can be passed as either a symbol or a string
+
+
  Pointers
 ----------
 

data/lib/sugarcube/adjust.rb

@@ -2,8 +2,19 @@ module SugarCube
   module Adjust
     module_function
 
-    def adjust view=nil
-      @@sugarcube_view ||= nil
+    def repl_format(format=nil)
+      if format
+        @@repl_format = format
+      else
+        # if adjust has not been called, the instance variable has not yet been set
+        @@repl_format ||= :ruby
+      end
+      @@repl_format
+    end
+
+    def adjust(view=nil, format=nil)
+      SugarCube::Adjust::repl_format(format.to_sym) if format
+      @@sugarcube_view ||= nil  #  this looks like a NOOP, but ||= also checks whether the variable exists.  aka: errors happen if we don't do this.
       return @@sugarcube_view if not view
 
       if view.is_a? Fixnum
@@ -19,6 +30,9 @@ module SugarCube
         shadow: SugarCube::Adjust.shadow,
       }
 
+      if format
+        puts format_frame view.frame
+      end
       view
     end
     alias a adjust
@@ -31,6 +45,9 @@ module SugarCube
       return SugarCube::CoreGraphics::Rect(@@sugarcube_view.frame) if not f
 
       @@sugarcube_view.frame = f
+      puts format_frame(f)
+
+      @@sugarcube_view
     end
     alias f frame
 
@@ -47,6 +64,9 @@ module SugarCube
       f = @@sugarcube_view.frame
       f.origin.x += val
       @@sugarcube_view.frame = f
+      puts format_frame(f)
+
+      @@sugarcube_view
     end
     alias r right
 
@@ -62,6 +82,9 @@ module SugarCube
       f = @@sugarcube_view.frame
       f.origin.y += val
       @@sugarcube_view.frame = f
+      puts format_frame(f)
+
+      @@sugarcube_view
     end
     alias d down
 
@@ -79,6 +102,9 @@ module SugarCube
         f.origin = x
       end
       @@sugarcube_view.frame = f
+      puts format_frame(f)
+
+      @@sugarcube_view
     end
     alias o origin
 
@@ -95,6 +121,9 @@ module SugarCube
       f = @@sugarcube_view.frame
       f.size.width += val
       @@sugarcube_view.frame = f
+      puts format_frame(f)
+
+      @@sugarcube_view
     end
     alias w wider
 
@@ -110,6 +139,9 @@ module SugarCube
       f = @@sugarcube_view.frame
       f.size.height += val
       @@sugarcube_view.frame = f
+      puts format_frame(f)
+
+      @@sugarcube_view
     end
     alias t taller
 
@@ -127,6 +159,9 @@ module SugarCube
         f.size = w
       end
       @@sugarcube_view.frame = f
+      puts format_frame(f)
+
+      @@sugarcube_view
     end
     alias z size
 
@@ -205,7 +240,7 @@ module SugarCube
         if self == view
           print "\033[1m"
         end
-        puts "#{view.class.name}(##{view.object_id.to_s(16)}, #{view.frame.to_s})"
+        puts "#{view.class.name}(##{view.object_id.to_s(16)}: #{format_frame(view.frame)})"
         if self == view
           print "\033[0m"
         end
@@ -230,5 +265,16 @@ module SugarCube
       end
     end
 
+    def format_frame(frame)
+      case SugarCube::Adjust::repl_format
+        when :json then "[x: #{frame.origin.x}, y: #{frame.origin.y}, height: #{frame.size.width}, width: #{frame.size.height}]"
+        when :ruby then "[[#{frame.origin.x}, #{frame.origin.y}], [#{frame.size.width}, #{frame.size.height}]]"
+        when nil, :objc
+          frame.to_s
+        else
+          raise "Unknown repl_format #{SugarCube::Adjust::repl_format.inspect}"
+      end
+    end
+
   end
 end

data/lib/sugarcube/defaults.rb

@@ -4,6 +4,10 @@ class Symbol
     to_s.get_default
   end
 
+  def get_default_or(default)
+    to_s.get_default_or(default)
+  end
+
   def set_default val
     to_s.set_default val
   end
@@ -17,10 +21,21 @@ end
 
 class String
 
-  def get_default
+  def get_default(default=nil)
     NSUserDefaults.standardUserDefaults.objectForKey(self)
   end
 
+  def get_default_or(default)
+    raise "Invalid default value" if default.nil?
+
+    nsdefault = self.get_default
+    if nsdefault.nil?
+      self.set_default(default)
+      nsdefault = default
+    end
+    return nsdefault
+  end
+
   def set_default val
     NSUserDefaults.standardUserDefaults.setObject(val, forKey:self)
   end

data/lib/sugarcube/nscoder.rb

@@ -0,0 +1,74 @@
+class NSCoder
+
+  def [] key
+    return self.decodeObjectForKey key
+  end
+
+  def []= key, value
+    return self.encodeObject(value, forKey:key)
+  end
+
+  def bool(key)
+    return self.decodeBoolForKey(key)
+  end
+
+  def double(key)
+    return self.decodeDoubleForKey(key)
+  end
+
+  def float(key)
+    return self.decodeFloatForKey(key)
+  end
+
+  def int(key)
+    return self.decodeIntegerForKey(key)
+  end
+
+  def point(key)
+    return CGPointFromString(self.decodeObjectForKey(key))
+  end
+
+  def rect(key)
+    return CGRectFromString(self.decodeObjectForKey(key))
+  end
+
+  def size(key)
+    return CGSizeFromString(self.decodeObjectForKey(key))
+  end
+
+  def set(key, toBool:value)
+    self.encodeBool(value, forKey:key)
+    return self
+  end
+
+  def set(key, toDouble:value)
+    self.encodeDouble(value, forKey:key)
+    return self
+  end
+
+  def set(key, toFloat:value)
+    self.encodeFloat(value, forKey:key)
+    return self
+  end
+
+  def set(key, toInt:value)
+    self.encodeInteger(value, forKey:key)
+    return self
+  end
+
+  def set(key, toPoint:value)
+    self.encodeObject(NSStringFromCGPoint(value), forKey:key)
+    return self
+  end
+
+  def set(key, toRect:value)
+    self.encodeObject(NSStringFromCGRect(value), forKey:key)
+    return self
+  end
+
+  def set(key, toSize:value)
+    self.encodeObject(NSStringFromCGSize(value), forKey:key)
+    return self
+  end
+
+end

data/lib/sugarcube/symbol/symbol_uicolor.rb

@@ -37,7 +37,13 @@ class Symbol
     white:     :whiteColor,
     clear:     :clearColor,
 
-    table_view: :groupTableViewBackgroundColor,
+    light_text: :lightTextColor,
+    dark_text:  :darkTextColor,
+
+    table_view:  :groupTableViewBackgroundColor,
+    scroll_view: :scrollViewTexturedBackgroundColor,
+    flipside:    :viewFlipsideBackgroundColor,
+    under_page:  :underPageBackgroundColor,
   }
 
   @css_colors = {

data/lib/sugarcube/to_s/uicolor.rb

@@ -0,0 +1,35 @@
+class UIColor
+  def to_s
+    system_color = nil
+    Symbol.uicolors.each_pair do |color, method|
+      if UIColor.send(method) == self
+        if self.alpha < 1
+          system_color = "UIColor.#{method}(#{alpha})"
+        else
+          system_color = "UIColor.#{method}"
+        end
+        break
+      end
+    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
+
+    inside = "0x#{my_color.to_s(16)}"
+    Symbol.css_colors.each_pair do |color, hex|
+      if hex == my_color
+        inside = color.inspect
+        break
+      end
+    end
+
+    if self.alpha < 1
+      return "UIColor.color(#{inside}, #{alpha})"
+    else
+      return "UIColor.color(#{inside})"
+    end
+  end
+end

data/lib/sugarcube/to_s/uiview.rb

@@ -1,8 +1,8 @@
 class UIView
 
   def to_s
-    "#{self.class.name}(##{self.object_id.to_s(16)}, #{self.frame}, " +
-                        (self.superview ? " child of #{self.superview.class.name}(##{self.superview.object_id.to_s(16)})" : '')
+    "#{self.class.name}(##{self.object_id.to_s(16)}, #{SugarCube::Adjust::format_frame(self.frame)})" +
+                        (self.superview ? ",  child of #{self.superview.class.name}(##{self.superview.object_id.to_s(16)})" : '')
   end
 
 end

data/lib/sugarcube/uicolor.rb

@@ -2,30 +2,25 @@
 class UIColor
   def uicolor ; self ; end
 
+  def red
+    _sugarcube_colors[:red]
+  end
 
-  def to_s
-    alpha = self.alpha.to_s
+  def green
+    _sugarcube_colors[:green]
+  end
 
-    Symbol.uicolors.each_pair do |color, method|
-      if UIColor.send(method) == self
-        return "UIColor.#{method}(#{alpha})"
-      end
-    end
+  def blue
+    _sugarcube_colors[:blue]
+  end
 
-    red = (self.red * 255).to_i << 16
-    green = (self.green * 255).to_i << 8
-    blue = (self.blue * 255).to_i
-    my_color = red + green + blue
-    Symbol.css_colors.each_pair do |color, hex|
-      if hex == my_color
-        return "UIColor.color(#{color.inspect}, #{alpha})"
-      end
-    end
-    return "UIColor.color(#{red}, #{green}, #{blue}, #{alpha})"
+  def alpha
+    _sugarcube_colors[:alpha]
   end
 
-  def color
-    if not @color
+private
+  def _sugarcube_colors
+    @color ||= begin
       red = Pointer.new(:float)
       green = Pointer.new(:float)
       blue = Pointer.new(:float)
@@ -38,24 +33,6 @@ class UIColor
         alpha: alpha[0],
       }
     end
-    @color
-  end
-
-  def red
-    self.color[:red]
-  end
-
-  def green
-    self.color[:green]
   end
 
-  def blue
-    self.color[:blue]
-  end
-
-  def alpha
-    self.color[:alpha]
-  end
-
-
 end

data/lib/sugarcube/uiview.rb

@@ -24,6 +24,7 @@ class UIView
 
   def <<(view)
     self.addSubview view
+    return self
   end
 
   def show

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.9.3'
+  Version = '0.9.4'
 end

data/sugarcube.gemspec

@@ -29,8 +29,4 @@ DESC
   gem.test_files   = gem.files.grep(%r{^spec/})
 
   gem.require_paths = ['lib']
-
-  gem.add_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,30 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70363874967320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70363874967320
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70363874965460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70363874965460
+date: 2012-10-03 00:00:00.000000000 Z
+dependencies: []
 description: ! '== Description
 
 
@@ -75,6 +53,7 @@ files:
 - lib/sugarcube/fixnum.rb
 - lib/sugarcube/modal.rb
 - lib/sugarcube/notifications.rb
+- lib/sugarcube/nscoder.rb
 - lib/sugarcube/nsdate.rb
 - lib/sugarcube/nsdate_delta.rb
 - lib/sugarcube/nsindexpath.rb
@@ -86,6 +65,7 @@ files:
 - lib/sugarcube/symbol/symbol_uicolor.rb
 - lib/sugarcube/timer.rb
 - lib/sugarcube/to_s/nsset.rb
+- lib/sugarcube/to_s/uicolor.rb
 - lib/sugarcube/to_s/uievent.rb
 - lib/sugarcube/to_s/uitouch.rb
 - lib/sugarcube/to_s/uiview.rb
@@ -124,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully