teacup 1.3.2 → 1.3.3

data/Gemfile.lock

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

data/README.md

@@ -20,6 +20,10 @@ to create interfaces programmatically.
 ```bash
 > gem install teacup
 ```
+and in your Rakefile
+```ruby
+require 'teacup'
+```
 
 **Better Install**
 
@@ -55,7 +59,7 @@ gems on a per-project basis, using a gemset.  See the
       end
     end
     ```
-4.  Create the stylesheet
+4.  Create the stylesheet (Usually in app/styles/)
 
     ```ruby
     Teacup::Stylesheet.new :main_screen do

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
 end

data/lib/teacup/z_core_extensions/ui_view_getters.rb

@@ -18,21 +18,30 @@ class UIView
     view = subviews.find { |subview| found_subview = subview.viewWithStylename(name_or_class) }
     return found_subview if view
 
-    nil  # couldn't find it
+    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
-    r = []
-    r << self if self._teacup_check_stylename(name_or_class)
-
-    subviews.each do |view|
-      r << view if view._teacup_check_stylename(name_or_class)
-      r.concat view.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
-    r
+
+    return retval
   end
 
   def _teacup_check_stylename(name_or_class)

data/lib/teacup/z_core_extensions/z_handlers.rb

@@ -49,12 +49,28 @@ Teacup.handler UIView, :height { |target, h|
   target.frame = f
 }
 
+Teacup.handler UIView, :size { |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
+}
+
 Teacup.handler UIView, :origin { |target, origin|
   f = target.frame
-  f.origin = origin
+  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
 }
 
+Teacup.handler UIView, :center { |target, center|
+  center_x = Teacup::calculate(target, :width, center[0])
+  center_y = Teacup::calculate(target, :height, center[1])
+  target.center = [center_x, center_y]
+}
+
 Teacup.handler UIView, :size { |target, size|
   # odd... if I changed these to .is_a?, weird errors happen.  Use ===
   if Symbol === size && size == :full

data/samples/AutoLayout/Rakefile

@@ -9,5 +9,5 @@ Motion::Project::App.setup do |app|
   app.name = 'AutoLayout'
 
   #include styles
-  app.files += Dir.glob(File.join(app.project_dir, 'styles/**/*.rb'))
+  app.files += Dir.glob(File.join(app.project_dir, 'lib/**/*.rb'))
 end

data/samples/Hai/Gemfile.lock

@@ -1,13 +1,11 @@
 PATH
   remote: ../..
   specs:
-    teacup (0.3.2)
-      rake
+    teacup (1.3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    rake (0.9.2.2)
 
 PLATFORMS
   ruby

data/samples/Hai/Rakefile

@@ -9,5 +9,4 @@ Motion::Project::App.setup do |app|
   app.identifier = 'com.rubymotion.Hai'
 
   app.device_family = :iphone
-  app.files += Dir.glob(File.join(app.project_dir, 'styles/**/*.rb'))
 end

data/spec/ui_view_getters_spec.rb

@@ -0,0 +1,68 @@
+describe "UIView getters" do
+
+  before do
+    stylesheet1 = Teacup::Stylesheet.new do
+      style :parent_style
+    end
+    stylesheet2 = Teacup::Stylesheet.new do
+      import stylesheet1
+      style :extended_style, extends: :parent_style
+    end
+
+    @view = UIView.new.tap do |view|
+      @some_view = view.subview(UIView, :some_view)
+      @extended_style = view.subview(UIView, :extended_style)
+      container = view.subview(UIView)
+        @label1 = container.subview(UILabel)
+        @label2 = container.subview(UILabel)
+        @label3 = container.subview(UILabel)
+      @stylename1 = view.subview(UIView, :stylename)
+      @stylename2 = view.subview(UIView, :stylename)
+      @stylename3 = view.subview(UIView, :stylename)
+      container = view.subview(UIView)
+        @button = container.subview(UIButton)
+    end
+    @view.stylesheet = stylesheet2
+    @view.stylename = :self_style
+  end
+
+  describe "viewWithStylename" do
+    it "should return based on stylename" do
+      @view.viewWithStylename(:some_view).should == @some_view
+    end
+
+    it "should return self based on stylename" do
+      @view.viewWithStylename(:self_style).should == @view
+    end
+
+    it "should return based on class" do
+      @view.viewWithStylename(UIButton).should == @button
+    end
+
+    it "should return based on extended stylename" do
+      @view.viewWithStylename(:extended_style).should == @extended_style
+      @view.viewWithStylename(:parent_style).should == @extended_style
+    end
+
+    it "should nil when there is no match" do
+      @view.viewWithStylename(:this_is_not_a_stylename).should == nil
+      @view.viewWithStylename(UITableView).should == nil
+    end
+  end
+
+  describe "viewsWithStylename" do
+    it "should return based on stylename" do
+      @view.viewsWithStylename(:stylename).should == [@stylename1, @stylename2, @stylename3]
+    end
+
+    it "should return based on class" do
+      @view.viewsWithStylename(UILabel).should == [@label1, @label2, @label3]
+    end
+
+    it "should [] when there is no match" do
+      @view.viewsWithStylename(:this_is_not_a_stylename).should == []
+      @view.viewsWithStylename(UITableView).should == []
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
@@ -72,19 +72,18 @@ files:
 - samples/AutoLayout/Rakefile
 - samples/AutoLayout/app/app_delegate.rb
 - samples/AutoLayout/app/root_controller.rb
-- samples/AutoLayout/styles/base.rb
-- samples/AutoLayout/styles/dummy.rb
-- samples/AutoLayout/styles/handlers.rb
-- samples/AutoLayout/styles/root.rb
-- samples/AutoLayout/styles/settings.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/Hai/styles/iphone.rb
 - samples/OnePage/Gemfile
 - samples/OnePage/Rakefile
 - samples/OnePage/app/app_delegate.rb
@@ -99,6 +98,7 @@ files:
 - spec/present_modal_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb
+- spec/ui_view_getters_spec.rb
 - spec/uiswitch_spec.rb
 - spec/view_spec.rb
 - teacup.gemspec
@@ -135,5 +135,6 @@ test_files:
 - spec/present_modal_spec.rb
 - spec/style_spec.rb
 - spec/stylesheet_spec.rb
+- spec/ui_view_getters_spec.rb
 - spec/uiswitch_spec.rb
 - spec/view_spec.rb

data/samples/AutoLayout/styles/settings.rb

@@ -1,13 +0,0 @@
-Teacup::Stylesheet.new :settings do
-  import :base
-
-  v_padding = 10
-
-  style :label, extends: :custom_label,
-    constraints: [
-      :full_width,
-      constrain_top(150)
-    ],
-    backgroundColor: :clear
-
-end