ProMotion 0.6.5 → 0.7.0

data/lib/ProMotion/screens/_tables/grouped_table.rb

@@ -0,0 +1,16 @@
+module ProMotion
+  module GroupedTable
+    include Table
+    include RefreshableTable
+
+    def table_view
+      @table_view ||= begin
+        t = UITableView.alloc.initWithFrame(self.view.frame, style:UITableViewStyleGrouped)
+        t.dataSource = self
+        t.delegate = self
+        t
+      end
+    end
+    alias :tableView :table_view
+  end
+end

data/lib/ProMotion/screens/_tables/plain_table.rb

@@ -0,0 +1,17 @@
+module ProMotion
+  module PlainTable
+    include Table
+    include SearchableTable
+    include RefreshableTable
+
+    def table_view
+      @table_view ||= begin
+        t = UITableView.alloc.initWithFrame(self.view.frame, style:UITableViewStylePlain)
+        t.dataSource = self
+        t.delegate = self
+        t
+      end
+    end
+    alias :tableView :table_view
+  end
+end

data/lib/ProMotion/screens/_tables/table_data.rb

@@ -0,0 +1,148 @@
+module ProMotion
+  class TableData
+    attr_accessor :data, :filtered_data, :filtered, :table_view
+
+    def initialize(data, table_view)
+      self.data = data
+      self.table_view = table_view
+    end
+
+    def section(index)
+      s = sections.at(index)
+      s || { title: nil, cells: [] }
+    end
+
+    def sections
+      self.filtered ? self.filtered_data : self.data
+    end
+
+    def section_length(index)
+      section(index)[:cells].length
+    end
+
+    def cell(params={})
+      if params[:index_path]
+        params[:section] = params[:index_path].section
+        params[:index] = params[:index_path].row
+      end
+
+      table_section = self.section(params[:section])
+      table_section[:cells].at(params[:index].to_i)
+    end
+
+    def delete_cell(params={})
+      if params[:index_path]
+        params[:section] = params[:index_path].section
+        params[:index] = params[:index_path].row
+      end
+
+      table_section = self.section(params[:section])
+      table_section[:cells].delete_at(params[:index].to_i)
+    end
+
+    def search(search_string)
+      self.filtered_data = []
+      self.filtered = true
+
+      search_string = search_string.downcase.strip
+
+      self.data.each do |section|
+        new_section = {}
+        new_section[:cells] = []
+
+        new_section[:cells] = section[:cells].map do |cell|
+          cell[:searchable] != false && "#{cell[:title]}\n#{cell[:search_text]}".downcase.strip.include?(search_string) ? cell : nil
+        end.compact
+
+        if new_section[:cells] && new_section[:cells].length > 0
+          new_section[:title] = section[:title]
+          self.filtered_data << new_section
+        end
+      end
+
+      self.filtered_data
+    end
+
+    def stop_searching
+      self.filtered_data = []
+      self.filtered = false
+    end
+
+    def table_view_cell(params={})
+      if params[:index_path]
+        params[:section] = params[:index_path].section
+        params[:index] = params[:index_path].row
+      end
+
+      data_cell = self.cell(section: params[:section], index: params[:index])
+      return UITableViewCell.alloc.init unless data_cell # No data?
+
+      data_cell = self.remap_data_cell(data_cell) # TODO: Deprecated, remove in version 1.0
+      data_cell = self.set_data_cell_defaults(data_cell)
+
+      table_cell = self.create_table_cell(data_cell)
+
+      table_cell
+    end
+
+    def set_data_cell_defaults(data_cell)
+      data_cell[:cell_style] ||= UITableViewCellStyleDefault
+      data_cell[:cell_identifier] ||= "Cell"
+      data_cell[:cell_class] ||= ProMotion::TableViewCell
+      data_cell
+    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
+      }
+
+      if data_cell[:masks_to_bounds]
+        PM.logger.deprecated "masks_to_bounds: (value) is deprecated. Use layer: { masks_to_bounds: (value) } instead."
+        data_cell[:layer] ||= {}
+        data_cell[:layer][:masks_to_bounds] = data_cell[:masks_to_bounds] # TODO: Deprecate and then remove this.
+      end
+
+      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 create_table_cell(data_cell)
+      table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier])
+
+      unless table_cell
+        table_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:data_cell[:cell_identifier])
+        table_cell.extend ProMotion::TableViewCellModule unless table_cell.is_a?(ProMotion::TableViewCellModule)
+        table_cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
+      end
+
+      table_cell.setup(data_cell)
+
+      table_cell
+    end
+
+  end
+end

data/lib/ProMotion/screens/_tables/table_view_cell_module.rb

@@ -0,0 +1,156 @@
+module ProMotion
+  module TableViewCellModule
+    include ViewHelper
+
+    attr_accessor :data_cell
+
+    def setup(data_cell)
+      self.data_cell = data_cell
+
+      # TODO: Some of these need to go away. Unnecessary overhead.
+      set_cell_attributes
+      set_background_color
+      set_class_attributes
+      set_accessory_view
+      set_subtitle
+      set_image
+      set_remote_image
+      set_subviews
+      set_details
+      set_styles
+      set_selection_style
+
+      self
+    end
+
+    def set_cell_attributes
+      set_attributes self, data_cell.dup.tap{ |h| h.delete(:image) }
+      self
+    end
+
+    def set_background_color
+      self.backgroundView = UIView.new.tap{|v| v.backgroundColor = data_cell[:background_color]} if data_cell[:background_color]
+    end
+
+    def set_class_attributes
+      if data_cell[:cell_class_attributes]
+        PM.logger.deprecated "`cell_class_attributes` is deprecated. Just add the attributes you want to set right into your cell hash."
+        set_attributes self, data_cell[:cell_class_attributes]
+      end
+      self
+    end
+
+    def set_accessory_view
+      if data_cell[:accessory_view]
+        self.accessoryView = data_cell[:accessory_view]
+        self.accessoryView.autoresizingMask = UIViewAutoresizingFlexibleWidth
+      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]
+        self.accessoryView = switch_view
+      end
+
+      self
+    end
+
+    def set_subtitle
+      if data_cell[:subtitle] && self.detailTextLabel
+        self.detailTextLabel.text = data_cell[:subtitle]
+        self.detailTextLabel.backgroundColor = UIColor.clearColor
+        self.detailTextLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth
+      end
+      self
+    end
+
+    def set_remote_image
+      if data_cell[:remote_image]
+        if self.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)
+
+          self.image_size = data_cell[:remote_image][:size] if data_cell[:remote_image][:size] && self.respond_to?("image_size=")
+          self.imageView.setImageWithURL(url, placeholderImage: placeholder)
+          self.imageView.layer.masksToBounds = true
+          self.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
+      end
+      self
+    end
+
+    def set_image
+      if data_cell[:image]
+
+        cell_image = data_cell[:image].is_a?(Hash) ? data_cell[:image][:image] : data_cell[:image]
+        cell_image = UIImage.imageNamed(cell_image) if cell_image.is_a?(String)
+
+        self.imageView.layer.masksToBounds = true
+        self.imageView.image = cell_image
+        self.imageView.layer.cornerRadius = data_cell[:image][:radius] if data_cell[:image].is_a?(Hash) && data_cell[:image][:radius]
+      end
+      self
+    end
+
+    def set_subviews
+      tag_number = 0
+      Array(data_cell[:subviews]).each do |view|
+        # Remove an existing view at that tag number
+        tag_number += 1
+        existing_view = self.viewWithTag(tag_number)
+        existing_view.removeFromSuperview if existing_view
+
+        # Add the subview if it exists
+        if view
+          view.tag = tag_number
+          self.addSubview view
+        end
+      end
+      self
+    end
+
+    def set_details
+      if data_cell[:details]
+        self.addSubview data_cell[:details][:image]
+      end
+      self
+    end
+
+    def set_styles
+      if data_cell[:styles] && data_cell[:styles][:label] && data_cell[:styles][:label][:frame]
+        ui_label = false
+        self.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]
+          self.contentView.addSubview label
+        end
+
+        # TODO: What is this and why is it necessary?
+        self.textLabel.textColor = UIColor.clearColor
+      else
+        cell_title = data_cell[:title]
+        cell_title ||= ""
+        self.textLabel.backgroundColor = UIColor.clearColor
+        self.textLabel.text = cell_title
+      end
+
+      self
+    end
+
+    def set_selection_style
+      self.selectionStyle = UITableViewCellSelectionStyleNone if data_cell[:no_select]
+    end
+  end
+end

data/lib/ProMotion/screens/table_screen.rb

@@ -3,13 +3,14 @@ module ProMotion
   # Just make sure to implement the Obj-C methods in cocoatouch/TableViewController.rb.
   class TableScreen < TableViewController
     include ProMotion::TableScreenModule
+    # Includes PM::PlainTable already
   end
 
   class GroupedTableScreen < TableScreen
-    include ProMotion::MotionTable::GroupedTable
+    include ProMotion::GroupedTable
   end
 
   class SectionedTableScreen < TableScreen
-    include ProMotion::MotionTable::SectionedTable
+    include ProMotion::SectionedTable
   end
 end

data/lib/ProMotion/version.rb

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

data/spec/functional/func_screen_spec.rb

@@ -0,0 +1,66 @@
+describe "ProMotion::Screen functional" do
+  tests PM::Screen
+  
+  # Override controller to properly instantiate
+  def controller
+    rotate_device to: :portrait, button: :bottom
+    @controller ||= FunctionalScreen.new(nav_bar: true)
+    @controller.main_controller
+  end
+  
+  after do
+    @controller = nil
+  end
+  
+  it "should have a navigation bar" do
+    view("Functional").should.be.kind_of UINavigationItemView
+  end
+  
+  it "should allow setting a left nav bar button" do
+    @controller.set_nav_bar_button :left, title: "Cool", action: :triggered_button
+    tap("Cool")
+    @controller.button_was_triggered.should.be.true
+  end
+  
+  it "should allow setting a right nav bar button" do
+    @controller.set_nav_bar_button :right, title: "Cool2", action: :triggered_button
+    tap("Cool2")
+    @controller.button_was_triggered.should.be.true
+  end
+  
+  it "should allow opening another screen in the same nav bar and have a back button that is operational" do
+    @controller.open BasicScreen
+    
+    wait 0.5 do
+      
+      view("Basic").should.be.kind_of UINavigationItemView
+      view("Functional").should.be.kind_of UINavigationItemButtonView
+      
+      tap("Functional")
+      wait 0.5 do
+        view("Functional").should.be.kind_of UINavigationItemView
+      end
+        
+    end
+  end
+  
+  it "should allow opening and closing a modal screen" do
+    @basic = BasicScreen.new(nav_bar: true)
+    wait 0.1 do
+      @controller.open_modal @basic
+      
+      wait 0.6 do
+        
+        view("Basic").should.be.kind_of UINavigationItemView
+        @basic.close
+        
+        wait 0.6 do
+          @basic = nil
+          view("Functional").should.be.kind_of UINavigationItemView
+        end
+        
+      end
+    end
+  end
+  
+end

data/spec/functional/func_split_screen_spec.rb

@@ -0,0 +1,66 @@
+describe "Split screen functional" do
+  tests PM::SplitViewController
+  
+  # Override controller to properly instantiate
+  def controller
+    @app ||= TestDelegate.new
+    @master = MasterScreen.new(nav_bar: true)
+    @detail = DetailScreen.new(nav_bar: true)
+    @controller ||= @app.create_split_screen @master, @detail
+  end
+  
+  before do
+    rotate_device to: :landscape, button: :right
+  end
+  
+  after do
+    rotate_device to: :portrait, button: :bottom
+  end
+  
+  it "should allow opening a detail view from the master view" do
+    
+    @master.open BasicScreen.new(nav_bar: true), in_detail: true
+    
+    wait 0.75 do
+      view("Master").should.be.kind_of UINavigationItemView
+      view("Basic").should.be.kind_of UINavigationItemView
+      views(UINavigationItemView).each { |v| v.title.should.not == "Detail" }
+    end
+    
+  end
+    
+  it "should allow opening another view from the master view" do
+    
+    @master.open BasicScreen
+    
+    wait 0.75 do
+      view("Basic").should.be.kind_of UINavigationItemView
+      view("Detail").should.be.kind_of UINavigationItemView
+    end
+    
+  end
+    
+  it "should allow opening a master view from the detail view" do
+    
+    @detail.open BasicScreen.new(nav_bar: true), in_master: true
+    
+    wait 0.75 do
+      view("Basic").should.be.kind_of UINavigationItemView
+      view("Detail").should.be.kind_of UINavigationItemView
+      views(UINavigationItemView).each { |v| v.title.should.not == "Master" }
+    end
+    
+  end
+    
+  it "should allow opening another view from the detail view" do
+    
+    @detail.open BasicScreen
+    
+    wait 0.75 do
+      view("Basic").should.be.kind_of UINavigationItemView
+      view("Master").should.be.kind_of UINavigationItemView
+    end
+    
+  end
+    
+end