teacup 0.3.10 → 0.3.11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teacup (0.3.2)
+    teacup (0.3.11)
       rake
 
 GEM

data/README.md

@@ -54,7 +54,7 @@ class SomeController < UIViewController
 
   # code to enable orientation changes
   def shouldAutorotateToInterfaceOrientation(orientation)
-    if orientation == UIDeviceOrientationPortraitUpsideDown
+    if orientation == UIInterfaceOrientationPortraitUpsideDown
       return false
     end
     true
@@ -63,7 +63,7 @@ class SomeController < UIViewController
   # perform the frame changes depending on orientation
   def willAnimateRotationToInterfaceOrientation(orientation, duration:duration)
     case orientation
-    when UIDeviceOrientationLandscapeLeft, UIDeviceOrientationLandscapeRight
+    when UIInterfaceOrientationLandscapeLeft, UIInterfaceOrientationLandscapeRight
       @field.frame = [[10, 10], [360, 50]]
       @search.frame = [[10, 70], [360, 50]]
     else

data/app/controllers/landscape_only_controller.rb

@@ -6,7 +6,7 @@ class LandscapeOnlyController < UIViewController
   end
 
   def shouldAutorotateToInterfaceOrientation(orientation)
-    if orientation == UIDeviceOrientationLandscapeLeft or orientation == UIDeviceOrientationLandscapeRight
+    if orientation == UIInterfaceOrientationLandscapeLeft or orientation == UIInterfaceOrientationLandscapeRight
       true
     else
       false

data/lib/teacup/handler.rb

@@ -43,7 +43,11 @@ module Teacup
     target.class.ancestors.each do |ancestor|
       if Teacup.handlers[ancestor].has_key? key
         NSLog "#{ancestor.name} is handling #{key} = #{value.inspect}"  if target.respond_to? :debug and target.debug
-        Teacup.handlers[ancestor][key].call(target, value)
+        if Teacup.handlers[ancestor][key].arity == 1
+          target.instance_exec(value, &Teacup.handlers[ancestor][key])
+        else
+          Teacup.handlers[ancestor][key].call(target, value)
+        end
         handled = true
         break
       end

data/lib/teacup/layout.rb

@@ -72,17 +72,26 @@ module Teacup
         name = name_or_properties.to_sym
       end
 
+      # prevents the calling of restyle! until we return to this method
+      should_restyle = Teacup.should_restyle_and_block
+
       view.stylesheet = stylesheet
       view.stylename = name
-      view.style(properties) if properties
+      if properties
+        view.style(properties) if properties
+      end
 
-      begin
+      if block_given?
         superview_chain << view
         instance_exec(view, &block) if block_given?
-      ensure
         superview_chain.pop
       end
 
+      if should_restyle
+        view.restyle!
+        # restore to whatever it was, either nil or true
+        Teacup.should_restyle!
+      end
       view
     end
 
@@ -137,7 +146,7 @@ module Teacup
     protected
 
     def to_instance(class_or_instance)
-      if Class === 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

data/lib/teacup/restyle.rb

@@ -0,0 +1,22 @@
+module Teacup
+  module_function
+
+  def dont_restyle
+    @dont_restyle ||= nil
+  end
+
+  def should_restyle?
+    return ! self.dont_restyle
+  end
+
+  def should_restyle_and_block
+    should_restyle = self.should_restyle?
+    @dont_style = true
+    return should_restyle
+  end
+
+  def should_restyle!
+    @dont_style = nil
+  end
+
+end

data/lib/teacup/style.rb

@@ -34,7 +34,9 @@ module Teacup
       properties.stylesheet = self.stylesheet
 
       # at this point, we really DO need the orientation
-      orientation = UIApplication.sharedApplication.statusBarOrientation unless orientation
+      unless orientation
+        orientation = UIApplication.sharedApplication.statusBarOrientation
+      end
 
       # first, move orientation settings into properties "base" level.
       if orientation
@@ -43,10 +45,8 @@ module Teacup
             # override is first, so it takes precedence
             if override.is_a? Hash
               Teacup::merge_defaults override, properties, properties
-            elsif not properties.has_key? orientation_key
-              properties[orientation_key] = override
             end
-            properties.supports[orientation_key] = properties[orientation_key] ? true : false
+            properties.supports[orientation_key] = !!override
           end
         end
       end

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 
 end

data/lib/teacup/z_core_extensions/ui_view.rb

@@ -16,7 +16,7 @@ class UIView
   # is loaded lazily, so that assignment can occur before the Stylesheet has
   # been created.
   def stylesheet
-    if Symbol === @stylesheet
+    if @stylesheet.is_a? Symbol
       @stylesheet = Teacup::Stylesheet[@stylesheet]
     end
 
@@ -30,7 +30,7 @@ class UIView
   # @param Symbol  stylename
   def stylename=(new_stylename)
     @stylename = new_stylename
-    restyle!
+    restyle! if Teacup.should_restyle?
   end
 
   # Alter the stylesheet of this view.
@@ -44,14 +44,29 @@ class UIView
   #
   # @param Teacup::Stylesheet  stylesheet.
   def stylesheet=(new_stylesheet)
+    should_restyle = Teacup.should_restyle_and_block
+
     @stylesheet = new_stylesheet
-    restyle!
-    subviews.each{ |subview| subview.stylesheet = new_stylesheet }
+    subviews.each{ |subview| subview.set_stylesheet_quickly(new_stylesheet) }
+
+    if should_restyle
+      restyle!
+      Teacup.should_restyle!
+    end
+  end
+
+  def set_stylesheet_quickly(new_stylesheet)
+    @stylesheet = new_stylesheet
+    subviews.each{ |subview| subview.set_stylesheet_quickly(new_stylesheet) }
   end
 
   def restyle!(orientation=nil)
-    style(stylesheet.query(stylename, self, orientation)) if stylesheet
-    subviews.each{ |subview| subview.restyle!(orientation) }
+    if Teacup.should_restyle?
+      if stylesheet
+        style(stylesheet.query(stylename, self, orientation))
+      end
+      subviews.each{ |subview| subview.restyle!(orientation) }
+    end
   end
 
   # Animate a change to a new stylename.

data/lib/teacup/z_core_extensions/ui_view_controller.rb

@@ -66,8 +66,8 @@ class UIViewController
   # @example
   #
   #  def stylesheet
-  #    if [UIDeviceOrientationLandscapeLeft,
-  #        UIDeviceOrientationLandscapeRight].include?(UIDevice.currentDevice.orientation)
+  #    if [UIInterfaceOrientationLandscapeLeft,
+  #        UIInterfaceOrientationLandscapeRight].include?(UIInterface.currentDevice.orientation)
   #      Teacup::Stylesheet[:ipad]
   #    else
   #      Teacup::Stylesheet[:ipadvertical]
@@ -93,9 +93,8 @@ class UIViewController
   #   stylesheet = :ipadhorizontal
   def stylesheet=(new_stylesheet)
     @stylesheet = new_stylesheet
-    if view
-      view.stylesheet = new_stylesheet
-      view.restyle!
+    if self.view
+      self.view.stylesheet = new_stylesheet
     end
   end
 
@@ -109,12 +108,27 @@ class UIViewController
   # If you want to use Teacup in your controller, please hook into layoutDidLoad,
   # not viewDidLoad.
   def viewDidLoad
-    if not self.stylesheet
-      self.stylesheet = self.class.stylesheet
+    # look for a layout_definition in the list of ancestors
+    layout_definition = nil
+    my_stylesheet = self.stylesheet
+    parent_class = self.class
+    while parent_class != NSObject and not (layout_definition && my_stylesheet)
+      if not my_stylesheet and parent_class.respond_to?(:stylesheet)
+        my_stylesheet = parent_class.stylesheet
+      end
+
+      if not layout_definition and parent_class.respond_to?(:layout_definition)
+        layout_definition = parent_class.layout_definition
+      end
+      parent_class = parent_class.superclass
+    end
+
+    if my_stylesheet and not self.stylesheet
+      self.stylesheet = my_stylesheet
     end
 
-    if self.class.layout_definition
-      stylename, properties, block = self.class.layout_definition
+    if layout_definition
+      stylename, properties, block = layout_definition
       layout(view, stylename, properties, &block)
     end
 

data/lib/teacup/z_core_extensions/z_handlers.rb

@@ -1,69 +1,87 @@
 ##|
 ##|  UIView.frame
 ##|
-Teacup.handler UIView, :left, :x { |view, x|
-  f = view.frame
+Teacup.handler UIView, :left, :x { |x|
+  f = self.frame
   f.origin.x = x
-  view.frame = f
+  self.frame = f
 }
 
-Teacup.handler UIView, :right { |view, r|
-  f = view.frame
+Teacup.handler UIView, :right { |r|
+  f = self.frame
   f.origin.x = r - f.size.width
-  view.frame = f
+  self.frame = f
 }
 
-Teacup.handler UIView, :center_x, :middle_x { |view, x|
-  c = view.center
+Teacup.handler UIView, :center_x, :middle_x { |x|
+  c = self.center
   c.x = x
-  view.center = c
+  self.center = c
 }
 
-Teacup.handler UIView, :top, :y { |view, y|
-  f = view.frame
+Teacup.handler UIView, :top, :y { |y|
+  f = self.frame
   f.origin.y = y
-  view.frame = f
+  self.frame = f
 }
 
-Teacup.handler UIView, :bottom { |view, b|
-  f = view.frame
+Teacup.handler UIView, :bottom { |b|
+  f = self.frame
   f.origin.y = b - f.size.height
-  view.frame = f
+  self.frame = f
 }
 
-Teacup.handler UIView, :center_y, :middle_y { |view, y|
-  c = view.center
+Teacup.handler UIView, :center_y, :middle_y { |y|
+  c = self.center
   c.y = y
-  view.center = c
+  self.center = c
 }
 
-Teacup.handler UIView, :width { |view, w|
-  f = view.frame
+Teacup.handler UIView, :width { |w|
+  f = self.frame
   f.size.width = w
-  view.frame = f
+  self.frame = f
 }
 
-Teacup.handler UIView, :height { |view, h|
-  f = view.frame
+Teacup.handler UIView, :height { |h|
+  f = self.frame
   f.size.height = h
-  view.frame = f
+  self.frame = f
 }
 
-Teacup.handler UIView, :origin { |view, origin|
-  f = view.frame
+Teacup.handler UIView, :origin { |origin|
+  f = self.frame
   f.origin = origin
-  view.frame = f
+  self.frame = f
 }
 
-Teacup.handler UIView, :size { |view, size|
-  f = view.frame
+Teacup.handler UIView, :size { |size|
+  if Symbol === size && size == :full
+    if self.superview
+      size = Size(self.superview.bounds.size)
+    else
+      size = self.frame.size
+    end
+  end
+  f = self.frame
   f.size = size
-  view.frame = f
+  self.frame = f
+}
+
+Teacup.handler UIView, :frame { |frame|
+  if Symbol === frame && frame == :full
+    if self.superview
+      frame = Rect(self.superview.bounds)
+    else
+      frame = self.frame
+    end
+  end
+  self.frame = frame
 }
 
 ##|
 ##|  UIButton
 ##|
-Teacup.handler UIButton, :title { |view, title|
-  view.setTitle(title, forState: UIControlStateNormal)
+Teacup.handler UIButton, :title { |title|
+  self.setTitle(title, forState: UIControlStateNormal)
 }

data/spec/main_spec.rb

@@ -22,10 +22,10 @@ describe "Application 'Teacup'" do
   describe "view controller" do
 
     it "should be able to rotate" do
-      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationPortrait).should == true
-      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationLandscapeLeft).should == true
-      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationLandscapeRight).should == true
-      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIDeviceOrientationPortraitUpsideDown).should == false
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIInterfaceOrientationPortrait).should == true
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIInterfaceOrientationLandscapeRight).should == true
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIInterfaceOrientationLandscapeLeft).should == true
+      @view_ctrlr.shouldAutorotateToInterfaceOrientation(UIInterfaceOrientationPortraitUpsideDown).should == nil
     end
   end
 
@@ -131,7 +131,7 @@ describe "Application 'Teacup'" do
     before do
       @background = @app.windows[0].subviews[0].subviews[0]
       @view_ctrlr.landscape_only
-      UIApplication.sharedApplication.setStatusBarOrientation(UIDeviceOrientationLandscapeLeft, animated:false)
+      UIApplication.sharedApplication.setStatusBarOrientation(UIInterfaceOrientationLandscapeLeft, animated:false)
     end
 
     it "should be in landscape" do

data/spec/style_spec.rb

@@ -23,7 +23,11 @@ describe "Teacup::Style" do
       name: :upside_down_name,
     }
     # no orientation, which ends up being portrait anyway.
-    style.build()[:name].should == :portrait_name
+    if UIApplication.sharedApplication.statusBarOrientation == UIInterfaceOrientationPortrait
+      style.build()[:name].should == :portrait_name
+    else
+      style.build()[:name].should == :landscape_name
+    end
     # landscape
     style.build(nil, UIInterfaceOrientationLandscapeLeft)[:name].should == :landscape_name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70310569785840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70310569785840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70310569785180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70310569785180
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
 
@@ -78,6 +68,7 @@ files:
 - 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/rotation.rb
@@ -121,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A community-driven DSL for creating user interfaces on iOS.