teacup 1.3.4 → 2.0.0

data/spec/{main_spec.rb → ios/main_spec.rb}

@@ -1,5 +1,5 @@
 describe "Application 'Teacup'" do
-  tests FirstController
+  tests MainController
 
   before do
     @root_view = window.subviews[0]
@@ -38,6 +38,7 @@ describe "Application 'Teacup'" do
     @background.frame.size.width.should == 300
     @background.frame.size.height.should == 440
     @background.backgroundColor.should == UIColor.darkGrayColor
+    @background.custom_attr.should == :custom_value
   end
 
   it "background view should have subviews" do
@@ -69,29 +70,37 @@ describe "Application 'Teacup'" do
     @welcome.text.should == "Welcome to teacup"
   end
 
-  it "should be styled as :footer" do
-    @footer.stylename.should == :footer
-    @footer.frame.origin.x.should == 10
-    @footer.frame.origin.y.should == 410
-    @footer.frame.size.width.should == 280
-    @footer.frame.size.height.should == 20
-    @footer.text.should == "This is a teacup example"
+  it "should be assigned to .welcome" do
+    @welcome.should == controller.welcome
   end
 
   it "should be styled as :next_message" do
     @button.stylename.should == :next_message
     @button.frame.origin.x.should == 150
     @button.frame.origin.y.should == 370
-    @button.frame.size.width.should == 130
+    @button.frame.size.width.should == 140
     @button.frame.size.height.should == 20
     @button.titleForState(UIControlStateNormal).should == "Next Message..."
   end
 
+  it "should be assigned to .button" do
+    @button.should == controller.button
+  end
+
+  it "should be styled as :footer" do
+    @footer.stylename.should == :footer
+    @footer.frame.origin.x.should == 10
+    @footer.frame.origin.y.should == 410
+    @footer.frame.size.width.should == 280
+    @footer.frame.size.height.should == 20
+    @footer.text.should == "This is a teacup example"
+  end
+
 end
 
 
 describe "background view in landscape" do
-  tests FirstController
+  tests MainController
 
   before do
     @root_view = window.subviews[0]
@@ -148,16 +157,46 @@ describe "background view in landscape" do
     @button.stylename.should == :next_message
     @button.frame.origin.x.should == 20
     @button.frame.origin.y.should == 200
-    @button.frame.size.width.should == 130
+    @button.frame.size.width.should == 140
     @button.frame.size.height.should == 20
     @button.titleForState(UIControlStateNormal).should == "Next Message..."
   end
 
 end
 
-describe "Stylesheet 'first'" do
+
+describe "background view in landscape" do
+  tests MainController
+
+  before do
+    @root_view = window.subviews[0]
+    @background = @root_view.subviews[0]
+    @welcome = @background.subviews[0]
+    @footer = @background.subviews[1]
+    @button = @background.subviews[2]
+    rotate_device :to => :landscape
+    rotate_device :to => :portrait
+  end
+
+  it "should be in portrait" do
+    if UIApplication.sharedApplication.statusBarOrientation != UIInterfaceOrientationPortrait
+      NSLog("\n=====\n  The device orientation is not changing to `portrait`!\n=====\n")
+    end
+    UIApplication.sharedApplication.statusBarOrientation.should == UIInterfaceOrientationPortrait
+  end
+
+  it "root view should be styled as :root, keeping landscape properties that weren't changed" do
+    @root_view.stylename.should == :root
+    @root_view.backgroundColor.should == UIColor.redColor
+  end
+
+end
+
+
+# this is the stylesheet used in MainController
+describe "Stylesheet 'main'" do
   before do
-    @stylesheet = Teacup::Stylesheet[:first]
+    @stylesheet = Teacup::Stylesheet[:main]
   end
 
   it "should exist" do

data/spec/ios/motion_layout_spec.rb

@@ -0,0 +1,44 @@
+describe "MotionLayout" do
+  tests MotionLayoutController
+
+  describe 'applied constraints' do
+    it 'should have label1 on the left' do
+      label1_left = CGRectGetMinX(controller.label1.frame)
+      label1_left.should == 20
+    end
+
+    it 'should have label1 at the top' do
+      label1_top = CGRectGetMinY(controller.label1.frame)
+      label1_top.should == 100
+    end
+
+    it 'should have label2 at the top' do
+      label2_top = CGRectGetMinY(controller.label2.frame)
+      label2_top.should == 100
+    end
+
+    it 'should have margin between label1 and label2' do
+      label1_right = CGRectGetMaxX(controller.label1.frame)
+      label2_left = CGRectGetMinX(controller.label2.frame)
+      (label2_left - label1_right).should == 20
+    end
+
+    it 'should have label2 and label3 on the right' do
+      label2_right = CGRectGetMaxX(controller.label2.frame)
+      label3_right = CGRectGetMaxX(controller.label3.frame)
+      label3_right.should == label2_right
+    end
+
+    it 'should have label3 on the left' do
+      label3_left = CGRectGetMinX(controller.label3.frame)
+      label3_left.should == 20
+    end
+
+    it 'should have label3 at 220' do
+      label3_top = CGRectGetMinY(controller.label3.frame)
+      label3_top.should == 220
+    end
+
+  end
+
+end

data/spec/{style_spec.rb → ios/style_spec.rb}

@@ -194,7 +194,7 @@ describe "Teacup::Style" do
     style3 = Teacup::Style.new
     style3.stylesheet = sheet
 
-    built = style3.build(UIInterfaceOrientationPortrait)
+    built = style3.build(nil, UIInterfaceOrientationPortrait)
     built[:top].should == nil
     built[:left].should == nil
     built[:width].should == nil

data/spec/ios/stylesheet_extensions/autoresize_spec.rb

@@ -0,0 +1,50 @@
+describe "Stylesheet - Autoresize" do
+
+  it "should return the same object" do
+    stylesheet1 = Teacup::Stylesheet.new
+    stylesheet2 = Teacup::Stylesheet.new
+    stylesheet1.autoresize.should == stylesheet2.autoresize
+  end
+
+  it "should return autoresizeMask values" do
+    stylesheet = Teacup::Stylesheet.new
+
+    stylesheet.autoresize.flexible_left.should == UIViewAutoresizingFlexibleLeftMargin
+    stylesheet.autoresize.flexible_width.should == UIViewAutoresizingFlexibleWidth
+    stylesheet.autoresize.flexible_right.should == UIViewAutoresizingFlexibleRightMargin
+    stylesheet.autoresize.flexible_top.should == UIViewAutoresizingFlexibleTopMargin
+    stylesheet.autoresize.flexible_height.should == UIViewAutoresizingFlexibleHeight
+    stylesheet.autoresize.flexible_bottom.should == UIViewAutoresizingFlexibleBottomMargin
+  end
+
+  it "should return autoresizeMask values" do
+    stylesheet = Teacup::Stylesheet.new
+
+    stylesheet.autoresize.fill.should == UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
+    stylesheet.autoresize.fill_top.should == UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleBottomMargin
+    stylesheet.autoresize.fill_bottom.should == UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleTopMargin
+    stylesheet.autoresize.fill_left.should == UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleRightMargin
+    stylesheet.autoresize.fill_right.should == UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleLeftMargin
+
+    stylesheet.autoresize.fixed_top_left.should == UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin
+    stylesheet.autoresize.fixed_top_middle.should == UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin
+    stylesheet.autoresize.fixed_top_right.should == UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleBottomMargin
+    stylesheet.autoresize.fixed_middle_left.should == UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin
+    stylesheet.autoresize.fixed_middle.should == UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin
+    stylesheet.autoresize.fixed_middle_right.should == UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleLeftMargin
+    stylesheet.autoresize.fixed_bottom_left.should == UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin
+    stylesheet.autoresize.fixed_bottom_middle.should == UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin
+    stylesheet.autoresize.fixed_bottom_right.should == UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin
+
+    stylesheet.autoresize.float_horizontal.should == UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin
+    stylesheet.autoresize.float_vertical.should == UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin
+  end
+
+  it "should combine values in a block" do
+    stylesheet = Teacup::Stylesheet.new
+
+    stylesheet.autoresize { flexible_left | flexible_width }.should == UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleWidth
+    stylesheet.autoresize { flexible_width | flexible_height }.should == UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
+  end
+
+end

data/spec/{stylesheet_spec.rb → ios/stylesheet_spec.rb}

@@ -122,6 +122,7 @@ describe "Teacup::Stylesheet" do
         import :importedbyname
 
         style :label,
+          text: @imported_text,
           backgroundColor: :blue,
           layer: {
             borderWidth: 2,
@@ -129,6 +130,8 @@ describe "Teacup::Stylesheet" do
       end
 
       Teacup::Stylesheet.new(:importedbyname) do
+        @imported_text = 'imported text'
+
         style :label,
           title: "Imported by name",
           layer: {
@@ -141,6 +144,7 @@ describe "Teacup::Stylesheet" do
         import :importedbyname
 
         style :label,
+          text: @imported_text,
           backgroundColor: :blue
       end
 
@@ -179,6 +183,14 @@ describe "Teacup::Stylesheet" do
       @oo_name_importer.query(:label)[:layer][:borderColor].should == :red
     end
 
+    it 'should import instance variables' do
+      @name_importer.query(:label)[:text].should == 'imported text'
+    end
+
+    it 'should import instance variables even if defined out of order' do
+      @oo_name_importer.query(:label)[:text].should == 'imported text'
+    end
+
     it 'should work with a value' do
       imported_anonymously = Teacup::Stylesheet.new do
         style :label,

data/spec/{view_spec.rb → ios/view_spec.rb}

@@ -1,7 +1,19 @@
+class CustomLabel < UILabel
+  attr :partyTime
+
+  def initWithFrame(frame)
+    super.tap do
+      @partyTime = :excellent
+    end
+  end
+
+end
+
+
 describe "Teacup::View" do
 
   before do
-    @view = UILabel.new
+    @view = CustomLabel.new
 
     @stylesheet = Teacup::Stylesheet.new do
       style :label,
@@ -24,6 +36,14 @@ describe "Teacup::View" do
     end
   end
 
+  describe 'apply_stylename=' do
+    it 'should set the style when a stylesheet is there' do
+      @view.stylesheet = @stylesheet
+      @view.apply_stylename(:label)
+      @view.text.should == "Stylesheet1 Label1"
+    end
+  end
+
   describe 'stylesheet=' do
     it 'should work' do
       @view.stylesheet = @stylesheet
@@ -95,7 +115,8 @@ describe "Teacup::View" do
     end
 
     it 'should warn about unknown thingies' do
-      @view.style(partyTime: :excellent)
+      @view.style(partyTime: :bogus)
+      @view.partyTime.should == :excellent
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
@@ -36,36 +36,52 @@ files:
 - README.md
 - Rakefile
 - app/app_delegate.rb
+- app/controllers/appearance_controller.rb
 - app/controllers/constraints_controller.rb
-- app/controllers/first_controller.rb
 - app/controllers/gradient_controller.rb
 - app/controllers/landscape_only_controller.rb
+- app/controllers/main_controller.rb
+- app/controllers/motion_layout_controller.rb
 - app/controllers/present_modal_controller.rb
 - app/controllers/tableview_controller.rb
 - app/custom_class.rb
+- app/styles/appearance.rb
 - app/styles/main_styles.rb
 - app/views/custom_view.rb
-- lib/dummy.rb
+- lib/teacup-ios/appearance.rb
+- lib/teacup-ios/core_extensions/teacup_handlers.rb
+- lib/teacup-ios/core_extensions/ui_view.rb
+- lib/teacup-ios/core_extensions/ui_view_controller.rb
+- lib/teacup-ios/dummy.rb
+- lib/teacup-ios/handler.rb
+- lib/teacup-ios/style.rb
+- lib/teacup-ios/stylesheet_extensions/autoresize.rb
+- lib/teacup-ios/stylesheet_extensions/device.rb
+- lib/teacup-osx/core_extensions/ns_view.rb
+- lib/teacup-osx/core_extensions/ns_view_controller.rb
+- lib/teacup-osx/core_extensions/ns_window.rb
+- lib/teacup-osx/core_extensions/ns_window_controller.rb
+- lib/teacup-osx/core_extensions/teacup_handlers.rb
+- lib/teacup-osx/dummy.rb
+- lib/teacup-osx/handler.rb
+- lib/teacup-osx/style.rb
+- lib/teacup-osx/style_extensions/autoresize.rb
 - lib/teacup.rb
 - lib/teacup/calculations.rb
 - lib/teacup/constraint.rb
+- lib/teacup/core_extensions/ca_layer.rb
+- lib/teacup/core_extensions/view_getters.rb
 - lib/teacup/handler.rb
 - lib/teacup/layout.rb
 - lib/teacup/merge_defaults.rb
 - lib/teacup/restyle.rb
-- lib/teacup/style.rb
 - lib/teacup/stylesheet.rb
-- lib/teacup/stylesheet_extensions/autoresize.rb
 - lib/teacup/stylesheet_extensions/constraints.rb
-- lib/teacup/stylesheet_extensions/geometry.rb
-- lib/teacup/stylesheet_extensions/rotation.rb
+- lib/teacup/stylesheet_extensions/transform.rb
+- lib/teacup/teacup_controller.rb
 - lib/teacup/teacup_util.rb
+- lib/teacup/teacup_view.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
 - resources/Default-568h@2x.png
 - samples/AutoLayout/Gemfile
 - samples/AutoLayout/Gemfile.lock
@@ -91,17 +107,46 @@ files:
 - samples/OnePage/resources/Default-568h@2x.png
 - 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/ui_view_getters_spec.rb
-- spec/uiswitch_spec.rb
-- spec/view_spec.rb
+- samples/Tweets/Gemfile
+- samples/Tweets/Gemfile.lock
+- samples/Tweets/README
+- samples/Tweets/Rakefile
+- samples/Tweets/app/app_delegate.rb
+- samples/Tweets/app/data_parser.rb
+- samples/Tweets/app/json_parser.rb
+- samples/Tweets/app/main_window.rb
+- samples/Tweets/app/menu.rb
+- samples/Tweets/app/stylesheet.rb
+- samples/Tweets/app/tweet.rb
+- samples/Tweets/resources/Credits.rtf
+- samples/Tweets/spec/main_spec.rb
+- samples/teacup-osx/.gitignore
+- samples/teacup-osx/Gemfile
+- samples/teacup-osx/Gemfile.lock
+- samples/teacup-osx/Rakefile
+- samples/teacup-osx/app/app_delegate.rb
+- samples/teacup-osx/app/controller.rb
+- samples/teacup-osx/app/menu.rb
+- samples/teacup-osx/app/window.rb
+- samples/teacup-osx/resources/Credits.rtf
+- samples/teacup-osx/resources/teacup.png
+- samples/teacup-osx/spec/main_spec.rb
+- spec/ios/appearance_spec.rb
+- spec/ios/calculations_spec.rb
+- spec/ios/constraints_spec.rb
+- spec/ios/custom_class_spec.rb
+- spec/ios/gradient_spec.rb
+- spec/ios/layout_module_spec.rb
+- spec/ios/layout_spec.rb
+- spec/ios/main_spec.rb
+- spec/ios/motion_layout_spec.rb
+- spec/ios/present_modal_spec.rb
+- spec/ios/style_spec.rb
+- spec/ios/stylesheet_extensions/autoresize_spec.rb
+- spec/ios/stylesheet_spec.rb
+- spec/ios/ui_view_getters_spec.rb
+- spec/ios/uiswitch_spec.rb
+- spec/ios/view_spec.rb
 - teacup.gemspec
 homepage: https://github.com/rubymotion/teacup
 licenses: []
@@ -128,14 +173,19 @@ signing_key:
 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/ui_view_getters_spec.rb
-- spec/uiswitch_spec.rb
-- spec/view_spec.rb
+- spec/ios/appearance_spec.rb
+- spec/ios/calculations_spec.rb
+- spec/ios/constraints_spec.rb
+- spec/ios/custom_class_spec.rb
+- spec/ios/gradient_spec.rb
+- spec/ios/layout_module_spec.rb
+- spec/ios/layout_spec.rb
+- spec/ios/main_spec.rb
+- spec/ios/motion_layout_spec.rb
+- spec/ios/present_modal_spec.rb
+- spec/ios/style_spec.rb
+- spec/ios/stylesheet_extensions/autoresize_spec.rb
+- spec/ios/stylesheet_spec.rb
+- spec/ios/ui_view_getters_spec.rb
+- spec/ios/uiswitch_spec.rb
+- spec/ios/view_spec.rb

data/lib/teacup/stylesheet_extensions/autoresize.rb

@@ -1,39 +0,0 @@
-# Example:
-#     Teacup::Stylesheet.new :main do
-#       style :root,
-#         # stays centered and grows in height
-#         autoresizingMask: flexible_left|flexible_right|flexible_height
-#     end
-module Teacup
-  class Stylesheet
-
-    def none
-      UIViewAutoresizingNone
-    end
-
-    def flexible_left
-      UIViewAutoresizingFlexibleLeftMargin
-    end
-
-    def flexible_width
-      UIViewAutoresizingFlexibleWidth
-    end
-
-    def flexible_right
-      UIViewAutoresizingFlexibleRightMargin
-    end
-
-    def flexible_top
-      UIViewAutoresizingFlexibleTopMargin
-    end
-
-    def flexible_height
-      UIViewAutoresizingFlexibleHeight
-    end
-
-    def flexible_bottom
-      UIViewAutoresizingFlexibleBottomMargin
-    end
-
-  end
-end

data/lib/teacup/stylesheet_extensions/rotation.rb

@@ -1,37 +0,0 @@
-
-module Teacup
-  class Stylesheet
-
-    def identity
-      [1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1]
-    end
-
-    def pi
-      3.1415926
-    end
-
-    # rotates the "up & down" direction.  The bottom of the view will rotate
-    # towards the user as angle increases.
-    def flip matrix, angle
-      CATransform3DRotate(matrix, angle, 1, 0, 0)
-    end
-
-    # rotates the "left & right" direction.  The right side of the view will
-    # rotate towards the user as angle increases.
-    def twist matrix, angle
-      CATransform3DRotate(matrix, angle, 0, 1, 0)
-    end
-
-    # spins, along the z axis.  This is probably the one you want, for
-    # "spinning" a view like you might a drink coaster or paper napkin.
-    def spin matrix, angle
-      CATransform3DRotate(matrix, angle, 0, 0, 1)
-    end
-
-    # rotates the layer arbitrarily
-    def rotate matrix, angle, x, y, z
-      CATransform3DRotate(matrix, angle, x, y, z)
-    end
-
-  end
-end