sugarcube 2.7.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 887111adcadfc5e64dc1f50f649651c2283f052c
-  data.tar.gz: 102dbe9925b7c723a8b23a3711a3ec03d99421dc
+  metadata.gz: d92ca8801aa6ce45f836070a494cc25f9d474c6a
+  data.tar.gz: a99bc4acf26ba266d12f27151f909369956fb0f4
 SHA512:
-  metadata.gz: 63cd5a6ba9a81639b8caa2c80a860ffa290693cbeb87339f144584de8c92301e99f8a9f7f24ed385ea183f4c2d8ce8b722a91346a9dad2f65a8b68ed75dbe60d
-  data.tar.gz: 815c0a979776d4f2f1cb316f9ddc94d428f4a1db78e2abe3babc4995dfd7061c3952ebbb869c061d393bc1cd33336a0d962e8109b658b7b9c3597e82071d31a5
+  metadata.gz: df7aeb2713c85ccea53e7525942f724825ffde89b524ac8511c0b01cf2a786da80f26b2ea76a8ecbb289b02bdb5513b9d5d333265a96084daa5d9cf205970c65
+  data.tar.gz: 8ec64c92acadd1293ee94549f6450ed32f629017ede4ca931f9e629cfa3ad4c4fd2f0cce2a74eda3287143f34870fe3de1cf61cd9f809f95b1c204650e15b3ea

data/README.md

@@ -779,6 +779,7 @@ UIButton.buttonWithType(:custom.uibuttontype)
 # =>
 UIButton.custom
 
+# many of these are obsolete since iOS 7
 UIButton.custom            => UIButton.buttonWithType(:custom.uibuttontype)
 UIButton.rounded           => UIButton.buttonWithType(:rounded.uibuttontype)
 UIButton.rounded_rect      => UIButton.buttonWithType(:rounded_rect.uibuttontype)

data/lib/cocoa/sugarcube-repl/kernel.rb

@@ -9,6 +9,15 @@ module Kernel
   end
   alias a adjust
 
+  def collapse(*args)
+    if self.nil?
+      super
+    else
+      SugarCube::Repl.collapse(*args)
+    end
+  end
+  alias coll collapse
+
   def tree(*args)
     if self.nil?
       super

data/lib/cocoa/sugarcube-repl/repl.rb

@@ -4,6 +4,7 @@ module SugarCube
 
     @sugarcube_view = nil
     @sugarcube_items = nil
+    @sugarcube_collapsed_items = nil
     @sugarcube_restore = nil
 
     def adjust(view=nil)
@@ -23,6 +24,29 @@ module SugarCube
     end
     alias a adjust
 
+    def collapse(view)
+      if view.is_a? Fixnum
+        @sugarcube_items ||= SugarCube::Repl::build_tree(window, :subviews)
+        view = @sugarcube_items[view]
+      end
+
+      @sugarcube_collapsed_items ||= []
+      if @sugarcube_collapsed_items.include?(view)
+        @sugarcube_collapsed_items.delete(view)
+      else
+        @sugarcube_collapsed_items << view
+      end
+
+      retval = tree
+
+      if @sugarcube_collapsed_items
+        @sugarcube_collapsed_items.keep_if { |v| @sugarcube_items.include? v }
+      end
+
+      retval
+    end
+    alias coll collapse
+
     ##|  FRAME
     def frame(f=nil)
       return unless check_sugarcube_view
@@ -237,6 +261,9 @@ module SugarCube
       end
 
       @sugarcube_items = SugarCube::Repl::build_tree(item, selector)
+      if @sugarcube_collapsed_items
+        @sugarcube_collapsed_items.keep_if { |v| @sugarcube_items.include? v }
+      end
       if self.respond_to? :draw_tree
         draw_tree(item, selector)
       else
@@ -261,12 +288,16 @@ module SugarCube
 
       if tab
         print tab
-        if is_last
-          print '`-- '
-          tab += '    '
+        if @sugarcube_collapsed_items && @sugarcube_collapsed_items.include?(item)
+          print '<<< '
         else
-          print '+-- '
-          tab += '|   '
+          if is_last
+            print '`-- '
+            tab += '    '
+          else
+            print '+-- '
+            tab += '|   '
+          end
         end
       else
         print '. '
@@ -289,19 +320,22 @@ module SugarCube
       end
       items ||= []
 
-      items.each_with_index { |subview, index|
-        items_index += 1
-        if self.respond_to? :draw_tree
-          items_index = draw_tree(subview, selector, tab, index == items.length - 1, items_index)
-        else
-          items_index = SugarCube::Repl::draw_tree(subview, selector, tab, index == items.length - 1, items_index)
+      unless @sugarcube_collapsed_items && @sugarcube_collapsed_items.include?(item)
+        items.each_with_index do |subview, index|
+          items_index += 1
+          if self.respond_to? :draw_tree
+            items_index = draw_tree(subview, selector, tab, index == items.length - 1, items_index)
+          else
+            items_index = SugarCube::Repl::draw_tree(subview, selector, tab, index == items.length - 1, items_index)
+          end
         end
-      }
+      end
 
       return items_index
     end
 
     def build_tree(item, selector)
+
       if selector.is_a? Proc
         items = selector.call(item)
       else
@@ -310,9 +344,11 @@ module SugarCube
       items ||= []
 
       ret = [item]
-      items.each_with_index { |subview, index|
+      return ret if @sugarcube_collapsed_items && @sugarcube_collapsed_items.include?(item)
+
+      items.each_with_index do |subview, index|
         ret.concat SugarCube::Repl::build_tree(subview, selector)
-      }
+      end
       ret
     end
 

data/lib/ios/sugarcube-uikit/uibutton.rb

@@ -8,12 +8,25 @@ class UIButton
     setTitle(value, forState: UIControlStateNormal)
   end
 
+  def titleColor
+    titleColorForState(UIControlStateNormal)
+  end
+  alias title_color titleColor
+
+  def setTitleColor(value)
+    value = value.uicolor if value.respond_to?(:uicolor)
+    setTitleColor(value, forState: UIControlStateNormal)
+  end
+  alias title_color= setTitleColor
+
   def attributedTitle
     attributedTitleForState(UIControlStateNormal)
   end
+  alias attributed_title attributedTitle
 
   def setAttributedTitle(value)
     setAttributedTitle(value, forState: UIControlStateNormal)
   end
+  alias attributed_title= setAttributedTitle
 
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '2.7.1'
+  Version = '2.8.0'
 end

data/spec/ios/uibutton_spec.rb

@@ -19,11 +19,41 @@ describe UIButton do
     @subject.title.should == 'foo'
   end
 
+  it 'should set the titleColor using `titleColor=`' do
+    @subject.titleColor = UIColor.whiteColor
+    @subject.titleColorForState(UIControlStateNormal).should == UIColor.whiteColor
+  end
+
+  it 'should set the titleColor using `title_color=`' do
+    @subject.title_color = UIColor.whiteColor
+    @subject.titleColorForState(UIControlStateNormal).should == UIColor.whiteColor
+  end
+
+  it 'should set the titleColor using `setTitleColor()`' do
+    @subject.setTitleColor(UIColor.whiteColor)
+    @subject.titleColorForState(UIControlStateNormal).should == UIColor.whiteColor
+  end
+
+  it 'should get the titleColor' do
+    @subject.setTitleColor(UIColor.whiteColor, forState: UIControlStateNormal)
+    @subject.titleColor.should == UIColor.whiteColor
+  end
+
+  it 'should get the title_color' do
+    @subject.setTitleColor(UIColor.whiteColor, forState: UIControlStateNormal)
+    @subject.title_color.should == UIColor.whiteColor
+  end
+
   it 'should set the attributedTitle using `attributedTitle=`' do
     @subject.attributedTitle = 'foo'.attrd
     @subject.attributedTitleForState(UIControlStateNormal).should == 'foo'.attrd
   end
 
+  it 'should set the attributedTitle using `attributed_title=`' do
+    @subject.attributed_title = 'foo'.attrd
+    @subject.attributedTitleForState(UIControlStateNormal).should == 'foo'.attrd
+  end
+
   it 'should set the attributedTitle using `setAttributedTitle()`' do
     @subject.setAttributedTitle('foo'.attrd)
     @subject.attributedTitleForState(UIControlStateNormal).should == 'foo'.attrd
@@ -34,4 +64,9 @@ describe UIButton do
     @subject.attributedTitle.should == 'foo'.attrd
   end
 
+  it 'should get the attributed_title' do
+    @subject.setAttributedTitle('foo'.attrd, forState: UIControlStateNormal)
+    @subject.attributed_title.should == 'foo'.attrd
+  end
+
 end

metadata

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