teacup 1.2.5 → 1.2.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    teacup (1.2.3)
+    teacup (1.2.5)
       rake
 
 GEM

data/lib/teacup/constraint.rb

@@ -88,22 +88,22 @@ module Teacup
         [
           Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
         ]
-      when :top_left
+      when :top_left, :topleft
         [
           Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
           Teacup::Constraint.new(:self, :top).equals(relative_to, :top),
         ]
-      when :top_right
+      when :top_right, :topright
         [
           Teacup::Constraint.new(:self, :right).equals(relative_to, :right),
           Teacup::Constraint.new(:self, :top).equals(relative_to, :top),
         ]
-      when :bottom_right
+      when :bottom_right, :bottomright
         [
           Teacup::Constraint.new(:self, :right).equals(relative_to, :right),
           Teacup::Constraint.new(:self, :bottom).equals(relative_to, :bottom),
         ]
-      when :bottom_left
+      when :bottom_left, :bottomleft
         [
           Teacup::Constraint.new(:self, :left).equals(relative_to, :left),
           Teacup::Constraint.new(:self, :bottom).equals(relative_to, :bottom),

data/lib/teacup/merge_defaults.rb

@@ -26,10 +26,6 @@ module Teacup
 
     right.each do |key, value|
       if not target.has_key? key
-        if value.is_a?(Hash)
-          # make a copy of the Hash
-          value = Teacup::merge_defaults!({}, value)
-        end
         target[key] = value
       elsif value.is_a?(Hash) and left[key].is_a?(Hash)
         target[key] = Teacup::merge_defaults(left[key], value, (left==target ? left[key] : {}))

data/lib/teacup/stylesheet_extensions/constraints.rb

@@ -25,7 +25,7 @@ module Teacup
       Teacup::Constraint.new(:self, :right).equals(:superview, :right).plus(x)
     end
 
-    def constrain_center_x(x)
+    def constrain_center_x(x=0)
       Teacup::Constraint.new(:self, :center_x).equals(:superview, :center_x).plus(x)
     end
 
@@ -37,7 +37,7 @@ module Teacup
       Teacup::Constraint.new(:self, :bottom).equals(:superview, :bottom).plus(y)
     end
 
-    def constrain_center_y(y)
+    def constrain_center_y(y=0)
       Teacup::Constraint.new(:self, :center_y).equals(:superview, :center_y).plus(y)
     end
 

data/lib/teacup/stylesheet_extensions/geometry.rb

@@ -28,9 +28,15 @@ module Teacup
   class Stylesheet
     def iPhone       ; 1 << 1 ; end
     def iPhoneRetina ; 1 << 2 ; end
-    def iPhone5      ; 1 << 3 ; end
-    def iPad         ; 1 << 4 ; end
-    def iPadRetina   ; 1 << 5 ; end
+    def iPhone4      ; 1 << 3 ; end
+    def iPhone35     ; 1 << 4 ; end
+    def iPad         ; 1 << 5 ; end
+    def iPadRetina   ; 1 << 6 ; end
+
+    def iPhone5
+      NSLog('TEACUP WARNING: iPhone5 method is deprecated in lieu of size-based method names (iPhone4, iPhone35)')
+      1 << 3
+    end
 
     # returns the device size in points, regardless of status bar
     def screen_size
@@ -50,11 +56,15 @@ module Teacup
       @@this_device = 0
       if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone
         @@this_device |= iPhone
-        if UIScreen.mainScreen.respond_to? :scale
+
+        if UIScreen.mainScreen.respond_to?(:scale) && UIScreen.mainScreen.scale == 2
           @@this_device |= iPhoneRetina
-          if UIScreen.mainScreen.bounds.size.height == 568
-            @@this_device |= iPhone5
-          end
+        end
+
+        if UIScreen.mainScreen.bounds.size.height == 568
+          @@this_device |= iPhone4
+        else
+          @@this_device |= iPhone35
         end
       else
         @@this_device |= iPad

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '1.2.5'
+  VERSION = '1.2.7'
 
 end

data/lib/teacup/z_core_extensions/ui_view.rb

@@ -61,7 +61,7 @@ class UIView
     end
 
     # lastly, go up the chain; either a controller or superview
-    if ! retval && nextResponder
+    if ! retval && nextResponder && nextResponder.respond_to?(:stylesheet)
       retval = nextResponder.stylesheet
     end
 

data/spec/stylesheet_spec.rb

@@ -51,7 +51,7 @@ describe "Teacup::Stylesheet" do
           title: "Example!",
           frame: [[0, 0], [100, 100]],
           layer: {
-            borderRadius: 10,
+            borderWidth: 10,
             opacity: 0.5
           }
 
@@ -59,7 +59,7 @@ describe "Teacup::Stylesheet" do
           backgroundColor: :blue,
           frame: [[100, 100], [200, 200]],
           layer: {
-            borderRadius: 20
+            borderWidth: 20
           }
       end
     end
@@ -73,8 +73,8 @@ describe "Teacup::Stylesheet" do
       @stylesheet.query(:example_button)[:frame].should == [[100, 100], [200, 200]]
     end
 
-    it 'should give merge hashes' do
-      @stylesheet.query(:example_button)[:layer][:borderRadius].should == 20
+    it 'should merge hashes' do
+      @stylesheet.query(:example_button)[:layer][:borderWidth].should == 20
       @stylesheet.query(:example_button)[:layer][:opacity].should == 0.5
     end
   end
@@ -122,12 +122,19 @@ describe "Teacup::Stylesheet" do
         import :importedbyname
 
         style :label,
-          backgroundColor: :blue
+          backgroundColor: :blue,
+          layer: {
+            borderWidth: 2,
+          }
       end
 
       Teacup::Stylesheet.new(:importedbyname) do
         style :label,
-          title: "Imported by name"
+          title: "Imported by name",
+          layer: {
+            borderWidth: 1,
+            borderColor: :red,
+          }
       end
 
       @name_importer = Teacup::Stylesheet.new do
@@ -167,6 +174,11 @@ describe "Teacup::Stylesheet" do
       @oo_name_importer.query(:label)[:backgroundColor].should == :blue
     end
 
+    it 'should merge properties' do
+      @oo_name_importer.query(:label)[:layer][:borderWidth].should == 2
+      @oo_name_importer.query(:label)[:layer][:borderColor].should == :red
+    end
+
     it 'should work with a value' do
       imported_anonymously = Teacup::Stylesheet.new do
         style :label,
@@ -214,7 +226,7 @@ describe "Teacup::Stylesheet" do
         import :most_generic
 
         style :label,
-          borderRadius: 10,
+          borderWidth: 10,
           title: "Stylesheet"
       end
 
@@ -227,9 +239,15 @@ describe "Teacup::Stylesheet" do
       end
     end
 
+    after do
+      Teacup::Stylesheet.stylesheets.delete(:most_generic)
+      Teacup::Stylesheet.stylesheets.delete(:stylesheet)
+      Teacup::Stylesheet.stylesheets.delete(:most_specific)
+    end
+
     it 'should union different properties for the same rule' do
       @stylesheet.query(:label)[:backgroundColor].should == :blue
-      @stylesheet.query(:label)[:borderRadius] == 10
+      @stylesheet.query(:label)[:borderWidth] == 10
     end
 
     it 'should give the importer precedence' do
@@ -239,7 +257,7 @@ describe "Teacup::Stylesheet" do
     it 'should follow chains of imports' do
       @most_specific.query(:label)[:title].should == "Most specific"
       @most_specific.query(:label)[:font].should == "IMPACT"
-      @most_specific.query(:label)[:borderRadius].should == 10
+      @most_specific.query(:label)[:borderWidth].should == 10
       @most_specific.query(:label)[:backgroundColor].should == :blue
     end
 
@@ -295,13 +313,13 @@ describe "Teacup::Stylesheet" do
           backgroundColor: :blue
 
         style :my_textfield, extends: [:textfield, :input],
-          borderRadius: 10
+          borderWidth: 10
       end
 
       stylesheet.query(:my_textfield)[:text].should == "Extended"
       stylesheet.query(:my_textfield)[:backgroundColor].should == :blue
       stylesheet.query(:my_textfield)[:origin].should == [0, 0]
-      stylesheet.query(:my_textfield)[:borderRadius].should == 10
+      stylesheet.query(:my_textfield)[:borderWidth].should == 10
     end
 
     it 'should give precedence to imported rules over extended rules' do
@@ -311,7 +329,7 @@ describe "Teacup::Stylesheet" do
           backgroundColor: :blue
 
         style :my_textfield, extends: :textfield,
-          borderRadius: 10
+          borderWidth: 10
 
         import Teacup::Stylesheet.new{
           style :my_textfield,
@@ -321,7 +339,7 @@ describe "Teacup::Stylesheet" do
 
       stylesheet.query(:my_textfield)[:text].should == "Imported"
       stylesheet.query(:my_textfield)[:backgroundColor].should == :blue
-      stylesheet.query(:my_textfield)[:borderRadius].should == 10
+      stylesheet.query(:my_textfield)[:borderWidth].should == 10
     end
 
     it 'should import rules using a deep merge strategy' do
@@ -329,19 +347,19 @@ describe "Teacup::Stylesheet" do
         import Teacup::Stylesheet.new{
           style :my_textfield,
             layer: {
-              borderRadius: 1,
+              borderWidth: 1,
               opacity: 0.5
             }
         }
 
         style :my_textfield,
           layer: {
-            borderRadius: 10
+            borderWidth: 10
           }
       end
 
       stylesheet.query(:my_textfield)[:layer][:opacity].should == 0.5
-      stylesheet.query(:my_textfield)[:layer][:borderRadius].should == 10
+      stylesheet.query(:my_textfield)[:layer][:borderWidth].should == 10
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake