teacup 2.0.2 → 2.0.3

data/README.md

@@ -14,16 +14,18 @@ interfaces programmatically.
 * iOS
   * “[Hai][Hai]”
   * “[AutoLayout][AutoLayout]”
-  * “[OnePage][OnePage]”
+  * “[Sweettea Example][sweettea-example]”
 * OS X
   * “[Tweets][Tweets]” - ported from [RubyMotionSamples][]
-  * “[teacup-osx][teacup-osx]”
+  * “[simple][]”
+
+[Hai]: https://github.com/rubymotion/teacup/tree/master/samples/ios/Hai
+[AutoLayout]: https://github.com/rubymotion/teacup/tree/master/samples/ios/AutoLayout
+[sweettea-example]: https://github.com/rubymotion/teacup/tree/master/samples/ios/sweettea-example
+
+[Tweets]: https://github.com/rubymotion/teacup/tree/master/samples/osx/Tweets
+[simple]: https://github.com/rubymotion/teacup/tree/master/samples/osx/simple
 
-[Hai]: https://github.com/rubymotion/teacup/tree/master/samples/Hai
-[AutoLayout]: https://github.com/rubymotion/teacup/tree/master/samples/AutoLayout
-[OnePage]: https://github.com/rubymotion/teacup/tree/master/samples/OnePage
-[Tweets]: https://github.com/rubymotion/teacup/tree/master/samples/Tweets
-[teacup-osx]: https://github.com/rubymotion/teacup/tree/master/samples/teacup-osx
 [RubyMotionSamples]: https://github.com/HipByte/RubyMotionSamples/tree/master/osx/Tweets
 
 **Quick Install**
@@ -532,8 +534,7 @@ end
 And lastly, the `UIAppearance protocol` is supported by creating an instance of
 `Teacup::Appearance`.  There is debatable benefit to using [UIAppearance][],
 because it will apply styles to views that are outside your control, like the
-camera/image pickers and email/message controllers.  Using `import` instead will
-not apply styles to those views.
+camera/image pickers and email/message controllers.
 
 But, it does come in handy sometimes... so here it is!
 
@@ -555,6 +556,28 @@ Teacup::Appearance.new do
 end
 ```
 
+In your AppDelegate you need to call `Teacup::Appearance.apply`.  It will get
+called automatically using the `UIApplicationDidFinishLaunchingNotification`,
+but that notification is triggered *after* the method
+`AppDelegate#didFinishLaunching(withOptions:)` is called.
+
+###### app_delegate.rb
+```ruby
+class AppDelegate
+  def didFinishLaunching(application, withOptions:options)
+    Teacup::Appearance.apply
+
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+    ctlr = MainController.new
+    @window.rootViewController = UINavigationController.alloc.initWithRootController(ctlr)
+    @window.makeKeyAndVisible
+
+    true
+  end
+
+end
+```
+
 That block is called using the `UIApplicationDidFinishLaunchingNotification`,
 but that notification is not called until the *end* of the
 `application(application,didFinishLaunchingWithOptions:launchOptions)` method.

data/lib/teacup/layout.rb

@@ -155,7 +155,11 @@ module Teacup
         end
       end
 
-      Teacup.apply_hash view, teacup_style.build(view)
+      if view.is_a? Teacup::View
+        view.style(teacup_style.build(view))
+      else
+        Teacup.apply_hash view, teacup_style.build(view)
+      end
 
       # assign the 'teacup_next_responder', which is queried for a stylesheet if
       # one is not explicitly assigned to the view

data/lib/teacup/stylesheet_extensions/transform.rb

@@ -16,7 +16,27 @@ module Teacup
 
     def identity
       NSLog("The Stylesheet method `identity` is deprecated, use `transform_layer.identity` instead")
-      [1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1]
+      transform_layer.identity
+    end
+
+    def flip(matrix, angle)
+      NSLog("The Stylesheet method `flip` is deprecated, use `transform_layer.flip` instead")
+      transform_layer.flip(angle)
+    end
+
+    def twist(matrix, angle)
+      NSLog("The Stylesheet method `twist` is deprecated, use `transform_layer.twist` instead")
+      transform_layer.twist(angle)
+    end
+
+    def spin(matrix, angle)
+      NSLog("The Stylesheet method `spin` is deprecated, use `transform_layer.spin` instead")
+      transform_layer.spin(angle)
+    end
+
+    def rotate(matrix, angle, x, y, z)
+      NSLog("The Stylesheet method `rotate` is deprecated, use `transform_layer.rotate` instead")
+      transform_layer.rotate(angle, x, y, z)
     end
 
   end

data/lib/teacup/teacup_view.rb

@@ -295,10 +295,6 @@ module Teacup
     #
     # @param Hash  the properties to set.
     def style(properties)
-      if properties.key?(:constraints)
-        add_uniq_constraints(properties.delete(:constraints))
-      end
-
       apply_style_properties(properties)
     end
 

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 
 end

data/lib/teacup-ios/core_extensions/teacup_handlers.rb

@@ -1,3 +1,10 @@
+##|
+##|  Constraints
+##|
+Teacup.handler UIView, :constraints do |target, constraints|
+  target.add_uniq_constraints(constraints)
+end
+
 ##|
 ##|  UIView.frame
 ##|

data/lib/teacup-ios/dummy.rb

@@ -27,6 +27,7 @@ end
 class DummyScrollView < UIScrollView
 private
   def dummy
+    setPagingEnabled(nil)
     setScrollEnabled(nil)
     setShowsHorizontalScrollIndicator(nil)
     setShowsVerticalScrollIndicator(nil)

data/lib/teacup-osx/core_extensions/teacup_handlers.rb

@@ -1,3 +1,10 @@
+##|
+##|  Constraints
+##|
+Teacup.handler NSView, :constraints do |target, constraints|
+  target.add_uniq_constraints(constraints)
+end
+
 ##|
 ##|  NSView.frame
 ##|

data/lib/teacup-osx/core_extensions/z_core_extensions.rb

@@ -100,7 +100,7 @@ Teacup.handler NSView, :frame do |target, frame|
         [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) || CGRect === frame
+  elsif (Array === frame && frame.length == 2) || NSRect === frame
     frame = [
         [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])]

data/samples/README.md

@@ -2,3 +2,14 @@ Samples
 =======
 
 Welcome to the Teacup samples directory. Place sample apps using Teacup here.
+
+# iOS
+
+* Hai - a very simple teacup demo
+* AutoLayout - demonstrates the constraints DSL
+* Sweettea Example - uses SugarCube, Sweettea, and the constraints DSL
+
+# OS X
+
+* Teacup OSX - the original "hey, it works!" project
+* Tweets - a port of the RubyMotionSample app

data/samples/ios/AutoLayout/Gemfile

@@ -0,0 +1 @@
+gem 'teacup', :path => '../../..'

data/samples/{Hai → ios/AutoLayout}/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: ../..
   specs:
-    teacup (1.3.3)
+    teacup (2.0.2)
 
 GEM
-  remote: https://rubygems.org/
   specs:
 
 PLATFORMS

data/samples/ios/Hai/Gemfile

@@ -0,0 +1 @@
+gem 'teacup', :path => '../../..'

data/samples/{Tweets → ios/Hai}/Gemfile.lock

@@ -1,16 +1,13 @@
 PATH
   remote: ../..
   specs:
-    teacup (2.0.0pre)
+    teacup (2.0.2)
 
 GEM
-  remote: https://rubygems.org/
   specs:
-    rake (10.0.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake
   teacup!

data/samples/{Hai → ios/Hai}/Rakefile

@@ -1,5 +1,5 @@
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require 'bundler'
 Bundler.require
 

data/samples/{Hai → ios/Hai}/app/styles/iphone.rb

@@ -11,30 +11,37 @@ Teacup::Stylesheet.new(:iphone) do
   style :label,
     text: 'Hai!',
     backgroundColor: UIColor.whiteColor,
-    top: 10,
-    left: 100,
-    width: 50,
-    height: 20,
-    layer: {
-      transform: identity,
+    portrait: {
+      layer: {
+        transform: transform_layer.identity,
+      },
+      top: 10,
+      left: 100,
+      height: 20,
+      width: 50
     },
     landscape_left: {
       layer: {
-        transform: rotate(identity, pi/6, 0.3, 0.3, 0.3)
+        transform: transform_layer.rotate(pi/6, 0.3, 0.3, 0.3)
       },
+      top: 40,
+      left: 100,
+      height: 20,
       width: 75
     }
 
   style :footer,
     text: 'brought to you by teacup',
     backgroundColor: UIColor.lightGrayColor,
-    top: 440,
-    left: 120,
     width: 200,
     height: 20,
+    portrait: {
+      top: 440,
+      left: 120,
+    },
     landscape: {
+      top: 280,
       left: 280,
-      top: 280
     }
 
 end

data/samples/{OnePage → ios/sweettea-example}/Gemfile

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

data/samples/{OnePage → ios/sweettea-example}/Gemfile.lock

@@ -1,21 +1,23 @@
+PATH
+  remote: ../..
+  specs:
+    teacup (2.0.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    geomotion (0.12.1)
     rake (10.0.4)
     sugarcube (0.20.18)
     sweettea (0.5.6)
       rake
       sugarcube
       teacup
-    teacup (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  geomotion
   rake
   sugarcube
   sweettea
-  teacup
+  teacup!

data/samples/{OnePage → ios/sweettea-example}/Rakefile

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

data/samples/{OnePage → ios/sweettea-example}/app/app_delegate.rb

@@ -37,7 +37,7 @@ class MyController < UIViewController
 
   layout do
     @label = subview(UILabel, :label, text: 'nifty?')
-    @button = subview(UIButton, :button)
+    @button = subview(UIButton.rounded, :button)
   end
 
 end

data/samples/osx/Tweets/Gemfile

@@ -0,0 +1 @@
+gem 'teacup', :path => '../../..'

data/samples/osx/Tweets/Gemfile.lock

@@ -0,0 +1,13 @@
+PATH
+  remote: ../..
+  specs:
+    teacup (2.0.2)
+
+GEM
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  teacup!

data/samples/{Tweets → osx/Tweets}/Rakefile

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project/template/osx'
-require 'teacup'
+require 'bundler'
+Bundler.require
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.

data/samples/osx/simple/Gemfile

@@ -0,0 +1 @@
+gem 'teacup', :path => '../../..'

data/samples/{teacup-osx → osx/simple}/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    teacup (2.0.0pre)
+    teacup (2.0.2)
 
 GEM
   remote: https://rubygems.org/

data/samples/{teacup-osx → osx/simple}/app/app_delegate.rb

@@ -1,5 +1,3 @@
-include SugarCube::Adjust
-
 
 class AppDelegate
   def applicationDidFinishLaunching(notification)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
@@ -84,54 +84,51 @@ files:
 - lib/teacup/teacup_view.rb
 - lib/teacup/version.rb
 - resources/Default-568h@2x.png
-- samples/AutoLayout/Gemfile
-- samples/AutoLayout/Gemfile.lock
-- samples/AutoLayout/Rakefile
-- samples/AutoLayout/app/app_delegate.rb
-- samples/AutoLayout/app/root_controller.rb
-- samples/AutoLayout/app/styles/root.rb
-- samples/AutoLayout/lib/dummy.rb
-- samples/AutoLayout/lib/handlers.rb
-- samples/AutoLayout/lib/styles/base.rb
-- samples/Hai/.gitignore
-- samples/Hai/Gemfile
-- samples/Hai/Gemfile.lock
-- samples/Hai/Rakefile
-- samples/Hai/app/app_delegate.rb
-- samples/Hai/app/hai_controller.rb
-- samples/Hai/app/styles/iphone.rb
-- samples/Hai/spec/main_spec.rb
-- samples/OnePage/Gemfile
-- samples/OnePage/Gemfile.lock
-- samples/OnePage/Rakefile
-- samples/OnePage/app/app_delegate.rb
-- samples/OnePage/resources/Default-568h@2x.png
-- samples/OnePage/spec/main_spec.rb
 - samples/README.md
-- 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
+- samples/ios/AutoLayout/Gemfile
+- samples/ios/AutoLayout/Gemfile.lock
+- samples/ios/AutoLayout/Rakefile
+- samples/ios/AutoLayout/app/app_delegate.rb
+- samples/ios/AutoLayout/app/root_controller.rb
+- samples/ios/AutoLayout/app/styles/root.rb
+- samples/ios/AutoLayout/lib/dummy.rb
+- samples/ios/AutoLayout/lib/handlers.rb
+- samples/ios/AutoLayout/lib/styles/base.rb
+- samples/ios/Hai/.gitignore
+- samples/ios/Hai/Gemfile
+- samples/ios/Hai/Gemfile.lock
+- samples/ios/Hai/Rakefile
+- samples/ios/Hai/app/app_delegate.rb
+- samples/ios/Hai/app/hai_controller.rb
+- samples/ios/Hai/app/styles/iphone.rb
+- samples/ios/Hai/resources/Default-568h@2x.png
+- samples/ios/sweettea-example/Gemfile
+- samples/ios/sweettea-example/Gemfile.lock
+- samples/ios/sweettea-example/Rakefile
+- samples/ios/sweettea-example/app/app_delegate.rb
+- samples/ios/sweettea-example/resources/Default-568h@2x.png
+- samples/osx/Tweets/Gemfile
+- samples/osx/Tweets/Gemfile.lock
+- samples/osx/Tweets/README
+- samples/osx/Tweets/Rakefile
+- samples/osx/Tweets/app/app_delegate.rb
+- samples/osx/Tweets/app/data_parser.rb
+- samples/osx/Tweets/app/json_parser.rb
+- samples/osx/Tweets/app/main_window.rb
+- samples/osx/Tweets/app/menu.rb
+- samples/osx/Tweets/app/stylesheet.rb
+- samples/osx/Tweets/app/tweet.rb
+- samples/osx/Tweets/resources/Credits.rtf
+- samples/osx/simple/.gitignore
+- samples/osx/simple/Gemfile
+- samples/osx/simple/Gemfile.lock
+- samples/osx/simple/Rakefile
+- samples/osx/simple/app/app_delegate.rb
+- samples/osx/simple/app/controller.rb
+- samples/osx/simple/app/menu.rb
+- samples/osx/simple/app/window.rb
+- samples/osx/simple/resources/Credits.rtf
+- samples/osx/simple/resources/teacup.png
 - spec/ios/appearance_spec.rb
 - spec/ios/calculations_spec.rb
 - spec/ios/constraints_spec.rb

data/samples/AutoLayout/Gemfile

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

data/samples/AutoLayout/Gemfile.lock

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

data/samples/Hai/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'teacup', :path => '../..'

data/samples/Hai/spec/main_spec.rb

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

data/samples/OnePage/spec/main_spec.rb

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

data/samples/Tweets/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'teacup', :path => '../..'

data/samples/Tweets/spec/main_spec.rb

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

data/samples/teacup-osx/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'teacup', :path => '../..'

data/samples/teacup-osx/spec/main_spec.rb

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