ProMotion 0.6.5 → 0.7.0

data/Rakefile

@@ -19,3 +19,33 @@ Motion::Project::App.setup do |app|
 
   app.detect_dependencies = true
 end
+
+def all_files
+  App.config.spec_files
+end
+
+def functional_files
+  Dir.glob('./spec/functional/*.rb')
+end
+
+def unit_files
+  Dir.glob('./spec/unit/*.rb')
+end
+
+namespace :spec do
+  task :unit do
+    App.config.spec_mode = true
+    spec_files = all_files
+    spec_files -= functional_files
+    App.config.instance_variable_set("@spec_files", spec_files)
+    Rake::Task["simulator"].invoke
+  end
+
+  task :functional do
+    App.config.spec_mode = true
+    spec_files = all_files
+    spec_files -= unit_files
+    App.config.instance_variable_set("@spec_files", spec_files)
+    Rake::Task["simulator"].invoke
+  end
+end

data/app/app_delegate.rb

@@ -1,5 +1,7 @@
 class AppDelegate
+  
   def on_load(app, options)
-    open BasicScreen
+    open BasicScreen.new(nav_bar: true)
   end
+  
 end

data/lib/ProMotion.rb

@@ -6,7 +6,7 @@ require "ProMotion/version"
 
 Motion::Project::App.setup do |app|
   original_files = app.files
-  delegate = File.join(File.dirname(__FILE__), 'ProMotion/delegate.rb')
+  delegate = File.join(File.dirname(__FILE__), 'ProMotion/delegate/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/TableViewCell.rb

@@ -1,7 +1,10 @@
 module ProMotion
   class TableViewCell < UITableViewCell
+    include TableViewCellModule
+
     attr_accessor :image_size
 
+    # TODO: Is this necessary?
     def layoutSubviews
       super
 
@@ -12,5 +15,6 @@ module ProMotion
         self.imageView.frame = CGRectInset(f, size_inset_x, size_inset_y)
       end
     end
+
   end
-end
+end

data/lib/ProMotion/delegate/delegate.rb

@@ -0,0 +1,16 @@
+module ProMotion
+  class Delegate
+
+    include ProMotion::ScreenTabs
+    include ProMotion::SplitScreen if NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].include?("2") # Only with iPad
+    include DelegateHelper
+    include DelegateNotifications
+
+  end
+
+  class AppDelegateParent < Delegate
+    def self.inherited(klass)
+      PM.logger.deprecated "PM::AppDelegateParent is deprecated. Use PM::Delegate."
+    end
+  end
+end

data/lib/ProMotion/delegate/delegate_helper.rb

@@ -0,0 +1,88 @@
+module ProMotion
+  module DelegateHelper
+
+    attr_accessor :window, :aps_notification, :home_screen
+
+    def application(application, didFinishLaunchingWithOptions:launch_options)
+      
+      apply_status_bar
+      
+      on_load application, launch_options
+
+      check_for_push_notification launch_options
+      
+      true
+      
+    end
+    
+    def applicationWillTerminate(application)
+      
+      on_unload if respond_to?(:on_unload)
+      
+    end
+
+    def app_delegate
+      self
+    end
+
+    def app_window
+      self.window
+    end
+
+    def ui_window
+      (defined?(Motion) && defined?(Motion::Xray) && defined?(Motion::Xray::XrayWindow)) ? Motion::Xray::XrayWindow : UIWindow
+    end
+
+    def open_screen(screen, args={})
+
+      screen = screen.new if screen.respond_to?(:new)
+      screen.send(:on_load) if screen.respond_to?(:on_load)
+
+      self.home_screen = screen
+
+      self.window ||= self.ui_window.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+      self.window.rootViewController = screen.pm_main_controller
+      self.window.makeKeyAndVisible
+
+    end
+    alias :open :open_screen
+    alias :open_root_screen :open_screen
+    alias :home :open_screen
+
+    def apply_status_bar
+      self.class.send(:apply_status_bar)
+    end
+
+    def status_bar?
+      UIApplication.sharedApplication.statusBarHidden
+    end
+
+    module ClassMethods
+
+      def status_bar(visible = true, opts={})
+        @status_bar_visible = visible
+        @status_bar_opts = opts
+      end
+
+      def apply_status_bar
+        @status_bar_visible ||= true
+        @status_bar_opts ||= { animation: :none }
+        UIApplication.sharedApplication.setStatusBarHidden(!@status_bar_visible, withAnimation:status_bar_animation(@status_bar_opts[:animation]))
+      end
+
+      def status_bar_animation(opt)
+        {
+          fade: UIStatusBarAnimationFade,
+          slide: UIStatusBarAnimationSlide,
+          none: UIStatusBarAnimationNone
+        }[opt] || UIStatusBarAnimationNone
+      end
+
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+  end
+end

data/lib/ProMotion/delegate/delegate_notifications.rb

@@ -0,0 +1,61 @@
+module ProMotion
+  module DelegateNotifications
+
+    attr_accessor :aps_notification
+
+    def check_for_push_notification(options)
+      if options && options[UIApplicationLaunchOptionsRemoteNotificationKey]
+        received_push_notification options[UIApplicationLaunchOptionsRemoteNotificationKey]
+      end
+    end
+
+    def register_for_push_notifications(*notification_types)
+      notification_types = Array.new(notification_types)
+      notification_types = [ :badge, :sound, :alert, :newsstand ] if notification_types.include?(:all)
+
+      types = UIRemoteNotificationTypeNone
+      types = types | UIRemoteNotificationTypeBadge if notification_types.include?(:badge)
+      types = types | UIRemoteNotificationTypeSound if notification_types.include?(:sound)
+      types = types | UIRemoteNotificationTypeAlert if notification_types.include?(:alert)
+      types = types | UIRemoteNotificationTypeNewsstandContentAvailability if notification_types.include?(:newsstand)
+
+      UIApplication.sharedApplication.registerForRemoteNotificationTypes types
+    end
+
+    def unregister_for_push_notifications
+      UIApplication.sharedApplication.unregisterForRemoteNotifications
+    end
+
+    def registered_push_notifications
+      mask = UIApplication.sharedApplication.enabledRemoteNotificationTypes
+      types = []
+
+      types << :badge     if mask & UIRemoteNotificationTypeBadge
+      types << :sound     if mask & UIRemoteNotificationTypeSound
+      types << :alert     if mask & UIRemoteNotificationTypeAlert
+      types << :newsstand if mask & UIRemoteNotificationTypeNewsstandContentAvailability
+
+      types
+    end
+
+    def received_push_notification(notification)
+      @aps_notification = PM::PushNotification.new(notification)
+      on_push_notification(@aps_notification) if respond_to?(:on_push_notification)
+    end
+
+    # CocoaTouch
+
+    def application(application, didRegisterForRemoteNotificationsWithDeviceToken:device_token)
+      on_push_registration(device_token, nil) if respond_to?(:on_push_registration)
+    end
+
+    def application(application, didFailToRegisterForRemoteNotificationsWithError:error)
+      on_push_registration(nil, error) if respond_to?(:on_push_registration)
+    end
+
+    def application(application, didReceiveRemoteNotification:notification)
+      received_push_notification(notification)
+    end
+
+  end
+end

data/lib/ProMotion/helpers/console.rb

@@ -8,19 +8,19 @@ module ProMotion
 
     class << self
       def log(log, with_color:color)
-        return if RUBYMOTION_ENV == "test"
+        return if defined?(RUBYMOTION_ENV) && 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"
+        return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
         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"
+        return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
         PM.logger.deprecated "ProMotion::Console.log is deprecated. Use PM.logger (see README)"
         log(log, with_color: DEFAULT_COLOR)
       end

data/lib/ProMotion/helpers/logger.rb

@@ -1,9 +1,9 @@
 module ProMotion
   class Logger
     attr_accessor :level
-    
+
     NAME = "ProMotion::Logger: "
-    
+
     COLORS = {
       default:    [ '', '' ],
       red:        [ "\e[0;31m", "\e[0m" ],
@@ -13,7 +13,7 @@ module ProMotion
       purple:     [ "\e[0;35m", "\e[0m" ],
       cyan:       [ "\e[0;36m", "\e[0m" ]
     }
-    
+
     LEVELS = {
       off:        [],
       error:      [:error],
@@ -22,17 +22,17 @@ module ProMotion
       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) 
+    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]
@@ -40,26 +40,26 @@ module ProMotion
 
     def error(message)
       self.log('ERROR', message, :red) if self.levels.include?(:error)
-    end 
+    end
 
     def deprecated(message)
       self.log('DEPRECATED', message, :yellow) if self.levels.include?(:warn)
-    end 
+    end
 
-    def warn(message) 
+    def warn(message)
       self.log('WARN', message, :yellow) if self.levels.include?(:warn)
     end
-    
-    def debug(message) 
+
+    def debug(message)
       self.log('DEBUG', message, :purple) if self.levels.include?(:debug)
-    end 
+    end
 
-    def info(message) 
+    def info(message)
       self.log('INFO', message, :green) if self.levels.include?(:info)
     end
 
   end
-  
+
   module_function
 
   def logger

data/lib/ProMotion/helpers/view_helper.rb

@@ -6,13 +6,15 @@ module ProMotion
     end
 
     def set_attribute(element, k, v)
+      return element unless element
+
       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)
+        set_attributes(sub_element, v) if sub_element
       elsif element.respond_to?("#{k}=")
         element.send("#{k}=", v)
+      elsif v.is_a?(Array) && element.respond_to?("#{k}") && element.method("#{k}").arity == v.length
+        element.send("#{k}", *v)
       else
         # Doesn't respond. Check if snake case.
         if k.to_s.include?("_")
@@ -48,7 +50,7 @@ module ProMotion
     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]]."
+      PM.logger.deprecated "`frame_from_array` is deprecated and will be removed. Use RubyMotion's built-in [[x, y], [width, height]] or CGRectMake(x, y, w, h)."
       return CGRectMake(array[0], array[1], array[2], array[3]) if array.length == 4
       PM.logger.error "frame_from_array expects an array with four elements: [x, y, width, height]"
       CGRectZero.dup
@@ -68,4 +70,4 @@ module ProMotion
     end
 
   end
-end
+end

data/lib/ProMotion/push_notifications/push_notification.rb

@@ -0,0 +1,51 @@
+module ProMotion
+  class PushNotification
+
+    attr_accessor :notification
+
+    def initialize(n)
+      self.notification = n
+    end
+
+    def to_s
+      self.notification.inspect
+    end
+
+    def to_json
+      PM.logger.warn "PM::PushNotification.to_json not implemented yet."
+    end
+
+    def aps
+      self.notification["aps"]
+    end
+
+    def alert
+      aps["alert"] if aps
+    end
+
+    def badge
+      aps["badge"] if aps
+    end
+
+    def sound
+      aps["sound"] if aps
+    end
+
+    # For testing from the REPL
+    # > PM::PushNotification.simulate alert: "My test message", badge: 4
+    def self.simulate(args = {})
+      UIApplication.sharedApplication.delegate.on_push_notification self.fake_notification(args)
+    end
+
+    def self.fake_notification(args = {})
+      self.new({
+        "aps" => {
+          "alert" => args[:alert] || "Test Push Notification",
+          "badge" => args[:badge] || 2,
+          "sound" => args[:sound] || "default"
+        }
+      })
+    end
+
+  end
+end

data/lib/ProMotion/screen_helpers/screen_elements.rb

@@ -14,13 +14,13 @@ module ProMotion
     end
     alias :remove_element :remove
     alias :remove_view :remove
-    
+
     def add_to(parent_element, element, attrs = {})
+      parent_element.addSubview element
       if attrs && attrs.length > 0
         set_attributes(element, attrs)
         set_easy_attributes(parent_element, element, attrs)
       end
-      parent_element.addSubview element
       element
     end