sugarcube 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 972bf2ad876cf570e97d61fdc891d4d8b9da1e42
-  data.tar.gz: 699b6b63231c98b2a8b4904b9a46d7632adf6e61
+  metadata.gz: c5199a43eb183b24f64f8dad92396624560961df
+  data.tar.gz: f933938827851ae363a5be7182db0193de43a4ce
 SHA512:
-  metadata.gz: 93e69135801963c8c513797c7233171102c061bfa39dde8b91864121d3e5bd0dda2e50eb1cce54b69534609b69b294979379a054f436ce7e041323e32129654b
-  data.tar.gz: bd648614288a354c55e1a8d7ace67c1ff5012f3f8a6584d5ef18255d90aab0bde31181b633fcfa52cc74a2e86e5be78230ba99903ca0c3e2bb1b8648708ae98c
+  metadata.gz: 273a39aa060c9bce9caa6df076a199655b24a993385e2512b8726d3289b67387a2d22973e0a9cf2325bde332413a16791ac0abeb824e82a6df3794e8d201f805
+  data.tar.gz: 4c81bdce9927a97b40a842b5a9576540db7dbc03e5ed194a177c98019e873237a6bf8bbaf88a34295906ec2e52cd66f06299e8153af4ae0d6d8fc4104d335b65

data/lib/ios/sugarcube-to_s/uicolor.rb

@@ -3,25 +3,9 @@ class UIColor
   def to_s
     return super unless self.respond_to?(:alpha)
 
-    alpha_s = ((alpha || 1) < 1 ? "(#{alpha})" : '')
-    system_color = system_name
-    return "UIColor.#{system_color}#{alpha_s}" if system_color
-
-    alpha_s = ((alpha || 1) < 1 ? ", alpha: #{alpha}" : '')
-    inside = (css_name && ":#{css_name}") || (hex && "'#{hex}'")
-    if inside
-      return "UIColor.color(#{inside}#{alpha_s})"
-    else
-      super
-    end
-  end
-
-  def inspect
-    return super unless self.respond_to?(:alpha)
-
     alpha_s = ((alpha || 1) < 1 ? "(#{alpha})" : '')
     if system_name
-      return "UIColor.#{system_name}#{alpha_s}"
+      return "UIColor.#{system_name}#{alpha_s.length > 0 ? '.colorWithAlphaComponent' + alpha_s : ''}"
     elsif css_name
       return ":#{css_name}.uicolor#{alpha_s}"
     elsif hex

data/lib/ios/sugarcube-to_s/uiview.rb

@@ -2,8 +2,19 @@ class UIView
 
   def sugarcube_to_s(options={})
     suffix = ''
-    suffix += " stylename: #{self.stylename.inspect}" if self.respond_to?(:stylename) && self.stylename
-    suffix += " motion_kit_id: #{self.motion_kit_id.inspect}" if self.respond_to?(:motion_kit_id) && self.motion_kit_id
+    # teacup
+    if self.respond_to?(:stylename) && self.stylename && self.stylename.length > 0
+      suffix += " stylename: #{self.stylename.inspect}"
+    end
+    # motionkit
+    if self.respond_to?(:motion_kit_ids) && self.motion_kit_ids && self.motion_kit_ids.length > 0
+      if motion_kit_ids.length == 1
+        suffix += " motion_kit_id: #{self.motion_kit_id.inspect}"
+      else
+        suffix += " motion_kit_ids: #{self.motion_kit_ids.inspect}"
+      end
+    end
+    # rmq?
 
     if options[:inner].is_a? Hash
       inner = ''

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

@@ -3,29 +3,13 @@ class NSColor
   def to_s
     return super unless self.respond_to?(:alpha)
 
-    alpha_s = ((alpha || 1) < 1 ? "(#{alpha})" : '')
-    system_color = system_name
-    return "NSColor.#{system_color}#{alpha_s}" if system_color
-
-    alpha_s = ((alpha || 1) < 1 ? ", alpha: #{alpha}" : '')
-    inside = (css_name && ":#{css_name}") || (hex && "'#{hex}'")
-    if inside
-      return "NSColor.color(#{inside}#{alpha_s})"
-    else
-      super
-    end
-  end
-
-  def inspect
-    return super unless self.respond_to?(:alpha)
-
     alpha_s = ((alpha || 1) < 1 ? "(#{alpha})" : '')
     if system_name
-      return "NSColor.#{system_name}#{alpha_s}"
+      return "NSColor.#{system_name}#{alpha_s.length > 0 ? '.colorWithAlphaComponent' + alpha_s : ''}"
     elsif css_name
-      return ":#{css_name}.uicolor#{alpha_s}"
+      return ":#{css_name}.nscolor#{alpha_s}"
     elsif hex
-      return "'#{hex}'.uicolor#{alpha_s}"
+      return "'#{hex}'.nscolor#{alpha_s}"
     else
       super
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '2.4.0'
+  Version = '2.4.1'
 end

data/spec/ios/color_other_representations_spec.rb

@@ -37,11 +37,11 @@ describe 'UIColor (CSS)' do
 
   it "should have good to_s return values" do
     UIColor.whiteColor.to_s.should == 'UIColor.whiteColor'
-    UIColor.whiteColor.uicolor(0.5).to_s.should == 'UIColor.whiteColor(0.5)'
-    :indianred.uicolor.to_s.should == 'UIColor.color(:indianred)'
-    :indianred.uicolor(0.5).to_s.should == 'UIColor.color(:indianred, alpha: 0.5)'
-    '#12be3f'.uicolor.to_s.should == "UIColor.color('#12be3f')"
-    '#12be3f'.uicolor(0.5).to_s.should == "UIColor.color('#12be3f', alpha: 0.5)"
+    UIColor.whiteColor.uicolor(0.5).to_s.should == 'UIColor.whiteColor.colorWithAlphaComponent(0.5)'
+    :indianred.uicolor.to_s.should == ':indianred.uicolor'
+    :indianred.uicolor(0.5).to_s.should == ':indianred.uicolor(0.5)'
+    '#12be3f'.uicolor.to_s.should == "'#12be3f'.uicolor"
+    '#12be3f'.uicolor(0.5).to_s.should == "'#12be3f'.uicolor(0.5)"
   end
 
   it "should return UIColor objects" do

data/spec/ios/color_spec.rb

@@ -225,7 +225,10 @@ describe 'NSString UIColor extensions' do
   end
 
   it "that supports image names" do
-    'little_square'.uicolor.should == 'little_square'.uiimage.uicolor
+    a = 'little_square'.uicolor
+    b = 'little_square'.uiimage.uicolor
+    a.should.be.kind_of(UIColor)
+    b.should.be.kind_of(UIColor)
   end
 
   it "that supports non-existant image names" do

data/spec/ios/nsstring_files_spec.rb

@@ -16,8 +16,12 @@ describe 'NSString' do
   end
 
   it "should have a #temporary_path method" do
-    'foo'.temporary_path.should.start_with?('/Users')
-    'foo'.temporary_path.should.end_with?('tmp/foo')
+    if 'foo'.temporary_path.start_with?('/Users')
+      'foo'.temporary_path.should.start_with?('/Users')
+    else
+      'foo'.temporary_path.should.start_with?('/var/folders')
+    end
+    'foo'.temporary_path.should.end_with?('/foo')
   end
 
   it "should have a resource_path method" do
@@ -216,32 +220,27 @@ describe 'NSString deprecated methods' do
   end
 
   it "should have a #document method" do
-    'foo'.document.should.start_with?('/Users')
-    'foo'.document.should.end_with?('Documents/foo')
+    'foo'.document.should == 'foo'.document_path.should
   end
 
   it "should have a #cache method" do
-    'foo'.cache.should.start_with?('/Users')
-    'foo'.cache.should.end_with?('Library/Caches/foo')
+    'foo'.cache.should == 'foo'.cache_path
   end
 
   it "should have a #app_support method" do
-    'foo'.app_support.should.start_with?('/Users')
-    'foo'.app_support.should.end_with?('Library/Application Support/foo')
+    'foo'.app_support.should == 'foo'.app_support_path
   end
 
   it "should have a #temporary method" do
-    'foo'.temporary.should.start_with?('/Users')
-    'foo'.temporary.should.end_with?('tmp/foo')
+    'foo'.temporary.should == 'foo'.temporary_path
   end
 
   it "should have a resource method" do
-    'little_square.png'.resource.should.start_with?("/Users")
-    'little_square.png'.resource.should.end_with?("SugarCube_spec.app/little_square.png")
+    'little_square.png'.resource.should == 'little_square.png'.resource_path
   end
 
   it "should have an #exists? method" do
-    'foo'.document_path.exists?.should == false
+    'foo'.document_path.exists?.should == 'foo'.document_path.file_exists?
   end
 
   it "should have a remove! method" do

data/spec/osx/color_other_representations_spec.rb

@@ -37,11 +37,11 @@ describe 'NSColor (CSS)' do
 
   it "should have good to_s return values" do
     NSColor.whiteColor.to_s.should == 'NSColor.whiteColor'
-    NSColor.whiteColor.nscolor(0.5).to_s.should == 'NSColor.whiteColor(0.5)'
-    :indianred.nscolor.to_s.should == 'NSColor.color(:indianred)'
-    :indianred.nscolor(0.5).to_s.should == 'NSColor.color(:indianred, alpha: 0.5)'
-    '#12be3f'.nscolor.to_s.should == "NSColor.color('#12be3f')"
-    '#12be3f'.nscolor(0.5).to_s.should == "NSColor.color('#12be3f', alpha: 0.5)"
+    NSColor.whiteColor.nscolor(0.5).to_s.should == 'NSColor.whiteColor.colorWithAlphaComponent(0.5)'
+    :indianred.nscolor.to_s.should == ':indianred.nscolor'
+    :indianred.nscolor(0.5).to_s.should == ':indianred.nscolor(0.5)'
+    '#12be3f'.nscolor.to_s.should == "'#12be3f'.nscolor"
+    '#12be3f'.nscolor(0.5).to_s.should == "'#12be3f'.nscolor(0.5)"
   end
 
   Symbol.nscolors.each do |name, method|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Colin T.A. Gray