motion-prime 0.9.6 → 0.9.7

data/motion-prime/elements/draw.rb

@@ -36,36 +36,27 @@ module MotionPrime
 
     def bind_gesture(action, receiver = nil, target = nil)
       target ||= section
-      target.bind_gesture_on_container_for(self, action, receiver)
+      target.bind_gesture_on_container_for(self, action, receiver.weak_ref)
     end
 
     def hide
       return if computed_options[:hidden]
       computed_options[:hidden] = true
-      section.cached_draw_image = nil
-      view.setNeedsDisplay
+      rerender!
     end
 
     def show
       return if !computed_options[:hidden]
       computed_options[:hidden] = false
-      section.cached_draw_image = nil
-      view.setNeedsDisplay
+      rerender!
     end
 
-    def reload!
-      reset_computed_values
-      compute_options!
+    def rerender!
       section.cached_draw_image = nil
-    end
-
-    def update_with_options(new_options = {})
-      options.merge!(new_options)
-      reload!
       view.setNeedsDisplay
     end
 
-    private
+    protected
       def frame_outer_width; computed_frame.size.width end
       def frame_width; frame_outer_width - content_padding_width end
 
@@ -85,8 +76,7 @@ module MotionPrime
       def frame_inner_right; frame_right - content_padding_right end
 
       def reset_computed_values
-        @content_height = nil
-        @content_width = nil
+        super
         @computed_frame = nil
       end
 

data/motion-prime/helpers/has_authorization.rb

@@ -10,7 +10,7 @@ module MotionPrime
       current_user.present?
     end
     def api_client
-      @api_client ||= ApiClient.new(access_token: current_user.try(:access_token))
+      App.delegate.api_client
     end
   end
 end

data/motion-prime/models/_base_mixin.rb

@@ -49,7 +49,7 @@ module MotionPrime
         elsif options[:validate_attribute_presence]
           raise(StoreError, "unknown attribute: '#{k}'")
         else
-          NSLog("unknown attribute: #{k}")
+          Prime.logger.info("unknown attribute: #{k}")
         end
       end
     end

data/motion-prime/prime.rb

@@ -18,5 +18,9 @@ module MotionPrime
   def self.logger
     @logger ||= MotionPrime::Logger.new
   end
+
+  def self.logger=(value)
+    @logger = value
+  end
 end
 ::Prime = MotionPrime unless defined?(::Prime)

data/motion-prime/screens/extensions/_indicators_mixin.rb

@@ -1,17 +1,23 @@
 module MotionPrime
   module ScreenIndicatorsMixin
-    def show_activity_indicator
-      if @activity_indicator_view.nil?
-        @activity_indicator_view = UIActivityIndicatorView.gray
-        @activity_indicator_view.center = CGPointMake(view.center.x, view.center.y)
-        view.addSubview @activity_indicator_view
+    def show_activity_indicator(render_target = nil, options = {})
+      render_target ||= view
+      @activity_indicator_view ||= {}
+      indicator = @activity_indicator_view[render_target.object_id] ||= begin
+        indicator = UIActivityIndicatorView.gray
+        render_target.addSubview(indicator)
+        indicator
       end
-      @activity_indicator_view.startAnimating
+
+      center = options[:center] || {}
+      indicator.center = CGPointMake(center.fetch(:x, render_target.center.x), center.fetch(:y, render_target.center.y))
+      indicator.startAnimating
     end
 
-    def hide_activity_indicator
-      return unless @activity_indicator_view
-      @activity_indicator_view.stopAnimating
+    def hide_activity_indicator(render_target = nil)
+      @activity_indicator_view ||= {}
+      render_target ||= view
+      @activity_indicator_view[render_target.object_id].try(:stopAnimating)
     end
 
     def show_progress_indicator(text = nil, options = {})
@@ -24,7 +30,7 @@ module MotionPrime
         options[:add_to_view] ||= self.view
         @progress_indicator_view = self.progress_hud(options).view
       else
-        self.set_options(@progress_indicator_view, options.except(:add_to_view))
+        self.update_options_for(@progress_indicator_view, options.except(:add_to_view))
         @progress_indicator_view.show options.has_key?(:animated) ? options[:animatetd] : true
       end
     end

data/motion-prime/screens/screen.rb

@@ -35,7 +35,7 @@ module MotionPrime
       @visible = true
       @on_appear_happened ||= {}
       unless @on_appear_happened[view.object_id]
-        set_options view, styles: default_styles do
+        set_options_for view, styles: default_styles do
           run_callbacks :render do
             send((action).to_sym)
           end

data/motion-prime/sections/_async_table_mixin.rb

@@ -24,7 +24,7 @@ module Prime
     # Reset async loaded table data and preloader queue.
     #
     # @return [Boolean] true
-    def reset_data
+    def reset_table_data
       super # must be before to update fixed_table_data
       @async_loaded_data = async_data? ? fixed_table_data : nil
       Array.wrap(@preloader_queue).each { |queue| queue[:state] = :cancelled }
@@ -175,7 +175,6 @@ module Prime
 
       def preload_section_by_index(index)
         section = cell_section_by_index(index)
-
         if section.create_elements && !section.container_element && async_data? # perform only if just loaded
           section.load_container_with_elements(container: container_element_options_for(index))
           section

data/motion-prime/sections/_draw_section_mixin.rb

@@ -37,7 +37,9 @@ module MotionPrime
 
     def clear_gesture_for_receiver(receiver)
       return unless self.container_gesture_recognizers
-      self.container_gesture_recognizers.delete_if { |recognizer| recognizer[:receiver] == receiver }
+      self.container_gesture_recognizers.delete_if { |recognizer|
+        !recognizer[:receiver].weakref_alive? || recognizer[:receiver] == receiver
+      }
     end
 
     def prerender_elements_for_state(state = :normal)

data/motion-prime/sections/base_section.rb

@@ -22,7 +22,7 @@ module MotionPrime
     include DelegateMixin
 
     attr_accessor :screen, :model, :name, :options, :elements, :section_styles
-    class_attribute :elements_options, :container_options, :keyboard_close_bindings
+    class_attribute :elements_options, :container_options, :keyboard_close_bindings, :elements_callbacks
     define_callbacks :render, :initialize
 
     def initialize(options = {})
@@ -139,22 +139,17 @@ module MotionPrime
 
     # Force reload section, will also re-render elements.
     # For table view cells will also reload it's table data.
+    # Useful on some cases, but in common case please use #reload.
     #
     # @return [Boolean] true
-    def reload_section
+    def hard_reload_section
       # reload Base Elements
-      # TODO: probably should use update_with_options for Base elements too?
       self.elements_to_render.values.map(&:view).flatten.each do |view|
         view.removeFromSuperview if view
       end
-      create_elements!
-      run_callbacks :render do
-        render!
-      end
+      render({}, true)
       # reload Draw Elements
-      elements_to_draw.each do |key, element|
-        element.update_with_options
-      end
+      elements_to_draw.values.each(&:update)
 
       if @table && !self.is_a?(BaseFieldSection)
         cell.setNeedsDisplay
@@ -163,11 +158,23 @@ module MotionPrime
       true
     end
 
-    # Alias for reload_section
+    # Reload section, will re-render elements.
     #
     # @return [Boolean] true
     def reload
-      reload_section
+      elements.values.each(&:update)
+      true
+    end
+
+    def render_container(options = {}, &block)
+      if should_render_container? && !self.container_element.try(:view)
+        element = self.init_container_element(options)
+        element.render do
+          block.call
+        end
+      else
+        block.call
+      end
     end
 
     def add_element(key, options = {})
@@ -190,33 +197,30 @@ module MotionPrime
       true
     end
 
-    def render(container_options = {})
-      create_elements
+    def render(container_options = {}, force = false)
+      force ? create_elements! : create_elements
       self.container_options.merge!(container_options)
       run_callbacks :render do
         render!
       end
     end
 
-    def render_container(options = {}, &block)
-      if should_render_container? && !self.container_element.try(:view)
-        element = self.init_container_element(options)
-        element.render do
-          block.call
-        end
-      else
-        block.call
-      end
-    end
-
     def render!
       render_container(container_options) do
         elements_to_render.each do |key, element|
           element.render
+          on_element_render(element)
         end
       end
     end
 
+    def on_element_render(element)
+      return unless callbacks = elements_callbacks.try(:[], element.name)
+      callbacks.each do |options|
+        options[:method].to_proc.call(options[:target] || self)
+      end
+    end
+
     def element(name)
       self.elements ||= {}
       self.elements[name.to_sym]
@@ -305,7 +309,7 @@ module MotionPrime
     end
 
     def screen?
-      screen && screen.weakref_alive?
+      screen.weakref_alive?
     end
 
     protected
@@ -387,6 +391,7 @@ module MotionPrime
 
     class << self
       def inherited(subclass)
+        subclass.elements_callbacks = self.elements_callbacks.try(:clone)
         subclass.elements_options = self.elements_options.try(:clone)
         subclass.container_options = self.container_options.try(:clone)
         subclass.keyboard_close_bindings = self.keyboard_close_bindings.try(:clone)
@@ -415,6 +420,12 @@ module MotionPrime
       def after_initialize(*method_names, &block)
         set_callback :initialize, :after, *method_names, &block
       end
+      def after_element_render(element_name, method, options = {})
+        options.merge!(method: method)
+        self.elements_callbacks ||= {}
+        self.elements_callbacks[element_name] ||= []
+        self.elements_callbacks[element_name] << options
+      end
       def bind_keyboard_close(options)
         self.keyboard_close_bindings = options
       end

data/motion-prime/sections/form.rb

@@ -18,18 +18,18 @@ module MotionPrime
     # end
     #
 
-    class_attribute :fields_options, :text_field_limits, :text_view_limits
+    class_attribute :fields_options, :text_field_limits, :text_view_limits, :fields_callbacks
     attr_accessor :fields, :field_indexes, :keyboard_visible, :rendered_views, :grouped_data
 
     def table_data
       if has_many_sections?
-        grouped_data.compact
+        grouped_data.reject(&:nil?)
       else
         fields.values
       end
     end
 
-    def reload_cell_section(section)
+    def hard_reload_cell_section(section)
       field = section.name.to_sym
       path = field_indexes[field]
       section.cell.try(:removeFromSuperview)
@@ -43,10 +43,7 @@ module MotionPrime
       end
 
       set_data_stamp(fields[field].object_id)
-
-      # table_view.beginUpdates
       table_view.reloadRowsAtIndexPaths([path], withRowAnimation: UITableViewRowAnimationNone)
-      # table_view.endUpdates
     end
 
     # Returns element based on field name and element name
@@ -173,7 +170,7 @@ module MotionPrime
     def reload_data
       @groups_count = nil
       init_form_fields # must be before resetting to reflect changes on @data
-      reset_data
+      reset_table_data
       reload_table_data
     end
 
@@ -191,6 +188,13 @@ module MotionPrime
       if options && options[:after_render]
         self.send(options[:after_render])
       end
+
+      section = cell_section_by_index(index)
+      if callbacks = fields_callbacks.try(:[], section.name)
+        callbacks.each do |options|
+          options[:method].to_proc.call(options[:target] || self)
+        end
+      end
       super
     end
 
@@ -198,13 +202,14 @@ module MotionPrime
     # ---------------------
 
     def number_of_groups(table = nil)
-      has_many_sections? ? grouped_data.compact.count : 1
+      has_many_sections? ? grouped_data.reject(&:nil?).count : 1
     end
 
     class << self
       def inherited(subclass)
         super
         subclass.fields_options = self.fields_options.try(:clone)
+        subclass.fields_callbacks = self.fields_callbacks.try(:clone)
         subclass.text_field_limits = self.text_field_limits.try(:clone)
         subclass.text_view_limits = self.text_view_limits.try(:clone)
       end
@@ -223,6 +228,13 @@ module MotionPrime
         self.fields_options[name]
       end
 
+      def after_field_render(field_name, method, options = {})
+        options.merge!(method: method)
+        self.fields_callbacks ||= {}
+        self.fields_callbacks[field_name] ||= []
+        self.fields_callbacks[field_name] << options
+      end
+
       def limit_text_field_length(name, limit)
         self.text_field_limits ||= {}
         self.text_field_limits[name] = limit
@@ -252,6 +264,9 @@ module MotionPrime
           section_indexes[section_id] ||= 0
 
           section = load_field(field)
+          if section.options[:after_render].present?
+            puts "DEPRECATION: form field's option :after_render is deprecated, please use Prime::Section#after_field_render instead"
+          end
           self.fields[key] = section
           self.field_indexes[key] = NSIndexPath.indexPathForRow(section_indexes[section_id], inSection: section_id)
           grouped_data[section_id][section_indexes[section_id]] = section

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

@@ -30,19 +30,6 @@ module MotionPrime
       end
     end
 
-    # Changes height of the field (the cell in table) with animation.
-    #
-    # @param height [Integet] new height of field
-    # @return [MotionPrime::BaseFieldSection]
-    def update_height(height)
-      return if container_options[:height] == height
-      container_options[:height] = height
-      index = form.field_indexes[name]
-      form.send :set_data_stamp, self.object_id
-      form.table_view.reloadRowsAtIndexPaths([index], withRowAnimation: UITableViewRowAnimationFade)
-      self
-    end
-
     def on_section_render
       @status_for_updated = :rendered
       form.register_elements_from_section(self)
@@ -171,14 +158,13 @@ module MotionPrime
 
     def reload_section
       clear_observers
-      form.reload_cell_section(self)
+      form.hard_reload_cell_section(self)
     end
 
     def clear_observers
       return unless observing_errors?
       # unobserve_all cause double dealloc, following code is a replacement
       unobserve observing_errors_for.errors, :info
-      # TODO: clear 'on' events
     end
 
     def container_height

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

@@ -8,7 +8,7 @@ module MotionPrime
       options[:input] || {}
     end
 
-    after_render :bind_input
+    after_element_render :input, :bind_input
 
     def bind_input
       picker = view(:input)

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

@@ -7,7 +7,7 @@ module MotionPrime
       {secure_text_entry: true}.merge(options[:input] || {})
     end
     element :error_message, type: :error_message, text: proc { |field| field.all_errors.join("\n") if field.observing_errors? }
-    after_render :bind_text_input
+    after_element_render :input, :bind_text_input
 
     def value
       view(:input).text