teacup 1.3.0 → 1.3.1

data/README.md

@@ -3,9 +3,6 @@ Teacup
 
 A community-driven DSL for creating user interfaces on the iphone.
 
-**Note: for a yet-unknown reason teacup does not compile correctly using ruby
-2.0.  Use 1.9.3 instead please, or help determine what is wrong with 2.0.**
-
 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.

data/app/controllers/present_modal_controller.rb

@@ -1,4 +1,5 @@
 class PresentModalController < UIViewController
+  attr :modal
 
   stylesheet :present_modal
 
@@ -8,23 +9,8 @@ class PresentModalController < UIViewController
   end
 
   def open_modal_button
-    self.presentViewController(PresentedController.new, animated:true, completion:nil)
-  end
-
-end
-
-class PresentedController < UIViewController
-
-  stylesheet :present_modal
-
-  layout :root do
-    subview(UIView, :header)
-    subview(UIView, :footer)
-    subview(UIView, :center) do
-      $left = subview(UIView, :left)
-      $top_right = subview(UIView, :top_right)
-      $btm_right = subview(UIView, :btm_right)
-    end
+    @modal = ConstraintsController.new
+    self.presentViewController(@modal, animated:true, completion:nil)
   end
 
 end
@@ -41,56 +27,4 @@ Teacup::Stylesheet.new :present_modal do
       :centered
     ]
 
-  style :header,
-    backgroundColor: UIColor.blueColor,
-    constraints: [
-      :full_width,
-      :top,
-      constrain_height(52),
-    ]
-
-  style :footer,
-    backgroundColor: UIColor.magentaColor,
-    constraints: [
-      :full_width,
-      :bottom,
-      constrain_height(52),
-    ]
-
-  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.0'
+  VERSION = '1.3.1'
 
 end

data/lib/teacup/z_core_extensions/ui_view_controller.rb

@@ -256,13 +256,8 @@ class UIViewController
 end
 
 
-module Teacup
-
-module_function
-  def get_subviews(target)
-    [target] + target.subviews.map { |subview|
-      get_subviews(subview).select{ |v| v.stylename }
-    }.flatten
-  end
-
+def Teacup.get_subviews(target)
+  [target] + target.subviews.map { |subview|
+    get_subviews(subview).select{ |v| v.stylename }
+  }.flatten
 end

data/spec/styling_modal_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for