ProMotion 0.6.5 → 0.7.0

data/spec/unit/tables/table_view_cell_spec.rb

@@ -0,0 +1,106 @@
+describe "PM::TableViewCellModule" do
+  
+  def custom_cell
+    {
+      title: "Crazy Full Featured Cell",
+      subtitle: "This is way too huge...",
+      arguments: { data: [ "lots", "of", "data" ] },
+      action: :tapped_cell_1,
+      height: 50, # manually changes the cell's height
+      cell_style: UITableViewCellStyleSubtitle,
+      cell_identifier: "Cell",
+      cell_class: PM::TableViewCell,
+      layer: { masks_to_bounds: true },
+      background_color: UIColor.redColor,
+      selection_style: UITableViewCellSelectionStyleGray,
+      accessory: :switch, # currently only :switch is supported
+      accessory_checked: true, # whether it's "checked" or not
+      image: { image: UIImage.imageNamed("list"), radius: 15 },
+      subviews: [ UIView.alloc.initWithFrame(CGRectZero), UILabel.alloc.initWithFrame(CGRectZero) ] # arbitrary views added to the cell
+    }
+  end
+  
+  before do
+    @screen = TestTableScreen.new
+    button = UIButton.buttonWithType(UIButtonTypeRoundedRect).tap{|b| b.titleLabel.text = "ACC" }
+    @screen.mock! :table_data do
+      [
+        { title: "", cells: [] },
+        { title: "", cells: [
+          {title: "Test 1", accessory_type: UITableViewCellStateShowingEditControlMask },
+          custom_cell,
+          { title: "Test2", accessory_view: button } ] }
+      ]
+    end
+    
+    @screen.on_load
+    
+    custom_ip = NSIndexPath.indexPathForRow(1, inSection: 1) # Cell "Crazy Full Featured Cell"
+    
+    @screen.update_table_data
+    
+    @subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: custom_ip)
+  end
+  
+  it "should be a PM::TableViewCell" do
+    @subject.should.be.kind_of(PM::TableViewCell)
+  end
+  
+  it "should have the right title" do
+    @subject.textLabel.text.should == "Crazy Full Featured Cell"
+  end
+  
+  it "should have the right subtitle" do
+    @subject.detailTextLabel.text.should == "This is way too huge..."
+  end
+  
+  it "should have the right re-use identifier" do
+    @subject.reuseIdentifier.should == "Cell"
+  end
+  
+  it "should set the layer.masksToBounds" do
+    @subject.layer.masksToBounds.should == true
+  end
+  
+  it "should set the background color" do
+    @subject.backgroundView.backgroundColor.should == UIColor.redColor
+  end
+  
+  it "should set the selection color style" do
+    @subject.selectionStyle.should == UITableViewCellSelectionStyleGray
+  end
+  
+  it "should set the accessory view to a switch" do
+    @subject.accessoryView.should.be.kind_of(UISwitch)
+  end
+
+  it "should set the accessory view to a button" do
+    ip = NSIndexPath.indexPathForRow(2, inSection: 1)
+    subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: ip)
+    subject.accessoryView.should.be.kind_of(UIRoundedRectButton)
+  end
+  
+  it "should set the accessory type to edit" do
+    ip = NSIndexPath.indexPathForRow(0, inSection: 1)
+    subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: ip)
+    subject.accessoryView.should.be.nil
+    subject.accessoryType.should == UITableViewCellStateShowingEditControlMask
+  end
+  
+  it "should set an image with a radius" do
+    @subject.imageView.should.be.kind_of(UIImageView)
+    @subject.imageView.image.should == UIImage.imageNamed("list")
+    @subject.imageView.layer.cornerRadius.should == 15.0
+  end
+
+  it "should create two extra subviews" do
+    @subject.subviews.length.should == 4
+    @subject.subviews[2].class.should == UIView
+    @subject.subviews[3].class.should == UILabel
+  end
+  
+  
+  
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -89,32 +89,43 @@ files:
 - lib/ProMotion/cocoatouch/TableViewCell.rb
 - lib/ProMotion/cocoatouch/TableViewController.rb
 - lib/ProMotion/cocoatouch/ViewController.rb
-- lib/ProMotion/delegate.rb
+- lib/ProMotion/delegate/delegate.rb
+- lib/ProMotion/delegate/delegate_helper.rb
+- lib/ProMotion/delegate/delegate_notifications.rb
 - lib/ProMotion/helpers/console.rb
 - lib/ProMotion/helpers/logger.rb
 - lib/ProMotion/helpers/measure_helper.rb
 - lib/ProMotion/helpers/system_helper.rb
 - lib/ProMotion/helpers/view_helper.rb
 - lib/ProMotion/pro_motion.rb
-- lib/ProMotion/screen_helpers/_tables/_refreshable_table.rb
-- lib/ProMotion/screen_helpers/_tables/_searchable_table.rb
-- lib/ProMotion/screen_helpers/_tables/_sectioned_table.rb
-- lib/ProMotion/screen_helpers/_tables/grouped_table.rb
-- lib/ProMotion/screen_helpers/_tables/plain_table.rb
+- lib/ProMotion/push_notifications/push_notification.rb
 - lib/ProMotion/screen_helpers/screen_elements.rb
 - lib/ProMotion/screen_helpers/screen_navigation.rb
 - lib/ProMotion/screen_helpers/screen_tabs.rb
 - lib/ProMotion/screen_helpers/split_screen.rb
+- lib/ProMotion/screens/_compatibility/formotion_screen.rb
 - lib/ProMotion/screens/_screen_module.rb
 - lib/ProMotion/screens/_table_screen_module.rb
+- lib/ProMotion/screens/_tables/_refreshable_table.rb
+- lib/ProMotion/screens/_tables/_searchable_table.rb
+- lib/ProMotion/screens/_tables/_sectioned_table.rb
+- lib/ProMotion/screens/_tables/_table.rb
+- lib/ProMotion/screens/_tables/grouped_table.rb
+- lib/ProMotion/screens/_tables/plain_table.rb
+- lib/ProMotion/screens/_tables/table_data.rb
+- lib/ProMotion/screens/_tables/table_view_cell_module.rb
 - lib/ProMotion/screens/behaves_like_screen.rb
 - lib/ProMotion/screens/screen.rb
 - lib/ProMotion/screens/table_screen.rb
 - lib/ProMotion/version.rb
 - resources/list.png
+- spec/functional/func_screen_spec.rb
+- spec/functional/func_split_screen_spec.rb
+- spec/functional/func_table_screen_spec.rb
 - spec/helpers/basic_screen.rb
 - spec/helpers/detail_screen.rb
 - spec/helpers/dummy_class.rb
+- spec/helpers/functional_screen.rb
 - spec/helpers/home_screen.rb
 - spec/helpers/master_screen.rb
 - spec/helpers/screen_module_view_controller.rb
@@ -122,17 +133,20 @@ files:
 - spec/helpers/table_screen_refreshable.rb
 - spec/helpers/table_screen_searchable.rb
 - spec/helpers/test_delegate.rb
-- spec/ios_version_spec.rb
-- spec/logger_spec.rb
-- spec/main_spec.rb
-- spec/screen_helpers_spec.rb
-- spec/screen_module_spec.rb
-- spec/screen_spec.rb
-- spec/split_screen_in_tab_bar_spec.rb
-- spec/split_screen_open_screen_spec.rb
-- spec/split_screen_spec.rb
-- spec/table_screen_spec.rb
-- spec/view_helper_spec.rb
+- spec/unit/delegate_spec.rb
+- spec/unit/ios_version_spec.rb
+- spec/unit/logger_spec.rb
+- spec/unit/main_spec.rb
+- spec/unit/screen_helpers_spec.rb
+- spec/unit/screen_module_spec.rb
+- spec/unit/screen_spec.rb
+- spec/unit/split_screen_in_tab_bar_spec.rb
+- spec/unit/split_screen_open_screen_spec.rb
+- spec/unit/split_screen_spec.rb
+- spec/unit/tables/table_module_spec.rb
+- spec/unit/tables/table_screen_spec.rb
+- spec/unit/tables/table_view_cell_spec.rb
+- spec/unit/view_helper_spec.rb
 homepage: https://github.com/clearsightstudio/ProMotion
 licenses: []
 post_install_message: 
@@ -161,9 +175,13 @@ summary: ProMotion is a new way to organize RubyMotion apps. Instead of dealing
   your app and include a ton of great utilities to make iOS development more like
   Ruby and less like Objective-C.
 test_files:
+- spec/functional/func_screen_spec.rb
+- spec/functional/func_split_screen_spec.rb
+- spec/functional/func_table_screen_spec.rb
 - spec/helpers/basic_screen.rb
 - spec/helpers/detail_screen.rb
 - spec/helpers/dummy_class.rb
+- spec/helpers/functional_screen.rb
 - spec/helpers/home_screen.rb
 - spec/helpers/master_screen.rb
 - spec/helpers/screen_module_view_controller.rb
@@ -171,14 +189,17 @@ test_files:
 - spec/helpers/table_screen_refreshable.rb
 - spec/helpers/table_screen_searchable.rb
 - spec/helpers/test_delegate.rb
-- spec/ios_version_spec.rb
-- spec/logger_spec.rb
-- spec/main_spec.rb
-- spec/screen_helpers_spec.rb
-- spec/screen_module_spec.rb
-- spec/screen_spec.rb
-- spec/split_screen_in_tab_bar_spec.rb
-- spec/split_screen_open_screen_spec.rb
-- spec/split_screen_spec.rb
-- spec/table_screen_spec.rb
-- spec/view_helper_spec.rb
+- spec/unit/delegate_spec.rb
+- spec/unit/ios_version_spec.rb
+- spec/unit/logger_spec.rb
+- spec/unit/main_spec.rb
+- spec/unit/screen_helpers_spec.rb
+- spec/unit/screen_module_spec.rb
+- spec/unit/screen_spec.rb
+- spec/unit/split_screen_in_tab_bar_spec.rb
+- spec/unit/split_screen_open_screen_spec.rb
+- spec/unit/split_screen_spec.rb
+- spec/unit/tables/table_module_spec.rb
+- spec/unit/tables/table_screen_spec.rb
+- spec/unit/tables/table_view_cell_spec.rb
+- spec/unit/view_helper_spec.rb

data/lib/ProMotion/delegate.rb

@@ -1,63 +0,0 @@
-module ProMotion
-  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)
-      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)
-
-      true
-    end
-
-    def app_delegate
-      UIApplication.sharedApplication.delegate
-    end
-
-    def app_window
-      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.pm_main_controller
-
-      self.window ||= self.ui_window.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-      self.window.rootViewController = new_screen
-      self.window.makeKeyAndVisible
-    end
-    
-    def ui_window
-      (defined?(Motion) && defined?(Motion::Xray) && defined?(Motion::Xray::XrayWindow)) ? Motion::Xray::XrayWindow : UIWindow
-    end
-
-    def open_screen(screen, args={})
-      home(screen)
-      open_home_screen
-    end
-    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
-
-    def has_home_screen
-      @home_screen.nil? == false
-    end
-  end
-  class AppDelegateParent < Delegate; end # For backwards compatibility
-end

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

@@ -1,270 +0,0 @@
-module ProMotion::MotionTable
-  module SectionedTable
-    include ProMotion::ViewHelper
-    
-    def table_setup
-      PM.logger.error "Missing #table_data method in TableScreen #{self.class.to_s}." unless self.respond_to?(:table_data)
-
-      self.view = self.create_table_view_from_data(self.table_data)
-      
-      if self.class.respond_to?(:get_searchable) && self.class.get_searchable
-        self.make_searchable(content_controller: self, search_bar: self.class.get_searchable_params)
-      end
-      if self.class.respond_to?(:get_refreshable) && self.class.get_refreshable
-        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'."
-        end
-      end
-    end
-
-    # @param [Array] Array of table data
-    # @returns [UITableView] delegated to self
-    def create_table_view_from_data(data)
-      set_table_view_data data
-      return table_view
-    end
-    alias :createTableViewFromData :create_table_view_from_data
-
-    def update_table_view_data(data)
-      set_table_view_data data
-      self.table_view.reloadData
-    end
-    alias :updateTableViewData :update_table_view_data
-
-    def set_table_view_data(data)
-      @mt_table_view_groups = data
-    end
-    alias :setTableViewData :set_table_view_data
-
-    def section_at_index(index)
-      if @mt_filtered
-        @mt_filtered_data.at(index)
-      else
-        @mt_table_view_groups.at(index)
-      end
-    end
-
-    def cell_at_section_and_index(section, index)
-      if section_at_index(section) && section_at_index(section)[:cells]
-        return section_at_index(section)[:cells].at(index)
-      end
-    end
-    alias :cellAtSectionAndIndex :cell_at_section_and_index
-
-    def trigger_action(action, arguments)
-      if self.respond_to?(action)
-        expected_arguments = self.method(action).arity
-        if expected_arguments == 0
-          self.send(action)
-        elsif expected_arguments == 1 || expected_arguments == -1
-          self.send(action, arguments)
-        else
-          PM.logger.warn "#{action} expects #{expected_arguments} arguments. Maximum number of required arguments for an action is 1."
-        end
-      else
-        PM.logger.info "Action not implemented: #{action.to_s}"
-      end
-    end
-
-    def accessory_toggled_switch(switch)
-      table_cell = switch.superview
-      index_path = table_cell.superview.indexPathForCell(table_cell)
-
-      data_cell = cell_at_section_and_index(index_path.section, index_path.row)
-      data_cell[:arguments] = {} unless data_cell[:arguments]
-      data_cell[:arguments][:value] = switch.isOn if data_cell[:arguments].is_a? Hash
-      data_cell[:accessory_action] ||= data_cell[:accessoryAction] # For legacy support
-
-      trigger_action(data_cell[:accessory_action], data_cell[:arguments]) if data_cell[:accessory_action]
-    end
-
-    ########## Cocoa touch methods, leave as-is #################
-    def numberOfSectionsInTableView(table_view)
-      if @mt_filtered
-        return @mt_filtered_data.length if @mt_filtered_data
-      else
-        return @mt_table_view_groups.length if @mt_table_view_groups
-      end
-      0
-    end
-
-    # Number of cells
-    def tableView(table_view, numberOfRowsInSection:section)
-      return section_at_index(section)[:cells].length if section_at_index(section) && section_at_index(section)[:cells]
-      0
-    end
-
-    def tableView(table_view, titleForHeaderInSection:section)
-      return section_at_index(section)[:title] if section_at_index(section) && section_at_index(section)[:title]
-    end
-
-    # Set table_data_index if you want the right hand index column (jumplist)
-    def sectionIndexTitlesForTableView(table_view)
-      if self.respond_to?(:table_data_index)
-        self.table_data_index
-      end
-    end
-
-    def remap_data_cell(data_cell)
-      # Re-maps legacy data cell calls
-      mappings = {
-        cell_style: :cellStyle,
-        cell_identifier: :cellIdentifier,
-        cell_class: :cellClass,
-        masks_to_bounds: :masksToBounds,
-        background_color: :backgroundColor,
-        selection_style: :selectionStyle,
-        cell_class_attributes: :cellClassAttributes,
-        accessory_view: :accessoryView,
-        accessory_type: :accessoryType,
-        accessory_checked: :accessoryDefault,
-        remote_image: :remoteImage,
-        subviews: :subViews
-      }
-      mappings.each_pair do |n, old|
-        if data_cell[old]
-          warn "[DEPRECATION] `:#{old}` is deprecated in TableScreens. Use `:#{n}`"
-          data_cell[n] = data_cell[old]
-        end
-      end
-      if data_cell[:styles] && data_cell[:styles][:textLabel]
-        warn "[DEPRECATION] `:textLabel` is deprecated in TableScreens. Use `:label`"
-        data_cell[:styles][:label] = data_cell[:styles][:textLabel]
-      end
-      data_cell
-    end
-
-    def tableView(table_view, cellForRowAtIndexPath:index_path)
-      data_cell = cell_at_section_and_index(index_path.section, index_path.row)
-      return UITableViewCell.alloc.init unless data_cell
-
-      data_cell = self.remap_data_cell(data_cell)
-
-      data_cell[:cell_style] ||= UITableViewCellStyleDefault
-      data_cell[:cell_identifier] ||= "Cell"
-      cell_identifier = data_cell[:cell_identifier]
-      data_cell[:cell_class] ||= ProMotion::TableViewCell
-
-      table_cell = table_view.dequeueReusableCellWithIdentifier(cell_identifier)
-      unless table_cell
-        table_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:cell_identifier)
-
-        # Add optimizations here
-        table_cell.layer.masksToBounds = true if data_cell[:masks_to_bounds]
-        table_cell.backgroundColor = data_cell[:background_color] if data_cell[:background_color]
-        table_cell.selectionStyle = data_cell[:selection_style] if data_cell[:selection_style]
-        table_cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
-      end
-
-      if data_cell[:cell_class_attributes]
-        set_attributes table_cell, data_cell[:cell_class_attributes]
-      end
-
-      if data_cell[:accessory_view]
-        table_cell.accessoryView = data_cell[:accessory_view]
-        table_cell.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
-      end
-
-      if data_cell[:accessory_type]
-        table_cell.accessoryType = data_cell[:accessory_type]
-      end
-
-      if data_cell[:accessory] && data_cell[:accessory] == :switch
-        switch_view = UISwitch.alloc.initWithFrame(CGRectZero)
-        switch_view.addTarget(self, action: "accessory_toggled_switch:", forControlEvents:UIControlEventValueChanged)
-        switch_view.on = true if data_cell[:accessory_checked]
-        table_cell.accessoryView = switch_view
-      end
-
-      if data_cell[:subtitle] and table_cell.detailTextLabel
-        table_cell.detailTextLabel.text = data_cell[:subtitle]
-        table_cell.detailTextLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth
-      end
-
-      table_cell.selectionStyle = UITableViewCellSelectionStyleNone if data_cell[:no_select]
-
-      if data_cell[:remote_image]
-        if table_cell.imageView.respond_to?("setImageWithURL:placeholderImage:")
-          url = data_cell[:remote_image][:url]
-          url = NSURL.URLWithString(url) unless url.is_a?(NSURL)
-          placeholder = data_cell[:remote_image][:placeholder]
-          placeholder = UIImage.imageNamed(placeholder) if placeholder.is_a?(String)
-
-          table_cell.image_size = data_cell[:remote_image][:size] if data_cell[:remote_image][:size] && table_cell.respond_to?("image_size=")
-          table_cell.imageView.setImageWithURL(url, placeholderImage: placeholder)
-          table_cell.imageView.layer.masksToBounds = true
-          table_cell.imageView.layer.cornerRadius = data_cell[:remote_image][:radius] if data_cell[:remote_image].has_key?(:radius)
-        else
-          PM.logger.error "ProMotion Warning: to use remote_image with TableScreen you need to include the CocoaPod 'SDWebImage'."
-        end
-      elsif data_cell[:image]
-        table_cell.imageView.layer.masksToBounds = true
-        table_cell.imageView.image = data_cell[:image][:image]
-        table_cell.imageView.layer.cornerRadius = data_cell[:image][:radius] if data_cell[:image][:radius]
-      end
-
-      if data_cell[:subviews]
-        tag_number = 0
-        data_cell[:subviews].each do |view|
-          # Remove an existing view at that tag number
-          tag_number += 1
-          existing_view = table_cell.viewWithTag(tag_number)
-          existing_view.removeFromSuperview if existing_view
-
-          # Add the subview if it exists
-          if view
-            view.tag = tag_number
-            table_cell.addSubview view
-          end
-        end
-      end
-
-      if data_cell[:details]
-        table_cell.addSubview data_cell[:details][:image]
-      end
-
-      if data_cell[:styles] && data_cell[:styles][:label] && data_cell[:styles][:label][:frame]
-        ui_label = false
-        table_cell.contentView.subviews.each do |view|
-          if view.is_a? UILabel
-            ui_label = true
-            view.text = data_cell[:styles][:label][:text]
-          end
-        end
-
-        unless ui_label == true
-          label ||= UILabel.alloc.initWithFrame(CGRectZero)
-          set_attributes label, data_cell[:styles][:label]
-          table_cell.contentView.addSubview label
-        end
-        # hackery
-        table_cell.textLabel.textColor = UIColor.clearColor
-      else
-        cell_title = data_cell[:title]
-        cell_title ||= ""
-        table_cell.textLabel.text = cell_title
-      end
-
-      return table_cell
-    end
-
-    def tableView(tableView, heightForRowAtIndexPath:index_path)
-      cell = cell_at_section_and_index(index_path.section, index_path.row)
-      if cell[:height]
-        cell[:height].to_f
-      else
-        tableView.rowHeight
-      end
-    end
-
-    def tableView(table_view, didSelectRowAtIndexPath:index_path)
-      cell = cell_at_section_and_index(index_path.section, index_path.row)
-      table_view.deselectRowAtIndexPath(index_path, animated: true)
-      cell[:arguments] ||= {}
-      cell[:arguments][:cell] = cell if cell[:arguments].is_a?(Hash)
-      trigger_action(cell[:action], cell[:arguments]) if cell[:action]
-    end
-  end
-end