sugarcube 3.3.4 → 3.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f67b205769f1f470e8b590eb8b52767cd56a5b8
-  data.tar.gz: 2f24635340a8c3f5e22c73fe427b4ab6b2dfbe28
+  metadata.gz: 4de89aabaaf8a83810ab069bf1a29577102fa482
+  data.tar.gz: 725ac56efa88b23dd73d1dd6ea3995d0f0ea6555
 SHA512:
-  metadata.gz: b7db2394ee9acfd81c91048a737dcc2e4b2bbcc523979aadb75698f98c998ae6cbe63e2212663175bb5b55b516d7153959299b4cacc3c493e96979a6f8943c67
-  data.tar.gz: 11a4567ddff9a7c70b0fec35fc85da9e0ff7ea94ab9591b6202433c497b2125673379ccb9e357d4f3a40535f751b6eb78275b7e5fb6caeb8b0773d16b4db7052
+  metadata.gz: 957e029dcd2bb1dcb0f95e4f7da3b23ba2c159c8b6d8c2edccd8b54511ef709f23bc5c79ca2db304b697ef8ba0236437c7c0128dac65f6e77039ea5b0208b0bc
+  data.tar.gz: 046cec67dfe8b834fa135332b9d12160e0fa4e105def2def608795b5a957793ffb4aa12a96d8f71536267e0118d7f46318daf69e2a78c6dd62fa0cd85eaadc86

data/README.md

@@ -1,6 +1,8 @@
 SugarCube
 =========
 
+[![Join the chat at https://gitter.im/rubymotion/sugarcube](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/rubymotion/sugarcube?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 [![Build Status](https://travis-ci.org/rubymotion/sugarcube.svg?branch=master)](https://travis-ci.org/rubymotion/sugarcube)
 [![Version](https://badge.fury.io/rb/sugarcube.svg)](https://rubygems.org/gems/sugarcube)
 
@@ -701,7 +703,7 @@ end
 # a little more complex - the cancel button should be first, and the block will
 # receive a string and an index
 UIAlertView.alert('This is happening, OK?',
-  message: 'Don't worry, it'll be fine.',
+  message: 'Don\'t worry, it\'ll be fine.',
   buttons: ['Nevermind', 'OK'],
   ) do |button, button_index|
   if button == 'OK'  # or: button_index == 1
@@ -772,9 +774,9 @@ UIActionSheet.alert('This is happening, OK?', buttons: ['Cancel', 'Kill it!', 'U
 end
 
 # skip cancel and destructive buttons:
-UIActionSheet.alert('Should I?', buttons: [nil, nil, 'OK', 'Nevermind']) [ |pressed|
+UIActionSheet.alert('Should I?', buttons: [nil, nil, 'OK', 'Nevermind']) { |pressed|
   self.do_it if pressed == 'OK'
-]
+}
 
 UIActionSheet.alert 'I mean, is this cool?', buttons: ['Nah', 'With fire!', 'Sure', 'whatever'],
   cancel: proc { self.cancel },

data/lib/cocoa/sugarcube-files/nsstring.rb

@@ -15,10 +15,10 @@ class NSString
   end
 
   def app_support_path
-    @@sugarcube_app_suppert ||= NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true)[0]
-    return self if self.hasPrefix(@@sugarcube_app_suppert)
+    @@sugarcube_app_support ||= NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true)[0]
+    return self if self.hasPrefix(@@sugarcube_app_support)
 
-    @@sugarcube_app_suppert.stringByAppendingPathComponent(self)
+    @@sugarcube_app_support.stringByAppendingPathComponent(self)
   end
 
   def temporary_path

data/lib/cocoa/sugarcube-nsdata/nsdata.rb

@@ -2,13 +2,8 @@ class NSData
 
   # converts NSData into an NSString using any encoding, default is UTF8
   # @return [NSString]
-  def nsstring(encoding=nil)
-    if encoding
-      return NSString.stringWithCString(self.bytes, encoding: encoding)
-    else
-
-      return NSString.stringWithUTF8String(self)
-    end
+  def nsstring(encoding=NSUTF8StringEncoding)
+    return NSString.alloc.initWithData(self, encoding: encoding)
   end
 
   def write_to(path_or_url, atomically=true)

data/lib/cocoa/sugarcube-nsdate/nsdate.rb

@@ -43,40 +43,87 @@ class NSDate
     date_formatter.stringFromDate(self)
   end
 
-  # Pass in a format string or a Symbol.  The Symbol must exist in
+  # Pass in a format string or a Symbol.  If you use a Symbol, it must exist in
   # NSDate::SugarCubeFormats.
   #
+  # This method accepts some options:
+  #
+  # timezone: String or NSTimeZone.  Strings get converted using NSTimeZone.timeZoneWithName
+  # unicode: if true, this method will use Unicode date format (TR35) instead of converting to a locale specific format
+  # locale: Strings or NSLocale.  Strings get converted using NSLocale.localeWithLocaleIdentifier
+  #
   # See
   # <https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/DataFormatting/Articles/dfDateFormatting10_4.html#//apple_ref/doc/uid/TP40002369-SW1>
   # and
   # <http://www.unicode.org/reports/tr35/tr35-19.html#Date_Field_Symbol_Table>
   # for more information about date format strings.
   def string_with_format(format, options={})
-    locale = options[:locale] || NSLocale.currentLocale
     timezone = options[:timezone] || NSTimeZone.defaultTimeZone
+    if timezone.is_a?(NSString)
+      timezone = NSTimeZone.timeZoneWithName(timezone)
+    end
 
     if format.is_a?(Symbol)
-      formatters = SugarCubeFormats[format]
-      raise "No format found for #{format.inspect}" unless formatters
-      locale = NSLocale.localeWithLocaleIdentifier "en_US"
-      retval = ''
-      formatters.each do |formatter|
-        case formatter
-        when Symbol
-          retval << string_with_format(formatter.to_s, locale:locale, timezone:timezone)
-        when String
-          retval << formatter
+      return _string_with_sugarcube_format(format, timezone)
+    else
+      unicode = options[:unicode]
+      if unicode
+        return _string_with_unicode_format(format, timezone)
+      else
+        locale = options[:locale] || NSLocale.currentLocale
+        if locale.is_a?(NSString)
+          locale = NSLocale.localeWithLocaleIdentifier(locale)
         end
+
+        return _string_with_nsdate_format(format, timezone, locale)
       end
-      return retval
-    else
-      format_template = NSDateFormatter.dateFormatFromTemplate(format, options:0,
-                                                        locale:locale)
+    end
+  end
+
+  def _string_with_sugarcube_format(format, timezone)
+    formatters = SugarCubeFormats[format]
+    raise "No format found for #{format.inspect}" unless formatters
+    locale = NSLocale.localeWithLocaleIdentifier('en_US')
+    retval = ''
+    formatters.each do |formatter|
+      case formatter
+      when Symbol
+        retval << string_with_format(formatter.to_s, locale: locale, timezone: timezone)
+      when String
+        retval << formatter
+      end
+    end
+    return retval
+  end
+
+  def _string_with_nsdate_format(format, timezone, locale)
+    locale_name = locale.localeIdentifier
+    @@sugarcube_date_formatters ||= {}
+    @@sugarcube_date_formatters[locale_name] ||= {}
+    @@sugarcube_date_formatters[locale_name][format] ||= begin
+      format_template = NSDateFormatter.dateFormatFromTemplate(format, options: 0,
+                                                        locale: locale)
       date_formatter = NSDateFormatter.new
       date_formatter.setDateFormat(format_template)
-      date_formatter.setTimeZone(timezone)
-      return date_formatter.stringFromDate(self)
+      date_formatter
+    end
+
+    date_formatter = @@sugarcube_date_formatters[locale_name][format]
+    date_formatter.setTimeZone(timezone)
+    return date_formatter.stringFromDate(self)
+  end
+
+  def _string_with_unicode_format(format, timezone)
+    @@sugarcube_unicode_formatters ||= {}
+    @@sugarcube_unicode_formatters[format] ||= begin
+      date_formatter = NSDateFormatter.new
+      date_formatter.setDateFormat(format)
+      date_formatter
     end
+
+    date_formatter = @@sugarcube_unicode_formatters[format]
+    date_formatter.setTimeZone(timezone)
+    return date_formatter.stringFromDate(self)
   end
 
   def upto(last_date, delta={days: 1}, &block)

data/lib/osx/sugarcube-color/nsarray.rb

@@ -1,6 +1,6 @@
 class NSArray
 
-  # [160, 210, 242].uicolor => 0xA0D2F2.uicolor
+  # [160, 210, 242].nscolor => 0xA0D2F2.nscolor
   def nscolor(alpha=1.0)
     red = self[0] / 255.0
     green = self[1] / 255.0
@@ -16,7 +16,7 @@ class NSArray
   end
 
   def skcolor(alpha=nil)
-    uicolor(alpha)
+    nscolor(alpha)
   end
 
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '3.3.4'
+  Version = '3.3.5'
 end

data/spec/ios/nsdata_spec.rb

@@ -10,7 +10,7 @@ describe "NSData" do
     NSString.stringWithUTF8String("t\u0113st".nsdata).should == "t\u0113st"
   end
 
-  it "native methods should work - turkey" do
+  it "native methods should work - turkish letters" do
     NSString.stringWithUTF8String("\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb".dataUsingEncoding(NSUTF8StringEncoding)).should == "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb"
     NSString.stringWithUTF8String("\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb".nsdata).should == "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb"
   end

data/spec/ios/nsdate_spec.rb

@@ -90,11 +90,28 @@ describe "NSDate" do
   end
 
   it "should have an NSDate#string_with_format method (1)" do
-    @date.string_with_format("yyyyMMdd HH:mm:ss").should == '01/02/2013, 12:15:30'
+    @date.string_with_format('yyyyMMdd HH:mm:ss').should == '01/02/2013, 12:15:30'
   end
 
   it "should have an NSDate#string_with_format method (2)" do
-    @date.string_with_format("yyyyMMMMd HH:mm:ss").should == 'January 2, 2013, 12:15:30'
+    @date.string_with_format('yyyyMMMMd HH:mm:ss').should == 'January 2, 2013, 12:15:30'
+  end
+
+  it "should have an NSDate#string_with_format(unicode: true) method" do
+    @date.string_with_format("yyyy-MM-dd 'at' HH:mm", unicode: true).should == '2013-01-02 at 12:15'
+    # these formatters get cached, and it's important to test the cache:
+    @date.string_with_format("yyyy-MM-dd 'at' HH:mm", unicode: true).should == '2013-01-02 at 12:15'
+  end
+
+  it "should have an NSDate#string_with_format(locale: (France))" do
+    locale = NSLocale.localeWithLocaleIdentifier('fr')
+    @date.string_with_format('yyyyMMMMd HH:mm:ss', locale: locale).should == '2 January 2013 12:15:30'
+  end
+
+  it "should have an NSDate#string_with_format(locale: 'fr')" do
+    @date.string_with_format('yyyyMMMMd HH:mm:ss', locale: 'fr').should == '2 January 2013 12:15:30'
+    # these formatters get cached, and it's important to test the cache:
+    @date.string_with_format('yyyyMMMMd HH:mm:ss', locale: 'fr').should == '2 January 2013 12:15:30'
   end
 
   it "should have an NSDate#string_with_format method (:iso8601)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.3.5
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description