motion-prime 0.4.5 → 0.5.0

data/motion-prime/sections/_draw_section_mixin.rb

@@ -13,6 +13,23 @@ module MotionPrime
       container_element.try(:view)
     end
 
+    def init_container_element(options = {})
+      @container_element ||= begin
+        options.merge!({
+          screen: screen,
+          section: self.weak_ref,
+          has_drawn_content: true
+        })
+        options[:styles] ||= []
+        MotionPrime::BaseElement.factory(:view_with_section, options)
+      end
+    end
+
+    def load_container_element(options = {})
+      init_container_element(options)
+      @container_element.compute_options! unless @container_element.computed_options
+    end
+
     def draw_in(rect, state = :normal)
       if cached_draw_image[state]
         context = UIGraphicsGetCurrentContext()

data/motion-prime/sections/base_section.rb

@@ -1,12 +1,12 @@
 motion_require '../helpers/has_authorization'
 module MotionPrime
-  class BaseSection
-    # MotionPrime::BaseSection is container for Elements.
+  class Section
+    # MotionPrime::Section is container for Elements.
     # Sections are located inside Screen and can contain multiple Elements.
     # On render, each element will be added to parent screen.
 
     # == Basic Sample
-    # class MySection < MotionPrime::BaseSection
+    # class MySection < MotionPrime::Section
     #   element :title, text: "Hello World"
     #   element :avatar, type: :image, image: 'defaults/avatar.jpg'
     # end
@@ -22,22 +22,23 @@ module MotionPrime
 
     attr_accessor :screen, :model, :name, :options, :elements, :section_styles
     class_attribute :elements_options, :container_options, :keyboard_close_bindings
-    define_callbacks :render
+    define_callbacks :render, :initialize
 
     def initialize(options = {})
-      options[:screen] = options[:screen].try(:weak_ref)
       @options = options
-      self.screen = options[:screen]
-      @model = options[:model]
-      @name = options[:name] ||= default_name
-      @options_block = options[:block]
+
+      run_callbacks :initialize do
+        @options[:screen] = @options[:screen].try(:weak_ref)
+        self.screen = options[:screen]
+        @model = options[:model]
+        @name = options[:name] ||= default_name
+        @options_block = options[:block]
+      end
     end
 
     def dealloc
-      # pp 'deallocating section. elements count: ', self.elements.try(:count), self.to_s
-
-      NSNotificationCenter.defaultCenter.removeObserver self
-      self.delegate = nil if self.respond_to?(:delegate)
+      # pp 'deallocating section', self.name, self.elements.try(:count), self.to_s, self.object_id
+      NSNotificationCenter.defaultCenter.removeObserver self # unbinding events created in bind_keyboard_events
       super
     end
 
@@ -81,7 +82,9 @@ module MotionPrime
     end
 
     def reload_section
-      self.elements_to_render.values.map(&:view).flatten.compact.each { |view| view.removeFromSuperview }
+      self.elements_to_render.values.map(&:view).flatten.each do |view|
+        view.removeFromSuperview if view
+      end
       load_section!
       run_callbacks :render do
         render!
@@ -148,9 +151,22 @@ module MotionPrime
       end
     end
 
+    def render_container(options = {}, &block)
+      if should_render_container?
+        element = self.container_element || self.init_container_element(options)
+        element.render do
+          block.call
+        end
+      else
+        block.call
+      end
+    end
+
     def render!
-      elements_to_render.each do |key, element|
-        element.render
+      render_container(container_options) do
+        elements_to_render.each do |key, element|
+          element.render
+        end
       end
     end
 
@@ -218,6 +234,9 @@ module MotionPrime
       self.elements.select { |key, element| element.is_a?(BaseElement) }
     end
 
+    def events_off
+    end
+
     protected
       def bind_keyboard_close
         return unless self.class.keyboard_close_bindings.present?
@@ -241,6 +260,16 @@ module MotionPrime
       end
 
     private
+      def should_render_container?
+        has_drawn_content?
+      end
+
+      def has_drawn_content?
+        self.elements.values.any? do |element|
+          element.is_a?(DrawElement)
+        end
+      end
+
       def compute_container_options!
         raw_options = {}
         raw_options.merge!(self.class.container_options.try(:clone) || {})
@@ -274,6 +303,12 @@ module MotionPrime
       def after_render(method_name)
         set_callback :render, :after, method_name
       end
+      def before_initialize(method_name)
+        set_callback :initialize, :before, method_name
+      end
+      def after_initialize(method_name)
+        set_callback :initialize, :after, method_name
+      end
       def bind_keyboard_close(options)
         self.keyboard_close_bindings = options
       end

data/motion-prime/sections/form/base_field_section.rb

@@ -1,16 +1,17 @@
 module MotionPrime
-  class BaseFieldSection < BaseSection
+  class BaseFieldSection < Section
     include CellSectionMixin
     include BW::KVO
 
     attr_reader :form
     after_render :on_section_render
 
-    def initialize(options = {})
-      @form = options[:table].try(:weak_ref)
+    before_initialize :prepare_table_data
+    after_initialize :observe_model_errors
+
+    def prepare_table_data
+      @form = @options[:table]
       @errors_observer_options = normalize_options(options.delete(:observe_errors).clone, self) if options[:observe_errors]
-      super
-      observe_model_errors
     end
 
     def render_element?(element_name)
@@ -30,19 +31,26 @@ module MotionPrime
 
     def observe_model_errors
       return unless observing_errors?
-      errors_observer_fields.each do |field|
-        observe observing_errors_for.errors, observing_errors_for.errors.unique_key(field) do |old_value, new_value|
-          next if old_value == new_value
-          if @status_for_updated == :rendered
-            reload_section
-          else
-            load_section!
-            form.reload_table_data
-          end
+      on_error_change = proc { |old_value, new_value|
+        next if old_value == new_value
+        if @status_for_updated == :rendered
+          reload_section
+        else
+          load_section!
+          form.reload_table_data
         end
+      }.weak!
+
+      errors_observer_fields.each do |field|
+        observe observing_errors_for.errors, observing_errors_for.errors.unique_key(field), &on_error_change
       end
     end
 
+    def dealloc
+      clear_observers
+      super
+    end
+
     def form_name
       form.name
     end
@@ -120,9 +128,12 @@ module MotionPrime
     end
 
     def clear_observers
-      errors_observer_fields.each do |field|
+      return unless observing_errors?
+      # unobserve_all cause double dealloc, following code is a replacement
+      block = proc { |field|
         unobserve observing_errors_for.errors, observing_errors_for.errors.unique_key(field)
-      end if observing_errors?
+      }.weak!
+      errors_observer_fields.each(&block)
     end
 
     def container_height

data/motion-prime/sections/form/base_header_section.rb

@@ -1,14 +1,15 @@
 module MotionPrime
-  class BaseHeaderSection < BaseSection
+  class BaseHeaderSection < Section
     include CellSectionMixin
     DEFAULT_HEADER_HEIGHT = 20
 
     element :title, text: proc { @options[:title] }
     element :hint, text: proc { @options[:hint] }
 
-    def initialize(options = {})
+    before_initialize :prepare_header_options
+
+    def prepare_header_options
       @cell_type = :header
-      super
     end
 
     def render_element?(name)

data/motion-prime/sections/form/password_field_section.rb

@@ -8,5 +8,9 @@ module MotionPrime
     end
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
+
+    def events_off
+      view(:input).off :change
+    end
   end
 end

data/motion-prime/sections/form/select_field_section.rb

@@ -18,5 +18,9 @@ module MotionPrime
         form.send(options[:action]) if options[:action]
       end
     end
+
+    def events_off
+      view(:button).off :touch_down
+    end
   end
 end

data/motion-prime/sections/form/string_field_section.rb

@@ -10,5 +10,9 @@ module MotionPrime
 
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
+
+    def events_off
+      view(:input).off :change
+    end
   end
 end

data/motion-prime/sections/form/submit_field_section.rb

@@ -10,5 +10,9 @@ module MotionPrime
         form.send(options[:action]) if options[:action]
       end
     end
+
+    def events_off
+      view(:submit).off :touch
+    end
   end
 end

data/motion-prime/sections/form/text_field_section.rb

@@ -9,5 +9,9 @@ module MotionPrime
 
     element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
     after_render :bind_text_input
+
+    def events_off
+      view(:input).off :change
+    end
   end
 end

data/motion-prime/sections/form.rb

@@ -155,7 +155,7 @@ module MotionPrime
 
     def load_field(field)
       field_class = class_factory("#{field[:type]}_field_section", true)
-      field_class.new(field.merge(screen: screen, table: self))
+      field_class.new(field.merge(screen: screen, table: self.weak_ref))
     end
 
     def render_field?(name, options)
@@ -209,6 +209,12 @@ module MotionPrime
       section.container_height
     end
 
+    def events_off
+      fields.values.each do |section|
+        section.events_off
+      end
+    end
+
     class << self
       def field(name, options = {}, &block)
         options[:name] = name

data/motion-prime/sections/tabbed.rb

@@ -1,5 +1,5 @@
 module MotionPrime
-  class TabbedSection < BaseSection
+  class TabbedSection < Section
     # MotionPrime::TabbedSection is base class for building tabbed views.
 
     # == Basic Sample

data/motion-prime/sections/table/table_delegate.rb

@@ -5,6 +5,11 @@ module MotionPrime
       self.table_section = options[:section].try(:weak_ref)
     end
 
+    # def dealloc
+    #   pp '@@ dealloc table_delegate'
+    #   super
+    # end
+
     def init_pull_to_refresh
       return unless block = table_section.class.pull_to_refresh_block
       table_section.add_pull_to_refresh do

data/motion-prime/sections/table.rb

@@ -2,7 +2,7 @@ motion_require './table/refresh_mixin'
 motion_require './table/table_delegate'
 
 module MotionPrime
-  class TableSection < BaseSection
+  class TableSection < Section
     include TableSectionRefreshMixin
     include HasStyleChainBuilder
     include HasSearchBar
@@ -15,10 +15,11 @@ module MotionPrime
     after_render :init_pull_to_refresh
     delegate :init_pull_to_refresh, to: :table_delegate
 
-    # def dealloc
-    #   pp 'deallocating table. sections count:', @data.try(:count)
-    #   super
-    # end
+    def dealloc
+      cancel_block = proc { :cancelled }.weak!
+      @preloader_queue.map!(&cancel_block) if @preloader_queue.present?
+      super
+    end
 
     def table_data
       []
@@ -50,10 +51,18 @@ module MotionPrime
       @did_appear = false
       @data = nil
       @async_loaded_data = nil
-      @next_portion_starts_from = nil
+      @preloader_next_starts_from = nil
       @preloader_cancelled = false
       @data_stamp = nil
-      @queue_states[-1] = :cancelled if @queue_states.present?
+      @preloader_queue[-1] = :cancelled if @preloader_queue.present?
+      # @ids.each do |id|
+      #   table_view.dequeueReusableCellWithIdentifier(id)
+      # end if @ids
+      # table_view.valueForKey('_reusableTableCells').removeAllObjects
+
+      # releasing table_delegate
+      # @table_delegate = nil
+      # table_view.delegate = table_delegate
     end
 
     def table_styles
@@ -142,20 +151,16 @@ module MotionPrime
       element = section.container_element || section.init_container_element(container_element_options_for(index))
 
       view = element.render do
-        rows_for_section(index.section)[index.row].render
+        section.render
       end
-
-      @rendered_cells[index.section][index.row] = view
       on_row_render(view, index)
-
-      preload_sections_for(index)
-
+      preload_sections_after(index)
       view
     end
 
     def render_header(section)
       return unless options = self.section_header_options.try(:[], section)
-      self.section_headers[section] ||= BaseHeaderSection.new(options.merge(screen: screen, table: self))
+      self.section_headers[section] ||= BaseHeaderSection.new(options.merge(screen: screen, table: self.weak_ref))
     end
 
     def header_for_section(section)
@@ -204,9 +209,6 @@ module MotionPrime
     end
 
     def cell_for_index(table, index)
-      @rendered_cells ||= []
-      @rendered_cells[index.section] ||= []
-
       cell = cached_cell(index, table) || render_cell(index, table)
 
       # run table view is appeared callback if needed
@@ -255,7 +257,9 @@ module MotionPrime
 
     private
       def display_pending_cells
-        table_view.visibleCells.each { |cell_view| cell_view.section.display if cell_view.section.pending_display }
+        table_view.visibleCells.each do |cell_view|
+          cell_view.section.display if cell_view.section.pending_display
+        end
       end
 
       def set_table_data
@@ -328,8 +332,8 @@ module MotionPrime
             rows = [id]
           end
           rows.map { |row| "#{section}_#{row}" }
-        end.flatten
-        set_data_stamp(keys)
+        end
+        set_data_stamp(keys.flatten)
       end
 
       def load_sections
@@ -341,45 +345,61 @@ module MotionPrime
         end
       end
 
-      def preload_sections_for(index)
-        return if !async_data? || @next_portion_starts_from == false
-        service = index_service
-
-        load_limit = self.class.async_data_options.try(:[], :preload_rows_count)
-        @next_portion_starts_from ||= index
-        start_preload_when_index_loaded = service.sum_index(@next_portion_starts_from, load_limit ? -load_limit/2 : 0)
-        if service.compare_indexes(index, start_preload_when_index_loaded) >= 0
-          section = @next_portion_starts_from.section
-          next_row = @next_portion_starts_from.row
-          left_to_load = rows_for_section(section).count - next_row
-
-          load_count = [left_to_load, load_limit].compact.min
 
-          next_index = @next_portion_starts_from
-          @preloader_cancelled = false
+      # Preloads sections after rendering cell in current sheduled index or given index.
+      # TODO: probably should be in separate class.
+      #
+      # @param index [NSIndexPath] Value of first index to load if current sheduled index not exists.
+      # @return [NSIndexPath, Boolean] Index of next sheduled index.
+      def preload_sections_after(index)
+        return if !async_data? || @preloader_next_starts_from == false
+        service = preloader_index_service
 
-          @queue_states ||= []
-
-          BW::Reactor.schedule(@queue_states.count) do |queue_id|
-            @queue_states[queue_id] = :in_progress
-
-            result = load_count.times do |offset|
-              break if @queue_states[queue_id] == :cancelled
-              load_cell_by_index(next_index, preload: true)
-              next_index = service.sum_index(next_index, 1) unless offset == load_count - 1
-            end
+        load_limit = self.class.async_data_options.try(:[], :preload_rows_count)
+        @preloader_next_starts_from ||= index
+        index_to_start_preloading = service.sum_index(@preloader_next_starts_from, load_limit ? -load_limit/2 : 0)
+        if service.compare_indexes(index, index_to_start_preloading) >= 0
+          load_count = preload_sections_schedule_next(@preloader_next_starts_from, load_limit)
+          @preloader_next_starts_from = service.sum_index(@preloader_next_starts_from, load_count, false)
+        else
+          false
+        end
+      end
 
-            if result
-              on_async_data_preloaded(next_index)
-              @queue_states[queue_id] = :completed
+      # Schedules preloading sections starting with given index with given limit.
+      # TODO: probably should be in separate class.
+      #
+      # @param index [NSIndexPath] Value of first index to load.
+      # @param limit [Integer] Limit of sections to load.
+      # @return [Integer] Count of sections scheduled to load.
+      def preload_sections_schedule_next(index, limit)
+        service = preloader_index_service
+
+        left_to_load = rows_for_section(index.section).count - index.row
+        load_count = [left_to_load, limit].compact.min
+        @preloader_cancelled = false
+        @preloader_queue ||= []
+
+        # TODO: do not release parent_objcets unless finished
+        BW::Reactor.schedule(@preloader_queue.count) do |queue_id|
+          @preloader_queue[queue_id] = :in_progress
+
+          result = load_count.times do |offset|
+            break if @break_preload || @preloader_queue[queue_id] == :cancelled
+            load_cell_by_index(index, preload: true)
+            unless offset == load_count - 1
+              index = service.sum_index(index, 1)
             end
           end
-
-          @next_portion_starts_from = service.sum_index(@next_portion_starts_from, load_count, false)
+          if result
+            on_async_data_preloaded(index)
+            @preloader_queue[queue_id] = :completed
+          end
         end
+        load_count
       end
 
-      def index_service
+      def preloader_index_service
         TableDataIndexes.new(@data)
       end
 

data/motion-prime/services/logger.rb

@@ -0,0 +1,37 @@
+module MotionPrime
+  class Logger
+    LOGGER_ERROR_LEVEL = 0
+    LOGGER_INFO_LEVEL = 1
+    LOGGER_DEBUG_LEVEL = 2
+
+    class_attribute :level
+
+    class << self
+      def error(*args)
+        pp(*args) if LOGGER_ERROR_LEVEL <= current_level
+      end
+
+      def info(*args)
+        pp(*args) if LOGGER_INFO_LEVEL <= current_level
+      end
+
+      def debug(*args)
+        pp(*args) if LOGGER_DEBUG_LEVEL <= current_level
+      end
+
+      def current_level
+        current_level = self.level || (Config.logger.level.nil? ? :info : Config.logger.level)
+        case current_level.to_s
+        when 'error'
+          LOGGER_ERROR_LEVEL
+        when 'info'
+          LOGGER_INFO_LEVEL
+        when 'debug'
+          LOGGER_DEBUG_LEVE
+        else
+          2
+        end
+      end
+    end
+  end
+end

data/motion-prime/support/mp_cell_with_section.rb

@@ -1,9 +1,9 @@
 class MPCellWithSection < UITableViewCell
-  attr_accessor :section
+  attr_reader :section
 
   def setSection(section)
     @section = section.try(:weak_ref)
-    @section_name = section.name
+    @section_name = section.try(:name) # TODO: remove after debug
   end
 
   def drawRect(rect)
@@ -12,7 +12,12 @@ class MPCellWithSection < UITableViewCell
   end
 
   def draw_in(rect)
-    return unless section
-    section.draw_in(rect) if section.respond_to?(:draw_in)
+    # pp '++ drawing', @section_name, self.object_id
+    section.draw_in(rect) if section && section.respond_to?(:draw_in)
   end
+
+  # def dealloc
+  #   pp '--- deallog cell with section', @section_name, self.object_id
+  #   super
+  # end
 end

data/motion-prime/support/tab_bar_controller.rb

@@ -7,7 +7,8 @@ module MotionPrime
 
       screens.each_with_index do |screen, index|
         if screen.is_a?(Hash)
-          screen, image, title = screen[:screen].try(:weak_ref), screen[:image], screen[:title]
+          screen, image, title = screen[:screen], screen[:image], screen[:title]
+          screen = Screen.create_with_options(screen).try(:weak_ref)
           title ||= screen.title
           image = image.uiimage if image
           screen.tabBarItem = UITabBarItem.alloc.initWithTitle title, image: image, tag: index

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/motion-prime/views/layout.rb

@@ -2,7 +2,7 @@
 motion_require '../support/mp_cell_with_section'
 module MotionPrime
   module Layout
-    def add_view(klass, options = {}, &block)
+    def add_view(klass, options = {}, &block)    
       bounds = if view_stack.empty?
         options.delete(:parent_view).try(:bounds) || CGRectZero
       else

data/motion-prime/views/view_builder.rb

@@ -110,6 +110,13 @@ module MotionPrime
 
             klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
           },
+          'MPViewWithSection' => Proc.new{|klass, options|
+            if options[:has_drawn_content]
+              options[:background_color] = :clear
+              options.delete(:gradient)
+            end
+            klass.alloc.initWithFrame CGRectZero
+          },
           'UISearchBar' => Proc.new{|klass, options|
             klass = options[:search_field_background_image] ? MPSearchBarCustom : UISearchBar
             search_bar = klass.alloc.init

data/motion-prime.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../motion-prime/version', __FILE__)
 Gem::Specification.new do |spec|
   spec.name          = "motion-prime"
   spec.version       = MotionPrime::VERSION
-  spec.authors       = ["Iskander Haziev"]
+  spec.authors       = ["Iskander Haziev", "Pavel Feklistov"]
   spec.email         = ["gvalmon@gmail.com"]
   spec.description   = %q{RubyMotion apps development framework}
   spec.summary       = %q{RubyMotion apps development framework}

data/spec/delegate/{base_delegate_spec.rb → delegate_spec.rb}

@@ -1,4 +1,4 @@
-describe "base delegate" do
+describe MotionPrime::BaseAppDelegate do
 
   before { @subject = BaseDelegate.new }