sugarcube 1.4.1 → 1.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sugarcube (1.3.11)
+    sugarcube (1.4.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1077,21 +1077,28 @@ some problems with on RubyMotion (it worked, but not *always*.  Very strange).
 Files
 -----
 
-Methods to find document files, resource files, cache files, and to access
+Methods to find document files, resource files, cache files, temporary files, and to access
 entries out of the Info.plist file.
 
 > `require 'sugarcube-files'`
 
 ```ruby
 # file operations
-"my.plist".exists?   # => NSFileManager.defaultManager.fileExistsAtPath("my.plist")
-"my.plist".document  # => NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0].stringByAppendingPathComponent("my.plist")
-"my.plist".cache  # => NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, true)[0].stringByAppendingPathComponent("my.plist")
-"my.plist".remove!  # => NSFileManager.defaultManager.removeItemAtPath("my.plist".document, error: error)  (returns error, if any occurred)
+"my.plist".file_exists?   # => NSFileManager.defaultManager.fileExistsAtPath("my.plist")
+
+"my.plist".remove_file!  # => NSFileManager.defaultManager.removeItemAtPath("my.plist".document, error: error)  (returns error, if any occurred)
+
+"my.plist".document_path  # => NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0].stringByAppendingPathComponent("my.plist")
+"my.plist".cache_path  # => NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, true)[0].stringByAppendingPathComponent("my.plist")
+"my.plist".temporary_path  # => NSTemporaryDirectory().stringByAppendingPathComponent("my.plist")
+
+# all of these can be turned into a URL, too
+"my.plist".temporary_path.file_url  # => NSURL.fileURLWithPath("my.plist".temporary_path)
 
 # get the resource path, useful if you include json files or images you manipulate in the app
-"my.plist".resource  # => NSBundle.mainBundle.resourcePath.stringByAppendingPathComponent("my.plist")
-# same, but get a URL instead - often used to display a static HTML page that is stored in resources
+"my.plist".resource_path  # => NSBundle.mainBundle.resourcePath.stringByAppendingPathComponent("my.plist")
+# same, but get a URL instead - often used to display a static HTML page that is stored in resources.
+# getting a path URL from a resource is just a little different from creating a URL from any other type of path
 "index.html".resource_url  # => NSBundle.mainBundle.URLForResource("index", withExtension:"html")
 
 # access data from Info.plist

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.4.1'
+  Version = '1.4.2'
 end

data/lib/sugarcube-files/nsstring.rb

@@ -1,39 +1,46 @@
 class NSString
 
-  def document
+  def document_path
     @@sugarcube_docs ||= NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0]
     return self if self.hasPrefix(@@sugarcube_docs)
 
     @@sugarcube_docs.stringByAppendingPathComponent(self)
   end
-  
-  def cache
+
+  def cache_path
     @@sugarcube_caches ||= NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, true)[0]
     return self if self.hasPrefix(@@sugarcube_caches)
 
     @@sugarcube_caches.stringByAppendingPathComponent(self)
   end
 
-  def app_support
+  def app_support_path
     @@sugarcube_app_suppert ||= NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, true)[0]
     return self if self.hasPrefix(@@sugarcube_app_suppert)
 
     @@sugarcube_app_suppert.stringByAppendingPathComponent(self)
   end
 
-  def exists?
+  def temporary_path
+    @@sugarcube_temporary ||= NSTemporaryDirectory()
+    return self if self.hasPrefix(@@sugarcube_temporary)
+
+    @@sugarcube_temporary.stringByAppendingPathComponent(self)
+  end
+
+  def file_exists?
     path = self.hasPrefix('/') ? self : self.document
     NSFileManager.defaultManager.fileExistsAtPath(path)
   end
 
-  def remove!
+  def remove_file!
     ptr = Pointer.new(:id)
     path = self.hasPrefix('/') ? self : self.document
     NSFileManager.defaultManager.removeItemAtPath(path, error:ptr)
     ptr[0]
   end
 
-  def resource
+  def resource_path
     @@sugarcube_resources ||= NSBundle.mainBundle.resourcePath
     return self if self.hasPrefix(@@sugarcube_resources)
 
@@ -41,15 +48,19 @@ class NSString
   end
 
   def resource_exists?
-    NSFileManager.defaultManager.fileExistsAtPath(self.resource)
+    self.resource_path.file_exists?
   end
 
   def resource_url
-    a = self.split(".")
+    a = self.split('.')
     ext = a.pop if a.size >= 2
     NSBundle.mainBundle.URLForResource(a.join("."), withExtension:ext)
   end
 
+  def file_url
+    NSURL.fileURLWithPath(self)
+  end
+
   # It's convenient to store a property which is dependent on an environment to
   # Info.plist. For instance, to use a different server between development and
   # release versions.
@@ -69,7 +80,7 @@ class NSString
   # 'VerifyURL'.info_plist
   # </code>
   def info_plist
-      NSBundle.mainBundle.infoDictionary.valueForKey self
+    NSBundle.mainBundle.infoDictionary.valueForKey self
   end
 
 end

data/lib/sugarcube-files/nsstring_deprecated.rb

@@ -0,0 +1,45 @@
+class NSString
+
+  # This method will be removed in iOS 9
+  def document
+    NSLog('Warning: SugarCube\'s String#document method has been deprecated in favor of String#document_path')
+    self.document_path
+  end
+
+  # This method will be removed in iOS 9
+  def cache
+    NSLog('Warning: SugarCube\'s String#cache method has been deprecated in favor of String#cache_path')
+    self.cache_path
+  end
+
+  # This method will be removed in iOS 9
+  def app_support
+    NSLog('Warning: SugarCube\'s String#app_support method has been deprecated in favor of String#app_support_path')
+    self.app_support_path
+  end
+
+  # This method will be removed in iOS 9
+  def temporary
+    NSLog('Warning: SugarCube\'s String#temporary method has been deprecated in favor of String#temporary_path')
+    self.temporary_path
+  end
+
+  # This method will be removed in iOS 9
+  def exists?
+    NSLog('Warning: SugarCube\'s String#exists? method has been deprecated in favor of String#file_exists?')
+    self.file_exists?
+  end
+
+  # This method will be removed in iOS 9
+  def remove!
+    NSLog('Warning: SugarCube\'s String#remove! method has been deprecated in favor of String#remove_file!')
+    self.remove_file!
+  end
+
+  # This method will be removed in iOS 9
+  def resource
+    NSLog('Warning: SugarCube\'s String#resource method has been deprecated in favor of String#resource_path')
+    self.resource_path
+  end
+
+end

data/lib/sugarcube-foundation/nsarray.rb

@@ -35,5 +35,9 @@ class NSArray
   def nsset
     NSSet.setWithArray self
   end
+  
+  def nsorderedset
+    NSOrderedSet.orderedSetWithArray self
+  end
 
 end

data/lib/sugarcube-foundation/nsorderedset.rb

@@ -0,0 +1,7 @@
+class NSOrderedSet
+
+  alias :to_a :array
+
+end
+
+

data/spec/date_parser_spec.rb

@@ -27,7 +27,7 @@ describe "Base Methods" do
   describe "parses iso8601 dates" do
 
     it "parses '2013-08-22T21:34:48.874Z'" do
-      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48.874Z")
+      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48.874Z").getutc
       t.month.should == 8
       t.day.should == 22
       t.year.should == 2013
@@ -37,7 +37,7 @@ describe "Base Methods" do
     end
 
     it "parses '2013-08-22T21:34:48.874'" do
-      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48.874")
+      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48.874").getutc
       t.month.should == 8
       t.day.should == 22
       t.year.should == 2013
@@ -47,7 +47,7 @@ describe "Base Methods" do
     end
 
     it "parses '2013-08-22T21:34:48Z'" do
-      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48Z")
+      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48Z").getutc
       t.month.should == 8
       t.day.should == 22
       t.year.should == 2013
@@ -56,7 +56,7 @@ describe "Base Methods" do
     end
 
     it "parses '2013-08-22T21:34:48'" do
-      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48")
+      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48").getutc
       t.month.should == 8
       t.day.should == 22
       t.year.should == 2013

data/spec/nsorderedset_spec.rb

@@ -0,0 +1,13 @@
+describe "NSOrderedSet" do
+
+  # NSOrderedSet keesp ordering
+  it "should have a method #to_a" do
+    [1,0].nsorderedset.to_a.should == [1,0]
+  end
+  
+  # NSSet doesn't keep ordering. It's sorted.
+  it "should have a method #to_a" do
+    [1,0].nsset.to_a.should == [0,1]
+  end
+  
+end

data/spec/nsstring_files_spec.rb

@@ -1,30 +1,37 @@
 describe 'NSString' do
 
-  it "should have a #document method" do
-    'foo'.document.hasPrefix('/Users').should == true
-    'foo'.document.hasSuffix('Documents/foo').should == true
+  it "should have a #document_path method" do
+    'foo'.document_path.should.start_with?('/Users')
+    'foo'.document_path.should.end_with?('Documents/foo')
   end
 
-  it "should have a #cache method" do
-    'foo'.cache.hasPrefix('/Users').should == true
-    'foo'.cache.hasSuffix('Library/Caches/foo').should == true
+  it "should have a #cache_path method" do
+    'foo'.cache_path.should.start_with?('/Users')
+    'foo'.cache_path.should.end_with?('Library/Caches/foo')
   end
 
-  it "should have a #app_support method" do
-    'foo'.app_support.hasPrefix('/Users').should == true
-    'foo'.app_support.hasSuffix('Library/Application Support/foo').should == true
+  it "should have a #app_support_path method" do
+    'foo'.app_support_path.should.start_with?('/Users')
+    'foo'.app_support_path.should.end_with?('Library/Application Support/foo')
   end
 
-  it "should have an #exists? method" do
+  it "should have a #temporary_path method" do
+    'foo'.temporary_path.should.start_with?('/Users')
+    'foo'.temporary_path.should.end_with?('tmp/foo')
+  end
+
+  it "should have an #file_exists? method" do
+    'foo'.document.file_exists?.should == false
     'foo'.document.exists?.should == false
   end
 
-  it "should have a remove! method" do
-    unless 'remove_me'.exists?
-      NSData.data.writeToFile('remove_me'.document, atomically: true)
+  it "should have a remove_file! method" do
+    filename = 'remove_me'.document_path
+    unless filename.file_exists?
+      NSData.data.writeToFile(filename, atomically: true)
     end
-    'remove_me'.document.remove!
-    'remove_me'.exists?.should == false
+    filename.remove_file!
+    filename.file_exists?.should == false
   end
 
   it "should have a resource_exists? method" do
@@ -32,105 +39,105 @@ describe 'NSString' do
     'foo'.resource_exists?.should == false
   end
 
-  describe "exists?" do
+  describe "file_exists?" do
 
-    it "should not exists" do
-      "abc".exists?.should == false
+    it "should not file_exists" do
+      "abc".file_exists?.should == false
     end
 
-    it "should not exists" do
-      "abc".cache.exists?.should == false
+    it "should not file_exists" do
+      "abc".cache.file_exists?.should == false
     end
 
-    it "should not exists" do
-      "abc".resource.exists?.should == false
+    it "should not file_exists" do
+      "abc".resource.file_exists?.should == false
     end
 
     describe "in document" do
       before do
-        "abc".writeToFile "abc".document, atomically:true
+        "abc".writeToFile "abc".document_path, atomically:true
       end
       after do
-        NSFileManager.defaultManager.removeItemAtPath "abc".document, error:nil
+        NSFileManager.defaultManager.removeItemAtPath "abc".document_path, error:nil
       end
 
-      it "should be exists" do
-        "abc".exists?.should == true
+      it "should be file_exists" do
+        "abc".file_exists?.should == true
       end
     end
 
     describe "in cache" do
       before do
-        "abc".writeToFile "abc".cache, atomically:true
+        "abc".writeToFile "abc".cache_path, atomically:true
       end
       after do
-        NSFileManager.defaultManager.removeItemAtPath "abc".cache, error:nil
+        NSFileManager.defaultManager.removeItemAtPath "abc".cache_path, error:nil
       end
 
-      it "should be exists" do
-        "abc".cache.exists?.should == true
+      it "should be file_exists" do
+        "abc".cache_path.file_exists?.should == true
       end
     end
 
     describe "in resource" do
-      it "should be exists" do
-        "info.plist".resource.exists?.should == true
+      it "should be file_exists" do
+        "info.plist".resource.file_exists?.should == true
       end
     end
 
   end
 
-  describe "remove!" do
+  describe "remove_file!" do
 
     describe "in document" do
       before do
-        "abc".writeToFile "abc".document, atomically:true
+        "abc".writeToFile "abc".document_path, atomically:true
       end
       after do
-        NSFileManager.defaultManager.removeItemAtPath "abc".document, error:nil
+        NSFileManager.defaultManager.removeItemAtPath "abc".document_path, error:nil
       end
 
       it "should remove" do
-        "abc".remove!.should == nil
-        "abc".exists?.should == false
+        "abc".remove_file!.should == nil
+        "abc".file_exists?.should == false
       end
     end
 
     describe "in cache" do
       before do
-        "abc".writeToFile "abc".cache, atomically:true
+        "abc".writeToFile "abc".cache_path, atomically:true
       end
       after do
-        NSFileManager.defaultManager.removeItemAtPath "abc".cache, error:nil
+        NSFileManager.defaultManager.removeItemAtPath "abc".cache_path, error:nil
       end
 
       it "should remove" do
-        path = "abc".cache
-        path.remove!.should == nil
-        path.exists?.should == false
+        path = "abc".cache_path
+        path.remove_file!.should == nil
+        path.file_exists?.should == false
       end
     end
 
   end
 
   describe 'resource()' do
-    describe '"info.plist".resource' do
-      before { @it = "info.plist".resource }
+    describe '"info.plist".resource_path' do
+      before { @it = "info.plist".resource_path }
       it 'should start with "/Users"' do
-        @it.hasPrefix("/Users").should == true
+        @it.should.start_with?("/Users")
       end
       it 'should end with "SugarCube_spec.app/info.plist"' do
-        @it.hasSuffix("SugarCube_spec.app/info.plist").should == true
+        @it.should.end_with?("SugarCube_spec.app/info.plist")
       end
     end
 
-    describe '"PkgInfo".resource' do
-      before { @it = "PkgInfo".resource }
+    describe '"PkgInfo".resource_path' do
+      before { @it = "PkgInfo".resource_path }
       it 'should start with "/Users"' do
-        @it.hasPrefix("/Users").should == true
+        @it.should.start_with?("/Users")
       end
       it 'should end with "SugarCube_spec.app/PkgInfo"' do
-        @it.hasSuffix("SugarCube_spec.app/PkgInfo").should == true
+        @it.should.end_with?("SugarCube_spec.app/PkgInfo")
       end
     end
   end
@@ -154,12 +161,12 @@ describe 'NSString' do
       before { @it = "PkgInfo".resource_url.absoluteString }
       it 'should start with "file://localhost/Users"' do
         (
-          @it.hasPrefix("file://localhost/Users") ||
-          @it.hasPrefix("file:///Users")
+          @it.start_with?("file://localhost/Users") ||
+          @it.start_with?("file:///Users")
         ).should == true
       end
       it 'should end with "SugarCube_spec.app/PkgInfo"' do
-        @it.hasSuffix("SugarCube_spec.app/PkgInfo").should == true
+        @it.should.end_with?("SugarCube_spec.app/PkgInfo")
       end
     end
   end
@@ -180,5 +187,17 @@ describe 'NSString' do
     end
   end
 
+  describe 'file_url' do
+
+    it 'should convert path String to NSURL' do
+      'test'.resource_path.file_url.should.is_a?(NSURL)
+    end
+
+    it 'should be a file path' do
+      'test'.resource_path.file_url.absoluteString.should.start_with?('file://')
+    end
+
+  end
+
 end
 

data/spec/uialertview_spec.rb

@@ -179,6 +179,7 @@ describe 'UIAlertView' do
       proper_wait 0.6
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
+      proper_wait 0.1
 
       @called.should == true
       @text.should == 'test text'
@@ -191,6 +192,7 @@ describe 'UIAlertView' do
       proper_wait 0.6
       alert.textFieldAtIndex(0).text = 'test text'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+      proper_wait 0.1
 
       @text.should == 'test text'
     end
@@ -203,6 +205,7 @@ describe 'UIAlertView' do
       alert.textFieldAtIndex(0).text = 'test text 1'
       alert.textFieldAtIndex(1).text = 'test text 2'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+      proper_wait 0.1
 
       @text.should == 'test text 1 + test text 2'
     end
@@ -216,6 +219,7 @@ describe 'UIAlertView' do
       alert.textFieldAtIndex(0).text = 'test text 1'
       alert.textFieldAtIndex(1).text = 'test text 2'
       alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+      proper_wait 0.1
 
       @text.should == 'test text 1 + test text 2'
       @touched_index.should == alert.cancelButtonIndex

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -98,10 +98,12 @@ files:
 - lib/sugarcube-factories/uitableviewcell.rb
 - lib/sugarcube-files.rb
 - lib/sugarcube-files/nsstring.rb
+- lib/sugarcube-files/nsstring_deprecated.rb
 - lib/sugarcube-foundation.rb
 - lib/sugarcube-foundation/nsarray.rb
 - lib/sugarcube-foundation/nsindexpath.rb
 - lib/sugarcube-foundation/nsindexset.rb
+- lib/sugarcube-foundation/nsorderedset.rb
 - lib/sugarcube-foundation/nsset.rb
 - lib/sugarcube-foundation/nsstring.rb
 - lib/sugarcube-foundation/nsurl.rb
@@ -225,6 +227,7 @@ files:
 - spec/nsdate_delta_spec.rb
 - spec/nsdate_spec.rb
 - spec/nsdate_upto_spec.rb
+- spec/nsorderedset_spec.rb
 - spec/nsset_spec.rb
 - spec/nsstring_files_spec.rb
 - spec/nsstring_spec.rb
@@ -273,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully
@@ -302,6 +305,7 @@ test_files:
 - spec/nsdate_delta_spec.rb
 - spec/nsdate_spec.rb
 - spec/nsdate_upto_spec.rb
+- spec/nsorderedset_spec.rb
 - spec/nsset_spec.rb
 - spec/nsstring_files_spec.rb
 - spec/nsstring_spec.rb