teacup 1.0.4 → 1.2.2

data/.gitignore

@@ -5,3 +5,4 @@ resources/*.nib
 resources/*.momd
 resources/*.storyboardc
 teacup-*.gem
+/.dat*

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    teacup (1.0.3)
+    teacup (1.2.2)
       rake
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rspec (2.10.0)
       rspec-core (~> 2.10.0)
       rspec-expectations (~> 2.10.0)

data/app/custom_class.rb

@@ -0,0 +1,22 @@
+Teacup::Stylesheet.new :custom do
+  style :container,
+    frame: [[0, 0], [100, 20]]
+
+  style :label,
+    text: 'custom label',
+    frame: [[0, 0], [100, 20]]
+end
+
+class CustomTeacupClass
+  include Teacup::Layout
+
+  def initialize
+    self.stylesheet = :custom
+  end
+
+  def create_container
+    layout(UIView, :container) do
+      subview(UILabel, :label)
+    end
+  end
+end

data/lib/teacup/layout.rb

@@ -116,9 +116,9 @@ module Teacup
       # prevents the calling of restyle! until we return to this method
       should_restyle = Teacup.should_restyle_and_block
 
-      unless view.stylesheet
-        view.stylesheet = stylesheet
-      end
+      # assign the 'teacup_next_responder', which is queried for a stylesheet if
+      # one is not explicitly assigned to the view
+      view.teacup_next_responder = self
       view.stylename = name
       if properties
         view.style(properties) if properties
@@ -126,7 +126,13 @@ module Teacup
 
       if block_given?
         superview_chain << view
-        instance_exec(view, &block) if block_given?
+        begin
+          instance_exec(view, &block) if block_given?
+        rescue NoMethodError => e
+          NSLog("Exception executing layout(#{view.inspect}) in #{self.inspect} (stylesheet=#{stylesheet})")
+          raise e
+        end
+
         superview_chain.pop
       end
 

data/lib/teacup/style.rb

@@ -28,60 +28,77 @@ module Teacup
       supports[orientation_key]
     end
 
-    def build(target=nil, orientation=nil, seen={})
-      properties = Style.new.update(self)
+    def build(target=nil, rotation_orientation=nil, seen={})
+      properties = Style.new
       properties.stylename = self.stylename
       properties.stylesheet = self.stylesheet
 
-      # at this point, we really DO need the orientation
-      unless orientation
+      # if we have an orientation, only apply those styles.  otherwise apply the
+      # entire style, including the current orientation.
+      if rotation_orientation
+        # in order to preserve the "local-first" override, we need to *delete*
+        # the keys in imported_stylesheets and extended_properties that are
+        # present in this style - even though we don't ultimately *apply* the
+        # styles
+        delete_keys = self.keys
+        orientation = rotation_orientation
+      else
+        delete_keys = []
+        properties.update(self)
         orientation = UIApplication.sharedApplication.statusBarOrientation
       end
 
       # first, move orientation settings into properties "base" level.
       if orientation
         Overrides[orientation].each do |orientation_key|
-          if override = properties.delete(orientation_key)
+          if override = self[orientation_key]
             # override is first, so it takes precedence
             if override.is_a? Hash
               Teacup::merge_defaults override, properties, properties
             end
-            properties.supports[orientation_key] = !!override
           end
         end
       end
 
       # delete all of them from `properties`
       Orientations.each do |orientation_key|
-        if properties.delete(orientation_key)
+        if self[orientation_key]
           properties.supports[orientation_key] = true
         end
+        properties.delete(orientation_key)
       end
 
       # now we can merge extends, and importing.  before merging, these will go
       # through the same process that we just finished on the local style
       if stylesheet && stylesheet.is_a?(Teacup::Stylesheet)
         stylesheet.imported_stylesheets.reverse.each do |stylesheet|
-          imported_properties = stylesheet.query(self.stylename, target, orientation, seen)
+          imported_properties = stylesheet.query(self.stylename, target, rotation_orientation, seen)
+          delete_keys.each do |key|
+            imported_properties.delete(key)
+          end
           Teacup::merge_defaults! properties, imported_properties
         end
 
-        if also_includes = properties.delete(:extends)
+        if also_includes = self[:extends]
           also_includes = [also_includes] unless also_includes.is_a? Array
 
           # turn style names into Hashes by querying them on the stylesheet
           # (this does not pass `seen`, because this is a new query)
           also_includes.each do |also_include|
-            extended_properties = stylesheet.query(also_include, target, orientation)
+            extended_properties = stylesheet.query(also_include, target, rotation_orientation)
+            delete_keys.each do |key|
+              extended_properties.delete(key)
+            end
             Teacup::merge_defaults! properties, extended_properties
           end
         end
+        properties.delete(:extends)
 
         # if we know the class of the target, we can apply styles via class
         # inheritance.  We do not pass `target` in this case.
         if target
           target.class.ancestors.each do |ancestor|
-            extended_properties = stylesheet.query(ancestor, nil, orientation)
+            extended_properties = stylesheet.query(ancestor, nil, rotation_orientation)
             Teacup::merge_defaults!(properties, extended_properties)
           end
         end

data/lib/teacup/stylesheet_extensions/autoresize.rb

@@ -2,7 +2,7 @@
 #     Teacup::Stylesheet.new :main do
 #       style :root,
 #         # stays centered and grows in height
-#         autoresizingMask: left|right|height
+#         autoresizingMask: flexible_left|flexible_right|flexible_height
 #     end
 module Teacup
   class Stylesheet

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '1.0.4'
+  VERSION = '1.2.2'
 
 end

data/lib/teacup/z_core_extensions/ui_view.rb

@@ -9,6 +9,10 @@ class UIView
   # The current stylename that is used to look up properties in the stylesheet.
   attr_reader :stylename
 
+  # Any class that includes Teacup::Layout gets a `layout` method, which assigns
+  # itself as the 'teacup_next_responder'.
+  attr_accessor :teacup_next_responder
+
   # Enable debug messages for this object
   attr_accessor :debug
 
@@ -19,7 +23,7 @@ class UIView
   # @param Symbol  stylename
   def stylename=(new_stylename)
     @stylename = new_stylename
-    restyle! if Teacup.should_restyle?
+    restyle!
   end
 
   # Alter the stylesheet of this view.
@@ -36,7 +40,6 @@ class UIView
     should_restyle = Teacup.should_restyle_and_block
 
     @stylesheet = new_stylesheet
-    subviews.each{ |subview| subview.set_stylesheet_quickly(new_stylesheet) }
 
     if should_restyle
       Teacup.should_restyle!
@@ -44,9 +47,25 @@ class UIView
     end
   end
 
-  def set_stylesheet_quickly(new_stylesheet)
-    @stylesheet = new_stylesheet
-    subviews.each{ |subview| subview.set_stylesheet_quickly(new_stylesheet) }
+  def stylesheet
+    super
+    # is a stylesheet assigned explicitly?
+    retval = @stylesheet
+
+    # the 'teacup_next_responder' is assigned in the `layout` method, and links
+    # any views created there to the custom class (could be a controller, could
+    # be any class that includes Teacup::Layout).  That responder is checked
+    # next, but only if it wouldn't result in a circular loop.
+    if ! retval && @teacup_next_responder && teacup_next_responder != self
+      retval = @teacup_next_responder.stylesheet
+    end
+
+    # lastly, go up the chain; either a controller or superview
+    if ! retval && nextResponder
+      retval = nextResponder.stylesheet
+    end
+
+    return retval
   end
 
   def restyle!(orientation=nil)
@@ -94,6 +113,8 @@ class UIView
       end
 
       case original_constraint.relative_to
+      when nil
+        constraint.relative_to = nil
       when UIView
         constraint.relative_to = original_constraint.relative_to
       when :self
@@ -111,6 +132,17 @@ class UIView
         end
       end
 
+      if original_constraint.relative_to && ! constraint.relative_to
+        puts "Could not find #{original_constraint.relative_to.inspect}"
+        container = self
+        tab = '  '
+        while container && constraint.relative_to.nil?
+          tab << '->'
+          puts "#{tab} #{container.stylename.inspect}"
+          container = container.superview
+        end
+      end
+
       # the return value, for the map
       constraint.nslayoutconstraint
     end
@@ -157,6 +189,7 @@ class UIView
     # TODO: This should be in a style-sheet!
     UIView.setAnimationDuration(options[:duration]) if options[:duration]
     UIView.setAnimationCurve(options[:curve]) if options[:curve]
+    UIView.setAnimationDelay(options[:delay]) if options[:delay]
     self.stylename = stylename
     UIView.commitAnimations
   end
@@ -172,6 +205,7 @@ class UIView
     UIView.beginAnimations(nil, context: nil)
     UIView.setAnimationDuration(style[:duration]) if style[:duration]
     UIView.setAnimationCurve(style[:curve]) if style[:curve]
+    UIView.setAnimationDelay(options[:delay]) if options[:delay]
     style(style)
     UIView.commitAnimations
   end

data/lib/teacup/z_core_extensions/ui_view_controller.rb

@@ -69,8 +69,8 @@ class UIViewController
   #   stylesheet = :ipadhorizontal
   def stylesheet=(new_stylesheet)
     @stylesheet = new_stylesheet
-    if self.view
-      self.view.stylesheet = new_stylesheet
+    if self.viewLoaded?
+      self.view.restyle!
     end
   end
 
@@ -99,36 +99,27 @@ class UIViewController
       parent_class = parent_class.superclass
     end
 
+    should_restyle = Teacup.should_restyle_and_block
+
     if my_stylesheet and not self.stylesheet
       self.stylesheet = my_stylesheet
     end
 
     if layout_definition
       stylename, properties, block = layout_definition
-      should_restyle = Teacup.should_restyle_and_block
       layout(view, stylename, properties, &block)
-      Teacup.should_restyle! if should_restyle
     end
 
-    layoutDidLoad
-  end
-
-  alias old_viewWillAppear viewWillAppear
+    if should_restyle
+      Teacup.should_restyle!
+      self.view.restyle!
+    end
 
-  def viewWillAppear(animated)
-    old_viewWillAppear(animated)
-    self.view.restyle! unless @teacup_view_appeared
     if defined? NSLayoutConstraint
       self.view.apply_constraints
     end
-    @teacup_view_appeared = true
-  end
 
-  alias old_viewDidDisappear viewDidDisappear
-
-  def viewDidDisappear(animated)
-    old_viewDidDisappear(animated)
-    @teacup_view_appeared = false
+    layoutDidLoad
   end
 
   def layoutDidLoad

data/lib/teacup/z_core_extensions/ui_view_getters.rb

@@ -1,22 +1,21 @@
 # Methods to retrieve a subview using the stylename as a key
-# Kinda similar to jQuery-style $().find('stylename')
+# Kinda similar to jQuery-style $(el).find('stylename')
 class UIView
 
-  # get one subview by stylename or class
+  # get one subview by stylename or class.  If the receiver matches, it will be
+  # returned
   # my_view.viewWithStylename :button => #<UIButton..>
   # my_view.viewWithStylename UIButton => #<UIButton..>
   def viewWithStylename name_or_class
-    if name_or_class.is_a? Class
-      view = subviews.find { |view| view.is_a? name_or_class }
-    else
-      view = subviews.find { |view| view.stylename == name_or_class }
-    end
+    return self if self._teacup_check_stylename(name_or_class)
+
+    view = subviews.find { |view| view._teacup_check_stylename(name_or_class) }
     return view if view
 
     # found_subview will get assigned to the view we want, but the subview is
     # what is returned.
     found_subview = nil
-    view = subviews.find {|subview| found_subview = subview.viewWithStylename(name_or_class) }
+    view = subviews.find { |subview| found_subview = subview.viewWithStylename(name_or_class) }
     return found_subview if view
 
     nil  # couldn't find it
@@ -27,17 +26,21 @@ class UIView
   # my_view.viewsWithStylename UIButton => [#<UIButton..>, #<UIButton...>]
   def viewsWithStylename name_or_class
     r = []
+    r << self if self._teacup_check_stylename(name_or_class)
+
     subviews.each do |view|
-      if name_or_class.is_a? Class
-        if view.is_a? name_or_class
-          r << view
-        end
-      elsif view.stylename == name_or_class
-        r << view
-      end
+      r << view if view._teacup_check_stylename(name_or_class)
       r.concat view.viewsWithStylename name_or_class
     end
     r
   end
 
+  def _teacup_check_stylename(name_or_class)
+    if name_or_class.is_a? Class
+      self.is_a? name_or_class
+    else
+      self.stylename == name_or_class
+    end
+  end
+
 end

data/spec/custom_class_spec.rb

@@ -0,0 +1,23 @@
+describe "Any class that includes Teacup::Layout" do
+  before do
+    @subject = CustomTeacupClass.new
+  end
+
+  it "should be able to have a stylesheet" do
+    @subject.stylesheet.class.should == Teacup::Stylesheet
+  end
+
+  it "should be able to layout and create views" do
+    @subject.create_container.should != nil
+  end
+
+  it "should have a container and label that are styled" do
+    container = @subject.create_container
+    container.frame.size.width.should == 100
+    container.frame.size.height.should == 20
+    container.subviews.length.should == 1
+    label = container.subviews[0]
+    label.text.should == 'custom label'
+  end
+
+end

data/spec/main_spec.rb

@@ -25,9 +25,9 @@ describe "Application 'Teacup'" do
   it "root view should be styled as :root" do
     @root_view.stylename.should == :root
     @root_view.frame.origin.x.should == 0
-    @root_view.frame.origin.y.should == 0
+    @root_view.frame.origin.y.should == 20
     @root_view.frame.size.width.should == 320
-    @root_view.frame.size.height.should == 480
+    @root_view.frame.size.height.should == 460
     @root_view.backgroundColor.should == UIColor.yellowColor
   end
 

data/spec/style_spec.rb

@@ -136,6 +136,7 @@ describe "Teacup::Style" do
   it 'should respect precedence rules' do
     sheet = Teacup::Stylesheet.new do
       style :style1,
+        landscape: { tag: 1 },
         portrait: { text: "extended", tag: 1 }
     end
 
@@ -144,9 +145,13 @@ describe "Teacup::Style" do
     style2[:text] = "text"
     style2[:extends] = :style1
 
+    built = style2.build(nil)
+    built[:tag].should == 1
+    built[:text].should == 'text'
+
     built = style2.build(nil, UIInterfaceOrientationPortrait)
     built[:tag].should == 1
-    built[:text].should == "text"
+    built[:text].should == nil
   end
 
   it 'should respect merge based on class inheritance' do
@@ -172,4 +177,27 @@ describe "Teacup::Style" do
     built[:baz].should == 'baz'
   end
 
+  it 'should not apply default styles when orientation is specified ' do
+    sheet = Teacup::Stylesheet.new do
+      style :style1,
+        top: 10,
+        left: 8,
+        landscape: { width: 100 },
+        portrait: { width: 100 }
+      style :style2,
+        top: 10,
+        left: 8,
+        landscape: { width: 100 },
+        portrait: { width: 100 }
+    end
+
+    style3 = Teacup::Style.new
+    style3.stylesheet = sheet
+
+    built = style3.build(UIInterfaceOrientationPortrait)
+    built[:top].should == nil
+    built[:left].should == nil
+    built[:width].should == nil
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,6 +70,7 @@ files:
 - app/controllers/first_controller.rb
 - app/controllers/landscape_only_controller.rb
 - app/controllers/tableview_controller.rb
+- app/custom_class.rb
 - app/styles/main_styles.rb
 - app/views/custom_view.rb
 - lib/dummy.rb
@@ -101,6 +102,7 @@ files:
 - samples/Hai/spec/main_spec.rb
 - samples/Hai/styles/iphone.rb
 - samples/README.md
+- spec/custom_class_spec.rb
 - spec/main_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb
@@ -133,6 +135,7 @@ signing_key:
 specification_version: 3
 summary: A community-driven DSL for creating user interfaces on iOS.
 test_files:
+- spec/custom_class_spec.rb
 - spec/main_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb