teacup 1.2.8 → 1.2.9

data/Gemfile.lock

@@ -1,26 +1,14 @@
 PATH
   remote: .
   specs:
-    teacup (1.2.7)
-      rake
+    teacup (1.2.8)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    rake (10.0.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec
   teacup!

data/app/controllers/gradient_controller.rb

@@ -0,0 +1,3 @@
+
+class GradientController < UIViewController
+end

data/lib/dummy.rb

@@ -9,14 +9,17 @@ private
   def dummy
     setFrame(nil)
     setOpaque(nil)
+    setClipsToBounds(nil)
+    setUserInteractionEnabled(nil)
   end
 end
 
- class DummyTableView < UITableView
-   def allowsSelection=(value)
-     setAllowSelection value
-   end
+class DummyTableView < UITableView
+private
+ def dummy
+   setAllowSelection(value)
  end
+end
 
 class DummyButton < UIButton
 private
@@ -51,6 +54,7 @@ end
 class DummyTextField < UITextField
 private
   def dummy
+    setSecureTextEntry(nil)
     setReturnKeyType(nil)
     setAutocapitalizationType(nil)
     setAutocorrectionType(nil)
@@ -89,3 +93,4 @@ private
     setOn(true)
   end
 end
+

data/lib/teacup/constraint.rb

@@ -51,12 +51,12 @@ module Teacup
         ]
       when :full_width
         [
-          Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
+          Teacup::Constraint.new(:self, :center_x).equals(relative_to, :center_x),
           Teacup::Constraint.new(:self, :width).equals(relative_to, :width),
         ]
       when :full_height
         [
-          Teacup::Constraint.new(:self, :top).equals(relative_to, :top),
+          Teacup::Constraint.new(:self, :center_y).equals(relative_to, :center_y),
           Teacup::Constraint.new(:self, :height).equals(relative_to, :height),
         ]
       when :center_x
@@ -248,12 +248,3 @@ private
     end
   end
 end
-
-# constraintWithItem: target
-#          attribute: attribute
-#          relatedBy: relationship
-#             toItem: relative_to
-#          attribute: attribute2
-#         multiplier: multiplier
-#           constant: constant
-

data/lib/teacup/layout.rb

@@ -101,7 +101,7 @@ module Teacup
     #   end
     #
     def layout(view_or_class, name_or_properties=nil, properties_or_nil=nil, &block)
-      view = to_instance(view_or_class)
+      view = Teacup.to_instance(view_or_class)
 
       name = nil
       properties = properties_or_nil
@@ -182,7 +182,7 @@ module Teacup
     #   end
     #
     def subview(class_or_instance, *args, &block)
-      instance = to_instance(class_or_instance)
+      instance = Teacup.to_instance(class_or_instance)
 
       (superview_chain.last || top_level_view).addSubview(instance)
 
@@ -193,19 +193,6 @@ module Teacup
 
     protected
 
-    def to_instance(class_or_instance)
-      if class_or_instance.is_a? Class
-        unless class_or_instance <= UIView
-          raise "Expected subclass of UIView, got: #{class_or_instance.inspect}"
-        end
-        return class_or_instance.new
-      elsif class_or_instance.is_a?(UIView)
-        return class_or_instance
-      else
-        raise "Expected a UIView, got: #{class_or_instance.inspect}"
-      end
-    end
-
     # Get's the current stack of views in nested calls to layout.
     #
     # The view at the end of the stack is the one into which subviews

data/lib/teacup/stylesheet.rb

@@ -227,7 +227,8 @@ module Teacup
         # reset the stylesheet_cache for this stylename
         @stylesheet_cache.delete(stylename) if @stylesheet_cache
 
-        # merge into styles[stylename], new properties "win"
+        # merge into styles[stylename] (an instance of Teacup::Style). new
+        # properties "win" over existing properties.
         Teacup::merge_defaults(properties, styles[stylename], styles[stylename])
       end
     end

data/lib/teacup/teacup_util.rb

@@ -0,0 +1,17 @@
+module Teacup
+  module_function
+
+  def to_instance(class_or_instance)
+    if class_or_instance.is_a? Class
+      unless class_or_instance <= UIView
+        raise "Expected subclass of UIView, got: #{class_or_instance.inspect}"
+      end
+      return class_or_instance.new
+    elsif class_or_instance.is_a?(UIView)
+      return class_or_instance
+    else
+      raise "Expected a UIView, got: #{class_or_instance.inspect}"
+    end
+  end
+
+end

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '1.2.8'
+  VERSION = '1.2.9'
 
 end

data/lib/teacup/z_core_extensions/ui_view.rb

@@ -249,7 +249,7 @@ class UIView
       constraint.each { |sym, relative_to|
         @teacup_constraints[sym] = relative_to
       }
-    elsif constraint.is_a? Teacup::Constraint or constraint.is_a? Symbol
+    elsif constraint.is_a?(Teacup::Constraint) || constraint.is_a?(Symbol)
       @teacup_constraints[constraint] = true
     else
       raise "Unsupported constraint: #{constraint.inspect}"

data/lib/teacup/z_core_extensions/ui_view_controller.rb

@@ -125,14 +125,9 @@ class UIViewController
     true
   end
 
-  # The compiling mechanisms combined with how UIKit works of rubymotion do
-  # not allow the `shouldAutorotateToInterfaceOrientation` method to be
-  # overridden in modules/extensions.  So instead, HERE is the code for what
-  # `shouldAutorotateToInterfaceOrientation` should look like if you want
-  # to use the teacup rotation stuff.  Call this method from your own
-  # `shouldAutorotateToInterfaceOrientation` method.
-  #
-  # the teacup developers apologize for any inconvenience. :-)
+  # This method *used* to be useful for the `shouldAutorotateToOrientation`
+  # method, but the iOS 6 update deprecates that method.  Instead, use the
+  # `supportedInterfaceOrientations` and return `autorotateMask`.
   def autorotateToOrientation(orientation)
     if view.stylesheet and view.stylesheet.is_a?(Teacup::Stylesheet) and view.stylename
       properties = view.stylesheet.query(view.stylename, self, orientation)
@@ -164,14 +159,22 @@ class UIViewController
       return false
     end
 
-    return orientation == UIInterfaceOrientationPortrait
+    # returns the system default
+    if device == UIUserInterfaceIdiomPhone
+      return orientation != UIInterfaceOrientationPortraitUpsideDown
+    else
+      return true
+    end
   end
 
+  # You can use this method in `supportedInterfaceOrientations`, and it will
+  # query the stylesheet for the supported orientations, based on what
+  # orientations are defined.  At a minimum, to opt-in to this feature, you'll
+  # need to define styles like `style :root, landscape: true`
   def autorotateMask
+    device = UIDevice.currentDevice.userInterfaceIdiom
     if view.stylesheet and view.stylesheet.is_a?(Teacup::Stylesheet) and view.stylename
       properties = view.stylesheet.query(view.stylename, self, orientation)
-      device = UIDevice.currentDevice.userInterfaceIdiom
-      device == UIUserInterfaceIdiomPhone
 
       orientations = 0
       if properties.supports?(:portrait) or properties.supports?(:upside_up)
@@ -203,11 +206,63 @@ class UIViewController
       end
       return orientations
     end
-    return UIInterfaceOrientationPortrait
+
+    # returns the system default
+    if device == UIUserInterfaceIdiomPhone
+      return UIInterfaceOrientationMaskAllButUpsideDown
+    else
+      return UIInterfaceOrientationMaskAll
+    end
   end
 
+  # restyles the view!  be careful about putting styles in your stylesheet that
+  # you change in your controller.  anything that might change over time should
+  # be applied in your controller using `style`
   def willAnimateRotationToInterfaceOrientation(orientation, duration:duration)
     view.restyle!(orientation)
   end
 
+  ##|
+  ##|  Motion-Layout support
+  ##|
+
+  # Calling this method uses Nick Quaranto's motion-layout gem to provide ASCII
+  # art style access to autolayout.  It assigns all the subviews by stylename,
+  # and assigns `self.view` as the target view.  Beyond that, it's up to you to
+  # implement the layout methods:
+  #
+  #     auto do
+  #       metrics 'margin' => 20
+  #       vertical "|-[top]-margin-[bottom]-|"
+  #       horizontal "|-margin-[top]-margin-|"
+  #       horizontal "|-margin-[bottom]-margin-|"
+  #     end
+  def auto(layout_view=self.view, layout_subviews={}, &layout_block)
+    raise "gem install 'motion-layout'" unless defined? Motion::Layout
+
+    Teacup.get_subviews(self.view).each do |view|
+      if view.stylename && ! layout_subviews[view.stylename.to_s]
+        layout_subviews[view.stylename.to_s] = view
+      end
+    end
+
+    Motion::Layout.new do |layout|
+      layout.view layout_view
+      layout.subviews layout_subviews
+      layout.instance_eval(&layout_block)
+    end
+  end
+
+end
+
+
+module Teacup
+
+module_function
+  def get_subviews(target)
+    [target] + target.subviews.map { |subview|
+      get_subviews(subview).select{ |v| v.stylename }
+    }.flatten
+  end
+
 end

data/lib/teacup/z_core_extensions/z_handlers.rb

@@ -1,103 +1,103 @@
 ##|
 ##|  UIView.frame
 ##|
-Teacup.handler UIView, :left, :x { |x|
-  f = self.frame
-  f.origin.x = Teacup::calculate(self, :width, x)
-  self.frame = f
+Teacup.handler UIView, :left, :x { |target, x|
+  f = target.frame
+  f.origin.x = Teacup::calculate(target, :width, x)
+  target.frame = f
 }
 
-Teacup.handler UIView, :right { |r|
-  f = self.frame
-  f.origin.x = Teacup::calculate(self, :width, r) - f.size.width
-  self.frame = f
+Teacup.handler UIView, :right { |target, r|
+  f = target.frame
+  f.origin.x = Teacup::calculate(target, :width, r) - f.size.width
+  target.frame = f
 }
 
-Teacup.handler UIView, :center_x, :middle_x { |x|
-  c = self.center
-  c.x = Teacup::calculate(self, :width, x)
-  self.center = c
+Teacup.handler UIView, :center_x, :middle_x { |target, x|
+  c = target.center
+  c.x = Teacup::calculate(target, :width, x)
+  target.center = c
 }
 
-Teacup.handler UIView, :top, :y { |y|
-  f = self.frame
-  f.origin.y = Teacup::calculate(self, :height, y)
-  self.frame = f
+Teacup.handler UIView, :top, :y { |target, y|
+  f = target.frame
+  f.origin.y = Teacup::calculate(target, :height, y)
+  target.frame = f
 }
 
-Teacup.handler UIView, :bottom { |b|
-  f = self.frame
-  f.origin.y = Teacup::calculate(self, :height, b) - f.size.height
-  self.frame = f
+Teacup.handler UIView, :bottom { |target, b|
+  f = target.frame
+  f.origin.y = Teacup::calculate(target, :height, b) - f.size.height
+  target.frame = f
 }
 
-Teacup.handler UIView, :center_y, :middle_y { |y|
-  c = self.center
-  c.y = Teacup::calculate(self, :height, y)
-  self.center = c
+Teacup.handler UIView, :center_y, :middle_y { |target, y|
+  c = target.center
+  c.y = Teacup::calculate(target, :height, y)
+  target.center = c
 }
 
-Teacup.handler UIView, :width { |w|
-  f = self.frame
-  f.size.width = Teacup::calculate(self, :width, w)
-  self.frame = f
+Teacup.handler UIView, :width { |target, w|
+  f = target.frame
+  f.size.width = Teacup::calculate(target, :width, w)
+  target.frame = f
 }
 
-Teacup.handler UIView, :height { |h|
-  f = self.frame
-  f.size.height = Teacup::calculate(self, :height, h)
-  self.frame = f
+Teacup.handler UIView, :height { |target, h|
+  f = target.frame
+  f.size.height = Teacup::calculate(target, :height, h)
+  target.frame = f
 }
 
-Teacup.handler UIView, :origin { |origin|
-  f = self.frame
+Teacup.handler UIView, :origin { |target, origin|
+  f = target.frame
   f.origin = origin
-  self.frame = f
+  target.frame = f
 }
 
-Teacup.handler UIView, :size { |size|
+Teacup.handler UIView, :size { |target, size|
   # odd... if I changed these to .is_a?, weird errors happen.  Use ===
   if Symbol === size && size == :full
-    if self.superview
-      size = self.superview.bounds.size
+    if target.superview
+      size = target.superview.bounds.size
     else
-      size = self.frame.size
+      size = target.frame.size
     end
   elsif Array === size
-    size = [Teacup::calculate(self, :width, size[0]), Teacup::calculate(self, :height, size[1])]
+    size = [Teacup::calculate(target, :width, size[0]), Teacup::calculate(target, :height, size[1])]
   end
-  f = self.frame
+  f = target.frame
   f.size = size
-  self.frame = f
+  target.frame = f
 }
 
-Teacup.handler UIView, :frame { |frame|
+Teacup.handler UIView, :frame { |target, frame|
   # odd... if I changed these to .is_a?, weird errors happen.  Use ===
   if Symbol === frame && frame == :full
-    if self.superview
-      frame = self.superview.bounds
+    if target.superview
+      frame = target.superview.bounds
     else
-      frame = self.frame
+      frame = target.frame
     end
   elsif Array === frame && frame.length == 4
     frame = [
-        [Teacup::calculate(self, :width, frame[0]), Teacup::calculate(self, :height, frame[1])],
-        [Teacup::calculate(self, :width, frame[2]), Teacup::calculate(self, :height, frame[3])]
+        [Teacup::calculate(target, :width, frame[0]), Teacup::calculate(target, :height, frame[1])],
+        [Teacup::calculate(target, :width, frame[2]), Teacup::calculate(target, :height, frame[3])]
       ]
   elsif Array === frame && frame.length == 2
     frame = [
-        [Teacup::calculate(self, :width, frame[0][0]), Teacup::calculate(self, :height, frame[0][1])],
-        [Teacup::calculate(self, :width, frame[1][0]), Teacup::calculate(self, :height, frame[1][1])]
+        [Teacup::calculate(target, :width, frame[0][0]), Teacup::calculate(target, :height, frame[0][1])],
+        [Teacup::calculate(target, :width, frame[1][0]), Teacup::calculate(target, :height, frame[1][1])]
       ]
   end
-  self.frame = frame
+  target.frame = frame
 }
 
-Teacup.handler UIView, :gradient { |gradient|
-  gradient_layer = self.instance_variable_get(:@gradient_layer) || begin
+Teacup.handler UIView, :gradient { |target, gradient|
+  gradient_layer = target.instance_variable_get(:@teacup_gradient_layer) || begin
     gradient_layer = CAGradientLayer.layer
-    gradient_layer.frame = self.bounds
-    self.layer.insertSublayer(gradient_layer, atIndex:0)
+    gradient_layer.frame = target.bounds
+    target.layer.insertSublayer(gradient_layer, atIndex:0)
     gradient_layer
   end
 
@@ -111,23 +111,23 @@ Teacup.handler UIView, :gradient { |gradient|
     end
   end
 
-  self.instance_variable_set(:@gradient_layer, gradient_layer)
+  target.instance_variable_set(:@teacup_gradient_layer, gradient_layer)
 }
 
 ##|
 ##|  UIButton
 ##|
-Teacup.handler UIButton, :title { |title|
-  self.setTitle(title, forState: UIControlStateNormal)
+Teacup.handler UIButton, :title { |target, title|
+  target.setTitle(title, forState: UIControlStateNormal)
 }
 
 
-Teacup.handler UIButton, :titleColor { |color|
-  self.setTitleColor(color.uicolor, forState: UIControlStateNormal)
+Teacup.handler UIButton, :titleColor { |target, color|
+  target.setTitleColor(color.uicolor, forState: UIControlStateNormal)
 }
 
 
-Teacup.handler UIButton, :titleFont, :font { |font|
+Teacup.handler UIButton, :titleFont, :font { |target, font|
   font = font.uifont
-  self.titleLabel.font = font
+  target.titleLabel.font = font
 }

data/samples/AutoLayout/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "teacup"

data/samples/AutoLayout/Gemfile.lock

@@ -0,0 +1,12 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.0.3)
+    teacup (1.2.8)
+      rake
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  teacup

data/samples/AutoLayout/Rakefile

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project'
+require 'bundler'
+Bundler.require
+
+Motion::Project::App.setup do |app|
+  # Use `rake config' to see complete project settings.
+  app.name = 'AutoLayout'
+
+  #include styles
+  app.files += Dir.glob(File.join(app.project_dir, 'styles/**/*.rb'))
+end

data/samples/AutoLayout/app/app_delegate.rb

@@ -0,0 +1,12 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    myNavController = RootController.alloc.init
+
+    @window.rootViewController = UINavigationController.alloc.initWithRootViewController(myNavController)
+    @window.rootViewController.wantsFullScreenLayout = true
+    @window.makeKeyAndVisible
+
+    true
+  end
+end

data/samples/AutoLayout/app/root_controller.rb

@@ -0,0 +1,16 @@
+class RootController < UIViewController
+  stylesheet :root
+
+  layout :root do
+    @label = subview(UILabel, :label)
+    @button = subview(UIButton.buttonWithType(UIButtonTypeRoundedRect), :button)
+    @switch = subview(UISwitch, :switch)
+  end  
+
+  def viewDidLoad
+  	super
+  	# Title for this view
+  	self.title = "Autolayout Example"
+  end
+
+end

data/samples/AutoLayout/styles/base.rb

@@ -0,0 +1,33 @@
+Teacup::Stylesheet.new :base do
+  back_color = UIColor.grayColor
+  dark_color = UIColor.blackColor
+  mid_color = UIColor.redColor
+
+  style UIView,
+    backgroundColor: back_color,
+    nav_btn_tint: mid_color
+
+  style :custom_label,
+    text: 'App Stuff!',
+    backgroundColor: UIColor.clearColor,
+    numberOfLines: 0,
+    font: UIFont.boldSystemFontOfSize(40),
+    textColor: UIColor.whiteColor,
+    shadowColor: UIColor.blackColor,
+    textAlignment: UITextAlignmentCenter,
+    layer: {
+      transform: identity,
+      shadowRadius: 20,
+      shadowOpacity: 0.5,
+      masksToBounds: false
+    }
+
+  style :custom_button,
+    width: 142,
+    height: 34,
+    title: "Button"
+
+  style :custom_switch,
+    on: true
+
+end

data/samples/AutoLayout/styles/dummy.rb

@@ -0,0 +1,2 @@
+# for when I come across one of those silly precompile issues
+# that is not yet supported by teacup

data/samples/AutoLayout/styles/handlers.rb

@@ -0,0 +1,3 @@
+Teacup.handler UIView, :nav_btn_tint do |color|
+ 	UIBarButtonItem.appearance.setTintColor(color)
+end

data/samples/AutoLayout/styles/root.rb

@@ -0,0 +1,29 @@
+Teacup::Stylesheet.new :root do
+  import :base
+
+  v_padding = 10
+
+  style :label, extends: :custom_label,
+    constraints: [
+      :full_width,
+      constrain_top(50)
+    ],
+    backgroundColor: UIColor.clearColor
+
+  style :button, extends: :custom_button,
+    constraints: [
+      constrain_below(:label).plus(v_padding),
+      # Position at half of middle (q1)
+      constrain(:center_x).equals(:superview, :center_x).times(0.5),
+      constrain(:left).equals(:superview, :left).plus(10)
+    ]
+
+  style :switch, extends: :custom_switch,
+    constraints: [
+      constrain_below(:label).plus(v_padding * 2),
+      # Position at Middle + half (75%)
+      constrain(:center_x).equals(:superview, :center_x).times(1.5)
+    ]
+    
+end
+

data/samples/AutoLayout/styles/settings.rb

@@ -0,0 +1,13 @@
+Teacup::Stylesheet.new :settings do
+  import :base
+
+  v_padding = 10
+
+  style :label, extends: :custom_label,
+    constraints: [
+      :full_width,
+      constrain_top(150)
+    ],
+    backgroundColor: :clear
+
+end

data/samples/OnePage/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'sugarcube'
+gem 'teacup'
+gem 'sweettea'
+gem 'geomotion'

data/samples/OnePage/Rakefile

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project'
+require 'bundler'
+Bundler.require
+
+
+Motion::Project::App.setup do |app|
+  # Use `rake config' to see complete project settings.
+  app.name = 'one-page'
+end

data/samples/OnePage/app/app_delegate.rb

@@ -0,0 +1,43 @@
+include SugarCube::Adjust
+
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.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,
+    constraints: [
+      :center_x,
+      :center_y,
+    ]
+
+  style :button,
+    title: 'neat.',
+    constraints: [
+      :center_x,
+      constrain_below(:label).plus(0),
+    ]
+
+end
+
+
+class MyController < UIViewController
+  stylesheet :teacup
+
+  layout do
+    @label = subview(UILabel, :label, text: 'nifty?')
+    @button = subview(UIButton, :button)
+  end
+
+end

data/samples/OnePage/resources/you_didnt_see_this

@@ -0,0 +1,125 @@
+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/samples/OnePage/spec/main_spec.rb

@@ -0,0 +1,9 @@
+describe "Application 'teacup-example'" do
+  before do
+    @app = UIApplication.sharedApplication
+  end
+
+  it "has one window" do
+    @app.windows.size.should == 1
+  end
+end

data/spec/gradient_spec.rb

@@ -1,5 +1,5 @@
 describe "Gradient" do
-  tests FirstController
+  tests GradientController
 
   before do
     @root_view = window.subviews[0]
@@ -7,14 +7,14 @@ describe "Gradient" do
 
   it "should insert gradient layer when gradient style is set" do
     @root_view.style(gradient: { colors: [UIColor.redColor, UIColor.yellowColor] })
-    @root_view.layer.sublayers.size.should == 2
+    @root_view.layer.sublayers.size.should == 1
     @root_view.layer.sublayers.first.class.should == CAGradientLayer
   end
 
   it "should not insert another gradient layer when gradient style is changed" do
     @root_view.style(gradient: { colors: [UIColor.redColor, UIColor.yellowColor] })
     @root_view.style(gradient: { colors: [UIColor.greenColor, UIColor.whiteColor] })
-    @root_view.layer.sublayers.size.should == 2
+    @root_view.layer.sublayers.size.should == 1
   end
 
   it "should change gradient layer when gradient style is changed" do
@@ -27,6 +27,6 @@ describe "Gradient" do
 
   it "should accept CGColors" do
     @root_view.style(gradient: { colors: [UIColor.redColor.CGColor, UIColor.yellowColor.CGColor] })
-    @root_view.layer.sublayers.size.should == 2
+    @root_view.layer.sublayers.size.should == 1
   end
 end

data/teacup.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2013-04-03 00:00:00.000000000 Z
+dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
 
@@ -68,6 +36,7 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - app/controllers/first_controller.rb
+- app/controllers/gradient_controller.rb
 - app/controllers/landscape_only_controller.rb
 - app/controllers/tableview_controller.rb
 - app/custom_class.rb
@@ -87,12 +56,23 @@ files:
 - lib/teacup/stylesheet_extensions/constraints.rb
 - lib/teacup/stylesheet_extensions/geometry.rb
 - lib/teacup/stylesheet_extensions/rotation.rb
+- lib/teacup/teacup_util.rb
 - lib/teacup/version.rb
 - lib/teacup/z_core_extensions/ca_layer.rb
 - lib/teacup/z_core_extensions/ui_view.rb
 - lib/teacup/z_core_extensions/ui_view_controller.rb
 - lib/teacup/z_core_extensions/ui_view_getters.rb
 - lib/teacup/z_core_extensions/z_handlers.rb
+- samples/AutoLayout/Gemfile
+- samples/AutoLayout/Gemfile.lock
+- samples/AutoLayout/Rakefile
+- samples/AutoLayout/app/app_delegate.rb
+- samples/AutoLayout/app/root_controller.rb
+- samples/AutoLayout/styles/base.rb
+- samples/AutoLayout/styles/dummy.rb
+- samples/AutoLayout/styles/handlers.rb
+- samples/AutoLayout/styles/root.rb
+- samples/AutoLayout/styles/settings.rb
 - samples/Hai/.gitignore
 - samples/Hai/Gemfile
 - samples/Hai/Gemfile.lock
@@ -101,6 +81,12 @@ files:
 - samples/Hai/app/hai_controller.rb
 - samples/Hai/spec/main_spec.rb
 - samples/Hai/styles/iphone.rb
+- samples/OnePage/Gemfile
+- 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/custom_class_spec.rb
 - spec/gradient_spec.rb
@@ -130,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A community-driven DSL for creating user interfaces on iOS.
@@ -142,3 +128,4 @@ test_files:
 - spec/stylesheet_spec.rb
 - spec/uiswitch_spec.rb
 - spec/view_spec.rb
+has_rdoc: