sugarcube 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a0e6febb6aacdab99ba33a9b6c0cd0b454b12da
-  data.tar.gz: 0c9dbcb46e81cb7ba3f85e695c0940b7bd19cc9b
+  metadata.gz: edbf069e18731e7ae27cf805c765176069145cea
+  data.tar.gz: 9f7d20f7ec6eaf89bebcdb3636ed9e5b8d65dc79
 SHA512:
-  metadata.gz: a7f0cee0a51409f9e4c48fe257bb89577e5e2ee651862b7fe1e218a69fed9183524fd1191180988cf9d5ff99bf9936b82d26103aafbb3ce62344c1b66e77762e
-  data.tar.gz: fabd1cf378ee275c5358e4ee23e4a09e1e6c3ca749deafa9e46953e29e6f0d0fe539f2e38e5bea754879e1ad311e58c41473d85fdcfa1bae0e772da8eaff8000
+  metadata.gz: 9de9e1809c679e49a68561eeecdc488bf9384d2e2798e663bbe24314d779cc5b91301a82eeffda4704b5677eaf3a4261fe05d81762acd4600c7b05a11d2089b3
+  data.tar.gz: d9aca20f973bfcd4d13d58cfeac4b65b5fa0c7fbc1503e2ef1246e198b73c67c32432090031f911e7b7fd8675a22abf649e19350bf2eae16b2a8dab7bbca6271

data/lib/ios/sugarcube-constants/symbol.rb

@@ -183,6 +183,14 @@ class Symbol
     SugarCube.look_in(self, Symbol.uitablecellseparatorstyle, Symbol.uitablecellseparatorstyle__deprecated)
   end
 
+  def presentationstyle
+    SugarCube.look_in(self, Symbol.presentationstyle)
+  end
+
+  def transitionstyle
+    SugarCube.look_in(self, Symbol.transitionstyle)
+  end
+
   def uialertstyle
     SugarCube.look_in(self, Symbol.uialertstyle)
   end
@@ -294,6 +302,9 @@ class Symbol
     attr :uitablecellseparatorstyle
     attr :uitablecellseparatorstyle__deprecated
 
+    attr :presentationstyle
+    attr :transitionstyle
+
     attr :uialertstyle
     attr :uiactionstyle
 
@@ -767,6 +778,25 @@ class Symbol
     etched:             UITableViewCellSeparatorStyleSingleLineEtched,
   }
 
+  @presentationstyle = {
+      fullscreen:           UIModalPresentationFullScreen,
+      page_sheet:           UIModalPresentationPageSheet,
+      form_sheet:           UIModalPresentationFormSheet,
+      current_context:      UIModalPresentationCurrentContext,
+      custom:               UIModalPresentationCustom,
+      over_fullscreen:      UIModalPresentationOverFullScreen,
+      over_current_context: UIModalPresentationOverCurrentContext,
+      popover:              UIModalPresentationPopover,
+      none:                 UIModalPresentationNone
+  }
+
+  @transitionstyle = {
+      cover_vertical:  UIModalTransitionStyleCoverVertical,
+      flip_horizontal: UIModalTransitionStyleFlipHorizontal,
+      cross_dissolve:  UIModalTransitionStyleCrossDissolve,
+      partial_curl:    UIModalTransitionStylePartialCurl
+  }
+
   @uialertstyle = {
     default:                  UIAlertViewStyleDefault,
     secure_text_input:        UIAlertViewStyleSecureTextInput,

data/lib/ios/sugarcube-modal/modal.rb

@@ -4,6 +4,23 @@ module SugarCube
     def present_modal(view_ctlr, options={}, &block)
       target = options[:target] || UIApplication.sharedApplication.keyWindow.rootViewController
       animated = options.fetch(:animated, true)
+
+      presentation_style = options[:presentation]
+      if presentation_style
+        if presentation_style.respond_to?(:presentationstyle)
+          presentation_style = presentation_style.presentationstyle
+        end
+        view_ctlr.modalPresentationStyle = presentation_style
+      end
+
+      transition_style = options[:transition]
+      if transition_style
+        if transition_style.respond_to?(:transitionstyle)
+          transition_style = transition_style.transitionstyle
+        end
+        view_ctlr.modalTransitionStyle = transition_style
+      end
+
       target.presentViewController(view_ctlr, animated:animated, completion:block)
     end
 

data/lib/osx/sugarcube-color/nscolor.rb

@@ -14,12 +14,24 @@ class NSColor
 
   def nscolor(alpha=nil)
     if alpha
-      self.colorWithAlphaComponent(alpha.to_f)
+      if named_color_space?
+        self.colorUsingColorSpace(NSColorSpace.genericRGBColorSpace).colorWithAlphaComponent(alpha.to_f)
+      else
+        self.colorWithAlphaComponent(alpha.to_f)
+      end
     else
-      self
+      if named_color_space?
+        self.colorUsingColorSpace(NSColorSpace.genericRGBColorSpace)
+      else
+        self
+      end
     end
   end
 
+  def named_color_space?
+    colorSpaceName == "NSNamedColorSpace"
+  end
+
   def cgcolor(alpha=nil)
     nscolor(alpha).CGColor
   end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '2.9.1'
+  Version = '2.10.0'
 end

data/spec/osx/color_spec.rb

@@ -95,6 +95,10 @@ describe 'NSColor' do
     :black.nscolor.invert.blue.should == 1
   end
 
+  it "should process system colors with a NSNamedColorSpace correctly" do
+    NSColor.controlTextColor.invert.should.not.raise(StandardError)
+  end
+
   it "should have a #mix_with method" do
     white = :white.nscolor
     black = :black.nscolor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description