ProMotion 0.5.2 → 0.6.0

data/Rakefile

@@ -3,20 +3,15 @@ require 'motion/project'
 require 'bundler/gem_tasks'
 Bundler.setup
 Bundler.require
-# require 'motion-table'
 
 Motion::Project::App.setup do |app|
-  # Use `rake config' to see complete project settings.
   app.name = 'ProMotionTest'
-  app.version = "0.3.0"
-
+  app.version = "0.99.0" # I've got 99 problems and the test app's version isn't one of them
+  app.redgreen_style = :focused # :focused, :full
 
   # Devices
-  app.deployment_target = "5.0"
-  app.device_family = [:iphone, :ipad]
+  app.deployment_target = "6.0"
+  app.device_family = [:ipad] # so we can test split screen capability
 
   app.detect_dependencies = true
-
-  # Preload screens
-  # app.files = Dir.glob(File.join(app.project_dir, 'lib/**/*.rb')) | app.files
 end

data/app/app_delegate.rb

@@ -1,2 +1,5 @@
 class AppDelegate
+  def on_load(app, options)
+    open BasicScreen
+  end
 end

data/app/screens/basic_screen.rb

@@ -0,0 +1,27 @@
+class BasicScreen < PM::Screen
+  title "Basic"
+
+  def on_init
+    # Fires right after the screen is initialized
+  end
+
+  def on_load
+    # Fires just before a screen is opened for the first time.
+  end
+  
+  def will_appear
+    # Fires every time the screen will appear
+  end
+
+  def on_appear
+    # Fires just after the screen appears somewhere (after animations are complete)
+  end
+
+  def will_disappear
+    # Fires just before the screen will disappear
+  end
+
+  def on_disappear
+    # Fires after the screen is fully hidden
+  end
+end

data/lib/ProMotion.rb

@@ -5,10 +5,8 @@ end
 require "ProMotion/version"
 
 Motion::Project::App.setup do |app|
-  # app_delegate = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/app_delegate.rb'))
-  # app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')) | app_delegate | app.files
-
   original_files = app.files
-  app.files = FileList[File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')].exclude(File.join(File.dirname(__FILE__), 'ProMotion/app_delegate.rb'))
-  app.files = app.files | Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/app_delegate.rb')) | original_files
+  delegate = File.join(File.dirname(__FILE__), 'ProMotion/delegate.rb')
+  promotion_files = FileList[File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')].exclude(delegate).to_a
+  app.files = (promotion_files << delegate) + original_files
 end

data/lib/ProMotion/cocoatouch/SplitViewController.rb

@@ -0,0 +1,25 @@
+class SplitViewController < UISplitViewController
+  def master_screen
+    s = self.viewControllers.first
+    s.respond_to?(:visibleViewController) ? s.visibleViewController : s
+  end
+  def detail_screen
+    s = self.viewControllers.last
+    s.respond_to?(:visibleViewController) ? s.visibleViewController : s
+  end
+  def master_screen=(s)
+    self.viewControllers = [s.main_controller, self.viewControllers.last]
+  end
+  def detail_screen=(s)
+    # set the button from the old detail screen to the new one
+    button = detail_screen.navigationItem.leftBarButtonItem
+    s.navigationItem.leftBarButtonItem = button
+    
+    vc = s.respond_to?(:main_controller) ? s.main_controller : s
+
+    self.viewControllers = [self.viewControllers.first, vc]
+  end
+  def screens=(s_array)
+    self.viewControllers = s_array
+  end
+end

data/lib/ProMotion/cocoatouch/TableViewController.rb

@@ -20,15 +20,15 @@ module ProMotion
       super
       self.view_did_appear(animated) if self.respond_to?("view_did_appear:")
     end
-    
+
     def viewWillDisappear(animated)
       self.view_will_disappear(animated) if self.respond_to?("view_will_disappear:")
-      super      
+      super
     end
-    
+
     def viewDidDisappear(animated)
       self.view_did_disappear(animated) if self.respond_to?("view_did_disappear:")
-      super      
+      super
     end
 
     def shouldAutorotateToInterfaceOrientation(orientation)
@@ -42,7 +42,7 @@ module ProMotion
     def willRotateToInterfaceOrientation(orientation, duration:duration)
       self.will_rotate(orientation, duration)
     end
-    
+
     def didRotateFromInterfaceOrientation(orientation)
       self.on_rotate
     end

data/lib/ProMotion/cocoatouch/ViewController.rb

@@ -20,17 +20,17 @@ module ProMotion
       super
       self.view_did_appear(animated) if self.respond_to?("view_did_appear:")
     end
-    
+
     def viewWillDisappear(animated)
       self.view_will_disappear(animated) if self.respond_to?("view_will_disappear:")
-      super      
+      super
     end
-    
+
     def viewDidDisappear(animated)
       if self.respond_to?("view_did_disappear:")
         self.view_did_disappear(animated)
       end
-      super      
+      super
     end
 
     def shouldAutorotateToInterfaceOrientation(orientation)
@@ -44,7 +44,7 @@ module ProMotion
     def willRotateToInterfaceOrientation(orientation, duration:duration)
       self.will_rotate(orientation, duration)
     end
-    
+
     def didRotateFromInterfaceOrientation(orientation)
       self.on_rotate
     end

data/lib/ProMotion/{app_delegate.rb → delegate.rb}

@@ -1,20 +1,19 @@
 module ProMotion
-  class AppDelegateParent
+  class Delegate
     include ProMotion::ScreenTabs
+    include ProMotion::SplitScreen if NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].include?("2") # Only with iPad
     attr_accessor :window
-    
-    def application(application, didFinishLaunchingWithOptions:launch_options)
-      return true if RUBYMOTION_ENV == "test"
 
-      Console.log(" Your AppDelegate (usually in app_delegate.rb) needs an on_load(options) method.", with_color: Console::RED_COLOR) unless self.respond_to?("on_load:")
+    def application(application, didFinishLaunchingWithOptions:launch_options)
+      unless self.respond_to?(:on_load)
+        PM.logger.error "Your AppDelegate (usually in app_delegate.rb) needs an on_load(application, options) method."
+      end
 
       on_load(application, launch_options)
 
-      open_home_screen if has_home_screen
-
       true
     end
-    
+
     def app_delegate
       UIApplication.sharedApplication.delegate
     end
@@ -23,35 +22,35 @@ module ProMotion
       self.app_delegate.window
     end
 
+    def home(screen)
+      screen = screen.new if screen.respond_to?(:new)
+      @home_screen = screen
+    end
+
     def load_root_screen(new_screen)
       new_screen = new_screen.main_controller if new_screen.respond_to?(:main_controller)
 
-      self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+      self.window ||= self.ui_window.alloc.initWithFrame(UIScreen.mainScreen.bounds)
       self.window.rootViewController = new_screen
       self.window.makeKeyAndVisible
     end
-
-    def open_screen(screen)
-      home(screen)
-    end
-    alias :open :open_screen
-
-    def home(screen)
-      screen = screen.new if screen.respond_to?(:new)
-      @home_screen = screen
+    
+    def ui_window
+      (defined?(Motion) && defined?(Motion::Xray) && defined?(Motion::Xray::XrayWindow)) ? Motion::Xray::XrayWindow : UIWindow
     end
 
-    def open_root_screen(new_screen)
-      home(new_screen)
+    def open_screen(screen, args={})
+      home(screen)
       open_home_screen
     end
-    alias :fresh_start :open_root_screen
+    alias :open :open_screen
+    alias :open_root_screen :open_screen
 
     def open_home_screen
       get_home_screen.send(:on_load) if get_home_screen.respond_to?(:on_load)
       load_root_screen get_home_screen
     end
-    
+
     def get_home_screen
       @home_screen
     end
@@ -60,4 +59,5 @@ module ProMotion
       @home_screen.nil? == false
     end
   end
-end
+  class AppDelegateParent < Delegate; end # For backwards compatibility
+end

data/lib/ProMotion/helpers/console.rb

@@ -3,23 +3,25 @@ module ProMotion
     NAME = "RubyMotion::Console: "
     DEFAULT_COLOR = [ '', '' ]
     RED_COLOR = [ "\e[0;31m", "\e[0m" ] # Must be in double quotes
-    GREEN_COLOR = [ "\e[0;32m", "\e[0m" ] 
-    PURPLE_COLOR = [ "\e[0;35m", "\e[0m" ] 
+    GREEN_COLOR = [ "\e[0;32m", "\e[0m" ]
+    PURPLE_COLOR = [ "\e[0;35m", "\e[0m" ]
 
     class << self
       def log(log, with_color:color)
         return if RUBYMOTION_ENV == "test"
+        PM.logger.deprecated "ProMotion::Console.log is deprecated. Use PM.logger (see README)"
         puts color[0] + NAME + log + color[1]
       end
-      
+
       def log(log, withColor:color)
         return if RUBYMOTION_ENV == "test"
-        warn "[DEPRECATION] `log(log, withColor:color)` is deprecated. Use `log(log, with_color:color)`"
+        PM.logger.deprecated "ProMotion::Console.log is deprecated. Use PM.logger (see README)"
         self.log(log, with_color:color)
       end
 
       def log(log)
         return if RUBYMOTION_ENV == "test"
+        PM.logger.deprecated "ProMotion::Console.log is deprecated. Use PM.logger (see README)"
         log(log, with_color: DEFAULT_COLOR)
       end
     end

data/lib/ProMotion/helpers/logger.rb

@@ -0,0 +1,73 @@
+module ProMotion
+  class Logger
+    attr_accessor :level
+    
+    NAME = "ProMotion::Logger: "
+    
+    COLORS = {
+      default:    [ '', '' ],
+      red:        [ "\e[0;31m", "\e[0m" ],
+      green:      [ "\e[0;32m", "\e[0m" ],
+      yellow:     [ "\e[0;33m", "\e[0m" ],
+      blue:       [ "\e[0;34m", "\e[0m" ],
+      purple:     [ "\e[0;35m", "\e[0m" ],
+      cyan:       [ "\e[0;36m", "\e[0m" ]
+    }
+    
+    LEVELS = {
+      off:        [],
+      error:      [:error],
+      warn:       [:error, :warn],
+      info:       [:error, :warn, :info],
+      verbose:    [:error, :warn, :info, :debug, :verbose],
+      debug:      [:error, :warn, :info, :debug, :verbose]
+    }
+    
+    def level
+      @level ||= :debug
+    end
+    
+    def levels
+      LEVELS[self.level] || []
+    end
+    
+    # Usage: PM.logger.log("ERROR", "message here", :red)
+    def log(label, message_text, color) 
+      return if RUBYMOTION_ENV == "test"
+      color = COLORS[color] || COLORS[:default]
+      puts color[0] + NAME + "[#{label}] #{message_text}" + color[1]
+    end
+
+    def error(message)
+      self.log('ERROR', message, :red) if self.levels.include?(:error)
+    end 
+
+    def deprecated(message)
+      self.log('DEPRECATED', message, :yellow) if self.levels.include?(:warn)
+    end 
+
+    def warn(message) 
+      self.log('WARN', message, :yellow) if self.levels.include?(:warn)
+    end
+    
+    def debug(message) 
+      self.log('DEBUG', message, :purple) if self.levels.include?(:debug)
+    end 
+
+    def info(message) 
+      self.log('INFO', message, :green) if self.levels.include?(:info)
+    end
+
+  end
+  
+  module_function
+
+  def logger
+    @logger ||= Logger.new
+  end
+
+  def logger=(log)
+    @logger = log
+  end
+
+end

data/lib/ProMotion/helpers/view_helper.rb

@@ -1,26 +1,57 @@
 module ProMotion
   module ViewHelper
     def set_attributes(element, args = {})
-      args.each do |k, v|
-        if v.is_a? Hash
-          # TODO: Do this recursively
-          v.each do |k2, v2|
-            sub_element = element.send("#{k}")
-            sub_element.send("#{k2}=", v2) if sub_element.respond_to?("#{k2}=")
-          end
-        elsif v.is_a? Array
-          element.send("#{k}", *v) if element.respond_to?("#{k}")
-        else
-          element.send("#{k}=", v) if element.respond_to?("#{k}=")
+      args.each { |k, v| set_attribute(element, k, v) }
+      element
+    end
+
+    def set_attribute(element, k, v)
+      if v.is_a?(Hash) && element.respond_to?(k)
+        sub_element = element.send(k)
+        set_attributes sub_element, v
+      elsif v.is_a?(Array) && element.respond_to?("#{k}")
+        element.send("#{k}", *v)
+      elsif element.respond_to?("#{k}=")
+        element.send("#{k}=", v)
+      else
+        # Doesn't respond. Check if snake case.
+        if k.to_s.include?("_")
+          set_attribute(element, objective_c_method_name(k), v)
         end
       end
       element
     end
 
+    def objective_c_method_name(meth)
+      meth.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
+    end
+
+    def set_easy_attributes(parent, element, args={})
+      attributes = {}
+
+      if args[:resize]
+        attributes[:autoresizingMask]  = UIViewAutoresizingNone
+        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleLeftMargin   if args[:resize].include?(:left)
+        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleRightMargin  if args[:resize].include?(:right)
+        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleTopMargin    if args[:resize].include?(:top)
+        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleBottomMargin if args[:resize].include?(:bottom)
+        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleWidth        if args[:resize].include?(:width)
+        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleHeight       if args[:resize].include?(:height)
+      end
+
+      if [:left, :top, :width, :height].select{ |a| args[a] && args[a] != :auto }.length == 4
+        attributes[:frame] = CGRectMake(args[:left], args[:top], args[:width], args[:height])
+      end
+
+      set_attributes element, attributes
+      element
+    end
+
     def frame_from_array(array)
+      PM.logger.deprecated "`frame_from_array` is deprecated and will be removed. Use RubyMotion's built-in [[x, y], [width, height]]."
       return CGRectMake(array[0], array[1], array[2], array[3]) if array.length == 4
-      Console.log(" - frame_from_array expects an array with four elements: [x, y, width, height]", with_color: Console::RED_COLOR)
-      CGRectZero
+      PM.logger.error "frame_from_array expects an array with four elements: [x, y, width, height]"
+      CGRectZero.dup
     end
 
     def content_height(view)
@@ -35,5 +66,6 @@ module ProMotion
       end
       height
     end
+
   end
 end

data/lib/ProMotion/screen_helpers/_tables/_refreshable_table.rb

@@ -0,0 +1,42 @@
+module ProMotion::MotionTable
+  module RefreshableTable
+    def make_refreshable(params={})
+      pull_message = params[:pull_message] || "Pull to refresh"
+      @refreshing = params[:refreshing] || "Refreshing data..."
+      @updated_format = params[:updated_format] || "Last updated at %s"
+      @updated_time_format = params[:updated_time_format] || "%l:%M %p"
+      @refreshable_callback = params[:callback]|| :on_refresh
+
+      @refresh_control = UIRefreshControl.alloc.init
+      @refresh_control.attributedTitle = NSAttributedString.alloc.initWithString(pull_message)
+      @refresh_control.addTarget(self, action:'refreshView:', forControlEvents:UIControlEventValueChanged)
+      self.refreshControl = @refresh_control
+    end
+    alias :makeRefreshable :make_refreshable
+
+    ######### iOS methods, headless camel case #######
+
+    # UIRefreshControl Delegates
+    def refreshView(refresh)
+      refresh.attributedTitle = NSAttributedString.alloc.initWithString(@refreshing)
+      if @refreshable_callback && self.respond_to?(@refreshable_callback)
+        self.send(@refreshable_callback)
+      else
+        PM.logger.warn "You must implement the '#{@refreshable_callback}' method in your TableScreen."
+      end
+    end
+
+    def start_refreshing
+      return unless @refresh_control
+
+      @refresh_control.beginRefreshing
+    end
+
+    def end_refreshing
+      return unless @refresh_control
+
+      @refresh_control.attributedTitle = NSAttributedString.alloc.initWithString(sprintf(@updated_format, Time.now.strftime(@updated_time_format)))
+      @refresh_control.endRefreshing
+    end
+  end
+end