teacup 2.0.3 → 2.0.4

data/.travis.yml

@@ -1,2 +1,2 @@
 language: objective-c
-before_install: rvm use 1.9.3
+before_install: rvm use ruby-1.9.3-p392

data/Gemfile

@@ -1,5 +1,9 @@
 source 'https://rubygems.org'
 
+group :test, :development do
+  gem 'rake'
+end
+
 gem 'motion-layout'
 
 gemspec

data/Gemfile.lock

@@ -1,16 +1,18 @@
 PATH
   remote: .
   specs:
-    teacup (2.0.2)
+    teacup (2.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     motion-layout (0.0.1)
+    rake (0.9.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   motion-layout
+  rake
   teacup!

data/lib/teacup/version.rb

@@ -1,5 +1,5 @@
 module Teacup
 
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 
 end

data/lib/teacup-ios/stylesheet_extensions/device.rb

@@ -78,7 +78,7 @@ module Teacup
 
     def device_is?(this_device)
       this_device = self.send(this_device) if this_device.is_a? Symbol
-      return device & this_device > 0
+      return self.device & this_device > 0
     end
 
   end

data/spec/ios/stylesheet_extensions/device_spec.rb

@@ -0,0 +1,46 @@
+describe "Stylesheet - Device" do
+
+  it "should have device methods" do
+    stylesheet = Teacup::Stylesheet.new
+    stylesheet.iPhone.should.not == nil
+    stylesheet.iPhoneRetina.should.not == nil
+    stylesheet.iPhone4.should.not == nil
+    stylesheet.iPhone35.should.not == nil
+    stylesheet.iPad.should.not == nil
+    stylesheet.iPadRetina.should.not == nil
+  end
+
+  it "should return appropriate sizes" do
+    stylesheet = Teacup::Stylesheet.new
+
+    device = UIDevice.currentDevice.userInterfaceIdiom
+    case device
+    when UIUserInterfaceIdiomPhone
+      if UIScreen.mainScreen.respond_to?(:scale) && UIScreen.mainScreen.scale == 2
+        stylesheet.device_is?(:iPhoneRetina).should == true
+      else
+        stylesheet.device_is?(:iPhoneRetina).should == false
+      end
+
+      if UIScreen.mainScreen.bounds.size.height == 568
+        stylesheet.screen_size.height.should == 568
+        stylesheet.device_is?(:iPhone4).should == true
+      else
+        stylesheet.screen_size.height.should == 480
+        stylesheet.device_is?(:iPhone35).should == true
+      end
+      stylesheet.screen_size.width.should == 320
+      stylesheet.device_is?(:iPhone).should == true
+    when UIUserInterfaceIdiomPad
+      if UIScreen.mainScreen.respond_to?(:scale) && UIScreen.mainScreen.scale == 2
+        stylesheet.device_is?(:iPadRetina).should == true
+      else
+        stylesheet.device_is?(:iPadRetina).should == false
+      end
+      stylesheet.screen_size.width.should == 768
+      stylesheet.screen_size.height.should == 1024
+      stylesheet.device_is?(:iPad).should == true
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teacup
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies: []
 description: ! 'Teacup is a community-driven DSL for making CSS-like styling, and
   layouts for
@@ -141,6 +141,7 @@ files:
 - spec/ios/present_modal_spec.rb
 - spec/ios/style_spec.rb
 - spec/ios/stylesheet_extensions/autoresize_spec.rb
+- spec/ios/stylesheet_extensions/device_spec.rb
 - spec/ios/stylesheet_spec.rb
 - spec/ios/ui_view_getters_spec.rb
 - spec/ios/uiswitch_spec.rb
@@ -183,6 +184,7 @@ test_files:
 - spec/ios/present_modal_spec.rb
 - spec/ios/style_spec.rb
 - spec/ios/stylesheet_extensions/autoresize_spec.rb
+- spec/ios/stylesheet_extensions/device_spec.rb
 - spec/ios/stylesheet_spec.rb
 - spec/ios/ui_view_getters_spec.rb
 - spec/ios/uiswitch_spec.rb