teacup 1.3.1 → 1.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teacup (1.3.0)
+    teacup (1.3.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -3,6 +3,8 @@ Teacup
 
 A community-driven DSL for creating user interfaces on the iphone.
 
+[![Build Status](https://travis-ci.org/rubymotion/teacup.png)](https://travis-ci.org/rubymotion/teacup)
+
 Using teacup, you can easily create and style layouts while keeping your code
 dry.  The goal is to offer a rubyesque (well, actually a rubymotion-esque) way
 to create interfaces programmatically.
@@ -67,6 +69,17 @@ Teacup implements the `viewDidLoad` method and instantiates any views you
 declare in the `layout` block.  Make sure to call `super` if you implement
 `viewDidLoad`, or you can use the "teacup-esque" `layoutDidLoad` method.
 
+#### Styling Without Implicitly Adding the View
+In the situation where you'd like to utilize the styles of Teacup without having your view
+automatically added in `viewDidLoad`.  You can accomplish this by calling the `layout` method instead of the block.
+
+```ruby
+# Custom Navigation Title still styled by Teacup
+@custom_label = layout(UILabel, :custom_title)
+self.navigationItem.titleView = @custom_label
+```
+
+Additionally, you can use the `style` method on a view to apply your styling inline (e.g. `@label.style(styles)`).
 
 #### Showdown
 

data/app/app_delegate.rb

@@ -6,8 +6,8 @@ class AppDelegate
     application.setStatusBarHidden(true, withAnimation:UIStatusBarAnimationSlide)
 
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-    ctlr = PresentModalController.new
-    @window.rootViewController = UINavigationController.alloc.initWithRootViewController(ctlr)
+    ctlr = ConstraintsController.new
+    @window.rootViewController = ctlr
     @window.rootViewController.wantsFullScreenLayout = true
     @window.makeKeyAndVisible
 

data/app/controllers/constraints_controller.rb

@@ -0,0 +1,92 @@
+class ConstraintsController < UIViewController
+  attr :container,
+       :header_view,
+       :footer_view,
+       :center_view,
+       :left_view,
+       :top_right_view,
+       :btm_right_view
+
+  stylesheet :constraints
+
+  layout :root do
+    @container = subview(UIView, :container) do
+      @header_view = subview(UIView, :header)
+      @footer_view = subview(UIView, :footer)
+      @center_view = subview(UIView, :center) do
+        @left_view = subview(UIView, :left)
+        @top_right_view = subview(UIView, :top_right)
+        @btm_right_view = subview(UIView, :btm_right)
+      end
+    end
+  end
+
+  def supportedInterfaceOrientations
+    UIInterfaceOrientationMaskAllButUpsideDown
+  end
+
+end
+
+
+Teacup::Stylesheet.new :constraints do
+
+  style :root,
+    accessibilityLabel: 'root view'
+
+  style :container,
+    constraints: [:full],
+    backgroundColor: UIColor.blackColor
+
+  style :header,
+    backgroundColor: UIColor.blueColor,
+    constraints: [
+      :full_width,
+      :top,
+      constrain_height(52),
+    ]
+
+  style :footer,
+    backgroundColor: UIColor.magentaColor,
+    constraints: [
+      :full_width,
+      :bottom,
+      constrain(:height).equals(:header, :height),
+    ]
+
+  style :center,
+    backgroundColor: UIColor.lightGrayColor,
+    constraints: [
+      constrain_below(:header).plus(8),
+      constrain_above(:footer).minus(8),
+      constrain_left(8),
+      constrain_right(-8),
+    ]
+
+  style :left,
+    backgroundColor: UIColor.redColor,
+    constraints: [
+      constrain_left(8),
+      constrain_top(8),
+      constrain(:right).plus(8).equals(:top_right, :left),
+      constrain(:right).plus(8).equals(:btm_right, :left),
+      constrain_bottom(-8),
+      constrain(:width).equals(:top_right, :width),
+      constrain(:width).equals(:btm_right, :width),
+    ]
+
+  style :top_right,
+    backgroundColor: UIColor.greenColor,
+    constraints: [
+      constrain(:top).equals(:left, :top),
+      constrain_right(-8),
+      constrain(:height).equals(:btm_right, :height),
+      constrain(:bottom).plus(8).equals(:btm_right, :top),
+    ]
+
+  style :btm_right,
+    backgroundColor: UIColor.yellowColor,
+    constraints: [
+      constrain(:bottom).equals(:left, :bottom),
+    ]
+
+end

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 
 end

data/lib/teacup/z_core_extensions/z_handlers.rb

@@ -123,7 +123,7 @@ Teacup.handler UIButton, :title { |target, title|
 
 
 Teacup.handler UIButton, :titleColor { |target, color|
-  target.setTitleColor(color.uicolor, forState: UIControlStateNormal)
+  target.setTitleColor(color, forState: UIControlStateNormal)
 }
 
 

data/spec/constraints_spec.rb

@@ -0,0 +1,131 @@
+##|
+##|  PORTRAIT
+##|
+describe 'Using constraints in portrait' do
+  tests ConstraintsController
+
+  it 'should have a header view' do
+    @controller.header_view.frame.tap do |f|
+      f.origin.x.should == 0
+      f.origin.y.should == 0
+      f.size.width.should == @controller.container.frame.size.width
+      f.size.height.should == 52
+    end
+  end
+
+  it 'should have a footer view' do
+    @controller.footer_view.frame.tap do |f|
+      f.origin.x.should == 0
+      (f.origin.y + f.size.height).should == @controller.container.frame.size.height
+      f.size.width.should == @controller.container.frame.size.width
+      f.size.height.should == 52
+    end
+  end
+
+  it 'should have a center view' do
+    @controller.center_view.frame.tap do |f|
+      f.origin.x.should == 8
+      f.origin.y.should == @controller.header_view.frame.size.height + 8
+      f.size.width.should == @controller.container.frame.size.width - 16
+      f.size.height.should == @controller.container.frame.size.height - 120
+    end
+  end
+
+  it 'should have a left view' do
+    @controller.left_view.frame.tap do |f|
+      f.origin.x.should == 8
+      f.origin.y.should == 8
+      f.size.width.should == @controller.center_view.frame.size.width / 2 - 12
+      f.size.height.should == @controller.center_view.frame.size.height - 16
+    end
+  end
+
+  it 'should have a top_right view' do
+    @controller.top_right_view.frame.tap do |f|
+      f.origin.x.should == @controller.center_view.frame.size.width / 2 + 4
+      f.origin.y.should == 8
+      f.size.width.should == @controller.left_view.frame.size.width
+      f.size.height.should == @controller.left_view.frame.size.height / 2 - 4
+    end
+  end
+
+  it 'should have a btm_right view' do
+    @controller.btm_right_view.frame.tap do |f|
+      f.origin.x.should == @controller.center_view.frame.size.width / 2 + 4
+      f.origin.y.should == @controller.center_view.frame.size.height / 2 + 4
+      f.size.width.should == @controller.left_view.frame.size.width
+      f.size.height.should == @controller.top_right_view.frame.size.height
+    end
+  end
+
+end
+
+##|
+##|  LANDSCAPE
+##|
+describe 'Using constraints in landscape' do
+  tests ConstraintsController
+
+  before do
+    rotate_device :to => :landscape
+  end
+
+  after do
+    rotate_device :to => :portrait
+  end
+
+  it 'should have a header view' do
+    @controller.header_view.frame.tap do |f|
+      f.origin.x.should == 0
+      f.origin.y.should == 0
+      f.size.width.should == @controller.container.frame.size.width
+      f.size.height.should == 52
+    end
+  end
+
+  it 'should have a footer view' do
+    @controller.footer_view.frame.tap do |f|
+      f.origin.x.should == 0
+      (f.origin.y + f.size.height).should == @controller.container.frame.size.height
+      f.size.width.should == @controller.container.frame.size.width
+      f.size.height.should == 52
+    end
+  end
+
+  it 'should have a center view' do
+    @controller.center_view.frame.tap do |f|
+      f.origin.x.should == 8
+      f.origin.y.should == @controller.header_view.frame.size.height + 8
+      f.size.width.should == @controller.container.frame.size.width - 16
+      f.size.height.should == @controller.container.frame.size.height - 120
+    end
+  end
+
+  it 'should have a left view' do
+    @controller.left_view.frame.tap do |f|
+      f.origin.x.should == 8
+      f.origin.y.should == 8
+      f.size.width.should == @controller.center_view.frame.size.width / 2 - 12
+      f.size.height.should == @controller.center_view.frame.size.height - 16
+    end
+  end
+
+  it 'should have a top_right view' do
+    @controller.top_right_view.frame.tap do |f|
+      f.origin.x.should == @controller.center_view.frame.size.width / 2 + 4
+      f.origin.y.should == 8
+      f.size.width.should == @controller.left_view.frame.size.width
+      f.size.height.should == @controller.left_view.frame.size.height / 2 - 4
+    end
+  end
+
+  it 'should have a btm_right view' do
+    @controller.btm_right_view.frame.tap do |f|
+      f.origin.x.should == @controller.center_view.frame.size.width / 2 + 4
+      f.origin.y.should == @controller.center_view.frame.size.height / 2 + 4
+      f.size.width.should == @controller.left_view.frame.size.width
+      f.size.height.should == @controller.top_right_view.frame.size.height
+    end
+  end
+
+end

data/spec/present_modal_spec.rb

@@ -0,0 +1,9 @@
+describe 'Presenting a modal view' do
+  tests PresentModalController
+
+  it 'should style the view' do
+    tap 'Open Modal'
+    @controller.modal.view.accessibilityLabel.should == 'root view'
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
@@ -36,6 +36,7 @@ files:
 - README.md
 - Rakefile
 - app/app_delegate.rb
+- app/controllers/constraints_controller.rb
 - app/controllers/first_controller.rb
 - app/controllers/gradient_controller.rb
 - app/controllers/landscape_only_controller.rb
@@ -88,16 +89,16 @@ files:
 - samples/OnePage/Rakefile
 - samples/OnePage/app/app_delegate.rb
 - samples/OnePage/resources/Default-568h@2x.png
-- samples/OnePage/resources/you_didnt_see_this
 - samples/OnePage/spec/main_spec.rb
 - samples/README.md
 - spec/calculations_spec.rb
+- spec/constraints_spec.rb
 - spec/custom_class_spec.rb
 - spec/gradient_spec.rb
 - spec/main_spec.rb
+- spec/present_modal_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb
-- spec/styling_modal_spec.rb
 - spec/uiswitch_spec.rb
 - spec/view_spec.rb
 - teacup.gemspec
@@ -127,11 +128,12 @@ specification_version: 3
 summary: A community-driven DSL for creating user interfaces on iOS.
 test_files:
 - spec/calculations_spec.rb
+- spec/constraints_spec.rb
 - spec/custom_class_spec.rb
 - spec/gradient_spec.rb
 - spec/main_spec.rb
+- spec/present_modal_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb
-- spec/styling_modal_spec.rb
 - spec/uiswitch_spec.rb
 - spec/view_spec.rb

data/samples/OnePage/resources/you_didnt_see_this

@@ -1,125 +0,0 @@
-include SugarCube::Adjust
-
-class AppDelegate
-  def application(application, didFinishLaunchingWithOptions:launchOptions)
-    @window = Kiln::KilnWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-    ctlr = MyController.new
-    first = UINavigationController.alloc.initWithRootViewController(ctlr)
-    @window.rootViewController = first
-    @window.makeKeyAndVisible
-    true
-  end
-end
-
-
-Teacup::Stylesheet.new(:teacup) do
-  style :label,
-    color: :white,
-    background: :clear,
-    portrait: {
-      text: 'portrait',
-    },
-    landscape: {
-      text: 'landscape',
-    },
-    constraints: [
-      :center_x,
-      :center_y,
-    ]
-
-  style :button,
-    constraints: [
-      :center_x,
-      constrain_below(:label).plus(0),
-    ]
-
-end
-
-
-class MyController < UIViewController
-  stylesheet :teacup
-
-  layout do
-    @label = subview(UILabel, :label)
-    @button = subview(NiftyButton, :button)
-
-    auto do
-      metrics 'margin' => 20,
-              'height' => 75,
-              'top' => 95
-      horizontal '|-margin-[label]-margin-|'
-      horizontal '|-margin-[button]-margin-|'
-      vertical '|-[label]-margin-[button]-margin-|'
-    end
-  end
-
-  def viewDidAppear(animated)
-    @label.text = 'testing'
-  end
-
-end
-
-
-class NiftyButton < UIButton
-  attr_accessor :text
-  attr_accessor :font
-
-  def foreground_color
-    (@touched ? :black : :white).uicolor
-  end
-
-  def background_color
-    (@touched ? :white : :black).uicolor
-  end
-
-  def drawRect(rect)
-    background_color.setFill
-    UIBezierPath.bezierPathWithRoundedRect(bounds, cornerRadius:5).fill
-
-    foreground_color.uicolor.setFill
-    UIBezierPath.bezierPathWithRoundedRect(bounds.shrink(2), cornerRadius:5).fill
-
-    background_color.setFill
-    text.drawAtPoint([5, 5], withFont: font)
-  end
-
-  def text
-    @text || 'neat.'
-  end
-
-  def font
-    @font || :bold.uifont
-  end
-
-  def intrinsicContentSize
-    text.sizeWithFont(font).wider(10).taller(10)
-  end
-
-  def accessibilityLabel
-    text
-  end
-
-  def touchesBegan(touches, withEvent:event)
-    @touched = true
-    setNeedsDisplay
-  end
-
-  def touchesEnded(touches, withEvent:event)
-    @touched = false
-    setNeedsDisplay
-  end
-
-  def touchesCancelled(touches, withEvent:event)
-    @touched = false
-    setNeedsDisplay
-  end
-
-  def self.kiln
-    @kiln ||= {
-      'Content' => {
-        text: Kiln::TextEditor,
-      }
-    }
-  end
-
-end

data/spec/styling_modal_spec.rb

@@ -1,9 +0,0 @@
-describe 'Styling a modal view' do
-  tests PresentModalController
-
-  it 'should work' do
-    tap 'Open Modal'
-    @controller.modal.view.backgroundColor.should == UIColor.blackColor
-  end
-
-end