motion-juxtapose 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2ccac7f22e4efec4bbf3c70e6beea4764eb4539
-  data.tar.gz: 3eb7f65dd5b4585f891a97f7eac80892fbc5d828
+  metadata.gz: 63ccd001cc58321d3e6a1f0f26b00aa5aaf61c15
+  data.tar.gz: cf1665161b4fc35cba7dbf0911df67a85e01b081
 SHA512:
-  metadata.gz: ed97658f49980bbeb7aad17b81d63d6c6be702aff3e6a5651c9eb97dd0130b2e815b33c8b5542c9016f15af2addef85b7175716f306991efaa6d5bbba666acf1
-  data.tar.gz: d667feadb1158ce8dc85be01d79569fb96ef690bf77d19337aa39e0dfdfa806c6193aa30792ef69550cd6672cf9df5dcc96662f19ef61ff02e2d009ade0f4a32
+  metadata.gz: 596df2d0cb510adff4ae4f32a0c064c6a6eb6223253e7f7b598fb6718f4097c3e713e99d0ceb0eb3d149e206c46c9dbaa6eba9e8c354e0612ad1d0450eaba928
+  data.tar.gz: 710afe7ea4fdc765ef4a8f4f39e5d2ba68bfeb29bf097e706115e7d62d7b5f5c92840b287e15cd853bb733bb3da28291da4930c586c5b88619f6cb72ee75acfd

data/README.md

@@ -153,6 +153,10 @@ To start it, run `bundle exec juxtapose` in the root of your project and browse
 
 ## Release Notes
 
+#### v.0.3.1
+* Fixes bug where you could not test against non-portrait screenshots ([@ohammersmith](https://github.com/ohammersmith))
+
+
 #### v.0.3.0
 * Add Appium support ([@squidpunch](http://github.com/squidpunch))
 * Add support for 6/6+ screen sizes ([@squidpunch](http://github.com/squidpunch))
@@ -177,6 +181,7 @@ To start it, run `bundle exec juxtapose` in the root of your project and browse
 * [Jeffrey Chupp](http://github.com/semanticart)
 * [Michael Denomy](http://github.com/mdenomy)
 * [David Larrabee](http://github.com/squidpunch)
+* [Otto Hammersmith](https://github.com/ohammersmith)
 
 
 ## Contributing

data/lib/juxtapose/strategy/mac_bacon_strategy.rb

@@ -15,10 +15,10 @@ module Juxtapose
 
     def device_name
       name = [UIDevice.currentDevice.model.gsub(/\s+Simulator/, '').downcase]
-      name << 'retina' if UIScreen.mainScreen.scale > 1
-      name << '5' if UIScreen.mainScreen.bounds.size.height == 568.0
-      name << '6' if UIScreen.mainScreen.bounds.size.height == 667.0
-      name << '6-plus' if UIScreen.mainScreen.bounds.size.height == 736.0
+      name << 'retina' if retina?
+      name << '5' if iphone5?
+      name << '6' if iphone6?
+      name << '6-plus' if iphone6plus?
       name.join('-')
     end
 
@@ -40,15 +40,15 @@ module Juxtapose
 
       if currentOrientation == UIInterfaceOrientationLandscapeLeft
         CGContextTranslateCTM(context, size.width / 2.0, size.height / 2.0)
-        CGContextRotateCTM(context, M_PI_2)
+        CGContextRotateCTM(context, (Math::PI/2))
         CGContextTranslateCTM(context, - size.height / 2.0, - size.width / 2.0)
       elsif currentOrientation == UIInterfaceOrientationLandscapeRight
         CGContextTranslateCTM(context, size.width / 2.0, size.height / 2.0)
-        CGContextRotateCTM(context, -M_PI_2)
+        CGContextRotateCTM(context, -(Math::PI/2))
         CGContextTranslateCTM(context, - size.height / 2.0, - size.width / 2.0)
       elsif currentOrientation == UIInterfaceOrientationPortraitUpsideDown
         CGContextTranslateCTM(context, size.width / 2.0, size.height / 2.0)
-        CGContextRotateCTM(context, M_PI)
+        CGContextRotateCTM(context, Math::PI)
         CGContextTranslateCTM(context, -size.width / 2.0, -size.height / 2.0)
       end
 
@@ -89,6 +89,22 @@ module Juxtapose
     def height
       resolution.size.height
     end
+    
+    def iphone5?
+      height == 568.0 || (height == 320.0 && width == 568.0)
+    end
+    
+    def iphone6?
+      height == 667.0 || height == 375.0
+    end
+
+    def iphone6plus?
+      height == 736.0 || height == 414
+    end
+
+    def retina?
+      UIScreen.mainScreen.scale > 1
+    end
 
   end
 end

data/lib/juxtapose/version.rb

@@ -1,3 +1,3 @@
 module Juxtapose
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-juxtapose
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Joe Lind
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra