sugarcube 0.2.0 → 0.2.1

data/README.md

@@ -17,7 +17,7 @@ view << subview.
 
 The basic idea of sugarcube is to turn some operations on their head.  Insead of
 
-    NSUIApplication.sharedApplication.openURL(NSUrl.URLWithString(url))
+    UIApplication.sharedApplication.openURL(NSUrl.URLWithString(url))
 
 How about:
 
@@ -209,14 +209,15 @@ test[:my] = 'new'
 ###### Is it `CGMakeRect` or `CGRectMake`?
 
 Instead, just use `Rect`, `Size` and `Point`.  These are namespaced in
-`SugarCube` module, but I recommend you `include SugarCube` in app_delegate.rb.
+`SugarCube::CoreGraphics` module, but I recommend you `include
+SugarCube::CoreGraphics` in app_delegate.rb.
 
 ```ruby
-f = SugarCube::Rect(view.frame)  # converts a CGRect into a CGRectArray
-o = SugarCube::Point(view.frame.origin)  # converts a CGPoint into a CGPointArray
-s = SugarCube::Size(view.frame.size)  # converts a CGSize into a CGSizeArray
+f = Rect(view.frame)  # converts a CGRect into a CGRectArray
+o = Point(view.frame.origin)  # converts a CGPoint into a CGPointArray
+s = Size(view.frame.size)  # converts a CGSize into a CGSizeArray
 
-# lots of other conversions are possible.  Let's assume `include SugarCube`, too
+# lots of other conversions are possible.
 # 4 numbers
 f = Rect(x, y, w, h)
 # or two arrays
@@ -234,11 +235,11 @@ jQuery-like animation methods.
 
 ```ruby
 # default timeout is 0.3
-view.fadeout { |view|
+view.fade_out { |view|
   view.removeFromSuperview
 }
 # options:
-view.fadeout(0.5, delay: 0,
+view.fade_out(0.5, delay: 0,
                   options: UIViewAnimationOptionCurveLinear,
                   opacity: 0.5) { |view|
   view.removeFromSuperview
@@ -253,28 +254,30 @@ view.delta_to([0, 100])  # move over 0, down 100, from current position
 Pixel pushing is an unfortunate but necessary evil.  Well, at least we can make
 it a little less painful.
 
-These methods help you adjust the frame of a view.  They are in the `SugarCube`
-module so as not to conflict.  If you don't want the prefix, `include SugarCube` in
-app_delegate.rb
+These methods help you adjust the frame of a view.  They are in the
+`SugarCube::Adjust` module so as not to conflict.  If you don't want the prefix,
+`include SugarCube::Adjust` in app_delegate.rb
+
+Assume I ran `include SugarCube::Adjust` in these examples.
 
 ```ruby
 # if you are in the REPL, you might not be able to click on the view you want...
-> SugarCube::adjust superview.subviews[4].subviews[1]
-> SugarCube::up 1
-> SugarCube::down 1  # same as up -1, obviously
-> SugarCube::left 1
-> SugarCube::right 1  # same as up -1, obviously
-> SugarCube::origin 10, 12  # move to x:10, y:12
-> SugarCube::wider 1
-> SugarCube::thinner 1
-> SugarCube::taller 1
-> SugarCube::shorter 1
-> SugarCube::size 100, 10  # set size to width:100, height: 10
-> SugarCube::restore
+> adjust superview.subviews[4].subviews[1]
+> up 1
+> down 1  # same as up -1, obviously
+> left 1
+> right 1  # same as up -1, obviously
+> origin 10, 12  # move to x:10, y:12
+> wider 1
+> thinner 1
+> taller 1
+> shorter 1
+> size 100, 10  # set size to width:100, height: 10
+> restore  # original frame is saved when you call adjust
 ```
 
 ```ruby
-> # short versions!  and let's assume I ran `include SC`
+> # short versions!
 > a superview.subviews[4].subviews[1]  # this is not uncommon in the REPL
 > u          # up, default value=1
 > d          # down

data/lib/sugarcube/adjust.rb

@@ -1,93 +1,95 @@
 module SugarCube
-  module_function
+  module Adjust
+    module_function
 
-  def adjust view=nil
-    return @@sugarcube_view if not view
+    def adjust view=nil
+      return @@sugarcube_view if not view
 
-    @@sugarcube_view = view
-    @@sugarcube_restore = view.frame
-    view
-  end
-  alias :a :adjust
+      @@sugarcube_view = view
+      @@sugarcube_restore = view.frame
+      view
+    end
+    alias :a :adjust
 
-  ##|  ORIGIN
-  def left val=1
-    SugarCube::right -val
-  end
-  alias :l :left
+    ##|  ORIGIN
+    def left val=1
+      SugarCube::right -val
+    end
+    alias :l :left
 
-  def right val=1
-    f = @@sugarcube_view.frame
-    f.origin.x += val
-    @@sugarcube_view.frame = f
-  end
-  alias :r :right
+    def right val=1
+      f = @@sugarcube_view.frame
+      f.origin.x += val
+      @@sugarcube_view.frame = f
+    end
+    alias :r :right
 
-  def up val=1
-    SugarCube::down -val
-  end
-  alias :u :up
+    def up val=1
+      SugarCube::down -val
+    end
+    alias :u :up
 
-  def down val=1
-    f = @@sugarcube_view.frame
-    f.origin.y += val
-    @@sugarcube_view.frame = f
-  end
-  alias :d :down
+    def down val=1
+      f = @@sugarcube_view.frame
+      f.origin.y += val
+      @@sugarcube_view.frame = f
+    end
+    alias :d :down
 
-  def origin x, y=nil
-    f = @@sugarcube_view.frame
-    if y
-      f.origin.x = x
-      f.origin.y = y
-    else
-      f.origin = x
+    def origin x, y=nil
+      f = @@sugarcube_view.frame
+      if y
+        f.origin.x = x
+        f.origin.y = y
+      else
+        f.origin = x
+      end
+      @@sugarcube_view.frame = f
     end
-    @@sugarcube_view.frame = f
-  end
-  alias :o :origin
+    alias :o :origin
 
-  ##|  SIZE
-  def thinner val=1
-    SugarCube::wider -val
-  end
-  alias :n :thinner
+    ##|  SIZE
+    def thinner val=1
+      SugarCube::wider -val
+    end
+    alias :n :thinner
 
-  def wider val=1
-    f = @@sugarcube_view.frame
-    f.size.width += val
-    @@sugarcube_view.frame = f
-  end
-  alias :w :wider
+    def wider val=1
+      f = @@sugarcube_view.frame
+      f.size.width += val
+      @@sugarcube_view.frame = f
+    end
+    alias :w :wider
 
-  def taller val=1
-    SugarCube::shorter -val
-  end
-  alias :t :taller
+    def taller val=1
+      SugarCube::shorter -val
+    end
+    alias :t :taller
 
-  def shorter val=1
-    f = @@sugarcube_view.frame
-    f.size.height += val
-    @@sugarcube_view.frame = f
-  end
-  alias :s :shorter
+    def shorter val=1
+      f = @@sugarcube_view.frame
+      f.size.height += val
+      @@sugarcube_view.frame = f
+    end
+    alias :s :shorter
 
-  def size w, h=nil
-    f = @@sugarcube_view.frame
-    if h
-      f.size.width = w
-      f.size.height = h
-    else
-      f.size = w
+    def size w, h=nil
+      f = @@sugarcube_view.frame
+      if h
+        f.size.width = w
+        f.size.height = h
+      else
+        f.size = w
+      end
+      @@sugarcube_view.frame = f
     end
-    @@sugarcube_view.frame = f
-  end
-  alias :z :size
+    alias :z :size
 
-  ##|  RESTORE
-  def restore
-    @@sugarcube_view.frame = @@sugarcube_restore
-  end
-  alias :r :restore
+    ##|  RESTORE
+    def restore
+      @@sugarcube_view.frame = @@sugarcube_restore
+    end
+    alias :r :restore
 
+  end
 end

data/lib/sugarcube/core_graphics.rb

@@ -76,74 +76,76 @@ end
 
 
 module SugarCube
-  module_function
-
-  def Size(w_or_size, h=nil)
-    if not h
-      if CGSize === w_or_size
-        w = w_or_size.width
-        h = w_or_size.height
-      elsif Array === w_or_size
-        w = w_or_size[0]
-        h = w_or_size[1]
+  module CoreGraphics
+    module_function
+
+    def Size(w_or_size, h=nil)
+      if not h
+        if CGSize === w_or_size
+          w = w_or_size.width
+          h = w_or_size.height
+        elsif Array === w_or_size
+          w = w_or_size[0]
+          h = w_or_size[1]
+        else
+          raise RuntimeError.new("Invalid argument sent to Size(#{w_or_size.inspect})")
+        end
       else
-        raise RuntimeError.new("Invalid argument sent to Size(#{w_or_size.inspect})")
+        w = w_or_size
       end
-    else
-      w = w_or_size
+      return CGSizeArray.new([w, h])
     end
-    return CGSizeArray.new([w, h])
-  end
 
-  def Point(x_or_origin, y=nil)
-    if not y
-      if CGPoint === x_or_origin
-        x = x_or_origin.x
-        y = x_or_origin.y
-      elsif Array === x_or_origin
-        x = x_or_origin[0]
-        y = x_or_origin[1]
+    def Point(x_or_origin, y=nil)
+      if not y
+        if CGPoint === x_or_origin
+          x = x_or_origin.x
+          y = x_or_origin.y
+        elsif Array === x_or_origin
+          x = x_or_origin[0]
+          y = x_or_origin[1]
+        else
+          raise RuntimeError.new("Invalid argument sent to Point(#{x_or_origin.inspect})")
+        end
       else
-        raise RuntimeError.new("Invalid argument sent to Point(#{x_or_origin.inspect})")
+        x = x_or_origin
       end
-    else
-      x = x_or_origin
+      return CGPointArray.new([x, y])
     end
-    return CGPointArray.new([x, y])
-  end
 
-  # Accepts 2 or 4 arguments.  2 arguments should be a point and a size,
-  # 4 should be x, y, w, h
-  def Rect(x_or_origin, y_or_size=nil, w=nil, h=nil)
-    if not y_or_size
-      if CGRectArray === x_or_origin
-        x = x_or_origin[0][0]
-        y = x_or_origin[0][1]
-        w = x_or_origin[1][0]
-        h = x_or_origin[1][1]
-      elsif CGRect === x_or_origin
-        x = x_or_origin.origin.x
-        y = x_or_origin.origin.y
-        w = x_or_origin.size.width
-        h = x_or_origin.size.height
-      elsif Array === x_or_origin
-        x = x_or_origin[0]
-        y = x_or_origin[1]
-        w = x_or_origin[2]
-        h = x_or_origin[3]
+    # Accepts 2 or 4 arguments.  2 arguments should be a point and a size,
+    # 4 should be x, y, w, h
+    def Rect(x_or_origin, y_or_size=nil, w=nil, h=nil)
+      if not y_or_size
+        if CGRectArray === x_or_origin
+          x = x_or_origin[0][0]
+          y = x_or_origin[0][1]
+          w = x_or_origin[1][0]
+          h = x_or_origin[1][1]
+        elsif CGRect === x_or_origin
+          x = x_or_origin.origin.x
+          y = x_or_origin.origin.y
+          w = x_or_origin.size.width
+          h = x_or_origin.size.height
+        elsif Array === x_or_origin
+          x = x_or_origin[0]
+          y = x_or_origin[1]
+          w = x_or_origin[2]
+          h = x_or_origin[3]
+        else
+          raise RuntimeError.new("Invalid argument sent to Rect(#{x_or_origin.inspect})")
+        end
+      elsif not w and not h
+        x = x_or_origin.x
+        y = x_or_origin.y
+        w = y_or_size.width
+        h = y_or_size.height
       else
-        raise RuntimeError.new("Invalid argument sent to Rect(#{x_or_origin.inspect})")
+        x = x_or_origin
+        y = y_or_size
       end
-    elsif not w and not h
-      x = x_or_origin.x
-      y = x_or_origin.y
-      w = y_or_size.width
-      h = y_or_size.height
-    else
-      x = x_or_origin
-      y = y_or_size
+      return CGRectArray.new([[x, y], [w, h]])
     end
-    return CGRectArray.new([[x, y], [w, h]])
-  end
 
+  end
 end

data/lib/sugarcube/notifications.rb

@@ -13,7 +13,3 @@ class NSString
   end
 
 end
-
-
-class Object
-end

data/lib/sugarcube/nsurl.rb

@@ -0,0 +1,7 @@
+class NSURL
+
+  def open
+    NSUIApplication.sharedApplication.openURL(NSUrl.URLWithString(self))
+  end
+
+end

data/lib/sugarcube/uiview.rb

@@ -12,7 +12,7 @@ class UIView
                         "#{self.superview ? ' child of ' + self.superview.class.name : ''}"
   end
 
-  def fadeout(duration=0.3, options={}, &after)
+  def fade_out(duration=0.3, options={}, &after)
     UIView.animateWithDuration(duration,
                          delay: options[:delay] || 0,
                        options: options[:options] || UIViewAnimationOptionCurveLinear,

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.2.0'
+  Version = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70353599174140 !ruby/object:Gem::Requirement
+  requirement: &70111935636200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353599174140
+  version_requirements: *70111935636200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353599189900 !ruby/object:Gem::Requirement
+  requirement: &70111935651940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353599189900
+  version_requirements: *70111935651940
 description: ! 'CocoaTouch/iOS is a *verbose* framework.  These extensions hope to
   make
 
@@ -72,7 +72,8 @@ files:
 - lib/sugarcube/fixnum.rb
 - lib/sugarcube/float.rb
 - lib/sugarcube/notifications.rb
-- lib/sugarcube/string.rb
+- lib/sugarcube/nsstring.rb
+- lib/sugarcube/nsurl.rb
 - lib/sugarcube/symbol.rb
 - lib/sugarcube/symbol/symbol_uicolor.rb
 - lib/sugarcube/uicolor.rb