sugarcube 1.0.7 → 1.1.0

data/Gemfile.lock

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

data/app/app_delegate.rb

@@ -1,4 +1,3 @@
-include SugarCube::Adjust
 include SugarCube::CoreGraphics
 
 

data/lib/sugarcube-color/uicolor.rb

@@ -153,20 +153,6 @@ class UIColor
         break
       end
     end
-    Symbol.uicolors__deprecated.each do |old_name, new_name|
-      method = Symbol.uicolors[new_name]
-      if UIColor.send(method) == without_alpha
-        message = "The symbol #{old_name.inspect} has been deprecated in favor of #{new_name.inspect}"
-        if defined?(SugarCube::Legacy)
-          SugarCube::Legacy.log(message)
-        else
-          NSLog(message)
-        end
-
-        system_color = method
-        break
-      end
-    end
     return system_color
   end
 

data/lib/sugarcube-nsdata/uiimage.rb

@@ -1,8 +1,13 @@
 class UIImage
 
-  # @return [NSData] an NSData object in PNG format
-  def nsdata
-    UIImagePNGRepresentation(self)
+  # @return [NSData] an NSData object in PNG or JPG format
+  def nsdata(format=:png, compression=0.9)
+    case format
+    when :png, :PNG
+      UIImagePNGRepresentation(self)
+    when :jpg, :JPG
+      UIImageJPEGRepresentation(self, compression)
+    end
   end
 
 end

data/lib/sugarcube-nsdate/date_parser.rb

@@ -6,7 +6,12 @@ module SugarCube
     #
     # => 2013-02-20 09:00:00 -0800
     def self.parse_date(date_string)
-      detect(date_string).first.date
+      result = sugarcube_detect(date_string).first
+      if result
+        return result.date
+      else
+        return sugarcube_iso8601(date_string)
+      end
     end
 
     # Parse time zone from date
@@ -16,7 +21,8 @@ module SugarCube
     # Caveat: This is implemented per Apple documentation. I've never really
     #         seen it work.
     def self.parse_time_zone(date_string)
-      detect(date_string).first.timeZone
+      result = sugarcube_detect(date_string).first
+      result && result.timeZone
     end
 
     # Parse a date string: E.g.:
@@ -27,19 +33,36 @@ module SugarCube
     #
     # Divide by 3600.0 to get number of hours duration.
     def self.parse_duration(date_string)
-      detect(date_string).first.send(:duration)
+      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)
-      detect(date_string)
+      sugarcube_detect(date_string)
     end
 
     private
-    def self.detect(date_string)
-      @@detector ||= NSDataDetector.dataDetectorWithTypes(NSTextCheckingTypeDate, error:Pointer.new(:object))
-      matches = @@detector.matchesInString(date_string, options:0, range:NSMakeRange(0, date_string.length))
+    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)
+      @@sugarcube_iso_detectors ||= [
+        "yyyy-MM-dd'T'HH:mm:ss",
+        "yyyy-MM-dd'T'HH:mm:ssZ",
+        "yyyy-MM-dd'T'HH:mm:ss.S",
+        "yyyy-MM-dd'T'HH:mm:ss.SZ",
+        ].map do |date_format|
+          formatter = NSDateFormatter.alloc.init
+          formatter.timeZone = NSTimeZone.timeZoneWithAbbreviation "UTC"
+          formatter.dateFormat = date_format
+          formatter
+        end
+      return @@sugarcube_iso_detectors.inject(nil) { |date, formatter| date || formatter.dateFromString(date_string) }
+    end
+
   end
 end
 

data/lib/sugarcube-repl/object.rb

@@ -1,4 +1,4 @@
-class Object
+module Kernel
 
 private
   def adjust(*args)

data/lib/sugarcube/version.rb

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

data/spec/color_other_representations_spec.rb

@@ -18,6 +18,7 @@ describe 'UIColor (CSS)' do
   it "should have a #system_name method" do
     UIColor.whiteColor.system_name.should == :whiteColor
     UIColor.blackColor.system_name.should == :blackColor
+    UIColor.lightGrayColor.system_name.should == :lightGrayColor
   end
 
   it "should return css color names" do
@@ -27,7 +28,7 @@ describe 'UIColor (CSS)' do
       fuchsia: :magenta,
     }
     Symbol.css_colors.each do |name, val|
-      name = corrections[name] || name
+      name = corrections.fetch(name, name)
 
       color = val.uicolor
       color.css_name.should == name

data/spec/date_parser_spec.rb

@@ -1,4 +1,5 @@
 describe "Base Methods" do
+
   it "parses a relative natural language string, returning a date" do
     today = Time.now
     t = SugarCube::DateParser.parse_date("tomorrow at 7:30 PM")
@@ -8,7 +9,7 @@ describe "Base Methods" do
     t.sec.should == 0
     (t.day - today.day).should == 1
   end
-  
+
   it "parses a specific natural language string, returning a date" do
     t = SugarCube::DateParser.parse_date("6/18/13 at 7:30 AM")
     t.month.should == 6
@@ -17,6 +18,54 @@ describe "Base Methods" do
     t.hour.should == 7
     t.min.should == 30
   end
+
+  it "returns nil on failure" do
+    t = SugarCube::DateParser.parse_date("NOT A DATE")
+    t.should == nil
+  end
+
+  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.month.should == 8
+      t.day.should == 22
+      t.year.should == 2013
+      t.min.should == 34
+      t.sec.should == 48
+      t.usec.should == 874000
+    end
+
+    it "parses '2013-08-22T21:34:48.874'" do
+      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48.874")
+      t.month.should == 8
+      t.day.should == 22
+      t.year.should == 2013
+      t.min.should == 34
+      t.sec.should == 48
+      t.usec.should == 874000
+    end
+
+    it "parses '2013-08-22T21:34:48Z'" do
+      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48Z")
+      t.month.should == 8
+      t.day.should == 22
+      t.year.should == 2013
+      t.min.should == 34
+      t.sec.floor.should == 48
+    end
+
+    it "parses '2013-08-22T21:34:48'" do
+      t = SugarCube::DateParser.parse_date("2013-08-22T21:34:48")
+      t.month.should == 8
+      t.day.should == 22
+      t.year.should == 2013
+      t.min.should == 34
+      t.sec.floor.should == 48
+    end
+
+  end
+
 end
 
 describe "String Extensions" do

data/spec/nsdata_spec.rb

@@ -27,6 +27,34 @@ describe "NSData" do
     "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb".nsdata.nsstring.should == "\u00ab\u03c4\u03b1\u0411\u042c\u2113\u03c3\u00bb"
   end
 
+  describe "should be able to create an image" do
+    before do
+      @image = 'little_square'.uiimage
+    end
+
+    it "shouldn't need a format" do
+      new_image = @image.nsdata.uiimage
+      new_image.should.is_a? UIImage
+      new_image.size.width.should == @image.size.width * @image.scale
+      new_image.size.height.should == @image.size.height * @image.scale
+    end
+
+    it "should support :png" do
+      new_image = @image.nsdata(:png).uiimage
+      new_image.should.is_a? UIImage
+      new_image.size.width.should == @image.size.width * @image.scale
+      new_image.size.height.should == @image.size.height * @image.scale
+    end
+
+    it "should support :jpg" do
+      new_image = @image.nsdata(:jpg).uiimage
+      new_image.should.is_a? UIImage
+      new_image.size.width.should == @image.size.width * @image.scale
+      new_image.size.height.should == @image.size.height * @image.scale
+    end
+
+  end
+
   describe "write_to" do
 
     after do
@@ -49,7 +77,7 @@ describe "NSData" do
       path.exists?.should == true
       url.nsdata.nsstring.should == contents
     end
-    
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies: []
 description: ! '== Description