teacup 1.3.4 → 2.0.0

data/Rakefile

@@ -1,5 +1,11 @@
 $:.unshift('/Library/RubyMotion/lib')
-require 'motion/project'
+if ENV.fetch('platform', 'ios') == 'ios'
+  require 'motion/project/template/ios'
+elsif ENV['platform'] == 'osx'
+  require 'motion/project/template/osx'
+else
+  raise "Unsupported platform #{ENV['platform']}"
+end
 require 'bundler'
 Bundler.require
 
@@ -8,4 +14,5 @@ Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'teacup'
   app.identifier = 'com.rubymotion.teacup'
+  app.specs_dir = "spec/#{app.template}/"
 end

data/app/app_delegate.rb

@@ -6,7 +6,7 @@ class AppDelegate
     application.setStatusBarHidden(true, withAnimation:UIStatusBarAnimationSlide)
 
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-    ctlr = ConstraintsController.new
+    ctlr = MotionLayoutController.new
     @window.rootViewController = ctlr
     @window.rootViewController.wantsFullScreenLayout = true
     @window.makeKeyAndVisible

data/app/controllers/appearance_controller.rb

@@ -0,0 +1,13 @@
+class CustomAppearanceController < UIViewController
+  attr :label_1
+  attr :container
+  attr :label_2
+
+  layout do
+    @label_1 = subview(CustomAppearanceLabel)
+    @container = subview(CustomAppearanceContainer) do
+      @label_2 = subview(CustomAppearanceLabel)
+    end
+  end
+
+end

data/app/controllers/landscape_only_controller.rb

@@ -2,7 +2,7 @@
 class LandscapeOnlyController < UIViewController
 
   def viewDidLoad
-    UIApplication.sharedApplication.windows[0].rootViewController = FirstController.alloc.init
+    UIApplication.sharedApplication.windows[0].rootViewController = MainController.alloc.init
   end
 
   def shouldAutorotateToInterfaceOrientation(orientation)

data/app/controllers/{first_controller.rb → main_controller.rb}

@@ -1,7 +1,8 @@
+class MainController < UIViewController
+  attr :welcome
+  attr :button
 
-class FirstController < UIViewController
-
-  stylesheet :first
+  stylesheet :main
 
   layout :root do
     subview(CustomView, :background) do

data/app/controllers/motion_layout_controller.rb

@@ -0,0 +1,22 @@
+class MotionLayoutController < UIViewController
+  attr :label1
+  attr :label2
+  attr :label3
+
+  layout :root do
+    @label1 = subview(UILabel, :label1, text: 'label1')
+    @label2 = subview(UILabel, :label2, text: 'label2')
+    @label3 = subview(UILabel, :label3, text: 'label3')
+  end
+
+  def layoutDidLoad
+    auto do
+      metrics "margin" => 20, "top" => 100
+      horizontal '|-margin-[label1]-margin-[label2(==label1)]-margin-|'
+      horizontal '|-margin-[label3]-margin-|'
+      vertical '|-top-[label1]'
+      vertical '|-220-[label3(==label1)]'
+    end
+  end
+
+end

data/app/styles/appearance.rb

@@ -0,0 +1,24 @@
+class CustomAppearanceLabel < UILabel
+end
+
+class CustomAppearanceContainer < UIView
+end
+
+Teacup.handler UIView, :redHerring do |view, alpha|
+  view.alpha = alpha
+end
+
+Teacup::Appearance.new do
+
+  style CustomAppearanceLabel,
+    redHerring: 0.75,
+    numberOfLines: 3
+
+  style CustomAppearanceContainer,
+    backgroundColor: UIColor.whiteColor
+
+  style CustomAppearanceLabel, when_contained_in: CustomAppearanceContainer,
+    redHerring: 0.5,
+    numberOfLines: 2
+
+end

data/app/styles/main_styles.rb

@@ -1,5 +1,5 @@
 
-Teacup::Stylesheet.new(:first) do
+Teacup::Stylesheet.new(:main) do
 
   # enable orientations on the root view
   style :root,
@@ -8,8 +8,8 @@ Teacup::Stylesheet.new(:first) do
     width: 320,
     height: 480,
     backgroundColor:  UIColor.yellowColor,
-    portrait:    true,
-    upside_down:  false,
+    portrait: true,
+    upside_down: false,
 
     layer: {
       cornerRadius: 10.0,
@@ -21,13 +21,13 @@ Teacup::Stylesheet.new(:first) do
 
     landscape_left: {
       layer: {
-        transform: spin(identity, -pi / 2),
+        transform: transform_layer.spin(-pi / 2),
       },
     },
 
     landscape_right: {
       layer: {
-        transform: spin(identity, pi / 2),
+        transform: transform_layer.spin(pi / 2),
       },
     }
 
@@ -50,6 +50,7 @@ Teacup::Stylesheet.new(:first) do
     left: 10,
     top: 30,
     backgroundColor:  UIColor.blackColor,
+    custom_attr: :custom_value,
 
     portrait: {
       width:  300,
@@ -90,7 +91,6 @@ Teacup::Stylesheet.new(:first) do
 
 
   style :next_message,
-    width:   130,
     height:  20,
     portrait: nil,
     title:   "Next Message..."
@@ -101,11 +101,13 @@ Teacup::Stylesheet.new(:first) do
     portrait: {
       left:   150,
       top:    370,
+      width:   140,  # this should get overridden
     },
 
     landscape: {
       left:   20,
       top:    200,
+      width:   140,  # this should get overridden
     }
 
 end

data/app/views/custom_view.rb

@@ -1,4 +1,5 @@
 
 class CustomView < UIView
   # not very custom, is it!?
+  attr_accessor :custom_attr
 end

data/lib/teacup/calculations.rb

@@ -10,9 +10,9 @@ module Teacup
 
       case dimension
       when :width
-        CGRectGetWidth(view.superview.bounds) * percent + offset
+        view.superview.bounds.size.width * percent + offset
       when :height
-        CGRectGetHeight(view.superview.bounds) * percent + offset
+        view.superview.bounds.size.height * percent + offset
       else
         raise "Unknown dimension #{dimension}"
       end

data/lib/teacup/core_extensions/view_getters.rb

@@ -0,0 +1,61 @@
+# Methods to retrieve a subview using the stylename as a key
+# Kinda similar to jQuery-style $(el).find('stylename')
+module Teacup
+  module View
+
+    # 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
+      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) }
+      return found_subview if view
+
+      return nil  # couldn't find it
+    end
+
+    # get all subviews by stylename or class
+    # my_view.viewsWithStylename :button => [#<UIButton..>, #<UIButton...>]
+    # my_view.viewsWithStylename UIButton => [#<UIButton..>, #<UIButton...>]
+    def viewsWithStylename name_or_class
+      retval = []
+      retval << self if self._teacup_check_stylename(name_or_class)
+
+      search_views = [].concat(self.subviews)
+      # ewww, a traditional for loop! the search_views array is modified in place,
+      # and `each` and other methods don't like that.
+      index = 0
+      while index < search_views.length
+        view = search_views[index]
+        if view._teacup_check_stylename(name_or_class)
+          retval << view
+        end
+        search_views.concat(view.subviews)
+        index += 1
+      end
+
+      return retval
+    end
+
+    def _teacup_check_stylename(name_or_class)
+      if name_or_class.is_a? Class
+        return self.is_a?(name_or_class)
+      elsif stylename == name_or_class
+        return true
+      elsif stylesheet.is_a?(Teacup::Stylesheet)
+        return stylesheet.extends_style?(self.stylename, name_or_class)
+      end
+      return false
+    end
+
+  end
+
+end

data/lib/teacup/handler.rb

@@ -27,23 +27,31 @@ module Teacup
 
   # applies a Hash of styles, and converts the frame styles (origin, size, top,
   # left, width, height) into one frame property.
-  def apply_hash(target, properties)
+  #
+  # For UIAppearance support, the class of the UIView class that is being
+  # modified can be passed in
+  def apply_hash(target, properties, klass=nil)
     properties.each do |key, value|
-      Teacup.apply target, key, value
+      Teacup.apply target, key, value, klass
     end
   end
 
   # Applies a single style to a target.  Delegates to a teacup handler if one is
   # found.
-  def apply(target, key, value)
+  def apply(target, key, value, klass=nil)
     # note about `debug`: not all objects in this method are a UIView instance,
     # so don't assume that the object *has* a debug method.
     if value.is_a? Proc
-      value = target.instance_exec(&value)
+      if value.arity == 1
+        value = value.call(target)
+      else
+        value = target.instance_exec(&value)
+      end
     end
 
+    klass ||= target.class
     handled = false
-    target.class.ancestors.each do |ancestor|
+    klass.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
         if Teacup.handlers[ancestor][key].arity == 1
@@ -71,15 +79,7 @@ module Teacup
       setter = 'set' + key.to_s.sub(/^./) {|c| c.capitalize} + ':'
     end
 
-    if assign and target.respond_to?(assign)
-      NSLog "Setting #{key} = #{value.inspect}" if target.respond_to? :debug and target.debug
-      target.send(assign, value)
-    elsif target.respondsToSelector(setter)
-      NSLog "Calling target(#{key}, #{value.inspect})" if target.respond_to? :debug and target.debug
-      target.send(setter, value)
-    else
-      NSLog "TEACUP WARNING: Can't apply #{setter.inspect}#{assign and " or " + assign.inspect or ""} to #{target.inspect}"
-    end
+    Teacup.apply_method(target, assign, setter, value)
   end
 
   def handlers

data/lib/teacup/layout.rb

@@ -1,4 +1,23 @@
 module Teacup
+  # Adds the class `stylesheet` method to
+  module LayoutClass
+
+    # Calling this method in the class body will assign a default stylesheet for
+    # all instances of your class
+    def stylesheet(new_stylesheet=nil)
+      if new_stylesheet.nil?
+        if @stylesheet.is_a? Symbol
+          @stylesheet = Teacup::Stylesheet[@stylesheet]
+        end
+
+        return @stylesheet
+      end
+
+      @stylesheet = new_stylesheet
+    end
+
+  end
+
   # Teacup::Layout defines a layout and subview function that can be used to
   # declare and configure the layout of views and the view hierarchy in your
   # application.
@@ -18,6 +37,10 @@ module Teacup
   #     end
   #   end
   module Layout
+    def self.included(base)
+      base.extend LayoutClass
+    end
+
     # Assign a Stylesheet or Stylesheet name (Symbol)
     #
     # @return val
@@ -60,7 +83,7 @@ module Teacup
         @stylesheet = Teacup::Stylesheet[@stylesheet]
       end
 
-      @stylesheet
+      @stylesheet || self.class.stylesheet
     end
 
     # Alter the layout of a view
@@ -74,7 +97,10 @@ module Teacup
     #                           current stylesheet (see {stylesheet}) for this
     #                           element will be immediately applied.
     #
-    # @param properties         The third parameter is optional, and is a Hash
+    # @param classes            The third parameter is optional, and is a list
+    #                           of style classes.
+    #
+    # @param properties         The fourth parameter is optional, and is a Hash
     #                           of properties to apply to the view directly.
     #
     # @param &block             If a block is passed, it is evaluated such that
@@ -100,34 +126,49 @@ module Teacup
     #     subview(UIImage, backgroundColor: UIColor.colorWithImagePattern(image)
     #   end
     #
-    def layout(view_or_class, name_or_properties=nil, properties_or_nil=nil, &block)
+    def layout(view_or_class, *teacup_settings, &block)
       view = Teacup.to_instance(view_or_class)
 
-      name = nil
-      properties = properties_or_nil
+      # prevents the calling of restyle! until we return to this method
+      should_restyle = Teacup.should_restyle_and_block
 
-      if name_or_properties.is_a? Hash
-        name = nil
-        properties = name_or_properties
-      elsif name_or_properties
-        name = name_or_properties.to_sym
+      teacup_style = Style.new
+
+      teacup_settings.each do |setting|
+        case setting
+        when Symbol, String
+          view.stylename = setting
+        when Hash
+          # override settings, but apply them to teacup_style so that it remains
+          # a Teacup::Style object
+          Teacup::merge_defaults(setting, teacup_style, teacup_style)
+        when Enumerable
+          view.style_classes = setting
+        when nil
+          # skip. this is so that helper methods that accept arguments like
+          # stylename can pass those on to this method without having to
+          # introspect the values (just set the default value to `nil`)
+          #
+          # long story short: tests will fail `nil` is not ignore here
+        else
+          raise "The argument #{setting.inspect} is not supported in Teacup::Layout::layout()"
+        end
       end
 
-      # prevents the calling of restyle! until we return to this method
-      should_restyle = Teacup.should_restyle_and_block
+      Teacup.apply_hash view, teacup_style.build(view)
 
       # 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
+      if view.is_a? Layout
+        view.teacup_next_responder = self
       end
 
       if block_given?
         superview_chain << view
         begin
-          instance_exec(view, &block) if block_given?
+          # yield will not work if this is defined in the context of the
+          # UIViewController `layout` class method.
+          instance_exec(view, &block)
         rescue NoMethodError => e
           NSLog("Exception executing layout(#{view.inspect}) in #{self.inspect} (stylesheet=#{stylesheet})")
           raise e
@@ -140,6 +181,7 @@ module Teacup
         Teacup.should_restyle!
         view.restyle!
       end
+
       view
     end
 
@@ -191,6 +233,41 @@ module Teacup
       instance
     end
 
+    ##|
+    ##|  Motion-Layout support
+    ##|
+
+    # Calling this method uses Nick Quaranto's motion-layout gem to provide ASCII
+    # art style access to autolayout.  It assigns all the subviews by stylename,
+    # and assigns `self.view` as the target view.  Beyond that, it's up to you to
+    # implement the layout methods:
+    #
+    #     auto do
+    #       metrics 'margin' => 20
+    #       vertical "|-[top]-margin-[bottom]-|"
+    #       horizontal "|-margin-[top]-margin-|"
+    #       horizontal "|-margin-[bottom]-margin-|"
+    #     end
+    def auto(layout_view=top_level_view, layout_subviews={}, &layout_block)
+      raise "gem install 'motion-layout'" unless defined? Motion::Layout
+
+      Teacup.get_styled_subviews(top_level_view).each do |view|
+        if ! layout_subviews[view.stylename.to_s]
+          layout_subviews[view.stylename.to_s] = view
+        end
+      end
+
+      Motion::Layout.new do |layout|
+        layout.view layout_view
+        layout.subviews layout_subviews
+        layout.instance_eval(&layout_block)
+      end
+    end
+
+    def top_level_view
+      raise "No default view has been defined for #{self.class}.  Implement `top_level_view`."
+    end
+
     protected
 
     # Get's the current stack of views in nested calls to layout.

data/lib/teacup/stylesheet.rb

@@ -68,6 +68,7 @@ module Teacup
     attr_reader :name
 
     class << self
+
       def stylesheets
         @stylesheets ||= {}
       end
@@ -79,6 +80,7 @@ module Teacup
       def []= name, stylesheet
         stylesheets[name] = stylesheet
       end
+
     end
 
     # Create a new Stylesheet.
@@ -123,20 +125,18 @@ module Teacup
     # @stylesheet_cache object is manipulated directly (to invalidate entries,
     # or the entire cache)
     def stylesheet_cache
-      @stylesheet_cache ||= Hash.new { |cache,_stylename|
-        cache[_stylename] = Hash.new { |_target,_orientation|
+      @stylesheet_cache ||= Hash.new do |cache,_stylename|
+        cache[_stylename] = Hash.new do |_target,_orientation|
           _target[_orientation] = {}
-        }
-      }
+        end
+      end
     end
 
     def get_stylesheet_cache(stylename, target, orientation)
-      orientation ||= UIApplication.sharedApplication.statusBarOrientation
       stylesheet_cache[stylename][target][orientation]
     end
 
     def set_stylesheet_cache(stylename, target, orientation, value)
-      orientation ||= UIApplication.sharedApplication.statusBarOrientation
       self.stylesheet_cache[stylename][target][orientation] = value
     end
 
@@ -166,6 +166,33 @@ module Teacup
     def import(name_or_stylesheet)
       @stylesheet_cache = nil
       imported << name_or_stylesheet
+
+      sheet = nil
+      if name_or_stylesheet.is_a? Teacup::Stylesheet
+        sheet = name_or_stylesheet
+      elsif Teacup::Stylesheet.stylesheets.has_key? name_or_stylesheet
+        sheet = Teacup::Stylesheet.stylesheets[name_or_stylesheet]
+      end
+
+      if sheet
+        import_instance_vars(sheet)
+      end
+    end
+
+    # the block handed to Stylesheet#new is not run immediately - it is run
+    # the first time the stylesheet is queried.  This fixes bugs related to
+    # some resources (fonts) not available when the application is first
+    # started.  The downside is that @instance variables and variables that
+    # should be closed over are not.
+    #
+    # @return true if the block was run. false otherwise
+    def run_block
+      if @block
+        _block = @block
+        @block = nil
+        instance_eval &_block
+        true
+      end
     end
 
     # Get the properties defined for the given stylename, in this Stylesheet and
@@ -185,15 +212,7 @@ module Teacup
       return {} unless stylename
 
       unless get_stylesheet_cache(stylename, target, orientation)
-        # the block handed to Stylesheet#new is not run immediately - it is run
-        # the first time the stylesheet is queried.  This fixes bugs related to
-        # some resources (fonts) not available when the application is first
-        # started.  The downside is that @instance variables and variables that
-        # should be closed over are not.
-        if @block
-          instance_eval &@block
-          @block = nil
-        end
+        run_block
         seen[self] = true
 
         set_stylesheet_cache(stylename, target, orientation, styles[stylename].build(target, orientation, seen))
@@ -221,7 +240,7 @@ module Teacup
       if queries[-1].is_a? Hash
         properties = queries.pop
       else
-        # empty style declarations are allowed
+        # empty style declarations are allowed, but accomplish nothing.
         return
       end
 
@@ -239,7 +258,7 @@ module Teacup
     #
     # @return String
     def inspect
-      "Teacup::Stylesheet[#{name.inspect}] = #{styles.inspect}"
+      "#{self.class.name}[#{name.inspect}] = #{styles.inspect}"
     end
 
     # The array of Stylesheets that have been imported into this one.
@@ -248,12 +267,14 @@ module Teacup
     def imported_stylesheets
       imported.map do |name_or_stylesheet|
         if name_or_stylesheet.is_a? Teacup::Stylesheet
-          name_or_stylesheet
+          sheet = name_or_stylesheet
         elsif Teacup::Stylesheet.stylesheets.has_key? name_or_stylesheet
-          Teacup::Stylesheet.stylesheets[name_or_stylesheet]
+          sheet = Teacup::Stylesheet.stylesheets[name_or_stylesheet]
         else
           raise "Teacup tried to import Stylesheet #{name_or_stylesheet.inspect} into Stylesheet[#{self.name.inspect}], but it didn't exist"
         end
+
+        sheet
       end
     end
 
@@ -281,6 +302,19 @@ module Teacup
       return retval
     end
 
+    def exclude_instance_vars
+      @exclude_instance_vars ||= [:@name, :@block, :@imported, :@styles, :@stylesheet_cache]
+    end
+
+    def import_instance_vars(from_stylesheet)
+      from_stylesheet.run_block
+
+      from_stylesheet.instance_variables.each do |var|
+        next if exclude_instance_vars.include? var
+        self.instance_variable_set(var, from_stylesheet.instance_variable_get(var))
+      end
+    end
+
 protected
 
     # The list of Stylesheets or names that have been imported into this one.
@@ -290,16 +324,17 @@ protected
       @imported ||= []
     end
 
-    # The actual contents of this stylesheet as a Hash from stylename to properties.
+    # The styles hash contains Teacup::Style objects, which get linked to the
+    # current stylesheet.
     #
     # @return Hash[Symbol, Hash]
     def styles
-      @styles ||= Hash.new{ |_styles, stylename|
-        @styles[stylename] = Style.new
-        @styles[stylename].stylename = stylename
-        @styles[stylename].stylesheet = self
-        @styles[stylename]
-      }
+      @styles ||= Hash.new do |_styles, stylename|
+        _styles[stylename] = Style.new
+        _styles[stylename].stylename = stylename
+        _styles[stylename].stylesheet = self
+        _styles[stylename]
+      end
     end
 
   end