sugarcube 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9985bca73ff7087fee3be7621391ce74f9469d40
-  data.tar.gz: cf072b49b9dd5d8d8372863dca69825ca6cd85cb
+  metadata.gz: 64d971eb3d120c7952f35581299baa11b8f05040
+  data.tar.gz: 1cd8be72a4aefac254d0b29d0250a942a7318297
 SHA512:
-  metadata.gz: b4d920b6a983d8777da81443f4deaa308692bee99aad7018b173e6465880659ad173fe912574dedff7234088eb7578e93aa89167580e22febabb0062bd11a82b
-  data.tar.gz: 5cd6ff676e184587abc2618f18459293715153baa5c516bc8b7e4256d9ac5be0e73d34967f26701678e2325a855af149cd708618e6767470ad521bef3c7301af
+  metadata.gz: a7fde608a38bfe81d70cdc61298af9feca8bf9f369f2d950746dbf123132cd2eb6baabf24834998269c56f6fd64963f4efc5fa796a60eb2bd8a18b5a90cc63a0
+  data.tar.gz: c1b0618b2e4be3d733b0f0436fc708383fa8ed0e4d2a632fbade2a16f31cd335c76c8a082921ba573fa555409131a251e5da5e9fc399eab300efabe978a78442

data/lib/ios/sugarcube-568/uiimage.rb

@@ -1,32 +1,41 @@
 class UIImage
   class << self
-    SugarCube568_TallSuffix = '-568h@2x'
+    SugarCube568_TallSuffix = '-568h@2x'  # 320 x 568
+    SugarCube667_TallSuffix = '-667h@2x'  # 375 x 667
+    SugarCube736_TallSuffix = '-736h@2x'  # 414 x 736
 
-    def imageNamed568(name)
-      @may_use_taller_images ||= CGSizeEqualToSize(CGSizeMake(320, 568), UIScreen.mainScreen.bounds.size)
-      if ( @may_use_taller_images && name.length > 0  && name.rangeOfString(SugarCube568_TallSuffix).location == NSNotFound )
+    def sugarcube568_imageNamed(name)
+      case UIScreen.mainScreen.bounds.size.height
+      when 568
+        taller_image_ext = SugarCube568_TallSuffix
+      when 667
+        taller_image_ext = SugarCube667_TallSuffix
+      when 736
+        taller_image_ext = SugarCube736_TallSuffix
+      else
+        taller_image_ext = false
+      end
+
+      if ( taller_image_ext && name.length > 0 && name.rangeOfString(taller_image_ext).location == NSNotFound )
         # Check if is there a path extension or not
-        test_name = name;
+        test_name = name
         if test_name.pathExtension.length > 0
-          test_name = test_name.stringByDeletingPathExtension.stringByAppendingString(SugarCube568_TallSuffix).stringByAppendingPathExtension(name.pathExtension)
+          test_name = test_name.stringByDeletingPathExtension.stringByAppendingString(taller_image_ext).stringByAppendingPathExtension(name.pathExtension)
         else
-          test_name = test_name.stringByAppendingString(SugarCube568_TallSuffix + ".png")
+          test_name = test_name.stringByAppendingString(taller_image_ext)
         end
 
-        image = imageNamed_old(test_name)
-        if image
-          return self.imageWithCGImage(image.CGImage, scale:2.0, orientation:image.imageOrientation)
-        end
+        return imageNamed_old(test_name)
       end
 
       return nil
     end
 
     alias :imageNamed_old :imageNamed
-# now we've got imageNamed568 and imageNamed_old to load the respective versions
+    # now we've got sugarcube568_imageNamed and imageNamed_old to load the respective versions
 
     def imageNamed(name)
-      imageNamed568(name) || imageNamed_old(name)
+      sugarcube568_imageNamed(name) || imageNamed_old(name)
     end
   end
 end

data/lib/osx/sugarcube-appkit/nsstring.rb

@@ -30,12 +30,8 @@ class NSString
 
   # @return [NSImageView]
   def nsimageview
-    image = NSImage.imageNamed(self)
-    unless image
-      NSLog("No image named #{self}")
-    end
     image_view = NSImageView.alloc.init
-    image_view.image = image
+    image_view.image = self.nsimage
     frame = image_view.frame
     frame.size = image_view.intrinsicContentSize
     image_view.frame = frame

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '2.8.1'
+  Version = '2.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description