sugarcube 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbbe819e97283451447a21765514919206aafca
-  data.tar.gz: 441826f0a2a375300361d9271cf18b1080938862
+  metadata.gz: b93b8cbedc130c019d2eaf293a07337b5a041b10
+  data.tar.gz: 04d121961d44ba27a8258fc3844d9dd2a47cfd72
 SHA512:
-  metadata.gz: f2f4e84bb18b4146cb59aa1f33dd498ad231c2e992852e863384a35ae4c18e562a5706dcfef06a41194acc73b26754aa5916ca36667d926c28367266e1cba9f4
-  data.tar.gz: 24882269621cdb3f1890bdc4aac91fade6c95bcc1b8baac773e66303e2f861da4e6041c74e25a86ad2aabec1a78f7693956e81add243f0d97b3ac91130da09be
+  metadata.gz: 372c7d62dcd616471d92ff970278060813113569faf9a34040dea78631f39fccaa48d8b9b13ec0e3de1e035f81435f4e7c42134da90cf7e496456f693eb98efb
+  data.tar.gz: 496c37d5f0760e84024e6c5d3a84b79cf586e21bb93c005a6205df5c2d10b1f3309387ec8ef727a5efdf74d9af47c78259ebe3696dd4eb15aeb4daf632e787bb

data/README.md

@@ -52,6 +52,15 @@ diligent about adding Yard documentation, which is available here:
 
 [documentation]: http://rubydoc.info/gems/sugarcube/latest
 
+Versioning
+==========
+
+SugarCube uses FerVer: https://github.com/jonathanong/ferver.  This means that
+minor breaking changes occur in minor version bumps, and sometimes a
+non-breaking change occures in the major version (like when we added OS X
+support).
+
+
 Installation
 ============
 

data/lib/cocoa/sugarcube-nsdate/nsdate_delta.rb

@@ -19,8 +19,8 @@ class NSDate
 
     delta = s
     # todo: leap second adjustment?  can leap seconds be detected?
-    delta += mi.minutes
-    delta += h.hours
+    delta += mi * 60
+    delta += h * 3600
 
     return_date = self + delta
 
@@ -42,17 +42,17 @@ class NSDate
       if mo > 0
         mo.times do
           delta = return_date.days_in_month
-          return_date += delta.days
+          return_date += delta * 3600 * 24
 
           # if the day_of_month is wrong, it must be because we either added PAST
           # the correct month (so roll back), or because we WERE rolled back and
           # when we moved forward a month, we were left back at the smaller day.
           if correct_day_of_month
             if return_date.day < 28
-              return_date -= return_date.day.days
+              return_date -= return_date.day * 3600 * 24
             elsif return_date.day < correct_day_of_month
               fix = correct_day_of_month > return_date.days_in_month ? return_date.days_in_month : correct_day_of_month
-              return_date += (fix - return_date.day).days
+              return_date += (fix - return_date.day) * 3600 * 24
             end
           end
         end
@@ -63,15 +63,15 @@ class NSDate
           # hour short of "last month" and so you end up with THIS month.  there
           # is NEVER a case when subtracting return_date.day+1 days is NOT
           # "previous month".  dates. :-|  f-em.
-          delta = (return_date - (return_date.day+1).days).days_in_month
-          return_date -= delta.days
+          delta = (return_date - (return_date.day+1) * 3600 * 24).days_in_month
+          return_date -= delta * 3600 * 24
           # same correction as above
           if correct_day_of_month
             if return_date.day < 28
-              return_date -= return_date.day.days
+              return_date -= return_date.day * 3600 * 24
             elsif return_date.day < correct_day_of_month
               fix = correct_day_of_month > return_date.days_in_month ? return_date.days_in_month : correct_day_of_month
-              return_date += (fix - return_date.day).days
+              return_date += (fix - return_date.day) * 3600 * 24
             end
           end
         end
@@ -79,8 +79,8 @@ class NSDate
     end
 
     delta = 0
-    delta += d.days
-    delta += w.weeks
+    delta += d * 3600 * 24
+    delta += w * 3600 * 24 * 7
     return_date += delta
 
     # DST adjustment, unless minutes, hours, or seconds were specified.
@@ -98,9 +98,9 @@ class NSDate
     # Time.at(3/10/2012).delta(hours:25)  # => 2012-03-11 18:00:00 -0600
     unless return_date.dst? == is_dst or is_very_specific
       if is_dst
-        return_date += 1.hour
+        return_date += 3600
       else
-        return_date -= 1.hour
+        return_date -= 3600
       end
     end
 

data/lib/ios/sugarcube-factories/uitableviewcell.rb

@@ -4,31 +4,59 @@ class UITableViewCell
   class << self
 
     # returns a cell in the default style, with reuse identifier
-    # `cell_identifier`.  Options are passed on to the
-    # `sugarcube_cell_factory` method.
-    def default(cell_identifier, options={})
-      return sugarcube_cell_factory(cell_identifier, :default, options)
+    # `reuse_identifier`.  Supported options are :accessory, :text, :detail,
+    # :image, and :selection_style.
+    # Valid values for `:accessory`:
+    #      :none, :disclosure, :disclosureindicator, :detail,
+    #      :detaildisclosurebutton, :checkmark
+    #      or any UITableViewCellAccessory constant
+    # Valid values for `:selection_style`:
+    #      :none, :blue, :gray
+    #      or any UITableViewCellSelectionStyle constant
+    def default(reuse_identifier, options={})
+      return sugarcube_cell_factory(reuse_identifier, :default, options)
     end
 
     # returns a cell in the value1 style, with reuse identifier
-    # `cell_identifier`.  Options are passed on to the
-    # `sugarcube_cell_factory` method.
-    def value1(cell_identifier, options={})
-      return sugarcube_cell_factory(cell_identifier, :value1, options)
+    # `reuse_identifier`.  Supported options are :accessory, :text, :detail,
+    # :image, and :selection_style.
+    # Valid values for `:accessory`:
+    #      :none, :disclosure, :disclosureindicator, :detail,
+    #      :detaildisclosurebutton, :checkmark
+    #      or any UITableViewCellAccessory constant
+    # Valid values for `:selection_style`:
+    #      :none, :blue, :gray
+    #      or any UITableViewCellSelectionStyle constant
+    def value1(reuse_identifier, options={})
+      return sugarcube_cell_factory(reuse_identifier, :value1, options)
     end
 
     # returns a cell in the value2 style, with reuse identifier
-    # `cell_identifier`.  Options are passed on to the
-    # `sugarcube_cell_factory` method.
-    def value2(cell_identifier, options={})
-      return sugarcube_cell_factory(cell_identifier, :value2, options)
+    # `reuse_identifier`.  Supported options are :accessory, :text, :detail,
+    # :image, and :selection_style.
+    # Valid values for `:accessory`:
+    #      :none, :disclosure, :disclosureindicator, :detail,
+    #      :detaildisclosurebutton, :checkmark
+    #      or any UITableViewCellAccessory constant
+    # Valid values for `:selection_style`:
+    #      :none, :blue, :gray
+    #      or any UITableViewCellSelectionStyle constant
+    def value2(reuse_identifier, options={})
+      return sugarcube_cell_factory(reuse_identifier, :value2, options)
     end
 
     # returns a cell in the subtitle style, with reuse identifier
-    # `cell_identifier`.  Options are passed on to the
-    # `sugarcube_cell_factory` method.
-    def subtitle(cell_identifier, options={})
-      return sugarcube_cell_factory(cell_identifier, :subtitle, options)
+    # `reuse_identifier`.  Supported options are :accessory, :text, :detail,
+    # :image, and :selection_style.
+    # Valid values for `:accessory`:
+    #      :none, :disclosure, :disclosureindicator, :detail,
+    #      :detaildisclosurebutton, :checkmark
+    #      or any UITableViewCellAccessory constant
+    # Valid values for `:selection_style`:
+    #      :none, :blue, :gray
+    #      or any UITableViewCellSelectionStyle constant
+    def subtitle(reuse_identifier, options={})
+      return sugarcube_cell_factory(reuse_identifier, :subtitle, options)
     end
 
 private
@@ -41,9 +69,10 @@ private
     #   text - textLabel.text content
     #   detail - detailTextLabel.text content
     #   selection - selectionStyle
-    def sugarcube_cell_factory(cell_identifier, cell_style, options)
+    def sugarcube_cell_factory(reuse_identifier, cell_style, options)
+      cell_style_name = cell_style
       cell_style = cell_style.uitablecellstyle if cell_style.respond_to?(:uitablecellstyle)
-      cell = UITableViewCell.alloc.initWithStyle(cell_style, reuseIdentifier: cell_identifier)
+      cell = UITableViewCell.alloc.initWithStyle(cell_style, reuseIdentifier: reuse_identifier)
 
       if options[:accessory]
         accessory = options[:accessory]
@@ -51,14 +80,14 @@ private
         cell.accessoryType = accessory
       end
 
-      if options[:selection]
-        selection = options[:selection]
-        selection = selection.uitablecellselectionstyle if selection.respond_to?(:uitablecellselectionstyle)
-        cell.selectionStyle = selection
+      selection_style = options[:selection] || options[:selection_style]
+      if selection_style
+        selection_style = selection_style.uitablecellselectionstyle if selection_style.respond_to?(:uitablecellselectionstyle)
+        cell.selectionStyle = selection_style
       end
 
       if options[:image]
-        raise "cell type #{cell_style} does not support imageView" unless cell.imageView
+        raise "cell type #{cell_style_name} does not support imageView" unless cell.imageView
         image = options[:image]
         cell.imageView.image = image && image.uiimage
       end
@@ -68,7 +97,7 @@ private
       end
 
       if options[:detail]
-        raise "cell type #{cell_style} does not support detailTextLabel" unless cell.detailTextLabel
+        raise "cell type #{cell_style_name} does not support detailTextLabel" unless cell.detailTextLabel
         cell.detailTextLabel.text = options[:detail]
       end
 

data/lib/ios/sugarcube-image/uiimage.rb

@@ -349,7 +349,7 @@ class UIImage
     # this is actually the interesting part:
     new_image = self.canvas(size: new_size) do |context|
       if background
-        background = background.uicolor
+        background = background.uicolor unless background.is_a?(UIColor)
         background.setFill
         CGContextAddRect(context, [[0, 0], new_size])
         CGContextDrawPath(context, KCGPathFill)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '3.3.1'
+  Version = '3.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description