sugarcube 0.20.7 → 0.20.8

data/Gemfile.lock

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

data/README.md

@@ -314,6 +314,15 @@ recurring events)
 (main)> feb_1_2013.end_of_day
 # NOTE! end_of_day is the NEXT DAY.  this is not an accident, it makes comparisons cleaner.  deal with it.
 => 2013-02-02 00:00:00 -0700
+(main)> feb_1_2013.start_of_week  # in the USA, start of week is Sunday
+=> 2013-01-27 00:00:00 -0700
+=> 2013-01-28 00:00:00 -0700  # in most other countries you will get Monday
+(main)> feb_1_2013.start_of_week(:monday)  # or you can specify it!
+=> 2013-01-28 00:00:00 -0700
+(main)> feb_1_2013.end_of_week  # Just like end_of_day, end_of_week returns midnight of the *next day*
+=> 2013-02-03 00:00:00 -0700
+(main)> feb_1_2013.end_of_week(:monday)
+=> 2013-02-04 00:00:00 -0700
 (main)> feb_1_2013.days_in_month
 => 28
 (main)> feb_1_2013.days_in_year
@@ -661,21 +670,25 @@ some problems with on RubyMotion (it worked, but not *always*.  Very strange).
 UIAlertView
 --------
 
-Accepts multiple buttons and success and cancel handlers.  In its simplest
-form, you can pass just a title and block.
+Accepts multiple buttons and handlers.  In its simplest form, you can pass just
+a title and block.
 
 ```ruby
 # simple
 UIAlertView.alert "This is happening, OK?" { self.happened! }
-# a little more complex
+
+# a little more complex - the cancel button should be first, and the block will
+# receive a string, not an index
 UIAlertView.alert("This is happening, OK?", buttons: ["Nevermind", "OK"],
-  message: "Don't worry, it'll be fine.") {
-  self.happened!
+  message: "Don't worry, it'll be fine.") { |button|
+  if button == "OK"
+    self.happened!
+  end
 }
 
-# Full on whiz-bangery.  Note the success block takes the pressed button, but as
-# a string instead of an index.  The cancel button should be the first entry in
-# `buttons:`
+# Full on whiz-bangery.  The cancel button should be the first entry in
+# `buttons:`.  When you specify the success and cancel button handlers this way,
+# you need not assign both.
 UIAlertView.alert "I mean, is this cool?", buttons: %w[No! Sure! Hmmmm],
   message: "No going back now",
   cancel: proc { self.cancel },

data/lib/sugarcube/adjust.rb

@@ -244,9 +244,19 @@ module SugarCube
     end
     alias h shadow
 
-    ##|  TREE
+    # @param item this can be a tree-like item (UIView, UIViewController,
+    #     CALayer) or an integer, in which case it will select that window from
+    #     UIApplication.sharedApplication.window.  Defalt is to display the
+    #     keyWindow
+    # @param selector If you pass an unsupported object to tree, you will need
+    #     to pass a selector as well - this method should return an array of
+    #     items which are passed recursively to tree
+    # @block sel_blk If a block is passed, it will be used to build the array of
+    #     items that are called recursively
     def tree(item=nil, selector=nil, &sel_blk)
-      unless item
+      if item.is_a?(Fixnum)
+        item = UIApplication.sharedApplication.windows[item]
+      elsif ! item
         item = UIApplication.sharedApplication.keyWindow
       end
       if not item
@@ -291,6 +301,7 @@ module SugarCube
       return item
     end
 
+    # Draws the tree items
     def draw_tree(item, selector, tab=nil, is_last=true, items_index=0)
       space = ' '
       if items_index < 10

data/lib/sugarcube/nsdata.rb

@@ -30,5 +30,5 @@ class NSData
       false
     end
   end
-  
+
 end

data/lib/sugarcube/nsdate.rb

@@ -1,5 +1,5 @@
 class NSDate
-  # these formatters are used in `string_with_format`.  Symbols are convertd to
+  # these formatters are used in `string_with_format`.  Symbols are converted to
   # a string using string_with_format's templating, and strings are concatenated
   # as-is
   SugarCubeFormats = {
@@ -174,6 +174,24 @@ class NSDate
     return self + time_interval
   end
 
+  #  (main)> t = Time.new
+  #  => 2012-09-27 11:29:12 +0900
+  #  (main)> t.start_of_week
+  #  => 2012-09-23 00:00:00 +0900
+  def start_of_week(start_day=nil)
+    result = self - days_to_week_start(start_day).days
+    result.start_of_day
+  end
+
+  #  (main)> t = Time.new
+  #  => 2012-09-27 11:29:12 +0900
+  #  (main)> t.start_of_week
+  #  => 2012-09-30 00:00:00 +0900
+  def end_of_week(start_day=nil)
+    result = self - days_to_week_start(start_day).days + 6.days
+    result.end_of_day
+  end
+
   #  (main)> t = Time.new
   #  => 2012-09-27 11:29:12 +0900
   #  (main)> t.start_of_month
@@ -202,4 +220,22 @@ class NSDate
   def _calendar_components(components)
     return NSCalendar.currentCalendar.components(components, fromDate:self)
   end
+
+  def days_to_week_start(start_day=nil)
+    start_day_number = week_day_index(start_day) || local_week_start
+    current_day_number = _calendar_components(NSWeekdayCalendarUnit).weekday
+    (current_day_number - start_day_number) % 7
+  end
+
+  def local_week_start
+    NSCalendar.currentCalendar.firstWeekday
+  end
+
+  def week_day_index(week_day=:monday)
+    day = week_day.to_s.capitalizedString
+    index = NSDateFormatter.new.weekdaySymbols.index(day)
+    return nil unless index
+    index + 1
+  end
+
 end

data/lib/sugarcube/nsindexpath.rb

@@ -1,4 +1,5 @@
 class NSIndexPath
+
   def to_a
     indexes_ptr = Pointer.new(:uint, self.length)
     self.getIndexes indexes_ptr
@@ -8,9 +9,17 @@ class NSIndexPath
     end
     a
   end
+
+  def to_s
+    "<NSIndexPath #{to_a.to_s}>"
+  end
+
 end
 
 
+# This class is used in `switch` statements.  Easy pattern matching, so instead
+# of `if index_path.row...index_path.section`, you can use
+# `when IndexPath[row, section]`
 class IndexPath
 
   def self.[] *values

data/lib/sugarcube/nsstring.rb

@@ -4,7 +4,7 @@ class NSString
   def nsurl
     @url ||= NSURL.alloc.initWithString(self)
   end
-  
+
   # @return [NSURL]
   def fileurl
     @fileurl ||= NSURL.fileURLWithPath(self)

data/lib/sugarcube/nsurl.rb

@@ -12,4 +12,8 @@ class NSURL
     NSData.dataWithContentsOfURL(self)
   end
 
+  def nsurlrequest
+    NSURLRequest.requestWithURL(self)
+  end
+
 end

data/lib/sugarcube/timer.rb

@@ -100,3 +100,14 @@ module SugarCube
     end
   end
 end
+
+
+class NSTimer
+  def every(time, user_info=nil, &fire)
+    time.every user_info, &fire
+  end
+
+  def after(time, user_info=nil, &fire)
+    time.later user_info, &fire
+  end
+end

data/lib/sugarcube/uialertview.rb

@@ -15,8 +15,9 @@ class UIAlertView
 
     # create the delegate
     delegate = SugarCube::AlertViewDelegate.new
-    delegate.on_success = options[:success] || block
+    delegate.on_success = options[:success]
     delegate.on_cancel = options[:cancel]
+    delegate.on_default = block
     delegate.send(:retain)
 
     args = [title]            # initWithTitle:
@@ -26,10 +27,18 @@ class UIAlertView
     buttons = options[:buttons] || []
     if buttons.empty?
       # cancelButtonTitle: is first, so check for cancel
-      buttons << "Cancel" if options[:cancel]
+      if options[:cancel]
+        buttons << "Cancel"
+      end
+
       # otherButtonTitles:
-      buttons << "OK" if options[:success] or buttons.empty?
-    elsif buttons.length == 1 and options[:cancel]
+      if buttons.empty?
+        buttons << nil  # cancel button => nil
+        buttons << "OK"  # other buttons => "OK"
+      elsif options[:success]
+        buttons << "OK"
+      end
+    elsif buttons.length == 1 && options[:cancel]
       raise "If you only have one button, use a :success handler, not :cancel (and definitely not BOTH)"
     end
 
@@ -37,7 +46,7 @@ class UIAlertView
     delegate.buttons = buttons
 
     # uses localized buttons in the actual alert
-    args.concat(buttons.map{ |s| s.localized })
+    args.concat(buttons.map { |m| m && m.localized })
     args << nil  # otherButtonTitles:..., nil
 
     alert = self.alloc
@@ -59,17 +68,24 @@ module SugarCube
     attr_accessor :buttons
     attr_accessor :on_cancel
     attr_accessor :on_success
+    attr_accessor :on_default
 
     def alertView(alert, didDismissWithButtonIndex:index)
-      if index == alert.cancelButtonIndex && on_cancel
-        on_cancel.call
-      elsif on_success
-        if on_success.arity == 0
-          on_success.call
-        else
-          button = buttons[index]
-          on_success.call(button)
-        end
+      cancel_handler = on_cancel || on_default
+      success_handler = on_success || on_default
+      handler = nil
+
+      if index == alert.cancelButtonIndex
+        handler = cancel_handler
+      else
+        handler = success_handler
+      end
+
+      if handler.arity == 0
+        handler.call
+      else
+        button = buttons[index]
+        handler.call(button)
       end
 
       self.send(:autorelease)

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '0.20.7'
+  Version = '0.20.8'
 end

data/lib/sugarcube-repl/object.rb

@@ -0,0 +1,97 @@
+class Object
+
+private
+  def adjust(*args)
+    SugarCube::Adjust.adjust(*args)
+  end
+  def a(*args)
+    SugarCube::Adjust.adjust(*args)
+  end
+  def frame(*args)
+    SugarCube::Adjust.frame(*args)
+  end
+  def f(*args)
+    SugarCube::Adjust.frame(*args)
+  end
+  def left(*args)
+    SugarCube::Adjust.left(*args)
+  end
+  def l(*args)
+    SugarCube::Adjust.left(*args)
+  end
+  def right(*args)
+    SugarCube::Adjust.right(*args)
+  end
+  def r(*args)
+    SugarCube::Adjust.right(*args)
+  end
+  def up(*args)
+    SugarCube::Adjust.up(*args)
+  end
+  def u(*args)
+    SugarCube::Adjust.up(*args)
+  end
+  def down(*args)
+    SugarCube::Adjust.down(*args)
+  end
+  def d(*args)
+    SugarCube::Adjust.down(*args)
+  end
+  def origin(*args)
+    SugarCube::Adjust.origin(*args)
+  end
+  def o(*args)
+    SugarCube::Adjust.origin(*args)
+  end
+  def thinner(*args)
+    SugarCube::Adjust.thinner(*args)
+  end
+  def n(*args)
+    SugarCube::Adjust.thinner(*args)
+  end
+  def wider(*args)
+    SugarCube::Adjust.wider(*args)
+  end
+  def w(*args)
+    SugarCube::Adjust.wider(*args)
+  end
+  def shorter(*args)
+    SugarCube::Adjust.shorter(*args)
+  end
+  def s(*args)
+    SugarCube::Adjust.shorter(*args)
+  end
+  def taller(*args)
+    SugarCube::Adjust.taller(*args)
+  end
+  def t(*args)
+    SugarCube::Adjust.taller(*args)
+  end
+  def size(*args)
+    SugarCube::Adjust.size(*args)
+  end
+  def z(*args)
+    SugarCube::Adjust.size(*args)
+  end
+  def center(*args)
+    SugarCube::Adjust.center(*args)
+  end
+  def c(*args)
+    SugarCube::Adjust.center(*args)
+  end
+  def shadow(*args)
+    SugarCube::Adjust.shadow(*args)
+  end
+  def h(*args)
+    SugarCube::Adjust.shadow(*args)
+  end
+  def tree(*args)
+    SugarCube::Adjust.tree(*args)
+  end
+  def root(*args)
+    SugarCube::Adjust.root(*args)
+  end
+  def restore(*args)
+    SugarCube::Adjust.restore(*args)
+  end
+end

data/lib/sugarcube-repl.rb

@@ -0,0 +1,23 @@
+unless defined?(Motion::Project::Config)
+  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
+end
+
+
+Motion::Project::App.setup do |app|
+  # scans app.files until it finds app/ (the default)
+  # if found, it inserts just before those files, otherwise it will insert to
+  # the end of the list
+  insert_point = 0
+  app.files.each_index do |index|
+    file = app.files[index]
+    if file =~ /^(?:\.\/)?app\//
+      # found app/, so stop looking
+      break
+    end
+    insert_point = index + 1
+  end
+
+  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-repl/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+end

data/spec/nsdata_spec.rb

@@ -26,13 +26,13 @@ describe "NSData" do
   it "should be able to create a turkey string from data" do
     "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb".nsdata.nsstring.should == "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb"
   end
-  
+
   describe "write_to" do
-  
+
     after do
       "a-z".document.remove!
     end
-    
+
     it "should write data to spcified path" do
       path = "a-z".document
       contents = (:a..:z).to_a.join
@@ -40,7 +40,7 @@ describe "NSData" do
       path.exists?.should == true
       path.fileurl.nsdata.nsstring.should == contents
     end
-    
+
     it "should write data to spcified url" do
       url = NSURL.alloc.initFileURLWithPath "a-z".document
       contents = (:a..:z).to_a.join
@@ -49,7 +49,19 @@ describe "NSData" do
       path.exists?.should == true
       url.nsdata.nsstring.should == contents
     end
-    
+
+  end
+
+  describe 'base64' do
+
+    it 'should convert nsstring data to base64' do
+      'much longer test'.nsdata.base64.should == 'bXVjaCBsb25nZXIgdGVzdA=='
+    end
+
+    it 'should convert image data (PNG) to base64' do
+      'test'.uiimage.nsdata.base64.should == 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAHgCAIAAADrGJBNAAAAHElEQVQ4jWO4a8TAxMAwikfxKB7Fo3gUj2I6YgAAiQTO+8u2PwAAAABJRU5ErkJggg=='
+    end
+
   end
 
 end

data/spec/nsdate_spec.rb

@@ -118,6 +118,14 @@ describe "NSDate" do
     @date.end_of_day.datetime_array.should == [2013, 1, 3, 0, 0, 0]
   end
 
+  it "should have an NSDate#start_of_week method" do
+    @date.start_of_week(:sunday).datetime_array.should == [2012, 12, 30, 0, 0, 0]
+  end
+
+  it "should have an NSDate#end_of_week method" do
+    @date.end_of_week(:sunday).datetime_array.should == [2013, 1, 6, 0, 0, 0]
+  end
+
   it "should have an NSDate#start_of_month method" do
     @date.start_of_month.datetime_array.should == [2013, 1, 1, 0, 0, 0]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 0.20.7
+  version: 0.20.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description
 
@@ -62,6 +62,8 @@ files:
 - lib/sugarcube-attributedstring/nsattributedstring.rb
 - lib/sugarcube-gestures.rb
 - lib/sugarcube-gestures/gestures.rb
+- lib/sugarcube-repl.rb
+- lib/sugarcube-repl/object.rb
 - lib/sugarcube-unholy.rb
 - lib/sugarcube-unholy/ivar.rb
 - lib/sugarcube.rb