sugarcube 1.1.0 → 1.3.0

data/lib/sugarcube-nsdate/date_parser.rb

@@ -1,16 +1,18 @@
 module SugarCube
   module DateParser
+    module_function
+
     # Parse a date string: E.g.:
     #
     # SugarCube::DateParser.parse_date "There is a date in here tomorrow at 9:00 AM"
     #
     # => 2013-02-20 09:00:00 -0800
-    def self.parse_date(date_string)
+    def parse_date(date_string)
       result = sugarcube_detect(date_string).first
       if result
         return result.date
       else
-        return sugarcube_iso8601(date_string)
+        return iso8601(date_string)
       end
     end
 
@@ -20,7 +22,7 @@ module SugarCube
     #
     # Caveat: This is implemented per Apple documentation. I've never really
     #         seen it work.
-    def self.parse_time_zone(date_string)
+    def parse_time_zone(date_string)
       result = sugarcube_detect(date_string).first
       result && result.timeZone
     end
@@ -32,23 +34,17 @@ module SugarCube
     # => 21600.0
     #
     # Divide by 3600.0 to get number of hours duration.
-    def self.parse_duration(date_string)
+    def parse_duration(date_string)
       result = sugarcube_detect(date_string).first
       result && result.send(:duration)
     end
 
     # Parse a date into a raw match array for further processing
-    def self.match(date_string)
+    def match(date_string)
       sugarcube_detect(date_string)
     end
 
-    private
-    def self.sugarcube_detect(date_string)
-      @@sugarcube_detector ||= NSDataDetector.dataDetectorWithTypes(NSTextCheckingTypeDate, error:Pointer.new(:object))
-      return @@sugarcube_detector.matchesInString(date_string, options:0, range:NSMakeRange(0, date_string.length))
-    end
-
-    def self.sugarcube_iso8601(date_string)
+    def iso8601(date_string)
       @@sugarcube_iso_detectors ||= [
         "yyyy-MM-dd'T'HH:mm:ss",
         "yyyy-MM-dd'T'HH:mm:ssZ",
@@ -63,6 +59,12 @@ module SugarCube
       return @@sugarcube_iso_detectors.inject(nil) { |date, formatter| date || formatter.dateFromString(date_string) }
     end
 
+    def sugarcube_detect(date_string)
+      @@sugarcube_detector ||= NSDataDetector.dataDetectorWithTypes(NSTextCheckingTypeDate, error:Pointer.new(:object))
+      return @@sugarcube_detector.matchesInString(date_string, options:0, range:NSMakeRange(0, date_string.length))
+    end
+    private :sugarcube_detect
+
   end
 end
 

data/lib/sugarcube-nsdate/nsstring.rb

@@ -1,5 +1,10 @@
 class NSString
 
+  # checks ISO8601 formats *before* falling back on natural language detection
+  def nsdate
+    SugarCube::DateParser.iso8601(self) || SugarCube::DateParser.parse_date(self)
+  end
+
   def nstimezone
     case self
     when /([+-]?\d{4})/

data/lib/sugarcube-nsdate/{fixnum.rb → numeric.rb}

@@ -1,7 +1,7 @@
-class Fixnum
+class Numeric
 
-  def nstimezone
-    NSTimeZone.timeZoneForSecondsFromGMT(self)
+  def nsdate
+    NSDate.dateWithTimeIntervalSince1970(self)
   end
 
   def before(date)
@@ -21,3 +21,12 @@ class Fixnum
   end
 
 end
+
+
+class Fixnum
+
+  def nstimezone
+    NSTimeZone.timeZoneForSecondsFromGMT(self)
+  end
+
+end

data/lib/sugarcube-numbers/numeric.rb

@@ -4,6 +4,13 @@ class Numeric
   ##|  MISC
   ##|
 
+  # Uses the screen scale to determine how many pixels (converts "pixels" to
+  # "points")
+  def pixels
+    self.to_f / UIScreen.mainScreen.scale
+  end
+  alias pixel pixels
+
   def percent
     self / 100.0
   end

data/lib/sugarcube-to_s/uilabel.rb

@@ -5,7 +5,7 @@ class UILabel
     if text && text.length > 20
       text = text[0..20] + '...'
     end
-    super options.merge(inner: 'text: ' + text.inspect)
+    super options.merge(inner: {text: text})
   end
 
 end

data/lib/sugarcube-to_s/uiview.rb

@@ -1,7 +1,6 @@
 class UIView
 
   def to_s(options={})
-    options[:superview] = true if options[:superview].nil?
     if self.respond_to? :stylename and self.stylename
       suffix = ' stylename: ' + self.stylename.inspect
     else
@@ -20,7 +19,7 @@ class UIView
     "#{self.class.name}(##{self.object_id.to_s(16)}, #{SugarCube::Adjust::format_frame(self.frame)}" +
                         (inner ? ', ' + inner : '') +
                         ')' +
-                        (options[:superview] && self.superview ? ", child of #{self.superview.class.name}(##{self.superview.object_id.to_s(16)})" : '') +
+                        (options.fetch(:superview, true) && self.superview ? ", child of #{self.superview.class.name}(##{self.superview.object_id.to_s(16)})" : '') +
                         suffix
   end
 

data/lib/sugarcube-uikit/uiview.rb

@@ -10,12 +10,12 @@ class UIView
     def attr_updates(*attrs)
       attr_accessor(*attrs)
       attrs.each do |attr|
-        define_method("#{attr}=") { |value|
+        define_method("#{attr}=") do |value|
           if instance_variable_get("@#{attr}") != value
             setNeedsDisplay
           end
           instance_variable_set("@#{attr}", value)
-        }
+        end
       end
     end
 
@@ -80,7 +80,7 @@ class UIView
     if use_content_size
       UIGraphicsBeginImageContextWithOptions(contentSize, false, scale)
       context = UIGraphicsGetCurrentContext()
-      subviews.each do |subview|
+      self.subviews.each do |subview|
         CGContextSaveGState(context)
         CGContextTranslateCTM(context, subview.frame.origin.x, subview.frame.origin.y)
         subview.layer.renderInContext(context)
@@ -99,12 +99,82 @@ class UIView
 
   # Returns the receiver's bounds in the coordinate system of `destination`
   def convert_bounds(destination)
-    self.convertRect(self.bounds, toView:destination)
+    message = "The (ambiguously named) `convert_bounds` method has been deprecated, use `convert_frame_to` (or `convert_frame_from`)"
+    if defined?(SugarCube::Legacy)
+      SugarCube::Legacy.log(message)
+    else
+      NSLog(message)
+    end
+    return convert_frame_to(destination)
+  end
+
+  def convert_frame_to(destination)
+    return self.convertRect(CGRectMake(0, 0, self.frame.size.width, self.frame.size.height), toView:destination)
+  end
+
+  def convert_frame_from(source)
+    return self.convertRect(CGRectMake(0, 0, source.frame.size.width, source.frame.size.height), fromView:source)
   end
 
   # Returns the receiver's bounds in the coordinate system of `destination`
   def convert_origin(destination)
-    self.convertPoint([0, 0], toView:destination)
+    message = "The (ambiguously named) `convert_origin` method has been deprecated, use `convert_origin_to` (or `convert_origin_from`)"
+    if defined?(SugarCube::Legacy)
+      SugarCube::Legacy.log(message)
+    else
+      NSLog(message)
+    end
+    return self.convert_origin_to(destination)
+  end
+
+  def convert_origin_to(destination)
+    return self.convertPoint([0, 0], toView:destination)
+  end
+
+  def convert_origin_from(source)
+    return self.convertPoint([0, 0], fromView:source)
+  end
+
+  # Easily get and set a UIView's frame properties
+
+  def x
+    self.frame.origin.x
+  end
+
+  def setX(newX)
+    newFrame = self.frame
+    newFrame.origin.x = newX
+    self.frame = newFrame
+  end
+
+  def y
+    self.frame.origin.y
+  end
+
+  def setY(newY)
+    newFrame = self.frame
+    newFrame.origin.y = newY
+    self.frame = newFrame
+  end
+
+  def height
+    self.frame.size.height
+  end
+
+  def setHeight(newHeight)
+    newFrame = self.frame
+    newFrame.size.height = newHeight
+    self.frame = newFrame
+  end
+
+  def width
+    self.frame.size.width
+  end
+
+  def setWidth(newWidth)
+    newFrame = self.frame
+    newFrame.size.width = newWidth
+    self.frame = newFrame
   end
 
 end

data/lib/sugarcube/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '1.1.0'
+  Version = '1.3.0'
 end

data/spec/nsattributedstring_spec.rb

@@ -99,6 +99,10 @@ describe 'NSAttributeString' do
       @subject.isEqualToAttributedString('test'.attrd.vertical_glyph_form(1)).should != true
     end
 
+    it 'should have `letterpress`' do
+      @subject.isEqualToAttributedString('test'.attrd.letterpress).should != true
+    end
+
   end
 
 end

data/spec/nsstring_files_spec.rb

@@ -31,21 +31,21 @@ describe 'NSString' do
     'little_square.png'.resource_exists?.should == true
     'foo'.resource_exists?.should == false
   end
-  
+
   describe "exists?" do
-    
+
     it "should not exists" do
       "abc".exists?.should == false
     end
-    
+
     it "should not exists" do
       "abc".cache.exists?.should == false
     end
-    
+
     it "should not exists" do
       "abc".resource.exists?.should == false
     end
-    
+
     describe "in document" do
       before do
         "abc".writeToFile "abc".document, atomically:true
@@ -53,12 +53,12 @@ describe 'NSString' do
       after do
         NSFileManager.defaultManager.removeItemAtPath "abc".document, error:nil
       end
-      
+
       it "should be exists" do
         "abc".exists?.should == true
       end
     end
-    
+
     describe "in cache" do
       before do
         "abc".writeToFile "abc".cache, atomically:true
@@ -66,7 +66,7 @@ describe 'NSString' do
       after do
         NSFileManager.defaultManager.removeItemAtPath "abc".cache, error:nil
       end
-      
+
       it "should be exists" do
         "abc".cache.exists?.should == true
       end
@@ -79,9 +79,9 @@ describe 'NSString' do
     end
 
   end
-  
+
   describe "remove!" do
-  
+
     describe "in document" do
       before do
         "abc".writeToFile "abc".document, atomically:true
@@ -89,13 +89,13 @@ describe 'NSString' do
       after do
         NSFileManager.defaultManager.removeItemAtPath "abc".document, error:nil
       end
-      
+
       it "should remove" do
         "abc".remove!.should == nil
         "abc".exists?.should == false
       end
     end
-    
+
     describe "in cache" do
       before do
         "abc".writeToFile "abc".cache, atomically:true
@@ -103,14 +103,14 @@ describe 'NSString' do
       after do
         NSFileManager.defaultManager.removeItemAtPath "abc".cache, error:nil
       end
-      
+
       it "should remove" do
         path = "abc".cache
         path.remove!.should == nil
         path.exists?.should == false
       end
     end
-    
+
   end
 
   describe 'resource()' do
@@ -153,7 +153,10 @@ describe 'NSString' do
     describe '"PkgInfo".resource_url' do
       before { @it = "PkgInfo".resource_url.absoluteString }
       it 'should start with "file://localhost/Users"' do
-        @it.hasPrefix("file://localhost/Users").should == true
+        (
+          @it.hasPrefix("file://localhost/Users") ||
+          @it.hasPrefix("file:///Users")
+        ).should == true
       end
       it 'should end with "SugarCube_spec.app/PkgInfo"' do
         @it.hasSuffix("SugarCube_spec.app/PkgInfo").should == true

data/spec/uiactionsheet_spec.rb

@@ -249,13 +249,13 @@ describe 'UIActionSheet' do
       proper_wait 0.6
     end
 
-    it 'should call block with "cancel" when cancel button is pressed' do
+    it 'should call block with :cancel when cancel button is pressed' do
       @alert.cancelButtonIndex.should == 3
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
       @touched.should == :cancel
     end
 
-    it 'should call block with "destructive" when destructive button is pressed' do
+    it 'should call block with :destructive when destructive button is pressed' do
       @alert.destructiveButtonIndex.should == 0
       @alert.dismissWithClickedButtonIndex(@alert.destructiveButtonIndex, animated: false)
       @touched.should == :destructive
@@ -276,4 +276,42 @@ describe 'UIActionSheet' do
 
   end
 
+  describe 'with success handler defined' do
+
+    before do
+      @touched = nil
+      @alert = UIActionSheet.alert('test',
+        buttons: ['cancel', 'destructive', 'test1', 'test2'],
+        success: ->(button, index){ @touched, @touched_index = button, index },
+        )
+      proper_wait 0.6
+    end
+
+    it 'should not call block when cancel button is pressed' do
+      @alert.cancelButtonIndex.should == 3
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+      @touched.should == nil
+    end
+
+    it 'should not call block when destructive button is pressed' do
+      @alert.destructiveButtonIndex.should == 0
+      @alert.dismissWithClickedButtonIndex(@alert.destructiveButtonIndex, animated: false)
+      @touched.should == nil
+    end
+
+    it 'should call block with "test1" when first button is pressed' do
+      @alert.firstOtherButtonIndex.should == 1
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex, animated: false)
+      @touched.should == 'test1'
+      @touched_index.should == @alert.firstOtherButtonIndex
+    end
+
+    it 'should call block with "test2" when second button is pressed' do
+      @alert.dismissWithClickedButtonIndex(@alert.firstOtherButtonIndex + 1, animated: false)
+      @touched.should == 'test2'
+      @touched_index.should == @alert.firstOtherButtonIndex + 1
+    end
+
+  end
+
 end

data/spec/uialertview_spec.rb

@@ -9,14 +9,14 @@ describe 'UIAlertView' do
 
   it 'should have :show option (show: true)' do
     alert = UIAlertView.alert('test', show: true)
-    proper_wait 0.6
+    proper_wait 1
     alert.visible?.should == true
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
   end
 
   it 'should show by default' do
     alert = UIAlertView.alert('test')
-    proper_wait 0.6
+    proper_wait 1
     alert.visible?.should == true
     alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
   end
@@ -144,6 +144,10 @@ describe 'UIAlertView' do
         )
     end
 
+    after do
+      @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
+    end
+
     it 'should work for :cancel' do
       proper_wait 0.6
       @alert.dismissWithClickedButtonIndex(@alert.cancelButtonIndex, animated: false)
@@ -167,13 +171,16 @@ describe 'UIAlertView' do
     end
 
     it 'should work with :secure_text_input' do
+      @called = false
       alert = UIAlertView.alert('test', buttons: ['cancel', 'ok'], style: :secure_text_input) { |button, text|
+        @called = true
         @text = text
       }
       proper_wait 0.6
       alert.textFieldAtIndex(0).text = 'test text'
-      alert.dismissWithClickedButtonIndex(alert.cancelButtonIndex, animated: false)
+      alert.dismissWithClickedButtonIndex(alert.firstOtherButtonIndex, animated: false)
 
+      @called.should == true
       @text.should == 'test text'
     end