purplish-frame 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea6268a5a630c4e0871f9cdbd740eadb1813463
-  data.tar.gz: bb6cc19f0999dc2baafd14320e06c026e4af9605
+  metadata.gz: 63ad510018fc944c6b60933bc2a4350c38cbb47a
+  data.tar.gz: 662ea93c6e9385bc70fd2a5759254ebe8130094e
 SHA512:
-  metadata.gz: 1ebc2f98c76afa27f09c2d45fe1ff8b42f3490f55076ccbdcbbead571b0e60c3e7dcacd6311f28ca384796d1b96661ac2b617e374bfaa51568707d6df07cb3ff
-  data.tar.gz: 67fde77f47e9261968cd8f0af95288a548683ba83715314c37cfad3a224897778340f89f302ac62a3c98963472aa9b4f53c1bf08ac18b80154b5b772612ebaff
+  metadata.gz: 83fa589d0497ebaf6c6d622acb74978bfafa6f63d289897add92bdc8c9ee71550dd970a33bc7104037795105b1489742b214edcd3e8673d44528db6f958f07da
+  data.tar.gz: c470f974b54d5c79caf4c203009adf50c7de5744d336208ab5133f44a7ae68a57ef38ad590e4c5cb6c70ad6fa729321bc1b7968c616d57c2e5da35f6cdc92dc6

data/lib/purplish-frame/{cg_size.rb → non-ui/cg_size.rb}

@@ -4,4 +4,8 @@ class CGSize
   def self.to_native_size(anObject)
     anObject.to_size
   end
+
+  def square?
+    width == height && width > 0
+  end
 end

data/lib/purplish-frame/{osx → non-ui/osx}/ns_size.rb

@@ -4,4 +4,8 @@ class NSSize
   def self.to_native_size(anObject)
     anObject.to_size
   end
+
+  def square?
+    width == height && width > 0
+  end
 end

data/lib/purplish-frame/ui/ios/cocoa_touch_view.rb

@@ -0,0 +1,13 @@
+module PurplishFrame
+  module CocoaTouchView
+    include View
+
+    def top
+      view_frame.origin.y
+    end
+
+    def bottom
+      view_frame.origin.y + view_frame.size.height
+    end
+  end
+end

data/lib/purplish-frame/ui/ios/ui_screen.rb

@@ -0,0 +1,11 @@
+class UIScreen
+  include PurplishFrame::CocoaTouchView
+
+  def view_frame
+    bounds
+  end
+
+  def center
+    CGPointMake(left+width/2, top+height/2)
+  end
+end

data/lib/purplish-frame/ui/ios/ui_view.rb

@@ -0,0 +1,47 @@
+class UIView
+  include PurplishFrame::CocoaTouchView
+
+  def view_frame
+    frame
+  end
+
+  def top=(y)
+    f = frame
+    f.origin.y = y
+    self.frame = f
+  end
+
+  def bottom=(bottom)
+    f = frame
+    f.origin.y = bottom - f.size.height
+    self.frame = f
+  end
+
+  def height=(height)
+    f = frame
+    f.size.height = height
+    self.frame = f
+  end
+
+  def origin_relative_to_superview(v)
+    sup = superview
+    offset = CGPointZero
+
+    #if ([sup isKindOfClass:[UIScrollView class]]) {
+      #offset = ((UIScrollView*)sup).contentOffset
+    #}
+
+    if !sup || v == sup
+      return CGPoint.new(left-offset.x, top-offset.y)
+    else
+      d = sup.origin_relative_to_superview(v)
+      return CGPoint.new(left+d.x-offset.x, top+d.y-offset.y)
+    end
+  end
+
+  def move_origin_relative_to_superview(v)
+    pt = origin_relative_to_superview(v)
+    self.left = pt.x
+    self.top = pt.y
+  end
+end

data/lib/purplish-frame/ui/osx/cocoa_view.rb

@@ -0,0 +1,71 @@
+module PurplishFrame
+  module CocoaView
+    include View
+
+    def view_frame
+      frame
+    end
+
+    def top
+      frame.origin.y + frame.size.height
+    end
+
+    def top=(y)
+      f = frame
+      f.origin.y = y - height
+      self.frame = f
+    end
+
+    def bottom
+      frame.origin.y
+    end
+
+    def bottom=(bottom)
+      f = frame
+      f.origin.y = bottom
+      self.frame = f
+    end
+
+    def center
+      NSMakePoint(left+width/2, top-height/2)
+    end
+
+    def center=(pt)
+      #We need to check because pt might be HIPoint or some Boxed type
+      pt = pt.to_point if pt.respond_to? :to_point
+      f = frame
+      f.origin.x = pt.x-width/2
+      f.origin.y = pt.y-height/2
+      self.frame = f
+    end
+
+    def height=(height)
+      f = frame
+      f.origin.y -= height - frame.size.height
+      f.size.height = height
+      self.frame = f
+    end
+
+    #def origin_relative_to_superview(v)
+      #sup = superview
+      #offset = CGPointZero
+
+      #if ([sup isKindOfClass:[UIScrollView class]]) {
+      #offset = ((UIScrollView*)sup).contentOffset
+      #}
+
+      #if !sup || v == sup
+        #return CGPoint.new(left-offset.x, top-offset.y)
+      #else
+        #d = sup.origin_relative_to_superview(v)
+        #return CGPoint.new(left+d.x-offset.x, top+d.y-offset.y)
+      #end
+    #end
+
+    #def move_origin_relative_to_superview(v)
+      #pt = origin_relative_to_superview(v)
+      #self.left = pt.x
+      #self.top = pt.y
+    #end
+  end
+end

data/lib/purplish-frame/ui/osx/ns_screen.rb

@@ -0,0 +1,3 @@
+class NSScreen
+  include PurplishFrame::CocoaView
+end

data/lib/purplish-frame/ui/osx/ns_view.rb

@@ -0,0 +1,3 @@
+class NSView
+  include PurplishFrame::CocoaView
+end

data/lib/purplish-frame/ui/osx/ns_window.rb

@@ -0,0 +1,11 @@
+class NSWindow
+  include PurplishFrame::CocoaView
+
+  def bounds
+    NSMakeRect(0, 0, width, height)
+  end
+
+  def frame=(rect)
+    setFrame(rect, display:true)
+  end
+end

data/lib/purplish-frame/ui/view.rb

@@ -0,0 +1,99 @@
+module PurplishFrame
+  module View
+    def left
+      view_frame.origin.x
+    end
+
+    def left=(x)
+      f = frame
+      f.origin.x = x
+      self.frame = f
+    end
+
+    def right
+      view_frame.origin.x + view_frame.size.width
+    end
+
+    def right=(right)
+      f = frame
+      f.origin.x = right - f.size.width
+      self.frame = f
+    end
+
+    def center_x
+      center.x
+    end
+
+    def center_x=(center_x)
+      self.center = [center_x, center.y]
+    end
+
+    def center_y
+      center.y
+    end
+
+    def center_y=(center_y)
+      self.center = [center.x, center_y]
+    end
+
+    def width
+      view_frame.size.width
+    end
+
+    def width=(width)
+      f = frame
+      f.size.width = width
+      self.frame = f
+    end
+
+    def height
+      view_frame.size.height
+    end
+
+    def size_width_to_fit
+      h = height
+      sizeToFit
+      self.height = h
+    end
+
+    def size_width_to_fit_align_right
+      x = right
+      size_width_to_fit
+      self.right = x
+    end
+
+    def size_width_to_fit_max(f)
+      size_width_to_fit
+      self.width = f if width > f
+    end
+
+    def size_width_to_fit_min(f)
+      size_width_to_fit
+      self.width = f if width < f
+    end
+
+    def size_height_to_fit
+      w = width
+      #Otherwise it doesn't expand short UILabel when it's too short to fit longer text
+      self.height = 1000
+      sizeToFit
+      self.width = w
+    end
+
+    def size_height_to_fit_align_bottom
+      y = bottom
+      size_height_to_fit
+      self.bottom = y
+    end
+
+    def size_height_to_fit_max(f)
+      size_height_to_fit
+      self.height = f if height > f
+    end
+
+    def size_height_to_fit_min(f)
+      size_height_to_fit
+      self.height = f if height < f
+    end
+  end
+end

data/lib/purplish-frame/version.rb

@@ -1,3 +1,3 @@
 module PurplishFrame
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/ui/ios/ui_screen_spec.rb

@@ -0,0 +1,15 @@
+if PurplishFrame.ios?
+  describe "UIScreen" do
+    it "Accessing" do
+      screen = UIScreen.mainScreen
+      screen.left.should.equal 0
+      screen.right.should.equal screen.bounds.size.width
+      screen.top.should.equal 0
+      screen.bottom.should.equal screen.bounds.size.height
+      screen.center_x.should.equal screen.bounds.size.width/2
+      screen.center_y.should.equal screen.bounds.size.height/2
+      screen.width.should.equal screen.bounds.size.width
+      screen.height.should.equal screen.bounds.size.height
+    end
+  end
+end

data/spec/ui/ios/ui_view_spec.rb

@@ -0,0 +1,15 @@
+if PurplishFrame.ios?
+  describe "UIView" do
+    it "Accessing" do
+      v = UIView.alloc.initWithFrame([[10, 20], [100, 200]])
+      v.left.should.equal 10
+      v.right.should.equal 110
+      v.top.should.equal 20
+      v.bottom.should.equal 220
+      v.center_x.should.equal 60
+      v.center_y.should.equal 120
+      v.width.should.equal 100
+      v.height.should.equal 200
+    end
+  end
+end

data/spec/ui/osx/ns_screen_spec.rb

@@ -0,0 +1,15 @@
+if PurplishFrame.osx?
+  describe "NSScreen" do
+    it "Accessing" do
+      screen = NSScreen.mainScreen
+      screen.left.should.equal screen.frame.origin.x
+      screen.right.should.equal screen.frame.size.width
+      screen.top.should.equal (screen.frame.origin.y+screen.frame.size.height)
+      screen.bottom.should.equal screen.frame.origin.y
+      screen.center_x.should.equal (screen.frame.origin.x+screen.frame.size.width/2)
+      screen.center_y.should.equal (screen.frame.origin.y+screen.frame.size.height/2)
+      screen.width.should.equal screen.frame.size.width
+      screen.height.should.equal screen.frame.size.height
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purplish-frame
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hwee-Boon Yar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies: []
 description: Make working with rects, sizes and points more convenient with RubyMotion
   for iOS & OS X
@@ -25,26 +25,37 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - lib/purplish-frame.rb
-- lib/purplish-frame/can_scale_width_height.rb
-- lib/purplish-frame/cg_point.rb
-- lib/purplish-frame/cg_rect.rb
-- lib/purplish-frame/cg_size.rb
-- lib/purplish-frame/ns_array.rb
-- lib/purplish-frame/osx/ns_array.rb
-- lib/purplish-frame/osx/ns_point.rb
-- lib/purplish-frame/osx/ns_rect.rb
-- lib/purplish-frame/osx/ns_size.rb
-- lib/purplish-frame/point.rb
+- lib/purplish-frame/non-ui/can_scale_width_height.rb
+- lib/purplish-frame/non-ui/cg_point.rb
+- lib/purplish-frame/non-ui/cg_rect.rb
+- lib/purplish-frame/non-ui/cg_size.rb
+- lib/purplish-frame/non-ui/ns_array.rb
+- lib/purplish-frame/non-ui/osx/ns_array.rb
+- lib/purplish-frame/non-ui/osx/ns_point.rb
+- lib/purplish-frame/non-ui/osx/ns_rect.rb
+- lib/purplish-frame/non-ui/osx/ns_size.rb
+- lib/purplish-frame/non-ui/point.rb
+- lib/purplish-frame/non-ui/rect.rb
 - lib/purplish-frame/purplish_frame.rb
-- lib/purplish-frame/rect.rb
+- lib/purplish-frame/ui/ios/cocoa_touch_view.rb
+- lib/purplish-frame/ui/ios/ui_screen.rb
+- lib/purplish-frame/ui/ios/ui_view.rb
+- lib/purplish-frame/ui/osx/cocoa_view.rb
+- lib/purplish-frame/ui/osx/ns_screen.rb
+- lib/purplish-frame/ui/osx/ns_view.rb
+- lib/purplish-frame/ui/osx/ns_window.rb
+- lib/purplish-frame/ui/view.rb
 - lib/purplish-frame/version.rb
 - purplish-frame.gemspec
-- spec/cg_point_spec.rb
-- spec/cg_rect_spec.rb
-- spec/cg_size.spec.rb
-- spec/osx/ns_point_spec.rb
-- spec/osx/ns_rect_spec.rb
-- spec/osx/ns_size_spec.rb
+- spec/non-ui/cg_point_spec.rb
+- spec/non-ui/cg_rect_spec.rb
+- spec/non-ui/cg_size.spec.rb
+- spec/non-ui/osx/ns_point_spec.rb
+- spec/non-ui/osx/ns_rect_spec.rb
+- spec/non-ui/osx/ns_size_spec.rb
+- spec/ui/ios/ui_screen_spec.rb
+- spec/ui/ios/ui_view_spec.rb
+- spec/ui/osx/ns_screen_spec.rb
 homepage: https://github.com/hboon/purplish-frame
 licenses:
 - BSD
@@ -71,10 +82,13 @@ specification_version: 4
 summary: Make working with rects, sizes and points more convenient with RubyMotion
   for iOS & OS X
 test_files:
-- spec/cg_point_spec.rb
-- spec/cg_rect_spec.rb
-- spec/cg_size.spec.rb
-- spec/osx/ns_point_spec.rb
-- spec/osx/ns_rect_spec.rb
-- spec/osx/ns_size_spec.rb
+- spec/non-ui/cg_point_spec.rb
+- spec/non-ui/cg_rect_spec.rb
+- spec/non-ui/cg_size.spec.rb
+- spec/non-ui/osx/ns_point_spec.rb
+- spec/non-ui/osx/ns_rect_spec.rb
+- spec/non-ui/osx/ns_size_spec.rb
+- spec/ui/ios/ui_screen_spec.rb
+- spec/ui/ios/ui_view_spec.rb
+- spec/ui/osx/ns_screen_spec.rb
 has_rdoc: