ProMotion 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78d4da42d437262fe73051ce835ad8753426509b
-  data.tar.gz: eddb27a4dea01d3e8bca74b058516d7440a31f05
+  metadata.gz: dbb79124827dba0dbba2f548f6248c0773fbc7eb
+  data.tar.gz: 1f094cabe4fd3ad811e8dff4e282cf1c6579ee05
 SHA512:
-  metadata.gz: db287d8260bf8fd89f2a2652e381ef11731694c81bec03cb0b0478286f5dbc70d22c919378e25679fe6bd4c180e77c826d22c6371a501c9817c5787d86900945
-  data.tar.gz: d5a780fa6df0bd7daab53f072d6f063f4fffd3f1eb1f0dc4a00e3f546b0b5827dd625a9fa851e1d2a36ad89f1949197cd22aa984484001e9d7e9ddac8b9296a9
+  metadata.gz: 93e97236dc4b5f98582a976acfba276d5b1811e7d3a8e955f4ec799d0110d22bafa5c42caea1d7d4f205d9825590f1cb21611cb6fe7b97e68f04b30f6bb7f305
+  data.tar.gz: 7f51de66669f39a469f99a8c31aa2d540ba17ffcd792265b576a764fde5d769aa5c1b68af43ecc87869404342f31c58e625f3255f6ec4554f8c8340307f684cf

data/README.md

@@ -69,16 +69,16 @@ end
 
 |Screens|Navigation Bars|Tab Bars|
 |---|---|---|
-|[![ProMotion Screen](https://f.cloud.github.com/assets/1479215/1534021/060aaaac-4c8f-11e3-903c-743e54252222.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20Screen/)|[![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/1534077/db39aab6-4c8f-11e3-83f7-e03d52ac615d.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20Screen/#set_nav_bar_buttonside-args)|[![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/1534115/9f4c4cd8-4c90-11e3-9285-96ac253facda.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20Tabs/)|
+|[![ProMotion Screen](https://f.cloud.github.com/assets/1479215/1534021/060aaaac-4c8f-11e3-903c-743e54252222.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20Screen/)|[![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/1534077/db39aab6-4c8f-11e3-83f7-e03d52ac615d.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20Screen/#set_nav_bar_buttonside-args)|[![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/1534115/9f4c4cd8-4c90-11e3-9285-96ac253facda.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20Tabs/)|
 
 |Table Screens|Grouped Tables|Searchable|Refreshable|
 |---|---|---|---|
-|[![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20TableScreen/)|[![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)](https://gist.github.com/jamonholmgren/382a6cf9963c5f0b2248)|[![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20TableScreen/#searchableplaceholder-placeholder-text)|[![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20TableScreen/#refreshableoptions)|
+|[![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20TableScreen/)|[![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)](https://gist.github.com/jamonholmgren/382a6cf9963c5f0b2248)|[![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20TableScreen/#searchableplaceholder-placeholder-text)|[![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20TableScreen/#refreshableoptions)|
 
 
 |iPad SplitScreens|Map Screens|Web Screens|
 |---|---|---|
-|[![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20SplitScreen/)|[![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20MapScreen/)|[![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)](http://promotion.readthedocs.org/en/master/API%20Reference%20-%20ProMotion%20WebScreen/)|
+|[![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20SplitScreen/)|[![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20MapScreen/)|[![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20WebScreen/)|
 
 #### ...and much more.
 

data/bin/promotion

@@ -31,7 +31,7 @@ class App
   def self.create(name)
     return puts "Usage: promotion new <appname>" unless name.to_s.length > 0
     info "Creating new ProMotion iOS app #{name}"
-    sh "motion create --template=git://github.com/jamonholmgren/promotion-template.git #{name}"
+    sh "motion create --template=https://github.com/jamonholmgren/promotion-template.git #{name}"
   end
 
   description "Command line for ProMotion."

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -48,7 +48,7 @@ module ProMotion
 
         selected_tab_vc
       else
-        PM.logger.error "Unable to open tab #{tab.to_s} -- not found."
+        mp "Unable to open tab #{tab.to_s} -- not found.", force_color: :red
         nil
       end
     end

data/lib/ProMotion/logger/logger.rb

@@ -38,10 +38,9 @@ module ProMotion
 
     # Usage: PM.logger.log("ERROR", "message here", :red)
     def log(label, message_text, color)
-      # return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
-      color = COLORS[color] || COLORS[:default]
-      $stderr.puts color[0] + NAME + "[#{label}] #{message_text}" + color[1]
-      nil
+      show_deprecation_warning
+
+      mp "#{NAME}[#{label}] #{message_text}", force_color: color
     end
 
     def error(message)
@@ -64,6 +63,10 @@ module ProMotion
       log('INFO', message, :green) if self.levels.include?(:info)
     end
 
+    def show_deprecation_warning
+      mp "PM.logger.log has been deprecated. Please update to motion_print: https://github.com/OTGApps/motion_print", force_color: :yellow
+    end
+
   end
 
   module_function

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -37,7 +37,7 @@ module ProMotion
 
     # TODO: In PM 2.1+, entirely remove this deprecated method.
     def set_nav_bar_left_button(title, args={})
-      PM.logger.deprecated "set_nav_bar_right_button and set_nav_bar_left_button have been removed. Use set_nav_bar_button :right/:left instead."
+      mp "set_nav_bar_right_button and set_nav_bar_left_button have been removed. Use set_nav_bar_button :right/:left instead.", force_color: :yellow
     end
     alias_method :set_nav_bar_right_button, :set_nav_bar_left_button
 
@@ -72,13 +72,13 @@ module ProMotion
     end
 
     def bar_button_item(button_type, args)
-      return PM.logger.deprecated("`system_icon:` no longer supported. Use `system_item:` instead.") if args[:system_icon]
+      return mp("`system_icon:` no longer supported. Use `system_item:` instead.", force_color: :yellow) if args[:system_icon]
       return button_type if button_type.is_a?(UIBarButtonItem)
       return bar_button_item_system_item(args) if args[:system_item]
       return bar_button_item_image(button_type, args) if button_type.is_a?(UIImage)
       return bar_button_item_string(button_type, args) if button_type.is_a?(String)
       return bar_button_item_custom(button_type) if button_type.is_a?(UIView)
-      PM.logger.error("Please supply a title string, a UIImage or :system.") && nil
+      mp("Please supply a title string, a UIImage or :system.", force_color: :red) && nil
     end
 
     def bar_button_item_image(img, args)

data/lib/ProMotion/screen/screen_module.rb

@@ -18,7 +18,7 @@ module ProMotion
       tab_bar_setup
       try :on_init
       try :screen_setup
-      PM.logger.deprecated "In #{self.class.to_s}, #on_create has been deprecated and removed. Use #screen_init instead." if respond_to?(:on_create)
+      mp "In #{self.class.to_s}, #on_create has been deprecated and removed. Use #screen_init instead.", force_color: :yellow if respond_to?(:on_create)
     end
 
     def modal?
@@ -160,7 +160,7 @@ module ProMotion
       when :view then self.navigationItem.titleView = self.class.title
       when :image then self.navigationItem.titleView = UIImageView.alloc.initWithImage(self.class.title)
       else
-        PM.logger.warn("title expects string, UIView, or UIImage, but #{self.class.title.class.to_s} given.")
+        mp("title expects string, UIView, or UIImage, but #{self.class.title.class.to_s} given.", force_color: :yellow)
       end
     end
 
@@ -213,7 +213,7 @@ module ProMotion
     module ClassMethods
       def title(t=nil)
         if t && t.is_a?(String) == false
-          PM.logger.deprecated "You're trying to set the title of #{self.to_s} to an instance of #{t.class.to_s}. In ProMotion 2+, you must use `title_image` or `title_view` instead."
+          mp "You're trying to set the title of #{self.to_s} to an instance of #{t.class.to_s}. In ProMotion 2+, you must use `title_image` or `title_view` instead.", force_color: :yellow
           return raise StandardError
         end
         @title = t if t
@@ -237,7 +237,7 @@ module ProMotion
 
       def status_bar(style=nil, args={})
         if NSBundle.mainBundle.objectForInfoDictionaryKey('UIViewControllerBasedStatusBarAppearance').nil?
-          PM.logger.warn("status_bar will have no effect unless you set 'UIViewControllerBasedStatusBarAppearance' to false in your info.plist")
+          mp "status_bar will have no effect unless you set 'UIViewControllerBasedStatusBarAppearance' to false in your info.plist", force_color: :yellow
         end
         @status_bar_style = style
         @status_bar_animation = args[:animation] if args[:animation]

data/lib/ProMotion/screen/screen_navigation.rb

@@ -47,8 +47,7 @@ module ProMotion
         send_on_return(args)
 
       else
-        PM.logger.warn "Tried to close #{self.to_s}; however, this screen isn't modal or in a nav bar."
-
+        mp "Tried to close #{self.to_s}; however, this screen isn't modal or in a nav bar.", force_color: :yellow
       end
     end
     alias :close :close_screen
@@ -62,13 +61,13 @@ module ProMotion
           self.parent_screen.send(:on_return)
         end
       elsif self.parent_screen.private_methods.include?(:on_return)
-        PM.logger.warn "#{self.parent_screen.inspect} has an `on_return` method, but it is private and not callable from the closing screen."
+        mp "#{self.parent_screen.inspect} has an `on_return` method, but it is private and not callable from the closing screen.", force_color: :yellow
       end
     end
 
     def push_view_controller(vc, nav_controller=nil, animated=true)
       unless self.navigationController
-        PM.logger.error "You need a nav_bar if you are going to push #{vc.to_s} onto it."
+        mp "You need a nav_bar if you are going to push #{vc.to_s} onto it.", force_color: :red
       end
       nav_controller ||= self.navigationController
       return if nav_controller.topViewController == vc
@@ -114,7 +113,7 @@ module ProMotion
 
     def open_in_tab(screen, tab_name)
       vc = open_tab(tab_name)
-      return PM.logger.error("No tab bar item '#{tab_name}'") && nil unless vc
+      return mp("No tab bar item '#{tab_name}'", force_color: :red) && nil unless vc
       if vc.is_a?(UINavigationController)
         push_view_controller(screen, vc)
       else

data/lib/ProMotion/styling/styling.rb

@@ -25,8 +25,10 @@ module ProMotion
       elsif k.to_s.include?("_") # Snake case?
         set_attribute(element, camelize(k), v)
       else # Warn
-        PM.logger.debug "set_attribute: #{element.inspect} does not respond to #{k}=."
-        PM.logger.log("BACKTRACE", caller(0).join("\n"), :default) if PM.logger.level == :verbose
+        mp "set_attribute: #{element.inspect} does not respond to #{k}=.", force_color: :purple
+        # TODO - remove now, or when fully deprecated - there will be no verbose
+        # check when logger is removed
+        mp "BACKTRACE", caller(0).join("\n") if PM.logger.level == :verbose
       end
       element
     end
@@ -118,9 +120,9 @@ module ProMotion
 
     def get_attributes_from_symbol(attrs)
       return attrs if attrs.is_a?(Hash)
-      PM.logger.error "#{attrs} styling method is not defined" unless self.respond_to?(attrs)
+      mp("#{attrs} styling method is not defined", force_color: :red) unless self.respond_to?(attrs)
       new_attrs = send(attrs)
-      PM.logger.error "#{attrs} should return a hash" unless new_attrs.is_a?(Hash)
+      mp("#{attrs} should return a hash", force_color: :red) unless new_attrs.is_a?(Hash)
       new_attrs
     end
 

data/lib/ProMotion/table/cell/table_view_cell_module.rb

@@ -25,7 +25,7 @@ module ProMotion
     def check_deprecated_styles
       whitelist = [ :title, :subtitle, :image, :remote_image, :accessory, :selection_style, :action, :long_press_action, :arguments, :cell_style, :cell_class, :cell_identifier, :editing_style, :moveable, :search_text, :keep_selection, :height, :accessory_type, :style, :properties, :searchable ]
       if (data_cell.keys - whitelist).length > 0
-        PM.logger.deprecated("In #{self.table_screen.class.to_s}#table_data, you should set :#{(data_cell.keys - whitelist).join(", :")} in a `properties:` hash. See TableScreen documentation.")
+        mp "In #{self.table_screen.class.to_s}#table_data, you should set :#{(data_cell.keys - whitelist).join(", :")} in a `properties:` hash. See TableScreen documentation.", force_color: :yellow
       end
     end
 
@@ -58,13 +58,13 @@ module ProMotion
             self.imageView.image = image unless image.nil?
         })
       elsif jm_image_cache?
-        PM.logger.warning "'JMImageCache' is known to have issues with ProMotion. Please consider switching to 'SDWebImage'. 'JMImageCache' support will be deprecated in the next major version."
+        mp "'JMImageCache' is known to have issues with ProMotion. Please consider switching to 'SDWebImage'. 'JMImageCache' support will be deprecated in the next major version.", force_color: :yellow
         JMImageCache.sharedCache.imageForURL(data_cell[:remote_image][:url].to_url, completionBlock:proc { |downloaded_image|
           self.imageView.image = downloaded_image
           self.setNeedsLayout
         })
       else
-        PM.logger.error "To use remote_image with TableScreen you need to include the CocoaPod 'SDWebImage'."
+        mp "To use remote_image with TableScreen you need to include the CocoaPod 'SDWebImage'.", force_color: :red
       end
 
       self.imageView.layer.masksToBounds = true

data/lib/ProMotion/table/extensions/longpressable.rb

@@ -18,7 +18,7 @@ module ProMotion
         gesture_point = gesture.locationInView(pressed_table_view)
         index_path = pressed_table_view.indexPathForRowAtPoint(gesture_point)
         return unless index_path
-        data_cell = self.promotion_table_data.cell(index_path: index_path)
+        data_cell = cell_at(index_path: index_path)
         return unless data_cell
         trigger_action(data_cell[:long_press_action], data_cell[:arguments], index_path) if data_cell[:long_press_action]
       end

data/lib/ProMotion/table/extensions/refreshable.rb

@@ -41,7 +41,7 @@ module ProMotion
         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."
+          mp "You must implement the '#{@refreshable_callback}' method in your TableScreen.", force_color: :yellow
         end
       end
     end

data/lib/ProMotion/table/table.rb

@@ -21,11 +21,10 @@ module ProMotion
       set_up_refreshable
       set_up_longpressable
       set_up_row_height
-      set_up_accessibility
     end
 
     def check_table_data
-      PM.logger.error "Missing #table_data method in TableScreen #{self.class.to_s}." unless self.respond_to?(:table_data)
+      mp("Missing #table_data method in TableScreen #{self.class.to_s}.", force_color: :red) unless self.respond_to?(:table_data)
     end
 
     def promotion_table_data
@@ -39,7 +38,7 @@ module ProMotion
           if view.is_a? UIView
             self.tableView.send(camelize("set_table_#{hf_view}_view:"), view)
           else
-            PM.logger.warn "Table #{hf_view} view must be a UIView."
+            mp "Table #{hf_view} view must be a UIView.", force_color: :yellow
           end
         end
       end
@@ -73,7 +72,7 @@ module ProMotion
         if defined?(UIRefreshControl)
           self.make_refreshable(self.class.get_refreshable_params)
         else
-          PM.logger.warn "To use the refresh control on < iOS 6, you need to include the CocoaPod 'CKRefreshControl'."
+          mp "To use the refresh control on < iOS 6, you need to include the CocoaPod 'CKRefreshControl'.", force_color: :yellow
         end
       end
     end
@@ -91,19 +90,6 @@ module ProMotion
       end
     end
 
-    def editable?
-      self.promotion_table_data.sections.each do |section|
-        section[:cells].each do |cell|
-          return true if [:insert,:delete].include?(cell[:editing_style])
-        end
-      end
-      false
-    end
-
-    def set_up_accessibility
-      self.extend(Editable) if editable?
-    end
-
     def searching?
       self.promotion_table_data.filtered
     end
@@ -135,7 +121,7 @@ module ProMotion
       index_path = closest_parent(UITableView, table_cell).indexPathForCell(table_cell)
 
       if index_path
-        data_cell = promotion_table_data.cell(section: index_path.section, index: index_path.row)
+        data_cell = cell_at(index_path: index_path)
         data_cell[:accessory][:arguments][:value] = switch.isOn if data_cell[:accessory][:arguments].is_a?(Hash)
         trigger_action(data_cell[:accessory][:action], data_cell[:accessory][:arguments], index_path) if data_cell[:accessory][:action]
       end
@@ -145,7 +131,7 @@ module ProMotion
       deletable_index_paths = []
       Array(index_paths).each do |index_path|
         delete_cell = false
-        delete_cell = send(:on_cell_deleted, self.promotion_table_data.cell(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
+        delete_cell = send(:on_cell_deleted, cell_at(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
         unless delete_cell == false
           self.promotion_table_data.delete_cell(index_path: index_path)
           deletable_index_paths << index_path
@@ -176,6 +162,11 @@ module ProMotion
       !!isEditing
     end
 
+    # Returns the data cell
+    def cell_at(args = {})
+      self.promotion_table_data.cell(args)
+    end
+
     ########## Cocoa touch methods #################
     def numberOfSectionsInTableView(_)
       self.promotion_table_data.sections.length
@@ -200,42 +191,46 @@ module ProMotion
 
     def tableView(_, cellForRowAtIndexPath: index_path)
       params = index_path_to_section_index(index_path: index_path)
-      data_cell = self.promotion_table_data.cell(section: params[:section], index: params[:index])
+      data_cell = cell_at(index: params[:index], section: params[:section])
       return UITableViewCell.alloc.init unless data_cell
       create_table_cell(data_cell)
     end
 
     def tableView(_, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
-      data_cell = self.promotion_table_data.cell(index_path: index_path)
+      data_cell = cell_at(index_path: index_path)
+      try :will_display_cell, table_cell, index_path
       table_cell.send(:will_display) if table_cell.respond_to?(:will_display)
       table_cell.send(:restyle!) if table_cell.respond_to?(:restyle!) # Teacup compatibility
     end
 
     def tableView(_, heightForRowAtIndexPath: index_path)
-      (self.promotion_table_data.cell(index_path: index_path)[:height] || tableView.rowHeight).to_f
+      (cell_at(index_path: index_path)[:height] || tableView.rowHeight).to_f
     end
 
     def tableView(table_view, didSelectRowAtIndexPath: index_path)
-      data_cell = self.promotion_table_data.cell(index_path: index_path)
+      data_cell = cell_at(index_path: index_path)
       table_view.deselectRowAtIndexPath(index_path, animated: true) unless data_cell[:keep_selection] == true
       trigger_action(data_cell[:action], data_cell[:arguments], index_path) if data_cell[:action]
     end
 
-    def tableView(_, editingStyleForRowAtIndexPath: index_path)
+    def tableView(_, canEditRowAtIndexPath:index_path)
       data_cell = self.promotion_table_data.cell(index_path: index_path, unfiltered: true)
+      [:insert,:delete].include?(data_cell[:editing_style])
+    end
+
+    def tableView(_, editingStyleForRowAtIndexPath: index_path)
+      data_cell = cell_at(index_path: index_path, unfiltered: true)
       map_cell_editing_style(data_cell[:editing_style])
     end
 
-    module Editable
-      def tableView(_, commitEditingStyle: editing_style, forRowAtIndexPath: index_path)
-        if editing_style == UITableViewCellEditingStyleDelete
-          delete_row(index_path)
-        end
+    def tableView(_, commitEditingStyle: editing_style, forRowAtIndexPath: index_path)
+      if editing_style == UITableViewCellEditingStyleDelete
+        delete_row(index_path)
       end
     end
 
     def tableView(_, canMoveRowAtIndexPath:index_path)
-      data_cell = self.promotion_table_data.cell(index_path: index_path, unfiltered: true)
+      data_cell = cell_at(index_path: index_path, unfiltered: true)
 
       if (!data_cell[:moveable].nil? || data_cell[:moveable].is_a?(Symbol)) && data_cell[:moveable] != false
         true
@@ -245,7 +240,7 @@ module ProMotion
     end
 
     def tableView(_, targetIndexPathForMoveFromRowAtIndexPath:source_index_path, toProposedIndexPath:proposed_destination_index_path)
-      data_cell = self.promotion_table_data.cell(index_path: source_index_path, unfiltered: true)
+      data_cell = cell_at(index_path: source_index_path, unfiltered: true)
 
       if data_cell[:moveable] == :section && source_index_path.section != proposed_destination_index_path.section
         source_index_path
@@ -267,7 +262,7 @@ module ProMotion
         }
         send(:on_cell_moved, args)
       else
-        PM.logger.warn "Implement the on_cell_moved method in your PM::TableScreen to be notified when a user moves a cell."
+        mp "Implement the on_cell_moved method in your PM::TableScreen to be notified when a user moves a cell.", force_color: :yellow
       end
     end
 
@@ -283,7 +278,7 @@ module ProMotion
     end
 
     def deleteRowsAtIndexPaths(index_paths, withRowAnimation: animation)
-      PM.logger.warn "ProMotion expects you to use 'delete_cell(index_paths, animation)'' instead of 'deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)'."
+      mp "ProMotion expects you to use 'delete_cell(index_paths, animation)'' instead of 'deleteRowsAtIndexPaths(index_paths, withRowAnimation:animation)'.", force_color: :yellow
       delete_row(index_paths, animation)
     end
 
@@ -343,6 +338,5 @@ module ProMotion
     def self.included(base)
       base.extend(TableClassMethods)
     end
-
   end
 end

data/lib/ProMotion/table/table_builder.rb

@@ -1,7 +1,7 @@
 module ProMotion
   module TableBuilder
     def trigger_action(action, arguments, index_path)
-      return PM.logger.info "Action not implemented: #{action.to_s}" unless self.respond_to?(action)
+      return mp("Action not implemented: #{action.to_s}", force_color: :green) unless self.respond_to?(action)
       case self.method(action).arity
       when 0 then self.send(action) # Just call the method
       when 2 then self.send(action, arguments, index_path) # Send arguments and index path

data/lib/ProMotion/table/table_class_methods.rb

@@ -7,7 +7,7 @@ module TableClassMethods
     if height == :auto
       if UIDevice.currentDevice.systemVersion.to_f < 8.0
         height = args[:estimated] || 44.0
-        PM.logger.warn "Using `row_height :auto` is not supported in iOS 7 apps. Setting to #{height}."
+        mp "Using `row_height :auto` is not supported in iOS 7 apps. Setting to #{height}.", force_color: :yellow
       else
         height = UITableViewAutomaticDimension
       end

data/lib/ProMotion/tabs/tabs.rb

@@ -51,14 +51,14 @@ module ProMotion
 
     def create_tab_bar_item(tab={})
       if tab[:system_icon] || tab[:icon]
-        PM.logger.deprecated("`system_icon:` no longer supported. Use `system_item:` instead.") if tab[:system_icon]
-        PM.logger.deprecated("`icon:` no longer supported. Use `item:` instead.") if tab[:icon]
+        mp("`system_icon:` no longer supported. Use `system_item:` instead.", force_color: :yellow) if tab[:system_icon]
+        mp("`icon:` no longer supported. Use `item:` instead.", force_color: :yellow) if tab[:icon]
         tab[:system_item] ||= tab[:system_icon]
         tab[:item] ||= tab[:icon]
       end
 
       unless tab[:system_item] || tab[:item]
-        PM.logger.warn("You must provide either a `system_item:` or custom `item:` in `tab_bar_item`")
+        mp "You must provide either a `system_item:` or custom `item:` in `tab_bar_item`", force_color: :yellow
         abort
       end
 

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "2.4.0" unless defined?(ProMotion::VERSION)
+  VERSION = "2.4.1" unless defined?(ProMotion::VERSION)
 end

data/lib/ProMotion/web/web_screen_module.rb

@@ -76,7 +76,7 @@ module ProMotion
     end
 
     def check_content_data
-      PM.logger.error "Missing #content method in WebScreen #{self.class.to_s}." unless self.respond_to?(:content)
+      mp("Missing #content method in WebScreen #{self.class.to_s}.", force_color: :red) unless self.respond_to?(:content)
     end
 
     def html

data/spec/functional/func_web_screen_spec.rb

@@ -18,32 +18,35 @@ describe "ProMotion::TestWebScreen functionality" do
   it "should have the proper html content" do
     file_name = "WebScreen.html"
 
-    controller.set_content(file_name)
-
-    @loaded_file = File.read(File.join(NSBundle.mainBundle.resourcePath, file_name))
-    wait_for_change controller, 'is_load_finished' do
-      controller.html.delete("\n").should == @loaded_file.delete("\n")
+    controller.mock!(:load_finished) do
+      loaded_file = File.read(File.join(NSBundle.mainBundle.resourcePath, file_name))
+      controller.html.delete("\n").should == loaded_file.delete("\n")
+      resume
     end
+    controller.set_content(file_name)
+    wait_max 8 {}
   end
 
   it "should allow you to navigate to a website" do
     stub_request(:get, "https://www.google.com/").
       to_return(body: %q{Google! <form action="/search">%}, content_type: "text/html")
 
-    controller.open_url(NSURL.URLWithString("https://www.google.com/"))
-    wait_for_change controller, 'is_load_finished' do
-      controller.html.include?('<form action="/search"').should == true
+    controller.mock!(:load_finished) do
+      controller.html.should.include('<form action="/search"')
+      resume
     end
+    controller.open_url(NSURL.URLWithString("https://www.google.com/"))
+    wait_max 8 {}
   end
 
   it "should manipulate the webscreen contents with javascript" do
-    controller.set_content('<h1 id="cool">Something Cool</h1>')
-
-    wait_for_change controller, 'is_load_finished' do
+    controller.mock!(:load_finished) do
       controller.evaluate('document.getElementById("cool").innerHTML = "Changed"')
       controller.html.should =~ /<h1 id="cool">Changed<\/h1>/
+      resume
     end
-
+    controller.set_content('<h1 id="cool">Something Cool</h1>')
+    wait_max 8 {}
   end
 
 end

data/spec/unit/tables/table_screen_spec.rb

@@ -62,29 +62,6 @@ describe "table screens" do
       screen.view.rowHeight.should == 77
       screen.view.estimatedRowHeight.should == 77
     end
-
-    it "sets up proper accessibility methods" do
-      class NoneditableTableScreen < PM::TableScreen
-        def on_load
-        end
-
-        def table_data
-          [{
-            title: "test",
-            cells: [{ title: "Non-editable test" }]
-          }]
-        end
-      end
-
-      noneditable = NoneditableTableScreen.new
-      noneditable.on_load
-      noneditable.editable?.should==false
-      index_path = NSIndexPath.indexPathForRow(0, inSection: 0)
-      lambda { noneditable.tableView(noneditable, commitEditingStyle: UITableViewCellEditingStyleDelete, forRowAtIndexPath: index_path) }.should.raise NoMethodError
-      @screen.editable?.should == true
-      @screen.should.respond_to(:"tableView:commitEditingStyle:forRowAtIndexPath")
-    end
-
   end
 
   describe "search functionality" do
@@ -273,4 +250,3 @@ describe "table screens" do
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -26,6 +26,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: motion_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webstub
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +88,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: ProMotion is a fast way to get started building RubyMotion iOS apps.
 email:
 - jamon@clearsightstudio.com
@@ -146,7 +160,6 @@ files:
 - spec/unit/image_title_screen_spec.rb
 - spec/unit/image_view_title_screen_spec.rb
 - spec/unit/load_view_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/main_spec.rb
 - spec/unit/screen_helpers_spec.rb
 - spec/unit/screen_module_spec.rb
@@ -186,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: ProMotion is a fast way to get started building RubyMotion apps. Instead
@@ -206,7 +219,6 @@ test_files:
 - spec/unit/image_title_screen_spec.rb
 - spec/unit/image_view_title_screen_spec.rb
 - spec/unit/load_view_spec.rb
-- spec/unit/logger_spec.rb
 - spec/unit/main_spec.rb
 - spec/unit/screen_helpers_spec.rb
 - spec/unit/screen_module_spec.rb

data/spec/unit/logger_spec.rb

@@ -1,68 +0,0 @@
-describe "logger functionality" do
-
-  describe "basic logger" do
-    it "should respond to PM.logger with a logger instance" do
-      PM.logger.is_a?(PM::Logger).should == true
-    end
-
-    it "should allow setting the log level" do
-      PM.logger.level = :warn
-      PM.logger.level.should == :warn
-    end
-  end
-
-  describe "testing levels" do
-
-    before do
-      PM.logger.stub! :log {|a, b, c| "It worked" }
-    end
-
-    after do
-      PM.logger.level = :debug
-    end
-
-    it "should not log if level is set to :none" do
-
-      PM.logger.stub! :log do |label, message_text, color|
-        should.flunk "should not log if logging is turned off!"
-      end
-
-      PM.logger.level = :none
-      PM.logger.warn("I'm giving you a warning that you should ignore.").should == nil
-
-    end
-
-    it "#error should log if set to :error level or above" do
-
-      PM.logger.level = :error
-      PM.logger.error("test message").should == "It worked"
-
-    end
-
-    it "#deprecated should log if set to :warn level or above" do
-
-      PM.logger.level = :warn
-      PM.logger.deprecated("test message").should == "It worked"
-
-    end
-    it "#warn should log if set to :warn level or above" do
-
-      PM.logger.level = :warn
-      PM.logger.warn("test message").should == "It worked"
-
-    end
-    it "#debug should log if set to :debug level or above" do
-
-      PM.logger.level = :debug
-      PM.logger.debug("test message").should == "It worked"
-
-    end
-    it "#info should log if set to :info level or above" do
-
-      PM.logger.level = :info
-      PM.logger.info("test message").should == "It worked"
-
-    end
-
-  end
-end