teacup 2.1.0 → 2.1.1

data/Gemfile.lock

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

data/README.md

@@ -138,7 +138,7 @@ constraints.  Teacup can also integrate with the [motion-layout][] gem!
   * [Using and re-using styles in a Stylesheet](#using-and-re-using-styles-in-a-stylesheet)
   * [Style via Stylename](#style-via-stylename)
   * [Extending Styles](#extending-styles)
-  * [Style via UIView Class](#style-via-uiview-class)
+  * [Style via View Class](#style-via-view-class)
   * [Importing stylesheets](#importing-stylesheets)
   * [Style via UIAppearance](#style-via-uiappearance) (iOS only)
 * [UITableViews](#uitableviews) - This is important if you are using styles and

data/lib/teacup/teacup_view.rb

@@ -19,6 +19,12 @@ module Teacup
     # Enable debug messages for this object
     attr_accessor :debug
 
+    # Subviews or empty collection of views to cater for issue with iOS7 dp3
+    def teacup_subviews
+      subviews || []
+    end
+
+
     # Alter the stylename of this view.
     #
     # This will cause new styles to be applied from the stylesheet.
@@ -122,7 +128,7 @@ module Teacup
           end
           style(stylesheet.query(self.stylename, self, orientation))
         end
-        subviews.each { |subview| subview.restyle!(orientation) }
+        teacup_subviews.each { |subview| subview.restyle!(orientation) }
       end
     end
 
@@ -199,7 +205,7 @@ module Teacup
       end
 
       # now add all che child constraints
-      subviews.each do |subview|
+      teacup_subviews.each do |subview|
         my_constraints.concat(subview.get_ns_constraints)
       end
 

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 
 end

data/lib/teacup-osx/dummy.rb

@@ -50,6 +50,7 @@ class DummyTextField < NSTextField
 private
   def dummy
     setAdjustsFontSizeToFitWidth(nil)
+    setFormatter(nil)
   end
 end
 

data/spec/ios/table_view/table_view_spec.rb

@@ -8,36 +8,70 @@ describe "TableViewCells" do
       @padding = @cell.contentView.subviews[0]
     end
 
-    it "should have styled padding" do
+    it "should have styled padding (backgroundColor.should)" do
       @padding.backgroundColor.should == UIColor.greenColor
-      @padding.center.x.should == @padding.superview.bounds.size.width / 2
-      @padding.center.y.should == @padding.superview.bounds.size.height / 2
+    end
+    it "should have styled padding (center.x.should)" do
+      @padding.center.x.round.should == (@padding.superview.bounds.size.width / 2).round
+    end
+    it "should have styled padding (center.y.should)" do
+      @padding.center.y.round.should == (@padding.superview.bounds.size.height / 2).round
+    end
+    it "should have styled padding (frame.size.width.should)" do
       @padding.frame.size.width.should < @padding.superview.bounds.size.width
+    end
+    it "should have styled padding (frame.size.height.should)" do
       @padding.frame.size.height.should < @padding.superview.bounds.size.height
     end
 
-    it "should have styled title" do
+    it "should have styled title (text)" do
       @cell.title_label.text.should =~ /^title/
+    end
+    it "should have styled title (frame.origin.x)" do
       @cell.title_label.frame.origin.x.should == 0
+    end
+    it "should have styled title (frame.origin.y)" do
       @cell.title_label.frame.origin.y.should == 0
+    end
+    it "should have styled title (frame.size.height)" do
       @cell.title_label.frame.size.height.should == 20
+    end
+    it "should have styled title (frame.size.width)" do
       @cell.title_label.frame.size.width.should == @padding.frame.size.width
+    end
+    it "should have styled title (textColor)" do
       @cell.title_label.textColor.should == UIColor.blueColor
     end
 
-    it "should have styled details" do
+    it "should have styled details (text)" do
       @cell.details_label.text.should =~ /^details/
+    end
+    it "should have styled details (frame.origin.x)" do
       @cell.details_label.frame.origin.x.should == 0
+    end
+    it "should have styled details (frame.origin.y)" do
       @cell.details_label.frame.origin.y.should == CGRectGetMaxY(@cell.title_label.frame) + 5
+    end
+    it "should have styled details (frame.size.height)" do
       @cell.details_label.frame.size.height.should == 17
+    end
+    it "should have styled details (frame.size.width)" do
       @cell.details_label.frame.size.width.should == @padding.frame.size.width
     end
 
-    it "should have styled other" do
+    it "should have styled other (text)" do
       @cell.other_label.text.should =~ /^other/
+    end
+    it "should have styled other (frame.origin.x)" do
       @cell.other_label.frame.origin.x.should == 0
+    end
+    it "should have styled other (frame.origin.y)" do
       @cell.other_label.frame.origin.y.should == CGRectGetMaxY(@cell.details_label.frame) + 5
+    end
+    it "should have styled other (frame.size.height)" do
       @cell.other_label.frame.size.height.should == 17
+    end
+    it "should have styled other (frame.size.width)" do
       @cell.other_label.frame.size.width.should == @padding.frame.size.width
     end
 
@@ -55,36 +89,70 @@ describe "TableViewCells" do
       @cell.is_reused.should == true
     end
 
-    it "should have styled padding" do
+    it "should have styled padding (backgroundColor)" do
       @padding.backgroundColor.should == UIColor.greenColor
-      @padding.center.x.should == @padding.superview.bounds.size.width / 2
-      @padding.center.y.should == @padding.superview.bounds.size.height / 2
+    end
+    it "should have styled padding (center.x)" do
+      @padding.center.x.round.should == (@padding.superview.bounds.size.width / 2).round
+    end
+    it "should have styled padding (center.y)" do
+      @padding.center.y.round.should == (@padding.superview.bounds.size.height / 2).round
+    end
+    it "should have styled padding (frame.size.width)" do
       @padding.frame.size.width.should < @padding.superview.bounds.size.width
+    end
+    it "should have styled padding (frame.size.height)" do
       @padding.frame.size.height.should < @padding.superview.bounds.size.height
     end
 
-    it "should have styled title" do
+    it "should have styled title (text)" do
       @cell.title_label.text.should =~ /^title/
+    end
+    it "should have styled title (frame.origin.x)" do
       @cell.title_label.frame.origin.x.should == 0
+    end
+    it "should have styled title (frame.origin.y)" do
       @cell.title_label.frame.origin.y.should == 0
+    end
+    it "should have styled title (frame.size.height)" do
       @cell.title_label.frame.size.height.should == 20
+    end
+    it "should have styled title (frame.size.width)" do
       @cell.title_label.frame.size.width.should == @padding.frame.size.width
+    end
+    it "should have styled title (textColor)" do
       @cell.title_label.textColor.should == UIColor.blueColor
     end
 
-    it "should have styled details" do
+    it "should have styled details (text)" do
       @cell.details_label.text.should =~ /^details/
+    end
+    it "should have styled details (frame.origin.x)" do
       @cell.details_label.frame.origin.x.should == 0
+    end
+    it "should have styled details (frame.origin.y)" do
       @cell.details_label.frame.origin.y.should == CGRectGetMaxY(@cell.title_label.frame) + 5
+    end
+    it "should have styled details (frame.size.height)" do
       @cell.details_label.frame.size.height.should == 17
+    end
+    it "should have styled details (frame.size.width)" do
       @cell.details_label.frame.size.width.should == @padding.frame.size.width
     end
 
-    it "should have styled other" do
+    it "should have styled other (text)" do
       @cell.other_label.text.should =~ /^other/
+    end
+    it "should have styled other (frame.origin.x)" do
       @cell.other_label.frame.origin.x.should == 0
+    end
+    it "should have styled other (frame.origin.y)" do
       @cell.other_label.frame.origin.y.should == CGRectGetMaxY(@cell.details_label.frame) + 5
+    end
+    it "should have styled other (frame.size.height)" do
       @cell.other_label.frame.size.height.should == 17
+    end
+    it "should have styled other (frame.size.width)" do
       @cell.other_label.frame.size.width.should == @padding.frame.size.width
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for