sugarcube 2.12.3 → 3.0.0

data/lib/cocoa/sugarcube/log.rb

@@ -2,7 +2,7 @@ module SugarCube
   module_function
 
   def stderr(message)
-    NSLog(message)
+    NSLog("%@", message)
   end
 
 end

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

@@ -3,6 +3,7 @@ class UIImage
     SugarCube568_TallSuffix = '-568h@2x'  # 320 x 568
     SugarCube667_TallSuffix = '-667h@2x'  # 375 x 667
     SugarCube736_TallSuffix = '-736h@2x'  # 414 x 736
+    SugarCube1024_TallSuffix = '-1024h@2x'  # 768 x 1024
 
     def sugarcube568_imageNamed(name)
       case UIScreen.mainScreen.bounds.size.height
@@ -12,6 +13,8 @@ class UIImage
         taller_image_ext = SugarCube667_TallSuffix
       when 736
         taller_image_ext = SugarCube736_TallSuffix
+      when 1024
+        taller_image_ext = SugarCube1024_TallSuffix
       else
         taller_image_ext = false
       end

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

@@ -1,12 +1,14 @@
 module SugarCube
-  module Repl
-    module_function
+  class << Repl
 
     def window(index=nil)
       if index
         UIApplication.sharedApplication.windows[index]
       else
-        UIApplication.sharedApplication.keyWindow
+        (
+          UIApplication.sharedApplication.keyWindow ||
+          UIApplication.sharedApplication.windows[0]
+        )
       end
     end
 
@@ -16,7 +18,7 @@ module SugarCube
 
     def adjust_init(view)
       if view.is_a?(UIView)
-        @sugarcube_restore = {
+        @restore = {
           frame: SugarCube::Repl.frame,
           shadow: SugarCube::Repl.shadow,
         }
@@ -39,19 +41,19 @@ module SugarCube
             if key == :color and [Symbol, Fixnum, NSString, UIImage, UIColor].any?{|klass| value.is_a? klass}
               value = value.uicolor.CGColor
             end
-            @sugarcube_view.layer.send(msg, value)
-            @sugarcube_view.layer.masksToBounds = false
-            @sugarcube_view.layer.shouldRasterize = true
+            @adjust_item.layer.send(msg, value)
+            @adjust_item.layer.masksToBounds = false
+            @adjust_item.layer.shouldRasterize = true
           end
         }
-        @sugarcube_view
+        @adjust_item
       else
         {
-          opacity: @sugarcube_view.layer.shadowOpacity,
-          radius: @sugarcube_view.layer.shadowRadius,
-          offset: @sugarcube_view.layer.shadowOffset,
-          color: @sugarcube_view.layer.shadowColor,
-          path: @sugarcube_view.layer.shadowPath,
+          opacity: @adjust_item.layer.shadowOpacity,
+          radius: @adjust_item.layer.shadowRadius,
+          offset: @adjust_item.layer.shadowOffset,
+          color: @adjust_item.layer.shadowColor,
+          path: @adjust_item.layer.shadowPath,
         }
       end
     end
@@ -60,15 +62,15 @@ module SugarCube
     def blink(color=nil)
       return unless check_sugarcube_view
 
-      blinking_view = UIView.alloc.initWithFrame([[0,0], @sugarcube_view.frame.size])
+      blinking_view = UIView.alloc.initWithFrame([[0,0], @adjust_item.frame.size])
       color = color.uicolor if color.respond_to?(:uicolor)
       blinking_view.backgroundColor = color
       blinking_view.alpha = 0
-      if @sugarcube_view.window
-        blinking_view.frame = @sugarcube_view.convertRect([[0, 0], @sugarcube_view.frame.size], toView: @sugarcube_view.window)
-        @sugarcube_view.window.addSubview(blinking_view)
+      if @adjust_item.window
+        blinking_view.frame = @adjust_item.convertRect([[0, 0], @adjust_item.frame.size], toView: @adjust_item.window)
+        @adjust_item.window.addSubview(blinking_view)
       else
-        @sugarcube_view.addSubview(blinking_view)
+        @adjust_item.addSubview(blinking_view)
       end
 
       duration = 0.2
@@ -83,19 +85,14 @@ module SugarCube
       end)
     end
 
-    def get_tree_selector(item)
-      if item.is_a? UIView
-        return :subviews
-      elsif item.is_a? UIViewController
-        return -> (ctlr) do
-          ret = Array.new ctlr.childViewControllers
-          if ctlr.presentedViewController && ctlr.presentedViewController.presentingViewController == ctlr
-            ret << ctlr.presentedViewController
-          end
-          ret
+    def register_platform_tree_selectors
+      register_tree_selector(UIView, :subviews)
+      register_tree_selector(UIViewController) do |ctlr|
+        ret = Array.new ctlr.childViewControllers
+        if ctlr.presentedViewController && ctlr.presentedViewController.presentingViewController == ctlr
+          ret << ctlr.presentedViewController
         end
-      else
-        nil
+        ret
       end
     end
 

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

@@ -1,6 +1,5 @@
 module SugarCube
-  module Repl
-    module_function
+  class << Repl
 
     def window(index=nil)
       if index
@@ -20,7 +19,7 @@ module SugarCube
 
     def adjust_init(view)
       if view.is_a?(NSView)
-        @sugarcube_restore = {
+        @restore = {
           frame: SugarCube::Repl.frame,
         }
       end
@@ -29,15 +28,15 @@ module SugarCube
     def blink(color=nil)
       return unless check_sugarcube_view
 
-      blinking_view = NSView.alloc.initWithFrame([[0,0], @sugarcube_view.frame.size])
+      blinking_view = NSView.alloc.initWithFrame([[0,0], @adjust_item.frame.size])
       color = color.nscolor if color.respond_to?(:nscolor)
       blinking_view.backgroundColor = color
       blinking_view.alpha = 0
-      if @sugarcube_view.window
-        blinking_view.frame = @sugarcube_view.convertRect([[0, 0], @sugarcube_view.frame.size], toView: @sugarcube_view.window)
-        @sugarcube_view.window.addSubview(blinking_view)
+      if @adjust_item.window
+        blinking_view.frame = @adjust_item.convertRect([[0, 0], @adjust_item.frame.size], toView: @adjust_item.window)
+        @adjust_item.window.addSubview(blinking_view)
       else
-        @sugarcube_view.addSubview(blinking_view)
+        @adjust_item.addSubview(blinking_view)
       end
 
       duration = 0.2
@@ -64,23 +63,13 @@ module SugarCube
       end)
     end
 
-    def get_tree_selector(item)
-      if item.is_a? NSView
-        return :subviews
-      elsif item.is_a? NSWindow
-        item = item.contentView
-        return :subviews
-      elsif item.is_a? NSWindowController
-        return -> (ctlr) { [ctlr.window] }
-      elsif item.is_a? NSViewController
-        return -> (ctlr) { [ctlr.view] }
-      elsif item.is_a? NSMenu
-        return :itemArray
-      elsif item.is_a? NSMenuItem
-        return -> (menu_item) { [menu_item.menu] }
-      else
-        nil
-      end
+    def register_platform_tree_selectors
+      register_tree_selector(NSView, :subviews)
+      register_tree_selector(NSWindow) { |window| window.contentView.subviews }
+      register_tree_selector(NSWindowController) { |ctlr| [ctlr.window] }
+      register_tree_selector(NSViewController) { |ctlr| [ctlr.view] }
+      register_tree_selector(NSMenu, :itemArray)
+      register_tree_selector(NSMenuItem) { |menu_item| [menu_item.menu] }
     end
 
     def draw_tree_item(item)

data/lib/sugarcube-568.rb

@@ -6,13 +6,6 @@ end
 require 'sugarcube'
 SugarCube.ios_only!('568')
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), 'ios/sugarcube-568/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-568')
 end

data/lib/sugarcube-animations.rb

@@ -5,16 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-animations/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-animations/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-animations')
 end

data/lib/sugarcube-anonymous.rb

@@ -5,13 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-anonymous/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-anonymous')
 end

data/lib/sugarcube-appkit.rb

@@ -6,16 +6,7 @@ end
 require 'sugarcube'
 SugarCube.osx_only!('appkit')
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), 'osx/sugarcube-appkit/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-cocoakit/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-cocoakit')
+  SugarCube.add_app_files(app, 'sugarcube-appkit')
 end

data/lib/sugarcube-attributedstring.rb

@@ -4,17 +4,8 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('attributedstring')
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-attributedstring/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-attributedstring/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-attributedstring')
 end

data/lib/sugarcube-awesome.rb

@@ -5,13 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-awesome/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-awesome')
 end

data/lib/sugarcube-color.rb

@@ -5,13 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-color/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-color')
 end

data/lib/sugarcube-constants.rb

@@ -5,13 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-constants/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-constants')
 end

data/lib/sugarcube-coregraphics.rb

@@ -4,14 +4,8 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('coregraphics')
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-coregraphics/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-coregraphics')
 end

data/lib/sugarcube-corelocation.rb

@@ -4,16 +4,13 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('corelocation')
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-corelocation')
+end
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-corelocation/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
 
-  app.frameworks << 'CoreLocation'
+Motion::Project::App.post_setup do |app|
+  app.frameworks += %w{CoreLocation}
 end

data/lib/sugarcube-events.rb

@@ -5,13 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-events/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-events')
 end

data/lib/sugarcube-factories.rb

@@ -5,13 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-factories/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-factories')
 end

data/lib/sugarcube-files.rb

@@ -5,13 +5,6 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-files/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-files')
 end

data/lib/sugarcube-foundation.rb

@@ -4,14 +4,8 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('foundation')
 
-Motion::Project::App.setup do |app|
-  # scans app.files until it finds app/ (the default)
-  # if found, it inserts just before those files, otherwise it will insert to
-  # the end of the list
-  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-foundation/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-foundation')
 end