motion-prime 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45140a3e0294c388e06a65d8984b3178d3a61860
-  data.tar.gz: bbdb962a185668be9c8788616fd562697b4dc80f
+  metadata.gz: 5a7abdeb0d07ef7b8ff96929509ca71f4d9735b2
+  data.tar.gz: 506e027301a4ce09c546ae0a89103813bf708158
 SHA512:
-  metadata.gz: 29e217defff9f85b314495158591cd4bb0215d58f86e3bee2e7660fd4e70e36668c035917f9589345425527d3f10edfd02d57255bfd7608937279b09203682cc
-  data.tar.gz: a459b509909885a8b77d71f94a4cb02cb12e91f56b9c9f91c24b1e1c863d9ba073b105258908fc6648da2487d8225638a98bc34b3bc479ec55f30a7c3f29b78d
+  metadata.gz: 4890d0d9e1f0231b41194eef01979d6b6f9314c465e8b4a4e5b9280ee1dc67924c148d746ab8263d7c996cf9eec39ba1c16827e7d4072a22cc162c0e2eead179
+  data.tar.gz: 114bd8c2ab635bd8ce17a4963965b03428bb71a045fdcec832c4e11d9e23841b386b0b295096d97aa7330a1b4a9e564ad2b702c4ff4f74cf96fac0f2806429c1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 1.0.6
+* Memory leak fixes
+* Fix pagination of page view section
+
 === 1.0.5
 * Bug fixes
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (1.0.5)
+    motion-prime (1.0.6)
       activesupport
       afmotion (~> 2.1.0)
       bubble-wrap (~> 1.6.0)

data/files/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.1'
-gem 'motion-prime', '1.0.5'
+gem 'motion-prime', '1.0.6'
 
 # add reside menu for sidebar support
 # gem 'prime_reside_menu', '~> 0.1.4'

data/motion-prime/core_ext/kernel.rb

@@ -91,7 +91,11 @@ class Kernel
       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 }
+    res = @_strong_references.all? { |key, refs|
+      refs.all? { |ref| ref.retainCount - 1 <= @_strong_references.count }
+    }
+    Prime.logger.debug "Released `#{self.class.name}`" if res
+    res
   end
 
   def clear_instance_variables(options = {})

data/motion-prime/elements/_text_mixin.rb

@@ -24,6 +24,7 @@ module MotionPrime
       }
 
       text = "#{options[:text]}<style>* { #{styles.join} }</style>"
+      # WARNING: there is a bug - it uses WebKit and can not be used in secondary threads
       NSAttributedString.alloc.initWithData(text.dataUsingEncoding(NSUTF8StringEncoding), options: html_options, documentAttributes: nil, error: nil)
     end
 

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

@@ -70,9 +70,10 @@ module MotionPrime
     end
 
     def strong_references
-      refs = [section, (section.collection_section if section.respond_to?(:cell_section_name))]
-      refs += section.try(:strong_references)
-      refs.compact
+      # .compact() is required here, otherwise screen will not be released
+      refs = [section, (section.collection_section if section.respond_to?(:cell_section_name))].compact
+      refs += section.strong_references if section
+      refs
     end
 
     def load_image
@@ -92,12 +93,15 @@ module MotionPrime
               return
             end
 
+            if computed_options[:post_process].present?
+              image = computed_options[:post_process][:method].to_proc.call(computed_options[:post_process][:target], image)
+            end
             self.image_data = image
             section.cached_draw_image = nil
             if section.respond_to?(:cell_section_name)
               section.pending_display!
             else
-              self.view.performSelectorOnMainThread :setNeedsDisplay, withObject: nil, waitUntilDone: false
+              self.view.performSelectorOnMainThread :setNeedsDisplay, withObject: nil, waitUntilDone: true
             end
             @loading = false
             release_strong_references(ref_key)

data/motion-prime/elements/image.rb

@@ -1,6 +1,7 @@
 module MotionPrime
   class ImageElement < BaseElement
     after_render :fetch_image
+
     def view_class
       "UIImageView"
     end
@@ -8,8 +9,40 @@ module MotionPrime
     def fetch_image
       return unless computed_options[:url]
       raise "You must set default image for `#{name}`" unless computed_options[:default]
-      view.setImageWithURL NSURL.URLWithString(computed_options[:url]),
-                        placeholderImage: computed_options[:default].uiimage
+
+      view.setImage(computed_options[:default].uiimage)
+      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|
+            unless image
+              release_strong_references(ref_key)
+              return
+            end
+
+            if computed_options[:post_process].present?
+              image = computed_options[:post_process][:method].to_proc.call(computed_options[:post_process][:target], image)
+            end
+
+            self.performSelectorOnMainThread :set_image, withObject: image, waitUntilDone: true
+            release_strong_references(ref_key)
+          }
+        )
+      end
+    end
+
+    def set_image(*args)
+      self.view.setImage(args)
+    end
+
+    def strong_references
+      # .compact() is required here, otherwise screen will not be released
+      refs = [section, (section.collection_section if section.respond_to?(:cell_section_name))].compact
+      refs += section.strong_references if section
+      refs
     end
   end
 end

data/motion-prime/helpers/has_search_bar.rb

@@ -31,7 +31,7 @@ module MotionPrime
       name = is_a?(TableSection) ? name : self.class_name_without_kvo.underscore
       screen = is_a?(TableSection) ? self.screen : self
       options[:styles] ||= []
-      options[:styles] += [:"base_search_bar", :"base_#{name}_search_bar"]
+      options[:styles] += [:"base_search_bar", :"base_#{name}_search_bar", :"#{name}_search_bar"]
 
       screen.search_bar(options).view
     end

data/motion-prime/models/_sync_mixin.rb

@@ -162,7 +162,7 @@ module MotionPrime
           if respond_to?(:"fetch_#{key}")
             self.send(:"fetch_#{key}", value)
           elsif has_association?(key) && (value.is_a?(Hash) || value.is_a?(Array))
-            fetch_association_with_attributes(key, value, save: options[:save_associations])
+            fetch_association_with_attributes(key.to_sym, value, save: options[:save_associations])
           elsif respond_to?(:"#{key}=")
             self.send(:"#{key}=", value)
             # TODO: self.info[:"#{key}"] = value is much faster, maybe we could use it

data/motion-prime/screens/_navigation_mixin.rb

@@ -59,7 +59,7 @@ module MotionPrime
     end
 
     def has_navigation?
-      !navigation_controller.nil?
+      navigation_controller.weakref_alive? && !navigation_controller.nil?
     end
 
     def navigation_controller

data/motion-prime/sections/abstract_collection.rb

@@ -222,6 +222,10 @@ module MotionPrime
       @decelerating = true
     end
 
+    def scroll_view_will_begin_decelerating(scroll); end
+
+    def scroll_view_did_end_scrolling_animation(scroll); end
+
     def scroll_view_did_end_decelerating(scroll)
       @decelerating = false
       display_pending_cells
@@ -278,6 +282,7 @@ module MotionPrime
           Prime::Config.prime.cell_section.mixins.each do |mixin|
             cell.class.send(:include, mixin) unless (class << cell; self; end).included_modules.include?(mixin)
           end
+
           cell.screen ||= screen
           cell.collection_section ||= self.weak_ref if cell.respond_to?(:collection_section=)
         end

data/motion-prime/sections/base_section.rb

@@ -54,7 +54,7 @@ module MotionPrime
     end
 
     def strong_references
-      [screen, screen.try(:main_controller)]
+      [screen, screen.try(:main_controller)].compact
     end
 
     def container_bounds

data/motion-prime/sections/collection/collection_delegate.rb

@@ -49,10 +49,18 @@ module MotionPrime
       collection_section.update_pull_to_refresh_after_scroll(scroll)
     end
 
+    def scrollViewDidEndScrollingAnimation(scroll)
+      collection_section.scroll_view_did_end_scrolling_animation(scroll)
+    end
+
     def scrollViewWillBeginDragging(scroll)
       collection_section.scroll_view_will_begin_dragging(scroll)
     end
 
+    def scrollViewWillBeginDecelerating(scroll)
+      collection_section.scroll_view_will_begin_decelerating(scroll)
+    end
+
     def scrollViewDidEndDecelerating(scroll)
       collection_section.scroll_view_did_end_decelerating(scroll)
     end

data/motion-prime/sections/form.rb

@@ -120,8 +120,8 @@ module MotionPrime
     end
 
     def keyboard_will_show
-      return if collection_view.contentSize.height + collection_view.top <= UIScreen.mainScreen.bounds.size.height - KEYBOARD_HEIGHT_PORTRAIT
       current_inset = collection_view.contentInset
+      return if collection_view.contentSize.height + collection_view.top + current_inset.top <= UIScreen.mainScreen.bounds.size.height - KEYBOARD_HEIGHT_PORTRAIT
       current_inset.bottom = KEYBOARD_HEIGHT_PORTRAIT + (self.collection_element.computed_options[:bottom_content_inset] || 0)
       collection_view.contentInset = current_inset
     end
@@ -163,7 +163,6 @@ module MotionPrime
     end
 
     def reload_data
-      @groups_count = nil
       init_form_fields # must be before resetting to reflect changes on @data
       reset_collection_data
       reload_collection_data
@@ -250,32 +249,33 @@ module MotionPrime
         self.field_indexes = {}
         self.grouped_data = []
         section_indexes = []
-        (self.class.fields_options || {}).each do |key, field|
-          next unless render_field?(key, field)
-          section_id = field[:group].to_i
-          @groups_count = [@groups_count || 1, section_id + 1].max
 
-          grouped_data[section_id] ||= []
-          section_indexes[section_id] ||= 0
+        grouped_fields = (self.class.fields_options || {}).inject([]) do |result, (key, field)|
+          next result unless render_field?(key, field)
+          group_id = field[:group].to_i
+          result[group_id] ||= {}
+          result[group_id][key] = field
+          result
+        end
 
-          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"
+        header_options = Array.wrap(self.class.group_header_options).map(&:clone)
+        header_options.each { |opts| normalize_options(opts) if opts }
+        self.group_header_options = header_options.delete_if.each_with_index { |opts, id| grouped_fields[id].blank? }
+
+        grouped_fields.compact.each_with_index do |fields, group_id|
+          fields.each_with_index do |(key, field), row_id|
+            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(row_id, inSection: group_id)
+            grouped_data[group_id] ||= []
+            grouped_data[group_id][row_id] = section
           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
-
-          section_indexes[section_id] += 1
         end
-        init_form_headers
-        reset_data_stamps
-      end
 
-      def init_form_headers
-        options = Array.wrap(self.class.group_header_options).map(&:clone)
-        options.compact.each { |opts| normalize_options(opts) }
-        self.group_header_options = options.delete_if.each_with_index { |opts, id| grouped_data[id].nil? }
+        reset_data_stamps
       end
   end
 end

data/motion-prime/sections/page_view.rb

@@ -66,21 +66,27 @@ module MotionPrime
     # Delegate
     def page_for_index(index)
       return nil if !index || data.length == 0 || index < 0 || index >= data.size
-      @view_controllers ||= []
-      if @view_controllers[index]
-        @view_controllers[index]
-      else
+      @view_controllers.try(:[], index) || prepare_cell_section(data[index], index)
+    end
+
+    def index_for_page(view_controller)
+      Array.wrap(@view_controllers).index(view_controller)
+    end
+
+    private
+      def prepare_collection_cell_sections(sections)
+        Array.wrap(sections.flatten).each_with_index do |section, index|
+          prepare_cell_section(section, index)
+        end
+      end
+
+      def prepare_cell_section(section, index)
+        @view_controllers ||= []
         controller = MotionPrime::Screen.new
         controller.parent_screen = self.screen
-        section = data[index]
         section.screen = controller.weak_ref
         controller.set_section :main, instance: section
         @view_controllers[index] = controller
       end
-    end
-
-    def index_for_page(view_controller)
-      Array.wrap(@view_controllers).index(view_controller)
-    end
   end
 end

data/motion-prime/sections/table.rb

@@ -234,6 +234,9 @@ module MotionPrime
       def reset_data_stamps
         super
         set_header_stamp
+      rescue # "undefined `super` method" bug fix
+        Prime.logger.debug "Undefined `super` in `table_section`"
+        []
       end
 
     class << self

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

@@ -64,10 +64,18 @@ module MotionPrime
       table_section.update_pull_to_refresh_after_scroll(scroll)
     end
 
+    def scrollViewDidEndScrollingAnimation(scroll)
+      table_section.scroll_view_did_end_scrolling_animation(scroll)
+    end
+
     def scrollViewWillBeginDragging(scroll)
       table_section.scroll_view_will_begin_dragging(scroll)
     end
 
+    def scrollViewWillBeginDecelerating(scroll)
+      table_section.scroll_view_will_begin_decelerating(scroll)
+    end
+
     def scrollViewDidEndDecelerating(scroll)
       table_section.scroll_view_did_end_decelerating(scroll)
     end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/motion-prime/views/view_styler.rb

@@ -281,7 +281,7 @@ module MotionPrime
           max_width max_outer_width min_width min_outer_width
           max_height max_outer_height min_height min_outer_width
           font_name font_size placeholder_font_name placeholder_font_size placeholder_font
-          bounds
+          bounds post_process
         ].include?(key.to_s)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake