sugarcube 0.20.1 → 0.20.3

data/README.md

@@ -514,6 +514,7 @@ NSError.new('Error Message', code: 404, userInfo: { warnings: ['blabla'] })
 # 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)
 
 # get the resource path, useful if you include json files or images you manipulate in the app
@@ -1184,6 +1185,16 @@ UIBarButtonItem.imaged(['portrate'.uiimage, 'landscape'.uiimage) {
 UIBarButtonItem.alloc.initWithImage('portrate'.uiimage, landscapeImagePhone:'landscape'.uiimage, style: :bordered.uibarbuttonstyle, target:self, action:"action:")
 ```
 
+Example Usage:
+```ruby
+toolbar = UIToolbar.new
+toolbar.items = [
+  @image_picker_button = UIBarButtonItem.camera { presentImagePickerController(self) },
+  UIBarButtonItem.flexiblespace,
+  @saveButton = UIBarButtonItem.save { save_photo(self) }
+]
+```
+
 NSNotificationCenter
 ----------------------
 
@@ -1208,15 +1219,24 @@ Makes it easy to post a notification to some or all objects.
 ---------
 
 ```ruby
+# once
 1.second.later do
   @view.shake
 end
-
+# repeating
 1.second.every do
   @view.shake
 end
 
-# since that looks funny, an every method is available in the SugarCube::Timer module
+# you can assign the return value (an NSTimer)
+timer = 1.second.every do
+  @view.shake
+end
+# and invalidate it
+timer.invalidate
+
+# the `every` method is available in the SugarCube::Timer module,
+# which you might find more readable
 include SugarCube::Timer
 every 1.minute do
   puts "tick"

data/lib/sugarcube-anonymous/anonymous.rb

@@ -26,13 +26,14 @@ module SugarCube
         key = symbol
         key = symbol.to_s unless self.include? key
         if self.include?(key)
+          self[key] = self[key].to_object
           return self[key]
         end
       elsif args.size == 1 && /(.*)=$/ =~ symbol.to_s
         key = $1.to_sym
         key = key.to_s unless self.include? key
         if self.include?(key)
-          return self[key] = args.first
+          return self[key] = args.first.to_object
         end
       end
       return super
@@ -42,10 +43,24 @@ module SugarCube
       self
     end
 
+    # replace enumerable methods
+    alias :anonymous_each :each
+    
+    def each
+      anonymous_each {|k,v| yield k, v.to_object}
+    end
+
   end
 
 end
 
+class NSObject
+
+  def to_object
+    self
+  end
+
+end
 
 class NSDictionary
 

data/lib/sugarcube-anonymous/anonymous_array.rb

@@ -0,0 +1,46 @@
+module SugarCube
+  class AnonymousArray < Array
+
+    def [] index
+      o = super.to_object
+      self[index] = o
+    end
+
+    def first
+      self.size == 0 ? nil : self[0]
+    end
+    
+    def last
+      c = self.size
+      c == 0 ? nil : self[c - 1]
+    end
+    
+    def to_object
+      self
+    end
+    
+    
+    # replace enumerable methods
+    #
+    # In AnonymousArray:
+    # It was not satisfied with the :each method only.
+    
+    [:each, :map, :collect].each do |method|
+      base_method = "anonymousarray_#{method.to_s}".to_sym
+      alias_method base_method, method
+      define_method method do
+        send(base_method) {|o| yield o.to_object}
+      end
+    end
+
+  end
+
+end
+
+class NSArray
+
+  def to_object
+    SugarCube::AnonymousArray.new(self)
+  end
+
+end

data/lib/sugarcube/nsarray.rb

@@ -49,5 +49,9 @@ class NSArray
     blue = self[2] / 255.0
     UIColor.colorWithRed(red, green:green, blue:blue, alpha:alpha.to_f)
   end
+  
+  def nsset
+    NSSet.setWithArray self
+  end
 
 end

data/lib/sugarcube/nsdate.rb

@@ -3,7 +3,9 @@ class NSDate
   # a string using string_with_format's templating, and strings are concatenated
   # as-is
   SugarCubeFormats = {
-    iso8601: [:yyyy, '-', :MM, '-', :dd, ' ', :'HH:mm:ss.SSS']
+    iso8601: [:yyyy, '-', :MM, '-', :dd, ' ', :'HH:mm:ss.SSS'],
+    ymd: [:yyyy, '-', :MM, '-', :dd],
+    hms: [:'HH:mm:ss.SSS'],
   }
 
   def self.from_components(components)
@@ -15,6 +17,18 @@ class NSDate
     return calendar.dateFromComponents(date_components)
   end
 
+  def self.today
+    NSDate.new.start_of_day
+  end
+
+  def self.tomorrow
+    NSDate.new.delta(days: 1).start_of_day
+  end
+
+  def self.yesterday
+    NSDate.new.delta(days: -1).start_of_day
+  end
+
   def string_with_style(date_style=NSDateFormatterMediumStyle,time_style=NSDateFormatterNoStyle)
     date_formatter = NSDateFormatter.new
     date_style = date_style.nsdatestyle if date_style.is_a? Symbol

data/lib/sugarcube/nsstring_files.rb

@@ -6,6 +6,13 @@ class NSString
 
     @@sugarcube_docs.stringByAppendingPathComponent(self)
   end
+  
+  def cache
+    @@sugarcube_caches ||= NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, true)[0]
+    return self if self.hasPrefix(@@sugarcube_caches)
+
+    @@sugarcube_caches.stringByAppendingPathComponent(self)
+  end
 
   def exists?
     NSFileManager.defaultManager.fileExistsAtPath(self.document)

data/lib/sugarcube/nsurl.rb

@@ -8,4 +8,8 @@ class NSURL
     UIApplication.sharedApplication.canOpenURL(self)
   end
 
+  def nsdata
+    NSData.dataWithContentsOfURL(self)
+  end
+
 end

data/lib/sugarcube/to_s/nsset.rb

@@ -3,5 +3,7 @@ class NSSet
   def to_s
     "NSSet(#{self.count}){#{self.allObjects.map{|o| o.inspect}.join(', ')}}"
   end
+  
+  alias :to_a :allObjects
 
 end

data/lib/sugarcube/uiviewcontroller.rb

@@ -2,7 +2,6 @@ class UIViewController
 
   def push(view_controller)
     self.addChildViewController(view_controller)
-    view_controller.didMoveToParentViewController(self)
     self
   end
 
@@ -12,6 +11,11 @@ class UIViewController
     push view_controller
   end
 
+  def pop
+    to_pop = self.childViewControllers[-1]
+    to_pop.removeFromParentViewController
+  end
+
 end
 
 

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.1'
+  Version = '0.20.3'
 end

data/spec/anonymous_spec.rb

@@ -59,3 +59,163 @@ describe "SugarCube::Anonymous" do
   end
 
 end
+
+
+describe "SugarCube::Anonymous nested case" do
+
+  before do
+    @h = SugarCube::Anonymous[
+      {
+        dictionary: { foo: 'FOO', array: [ { is_fine: 'is_fine' } ] },
+        array: [ { bar: 'BAR' }, [ 1, 2, 3 ] ]
+      }
+    ]
+  end
+  
+  describe "dictionary" do
+  
+    it 'should return an instance of SugarCube::Anonymous' do
+      @h.dictionary.class.should == SugarCube::Anonymous
+    end
+    
+    it 'should return a hash which contains a string and an array' do
+      @h.dictionary.should == { foo: 'FOO', array: [ { is_fine: 'is_fine' } ] }
+    end
+    
+    it 'should not copy again' do
+      @h.dictionary.object_id.should == @h.dictionary.object_id
+    end
+    
+    it 'should return is_fine' do
+      @h.dictionary.array[0].is_fine.should == 'is_fine'
+    end
+    
+    describe "Enumerable" do
+
+      describe "each" do
+      
+        it 'should return an instance of [SugarCube::Anonymous, SugarCube::AnonymousArray]' do
+          a = []
+          @h.each{|k,v| a << v.class}
+          a[0].should == SugarCube::Anonymous
+          a[1].should == SugarCube::AnonymousArray
+        end
+        
+      end
+
+      describe "map" do
+      
+        it 'should return an instance of [SugarCube::Anonymous, SugarCube::AnonymousArray]' do
+          a = @h.map{|k,v| v.class}
+          a[0].should == SugarCube::Anonymous
+          a[1].should == SugarCube::AnonymousArray
+        end
+        
+      end
+      
+      describe "collect" do
+      
+        it 'should return an instance of [SugarCube::Anonymous, SugarCube::AnonymousArray]' do
+          a = @h.collect{|k,v| v.class}
+          a[0].should == SugarCube::Anonymous
+          a[1].should == SugarCube::AnonymousArray
+        end
+
+      end
+      
+    end
+      
+  end
+
+  describe "array" do
+  
+    it 'should return an instance of SugarCube::AnonymousArray' do
+      @h.array.class.should == SugarCube::AnonymousArray
+    end
+    
+    it 'should not copy again' do
+      @h.array.object_id.should == @h.array.object_id
+    end
+      
+    describe "inner object" do
+    
+      it 'should return an instance of SugarCube::Anonymous' do
+        @h.array[0].class.should == SugarCube::Anonymous
+      end
+      
+      it 'should return an instance of SugarCube::Anonymous' do
+        @h.array.first.class.should == SugarCube::Anonymous
+      end
+      
+      it 'should return an instance of SugarCube::AnonymousArray' do
+        @h.array[1].class.should == SugarCube::AnonymousArray
+      end
+      
+      it 'should return an instance of SugarCube::AnonymousArray' do
+        @h.array.last.class.should == SugarCube::AnonymousArray
+      end
+    
+    end
+    
+    describe "Enumerable" do
+
+      describe "each" do
+      
+        it 'should return an instance of [SugarCube::Anonymous, SugarCube::AnonymousArray]' do
+          a = []
+          @h.array.each{|e| a << e.class}
+          a[0].should == SugarCube::Anonymous
+          a[1].should == SugarCube::AnonymousArray
+        end
+        
+      end
+      
+      describe "each_with_index" do
+      
+        it 'should return an instance of [0,1]' do
+          a = []
+          @h.array.each_with_index{|e,i| a << i}
+          a.should == [0,1]
+        end
+        
+      end
+      
+      describe "map" do
+      
+        it 'should return an instance of [SugarCube::Anonymous, SugarCube::AnonymousArray]' do
+          a = @h.array.map{|e| e.class}
+          a[0].should == SugarCube::Anonymous
+          a[1].should == SugarCube::AnonymousArray
+        end
+        
+      end
+      
+      describe "collect" do
+      
+        it 'should return an instance of [SugarCube::Anonymous, SugarCube::AnonymousArray]' do
+          a = @h.array.collect{|e| e.class}
+          a[0].should == SugarCube::Anonymous
+          a[1].should == SugarCube::AnonymousArray
+        end
+        
+      end
+      
+      describe "find" do
+      
+        it 'should return then first object' do
+          r = @h.array.find{|e| e.is_a? Hash}
+          r.should == @h.array[0]
+        end
+        
+        it 'should return the second object' do
+          r = @h.array.find{|e| e.is_a? Array}
+          r.should == @h.array[1]
+        end
+        
+      end
+      
+    end
+
+  end
+
+end

data/spec/nsarray_spec.rb

@@ -42,5 +42,10 @@ describe "NSArray" do
     color.blue.should == 0
     color.alpha.should == 0.5
   end
+  
+  it "should have a method #nsset" do
+    set = [0,1,0].nsset
+    set.count.should == 2
+  end
 
 end

data/spec/nsdate_spec.rb

@@ -7,6 +7,37 @@ describe "NSDate" do
     date.day.should == 2
   end
 
+  it "Should have an NSDate##today method" do
+    now = NSDate.new
+    date = NSDate.today
+    date.year.should == now.year
+    date.month.should == now.month
+    date.day.should == now.day
+    date.hour.should == 0
+    date.min.should == 0
+    date.sec.should == 0
+  end
+
+  it "Should have an NSDate##yesterday method" do
+    now = NSDate.today
+    date = NSDate.yesterday
+    date.hour.should == 0
+    date.min.should == 0
+    date.sec.should == 0
+    (now - date).in_hours.should >= 23  # keep in mind daylight
+    (now - date).in_hours.should <= 25  # savings time.
+  end
+
+  it "Should have an NSDate##tomorrow method" do
+    now = NSDate.today
+    date = NSDate.tomorrow
+    date.hour.should == 0
+    date.min.should == 0
+    date.sec.should == 0
+    (date - now).in_hours.should >= 23  # keep in mind daylight
+    (date - now).in_hours.should <= 25  # savings time.
+  end
+
   before do
     @date = NSDate.from_components(year: 2013, month: 1, day: 2, hour:12, minute: 15, second: 30)
   end

data/spec/nsset_spec.rb

@@ -0,0 +1,7 @@
+describe "NSSet" do
+
+  it "should have a method #to_a" do
+    [0,1].nsset.to_a.should == [0,1]
+  end
+  
+end

data/spec/nsstring_files_spec.rb

@@ -2,6 +2,12 @@ describe 'NSString' do
 
   it "should have a #document method" do
     'foo'.document.hasPrefix('/Users').should == true
+    'foo'.document.hasSuffix('Documents/foo').should == true
+  end
+
+  it "should have a #cache method" do
+    'foo'.cache.hasPrefix('/Users').should == true
+    'foo'.cache.hasSuffix('Library/Caches/foo').should == true
   end
 
   it "should have an #exists? method" do

data/spec/nsurl_spec.rb

@@ -8,4 +8,8 @@ describe "NSURL" do
     'https://github.com'.nsurl.can_open?.should == true
   end
 
+  it "should have a method #nsdata?" do
+    NSData.should === 'https://github.com'.nsurl.nsdata
+  end
+
 end

data/spec/uiviewcontroller_spec.rb

@@ -1,19 +1,31 @@
 describe 'UIViewController' do
 
+  before do
+    @root_controller = UIViewController.new
+    @second_controller = UIViewController.new
+    @third_controller = UIViewController.new
+  end
+
   it 'should have `push` method' do
-    controller = UIViewController.new
-    controller.push UIViewController.new
-    controller.childViewControllers.length.should == 1
-    controller.push UIViewController.new
-    controller.childViewControllers.length.should == 2
+    @root_controller.push @second_controller
+    @root_controller.childViewControllers.length.should == 1
+    @root_controller.push @third_controller
+    @root_controller.childViewControllers.length.should == 2
   end
 
   it 'should have `<<` method' do
-    controller = UIViewController.new
-    controller << UIViewController.new
-    controller.childViewControllers.length.should == 1
-    controller << UIViewController.new
-    controller.childViewControllers.length.should == 2
+    @root_controller << @second_controller
+    @root_controller.childViewControllers.length.should == 1
+    @root_controller << @third_controller
+    @root_controller.childViewControllers.length.should == 2
+  end
+
+  it 'should have `pop()` method' do
+    @root_controller.push(@second_controller)
+    length = @root_controller.childViewControllers.length
+    popped = @root_controller.pop
+    @root_controller.childViewControllers.length.should == length - 1 
+    popped.should == @second_controller
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -54,6 +54,7 @@ files:
 - lib/sugarcube-568/uiimage.rb
 - lib/sugarcube-anonymous.rb
 - lib/sugarcube-anonymous/anonymous.rb
+- lib/sugarcube-anonymous/anonymous_array.rb
 - lib/sugarcube-attributedstring.rb
 - lib/sugarcube-attributedstring/nsattributedstring.rb
 - lib/sugarcube-gestures.rb
@@ -144,6 +145,7 @@ files:
 - spec/nsdate_delta_spec.rb
 - spec/nsdate_spec.rb
 - spec/nsdate_upto_spec.rb
+- spec/nsset_spec.rb
 - spec/nsstring_files_spec.rb
 - spec/nsstring_spec.rb
 - spec/nsurl_spec.rb
@@ -207,6 +209,7 @@ test_files:
 - spec/nsdate_delta_spec.rb
 - spec/nsdate_spec.rb
 - spec/nsdate_upto_spec.rb
+- spec/nsset_spec.rb
 - spec/nsstring_files_spec.rb
 - spec/nsstring_spec.rb
 - spec/nsurl_spec.rb