motion-prime 0.8.1 → 0.8.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmUyZDc0MTg4NTY2NDE5MzMwNjI1NDgxMjI2ZDIzYzIwNWEzMWI5Nw==
+    YzY4ZDViYzJiOGMwNWM5YTdhN2UwZjNlYTNlOWQ0OTc0MDM4NDM4Yw==
   data.tar.gz: !binary |-
-    ZGJkMWQ4NWM0NjVhMzVhMWI1NzBjMGM2M2EyNTE3ZDllZjhjNjBjMg==
+    ODRiYzRiZDAxNTMzYzdiNzVmNTg3N2FhNjY0M2E1ZGQ2NDU5YjdlZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjNjNjNiMGEzMzVlOTAwM2EyNTkxZDlhZGY2YmMwMGE2ZDk2ZTIyNWUwNjYw
-    YmYxNDRjOThiZGJlM2IxNTNkZWNiMzI5ZjcyNDZmY2I3YWEwNjQ0MjYzNmMx
-    MzlmMjk1YjI0MjZjMGE1NTg4NDFkMzlkNTgwZTczZWUwMDZmZDE=
+    MDAyNTU2NzE0ODhhZWIxNzg5M2Y3ZWRlOWVlYWE0MjJmMDEzM2ZlMzE2NDI1
+    ZmMyODZjZGEyYjBmYmJlODZhZWRmYzZmZjg3OWE5ZmMzMDkxMjBkMGE2YjY1
+    NDNiMjMzN2I1NWRhNjVjNjJkYTc3NmZhYTI0ZmRlYTcxYjA4ZWM=
   data.tar.gz: !binary |-
-    NTE1MzZiZDA2NWMwOWQ4YjdjNThmNjMzMmMwOTY2ZGY4Y2IwZGU0OWFmMjc0
-    ZjMxZjg1Yjc4MDkwZGZlYzgwZTlkNDM2YTZiYzE0ODQ5M2FlNGVmZGFhN2Rl
-    MTRjZjMwNzVkMmYyNmM1NzUzZTg3Y2ZkNzczZTI5YjRiNDFiYTM=
+    MWJiZDQ3OGJlN2QzNWRlNjVhNTg2MGQyN2U2NThlNTUwNmUyMmFhMGZiN2Y1
+    MmQ2YzY0MjFmYzA4YjU4NzVkOThkY2Q4ZmNiM2Q4YTFiMjBlMWE1OGI2MWFm
+    NmZjOGQ2YWU5NGQ4NDJjM2Y2ZTc2MGUxN2IxMzExNGQ0YzViZTU=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.8.2
+* bug fixes.
+* added #clone method for Model.
+* added #filter method for association collection.
+* memory leak fixes.
+
 === 0.8.1
 * renamed submit element in submit field to button element.
 * renamed date_picker element in date_picker field to input element.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.1)
+    motion-prime (0.8.2)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.4.0)
       cocoapods

data/ROADMAP.md

@@ -1,10 +1,13 @@
 === 0.8.2
 * Move api_client and model sync mixin to prime_api gem.
+* Move bind keyboard events to forms.
 
 === 0.9.0
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text
 * bug: size_to_fit works incorrect with relative width.
 * bug: bind_keyboard_close breaks bind_guesture
+* bug: dealloc of Prime::Section will not be called for cell created in table_data using #map.
+* bug: images does not render after reload table if using draw_with_layer (prerender not enabled).
 * add clone to models to prevent problems when bag_key is overrided
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.

data/files/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
 
-gem 'motion-prime', '0.8.1'
+gem 'motion-prime', '0.8.2'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.4'

data/motion-prime/api_client.rb

@@ -17,7 +17,7 @@ class ApiClient
     end
     if config.sign_request?
       signature = RmDigest::MD5.hexdigest(
-        config.signature_secret + params.keys.map(&:to_s).sort.join
+        config.signature_secret + filter_sign_params(params).keys.map(&:to_s).sort.join
       )
       params.merge!(sign: signature)
     end
@@ -37,7 +37,7 @@ class ApiClient
       auth_data = response.object
 
       self.access_token = auth_data[:access_token] if auth_data
-      block.call(auth_data, response.operation.response.statusCode) if use_callback
+      block.call(auth_data, response.operation.response.try(:statusCode)) if use_callback
     end
     true
   end
@@ -111,6 +111,9 @@ class ApiClient
   end
 
   private
+    def filter_sign_params(params)
+      params.except(:_files)
+    end
 
     def config
       MotionPrime::Config.api_client

data/motion-prime/core_ext/kernel.rb

@@ -15,6 +15,42 @@ class Kernel
     self
   end
 
+  def allocate_strong_references(key = nil)
+    unless self.respond_to?(:strong_references)
+      Prime.logger.debug "User must define `strong_references` in `#{self.class.name}`"
+      return false
+    end
+
+    refs = Array.wrap(self.strong_references).compact
+    unless refs.present?
+      Prime.logger.debug "`strong_references` are empty for `#{self.class.name}`"
+      return false
+    end
+
+    @_strong_references ||= {}
+    key ||= [@_strong_references.count, Time.now.to_i].join('_')
+    @_strong_references[key] = refs.map(&:strong_ref)
+    key
+  end
+
+  def release_strong_references(key = nil)
+    unless self.respond_to?(:strong_references)
+      Prime.logger.debug "User must define `strong_references` in `#{self.class.name}`"
+      return false
+    end
+    key ||= @_strong_references.keys.last
+    @_strong_references.delete(key)
+    key
+  end
+
+  def allocated_references_released?
+    unless self.respond_to?(:strong_references)
+      Prime.logger.debug "User must define `strong_references` in `#{self.class.name}`"
+      return false
+    end
+    @_strong_references.all? { |key, ref| @_strong_references.count; ref.retainCount == @_strong_references.count }
+  end
+
   def clear_instance_variables(options = {})
     ivars = self.instance_variables
     excluded_ivars = Array.wrap(options[:except]).map(&:to_s)

data/motion-prime/elements/_content_text_mixin.rb

@@ -11,15 +11,19 @@ module MotionPrime
       (is_a?(ButtonElement) ? button_content_font : input_content_font) || :system.uifont
     end
 
-    def content_attributed_text
+    def current_attributed_text
       if view.try(:is_a?, UITextView) && view.text.present?
         text = view.attributedText
         text += ' ' if text.to_s.end_with?("\n") # does not respect \n at the end by default
-        return text
+        text
+      else
+        attributed_text_for_text(content_text)
       end
+    end
 
+    def attributed_text_for_text(text)
       options = {
-        text: content_text,
+        text: text,
         font: content_font,
         line_spacing: computed_options[:line_spacing],
         line_height: computed_options[:line_height]
@@ -28,11 +32,19 @@ module MotionPrime
     end
 
     def content_width
+      @content_width = width_for_attributed_text(current_attributed_text)
+    end
+
+    def width_for_text(text)
+      width_for_attributed_text(attributed_text_for_text(text))
+    end
+
+    def width_for_attributed_text(attributed_text)
       min, max = computed_options[:min_width].to_f, computed_options[:max_width]
-      return min if content_text.blank?
+      return min if attributed_text.blank?
 
-      rect = get_content_rect(Float::MAX)
-      @content_width = [[rect.size.width.ceil, max].compact.min, min].max.ceil
+      rect = get_content_rect(attributed_text, Float::MAX)
+      [[rect.size.width.ceil, max].compact.min, min].max.ceil
     end
 
     def cached_content_width
@@ -40,10 +52,19 @@ module MotionPrime
     end
 
     def content_height
+      @content_height = height_for_attributed_text(current_attributed_text)
+    end
+
+    def height_for_text(text)
+      height_for_attributed_text(attributed_text_for_text(text))
+    end
+
+    def height_for_attributed_text(attributed_text)
       min, max = computed_options[:min_height].to_f, computed_options[:max_height]
-      return min if content_text.blank?
-      rect = get_content_rect(computed_options[:width] - content_padding_width)
-      @content_height = [[rect.size.height.ceil, max].compact.min, min].max.ceil
+      return min if attributed_text.blank?
+
+      rect = get_content_rect(attributed_text, computed_options[:width] - content_padding_width)
+      [[rect.size.height.ceil, max].compact.min, min].max.ceil
     end
 
     def cached_content_height
@@ -55,14 +76,14 @@ module MotionPrime
     end
 
     private
-      def get_content_rect(width)
+      def get_content_rect(text, width)
         raise "Please set element width for content size calculation" unless width
 
         options = NSStringDrawingUsesLineFragmentOrigin
         if is_a?(TextViewElement)
           options |= NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine
         end
-        content_attributed_text.boundingRectWithSize([width, Float::MAX], options: options, context:nil)
+        text.boundingRectWithSize([width, Float::MAX], options: options, context:nil)
       end
 
       def button_content_text

data/motion-prime/elements/base_element.rb

@@ -27,9 +27,19 @@ module MotionPrime
       @name = options[:name]
       @block = options[:block]
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub(/(_draw)?_element/, '')
+
+      if Prime.env.development?
+        @_element_info = "#{@name} #{view_name} #{section.try(:name)} #{screen.class}"
+        @@_allocated_elements ||= []
+        @@_allocated_elements << @_element_info
+      end
     end
 
     def dealloc
+      if Prime.env.development?
+        index = @@_allocated_elements.index(@_element_info)
+        @@_allocated_elements.delete_at(index) if index
+      end
       Prime.logger.dealloc_message :element, self, self.name
       super
     end
@@ -41,12 +51,12 @@ module MotionPrime
 
     def render(options = {}, &block)
       run_callbacks :render do
-        render!(&block)
+        render!(options, &block)
       end
     end
 
-    def render!(&block)
-      view = screen.add_view class_factory(view_class), computed_options do |view|
+    def render!(options = {}, &block)
+      view = screen.add_view class_factory(view_class), computed_options.merge(options) do |view|
         @view = view
         block.try(:call, view, self)
       end
@@ -72,11 +82,14 @@ module MotionPrime
       normalize_options(@computed_options, section, %w[text placeholder font title_label padding padding_left padding_right min_width min_outer_width max_width max_outer_width width left right])
     end
 
+    def reload!
+      compute_options!
+    end
+
     def update_with_options(new_options = {})
       options.merge!(new_options)
-      compute_options!
+      reload!
       view.try(:removeFromSuperview)
-      @view = nil
       render
     end
 
@@ -107,29 +120,33 @@ module MotionPrime
 
       def compute_style_options(*style_sources)
         has_errors = section.respond_to?(:observing_errors?) && observing_errors? && has_errors?
-        is_cell_section = section.respond_to?(:cell_name)
+        is_cell_section = section.respond_to?(:cell_section_name)
 
         @styles = []
         if is_cell_section
           @styles += compute_cell_style_options(style_sources, has_errors)
         end
 
-         # styles got from mixins option
-        mixin_styles = style_sources.map do |source|
-          normalize_object(source.delete(:mixins), section)
-        end.flatten.map{ |m| :"_mixin_#{m}" }
-        @styles += mixin_styles
+        mixins = []
+        custom_styles = []
+        style_sources.each do |source|
+          if source_mixins = source.delete(:mixins)
+            mixins += Array.wrap(normalize_object(source_mixins, section))
+          end
+          if source_styles = source.delete(:styles)
+            custom_styles += Array.wrap(normalize_object(source_styles, section))
+          end
+        end
+        # styles got from mixins option
+        @styles += mixins.map{ |m| :"_mixin_#{m}" }
 
         # don't use present? here, it's slower, while this method should be very fast
         if section && section.name && section.name != '' && name && name != ''
           # using for base sections
           @styles << [section.name, name].join('_').to_sym
         end
-        # custom style (from options or block options), using for TableViews as well
-        custom_styles = style_sources.map do |source|
-          normalize_object(source.delete(:styles), section)
-        end.flatten
 
+        # custom style (from options or block options), using for TableViews as well
         @styles += custom_styles
         # puts @view_class.to_s + @styles.inspect, ''
         @styles
@@ -140,7 +157,7 @@ module MotionPrime
         suffixes = {common: [], specific: []}
         all_styles = []
 
-        # following example in Prime::TableSection#cell_styles
+        # following example in Prime::TableSection#cell_section_styles
         # form element/cell: <base|user>_form_field, <base|user>_form_string_field, user_form_field_email
         # table element/cell: <base|categories>_table_cell, categories_table_title
         if section.section_styles

data/motion-prime/elements/draw.rb

@@ -60,8 +60,9 @@ module MotionPrime
     def computed_right; computed_left + computed_width end
     def computed_inner_right; computed_right - content_padding_right end
 
-    def bind_gesture(action, receiver = nil)
-      section.bind_gesture_on_container_for(self, action, receiver)
+    def bind_gesture(action, receiver = nil, target = nil)
+      target ||= section
+      target.bind_gesture_on_container_for(self, action, receiver)
     end
 
     def hide
@@ -78,10 +79,15 @@ module MotionPrime
       view.setNeedsDisplay
     end
 
-    def update_with_options(new_options = {})
-      options.merge!(new_options)
+    def reload!
+      reset_computed_values
       compute_options!
       section.cached_draw_image = nil
+    end
+
+    def update_with_options(new_options = {})
+      options.merge!(new_options)
+      reload!
       view.setNeedsDisplay
     end
 

data/motion-prime/elements/draw/image.rb

@@ -14,7 +14,6 @@ module MotionPrime
 
     def draw_in(rect)
       return if computed_options[:hidden]
-
       draw_background_in_context(UIGraphicsGetCurrentContext())
       computed_options[:draw_in_rect] ? draw_in_context(UIGraphicsGetCurrentContext()) : draw_with_layer
       load_image
@@ -49,48 +48,60 @@ module MotionPrime
 
     def draw_with_layer
       options = draw_options
+      @layer.removeFromSuperlayer if @layer
       return unless image = options[:image]
       rect = options[:rect]
       radius = options[:corner_radius].to_f if options[:corner_radius] && options[:masks_to_bounds]
 
-      layer = CALayer.layer
-      layer.contents = image.CGImage
-      layer.frame = rect
-      layer.bounds = rect
+      @layer = CALayer.layer
+      @layer.contents = image.CGImage
+      @layer.frame = rect
+      @layer.bounds = rect
 
-      layer.masksToBounds = options[:masks_to_bounds]
-      layer.cornerRadius = radius if radius
+      @layer.masksToBounds = options[:masks_to_bounds]
+      @layer.cornerRadius = radius if radius
+      view.layer.addSublayer(@layer)
+    end
 
-      view.layer.addSublayer(layer)
+    def strong_references
+      [section, (section.table if section.respond_to?(:cell_section_name))].compact
     end
 
     def load_image
-      return if image_data || !computed_options[:url]
-      # TODO: why so many references?
-      @strong_refs = section.strong_references + [screen.main_controller.strong_ref]
+      return if @loading || image_data || !computed_options[:url]
+      @loading = true
+
+      ref_key = allocate_strong_references
       BW::Reactor.schedule do
         manager = SDWebImageManager.sharedManager
         manager.downloadWithURL(computed_options[:url],
           options: 0,
           progress: lambda{ |r_size, e_size|  },
           completed: lambda{ |image, error, type, finished|
-            if !image || screen.main_controller.retainCount == 1 || section.retainCount == 1
-              @strong_refs = nil
+            if !image || allocated_references_released?
+              @loading = false
+              release_strong_references(ref_key)
               return
             end
 
             self.image_data = image
 
             section.cached_draw_image = nil
-            if section.respond_to?(:cell_name)
+            if section.respond_to?(:cell_section_name)
               section.pending_display!
             else
               self.view.performSelectorOnMainThread :setNeedsDisplay, withObject: nil, waitUntilDone: false
             end
-            @strong_refs = nil
+            @loading = false
+            release_strong_references(ref_key)
           }
         )
       end
     end
+
+    def update_with_options(new_options = {})
+      super
+      self.image_data = nil if new_options.has_key?(:url)
+    end
   end
 end

data/motion-prime/elements/map.rb

@@ -1,7 +1,12 @@
 module MotionPrime
   class MapElement < BaseElement
+    after_render :remove_watermark
     def view_class
       "MKMapView"
     end
+
+    def remove_watermark
+      self.view.subviews.last.removeFromSuperview
+    end
   end
 end