teacup 2.1.2 → 2.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teacup (2.1.2)
+    teacup (2.1.3)
 
 GEM
   remote: https://rubygems.org/

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

@@ -107,7 +107,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) || NSRect === frame
+  elsif (Array === frame && frame.length == 2) || CGRect === 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/lib/teacup/layout.rb

@@ -255,7 +255,8 @@ module Teacup
     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|
+      styled_subviews = top_level_view.subviews.select { |v| v.stylename }
+      styled_subviews.each do |view|
         if ! layout_subviews[view.stylename.to_s]
           layout_subviews[view.stylename.to_s] = view
         end

data/lib/teacup/teacup_util.rb

@@ -1,12 +1,6 @@
 module Teacup
   module_function
 
-  # Returns all the subviews of `target` that have a stylename.  `target` is not
-  # included in the list.  Used by the motion-layout integration in layout.rb.
-  def get_styled_subviews(target)
-    target.subviews.select { |v| v.stylename }
-  end
-
   def to_instance(class_or_instance)
     if class_or_instance.is_a? Class
       return class_or_instance.new

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 
 end

data/teacup.gemspec

@@ -4,6 +4,7 @@ require File.expand_path('../lib/teacup/version.rb', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = 'teacup'
   gem.version       = Teacup::VERSION
+  gem.licenses      = ['BSD']
 
   gem.authors  = ['the rubymotion community']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
@@ -64,7 +64,6 @@ files:
 - 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/core_extensions/z_core_extensions.rb
 - lib/teacup-osx/dummy.rb
 - lib/teacup-osx/handler.rb
 - lib/teacup-osx/style.rb
@@ -151,7 +150,8 @@ files:
 - spec/ios/view_spec.rb
 - teacup.gemspec
 homepage: https://github.com/rubymotion/teacup
-licenses: []
+licenses:
+- BSD
 post_install_message: 
 rdoc_options: []
 require_paths:

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

@@ -1,131 +0,0 @@
-##|
-##|  NSView.frame
-##|
-Teacup.handler NSView, :left, :x do |target, x|
-  f = target.frame
-  f.origin.x = Teacup::calculate(target, :width, x)
-  target.frame = f
-end
-
-Teacup.handler NSView, :right do |target, r|
-  f = target.frame
-  f.origin.x = Teacup::calculate(target, :width, r) - f.size.width
-  target.frame = f
-end
-
-Teacup.handler NSView, :center_x, :middle_x do |target, x|
-  c = target.center
-  c.x = Teacup::calculate(target, :width, x)
-  target.center = c
-end
-
-Teacup.handler NSView, :top, :y do |target, y|
-  f = target.frame
-  f.origin.y = Teacup::calculate(target, :height, y)
-  target.frame = f
-end
-
-Teacup.handler NSView, :bottom do |target, b|
-  f = target.frame
-  f.origin.y = Teacup::calculate(target, :height, b) - f.size.height
-  target.frame = f
-end
-
-Teacup.handler NSView, :center_y, :middle_y do |target, y|
-  c = target.center
-  c.y = Teacup::calculate(target, :height, y)
-  target.center = c
-end
-
-Teacup.handler NSView, :width do |target, w|
-  f = target.frame
-  f.size.width = Teacup::calculate(target, :width, w)
-  target.frame = f
-end
-
-Teacup.handler NSView, :height do |target, h|
-  f = target.frame
-  f.size.height = Teacup::calculate(target, :height, h)
-  target.frame = f
-end
-
-Teacup.handler NSView, :size do |target, size|
-  f = target.frame
-  size_x = Teacup::calculate(target, :width, size[0])
-  size_y = Teacup::calculate(target, :height, size[1])
-  f.size = [size_x, size_y]
-  target.frame = f
-end
-
-Teacup.handler NSView, :origin do |target, origin|
-  f = target.frame
-  origin_x = Teacup::calculate(target, :width, origin[0])
-  origin_y = Teacup::calculate(target, :height, origin[1])
-  f.origin = [origin_x, origin_y]
-  target.frame = f
-end
-
-Teacup.handler NSView, :center do |target, center|
-  center_x = Teacup::calculate(target, :width, center[0])
-  center_y = Teacup::calculate(target, :height, center[1])
-  target.center = [center_x, center_y]
-end
-
-Teacup.handler NSView, :size do |target, size|
-  # odd... if I changed these to .is_a?, weird errors happen.  Use ===
-  if Symbol === size && size == :full
-    if target.superview
-      size = target.superview.bounds.size
-    else
-      size = target.frame.size
-    end
-  elsif Array === size
-    size = [Teacup::calculate(target, :width, size[0]), Teacup::calculate(target, :height, size[1])]
-  end
-  f = target.frame
-  f.size = size
-  target.frame = f
-end
-
-Teacup.handler NSView, :frame do |target, frame|
-  # odd... if I changed these to .is_a?, weird errors happen.  Use ===
-  if Symbol === frame && frame == :full
-    if target.superview
-      frame = target.superview.bounds
-    else
-      frame = target.frame
-    end
-  elsif Array === frame && frame.length == 4
-    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) || 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])]
-      ]
-  end
-  target.frame = frame
-end
-
-Teacup.handler NSView, :gradient do |target, gradient|
-  gradient_layer = target.instance_variable_get(:@teacup_gradient_layer) || begin
-    gradient_layer = CAGradientLayer.layer
-    gradient_layer.frame = target.bounds
-    target.layer.insertSublayer(gradient_layer, atIndex:0)
-    gradient_layer
-  end
-
-  gradient.each do |key, value|
-    case key.to_s
-    when 'colors'
-      colors = [value].flatten.collect { |color| color.is_a?(UIColor) ? color.CGColor : color }
-      gradient_layer.colors = colors
-    else
-      gradient_layer.send("#{key}=", value)
-    end
-  end
-
-  target.instance_variable_set(:@teacup_gradient_layer, gradient_layer)
-end