motion-prime 0.9.8 → 0.9.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWYyOGRiMGJjNjc2MjdkM2JiOTBlMWZjMzk2YTFjZTgwNTUzMDA2YQ==
+    ODMzMDQ2MmI4YTBmYTY4NWZiOTQzZjQ5NGVmMGEyNTFiN2NiZDhhOQ==
   data.tar.gz: !binary |-
-    MWU3OTRmN2RjZjRlZDc1M2Y2ZjAwZDI1MDRjYjI4MDk5ODU4N2E1Zg==
+    MDRmZmM2Y2QwY2Q5ZDI0MzY4OTkyZjg4MTQ1YTQ3NDFkMjA0YmM5ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2U5NzJkZjkxMTMyMTNjMzk2NGJlYTRkYjZjNDljN2QwODI5NDg2OWYxNWI4
-    ZGU3ZTI3MWVlYWFiMGJjMjNhOGFmMzA2YWUyZmUwNzE0YjZmNTM4NzA0OWNl
-    ZDNmZDI4NjA5YWM5NWM4NWJlMDllZWEyN2ZkMGI0NjAzN2NjMTA=
+    ZDJlMGEwMzAxNjE5ZTVlMzIxYTJiMWI5ODg4N2JhYjIwMjQzMDg2NGVjYjA0
+    YWVkMmZhNDA5MjgwMjZhMGU3YzNhM2UyNjBkZTJjZWJmZDRjNDU2NjdjOWNm
+    ZTEwYzUwMGRjMjlmYTc5OGEzOTlkMmEwODQ0NzRmM2Q4ZWNiMzY=
   data.tar.gz: !binary |-
-    Zjc5MDQ2MjJhYWY2MzU1YTIwYWJmZmE0NDhiOWVjNmY5Njg0ZmE5NTA3ZDg2
-    YmM2NmNhNWNmNmQ4NjQwYzQ3MTZkNDljNTFiY2EyMzljZDI0OGYzOTc2YjM3
-    YzU3ODg5MTNjNWJmNzMzZTNkMzVhNzE2YmRiOWRlM2FjZjE5ZGI=
+    MGYxMmZiZGU1YzM2NWIzOTI2OGI0Zjc5MjlhYzQ2ZDU5YjM2ZWJhYTI1MjBj
+    YTE5Nzc4MzdhN2JjYThjN2VmYTc5YjdiMWQ3MDY2YzM5ZmVmNmYwM2QyM2Zl
+    MWNmMzY1MGU4MzA3NGRjOTdiNGMxYWNmNWNlZGE4ZjdhZDRjMmY=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 0.9.9
+* BREAKING CHANGE: table delegate methods in table section does not accept table_view as first param.
+  See https://github.com/droidlabs/motion-prime/commit/c8f7b2e4fd1665a45309585484ac211381854f62
+* Bug fixes
+
 === 0.9.8
 * Ability to fetch one record / all records from server using Model.fetch(id) or Model.fetch_all
 * Bug fixes

data/Gemfile.lock

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

data/ROADMAP.md

@@ -1,5 +1,4 @@
 === 1.0.0
-* bug: size_to_fit makes draw label multiline by default.
 * bug: content_vertical_alignment conflicts with padding.
 * bug: content_vertical_alignment has not ideal centering.
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text.

data/generators/templates/scaffold/table.rb

@@ -5,7 +5,7 @@ class <%= @p_class_name %>IndexTableSection < Prime::TableSection
     end
   end
 
-  def on_click(table, index)
+  def on_click(index)
     section = data[index.row]
     screen.open_screen '<%= @p_name %>#show', params: { model: section.model }
   end

data/motion-prime/elements/base_element.rb

@@ -109,8 +109,10 @@ module MotionPrime
       rerender!
     end
 
-    def update_options(options)
-      ViewStyler.new(view, view.superview.try(:bounds), options).apply
+    def update_options(new_options)
+      options.merge!(new_options)
+      return unless view
+      ViewStyler.new(view, view.superview.try(:bounds), new_options).apply
     end
 
     def update

data/motion-prime/elements/draw.rb

@@ -53,7 +53,7 @@ module MotionPrime
 
     def rerender!
       section.cached_draw_image = nil
-      view.setNeedsDisplay
+      view.try(:setNeedsDisplay)
     end
 
     protected

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

@@ -13,7 +13,9 @@ module MotionPrime
 
       text_alignment_name = options.fetch(:text_alignment, :left)
       text_alignment = text_alignment_name.nstextalignment
-      line_break_mode_name = options.fetch(:line_break_mode, :tail_truncation)
+
+      default_break_mode = options[:size_to_fit] ? :word_wrap : :tail_truncation
+      line_break_mode_name = options.fetch(:line_break_mode, default_break_mode)
       line_break_mode = line_break_mode_name.uilinebreakmode
 
       top_left_corner = CGPointMake(frame_inner_left, frame_inner_top)
@@ -52,7 +54,7 @@ module MotionPrime
 
       UIGraphicsPushContext(context)
       options = draw_options
-      if options[:is_html] || options[:line_spacing] || 
+      if options[:is_html] || options[:line_spacing] ||
         options[:line_height] || options[:underline] || options[:force_attributed]
         prepared_text = options[:is_html] ? html_string(options) : attributed_string(options)
 

data/motion-prime/models/_association_mixin.rb

@@ -6,6 +6,10 @@ module MotionPrime
       @_bags ||= {}
     end
 
+    def bag_key_for(bag_name)
+      self.info[bag_name]
+    end
+
     # Saves model and all associations to store.
     #
     # @return [Prime::Model] model
@@ -16,9 +20,7 @@ module MotionPrime
       end
       super
     rescue StoreError => e
-      if Prime.env.development?
-        raise StoreError, e.description
-      end
+      raise e if Prime.env.development?
     end
 
     module ClassMethods
@@ -28,8 +30,9 @@ module MotionPrime
       # @return [Nil]
       def bag(name)
         define_method(name) do |*args, &block|
-          return _bags[name] if _bags[name]
-          bag_key = self.info[name]
+          # use users_bag(true) to reload bag
+          return _bags[name] if _bags[name] && args[0] != true
+          bag_key = bag_key_for(name)
           if bag_key.present?
             bag = self.class.store.bagsWithKeysInArray([bag_key]).first
           end
@@ -69,8 +72,9 @@ module MotionPrime
         self._associations[association_name] = options.merge(type: :one)
 
         define_method("#{association_name}=") do |value|
-          self.send(bag_name).clear
-          self.send(:"#{bag_name}") << value
+          bag = self.send(bag_name)
+          bag.clear
+          bag << value
           value
         end
         define_method("#{association_name}_attributes=") do |value|

data/motion-prime/models/_base_mixin.rb

@@ -204,14 +204,16 @@ module MotionPrime
         attributes << name.to_sym
         attributes.uniq!
 
-        define_method(:"#{name}=") do |value, &block|
-          track_changed_attributes do
+        define_method(:"#{name}=") do |value|
+          tracking_block = proc {
             if options[:convert] || !options.has_key?(:convert)
               self.info[name] = attribute_convert_in(value, options[:type])
             else
               self.info[name] = value
             end
-          end
+          }
+          return tracking_block.call if @_tracking_changes
+          track_changed_attributes(&tracking_block)
         end
 
         define_method(name.to_sym) do

data/motion-prime/models/_dirty_mixin.rb

@@ -7,6 +7,7 @@ module MotionPrime
     end
 
     def track_changed_attributes(&block)
+      @_tracking_changes = true
       @_changed_attributes ||= {}
       old_attrs = self.info.clone
       result = block.call
@@ -22,6 +23,7 @@ module MotionPrime
           @_changed_attributes[key.to_s] = old_attrs[key]
         end
       end
+      @_tracking_changes = false
       result
     end
 

data/motion-prime/models/_filter_mixin.rb

@@ -2,7 +2,13 @@ module MotionPrime
   module FilterMixin
     def filter_array(data, find_options = {}, sort_options = nil)
       data = data.select do |entity|
-        find_options.all? { |field, value| entity.info[field] == value }
+        find_options.all? do |field, value|
+          if value.is_a?(Array)
+            value.include?(entity.info[field].to_s)
+          else
+            entity.info[field] == value
+          end
+        end
       end if find_options.present?
 
       data.sort! do |a, b|

data/motion-prime/models/_nano_bag_mixin.rb

@@ -1,6 +1,8 @@
 motion_require './_finder_mixin.rb'
 module MotionPrime
   module NanoBagMixin
+    include FilterMixin
+
     def self.included(base)
       base.class_eval do
         alias_method :saved, :savedObjects
@@ -30,9 +32,11 @@ module MotionPrime
     # Add an object or array of objects to bag
     #
     # @return self [Prime::Model]
-    def add(object_or_array)
+    def add(object_or_array, options = {})
       error_ptr = Pointer.new(:id)
-      prepared = prepare_for_store(object_or_array)
+      options[:existed_ids] ||= []
+      options[:existed_ids] += filter_array(self.to_a, bag_key: self.key).map(&:id)
+      prepared = prepare_for_store(object_or_array, options)
 
       if object_or_array.is_a?(Array)
         self.addObjectsFromArray(prepared, error:error_ptr)
@@ -45,12 +49,13 @@ module MotionPrime
     alias_method :+, :add
     alias_method :<<, :add
 
-    def prepare_for_store(object)
+    def prepare_for_store(object, options = {})
       if object.is_a?(Array)
-        object.map { |entity| prepare_for_store(entity) }.compact
+        object.map { |entity| prepare_for_store(entity, options) }.compact
       else
         object.bag_key = self.key
-        if object.id.present? && self.store && self.find(id: object.id, bag_key: self.key).any?
+        if object.id.present? && Array.wrap(options[:existed_ids]).include?(object.id)
+          return if options[:silent_validation]
           raise StoreError, "duplicated item added `#{object.class_name_without_kvo}` with `id` = #{object.id}"
         end
         object

data/motion-prime/models/_sync_mixin.rb

@@ -162,10 +162,10 @@ module MotionPrime
           if respond_to?(:"fetch_#{key}")
             self.send(:"fetch_#{key}", value)
           elsif has_association?(key) && (value.is_a?(Hash) || value.is_a?(Array))
-            should_save = options[:save_associations]
-            fetch_association_with_attributes(key, value, save: should_save)
+            fetch_association_with_attributes(key, 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
           end
         end
       end
@@ -231,11 +231,13 @@ module MotionPrime
     def fetch_has_many(key, options = {}, sync_options = {}, &block)
       use_callback = block_given?
       NSLog("SYNC: started sync for #{key} in #{self.class_name_without_kvo}")
-      api_client.get association_sync_url(key, options, sync_options) do |response, status_code|
+
+      params = (options[:params] || {}).deep_merge(sync_options[:params] || {})
+      api_client.get association_sync_url(key, options, sync_options), params do |response, status_code|
         data = options[:sync_key] && response ? response[options[:sync_key]] : response
         if data
-          fetch_has_many_with_attributes(key, data, sync_options)
           NSLog("SYNC: finished sync for #{key} in #{self.class_name_without_kvo}")
+          fetch_has_many_with_attributes(key, data, sync_options)
           block.call(data, status_code, response) if use_callback
         else
           NSLog("SYNC ERROR: failed sync for #{key} in #{self.class_name_without_kvo}")
@@ -244,36 +246,74 @@ module MotionPrime
       end
     end
 
+    def update_storage(bags_options, sync_options = {})
+      should_save = sync_options[:save]
+      if should_save
+        models_to_save = bags_options.inject([]) { |result, (key, bag_options)| result + bag_options[:save] }
+        models_to_delete = bags_options.inject([]) { |result, (key, bag_options)| result + bag_options[:delete] }
+        self.store.save_interval = [models_to_save.count, 1].max
+
+        models_to_save.each(&:save)
+        models_to_delete.each(&:delete)
+      end
+
+      bags_changed = false
+      bags_options.each do |bag_key, bag_options|
+        next if bag_options[:add].empty? && bag_options[:delete].empty?
+        bags_changed = true
+        bag = self.send(:"#{bag_key}_bag")
+        bag.add(bag_options[:add], silent_validation: true)
+        bag.save if should_save
+      end
+
+      save if should_save && (bags_changed || has_changed?)
+
+      self.store.save_interval = 1
+    end
+
     def fetch_has_many_with_attributes(key, data, sync_options = {})
-      old_collection = self.send(key)
-      model_class = key.classify.constantize
-      self.store.save_interval = data.present? ? data.count : 1
-      # Update/Create existing records
+      # TODO: should we skip add/delete/save unless should_save?
+      should_save = sync_options[:save]
+
+      models_to_add = []
+      models_to_save = []
+      models_to_delete = []
+
       track_changed_attributes do
+        old_collection = self.send(key)
+        model_class = key.classify.constantize
+
         data.each do |attributes|
           model = old_collection.detect{ |model| model.id == attributes[:id]}
           unless model
             model = model_class.new
-            self.send(key).add(model)
+            models_to_add << model
+          end
+          model.fetch_with_attributes(attributes, save_associations: should_save)
+          if should_save && model.has_changed?
+            models_to_save << model
           end
-          model.fetch_with_attributes(attributes, save_associations: sync_options[:save])
-          model.save if sync_options[:save] && model.has_changed?
         end
         old_collection.each do |old_model|
           model = data.detect{ |model| model[:id] == old_model.id}
           unless model
-            old_model.delete
+            models_to_delete << old_model
           end
         end unless sync_options[:append]
       end
-      save if sync_options[:save] && has_changed?
-      self.store.save_interval = 1
+
+      update_storage({key => {
+        save: models_to_save,
+        delete: models_to_delete,
+        add: models_to_add
+      }}, sync_options)
     end
 
     def fetch_has_one(key, options = {}, sync_options = {}, &block)
       use_callback = block_given?
       NSLog("SYNC: started sync for #{key} in #{self.class_name_without_kvo}")
-      api_client.get association_sync_url(key, options, sync_options) do |response, status_code|
+      params = (options[:params] || {}).deep_merge(sync_options[:params] || {})
+      api_client.get association_sync_url(key, options, sync_options), params do |response, status_code|
         data = options.has_key?(:sync_key) ? response[options[:sync_key]] : response
         if data.present?
           fetch_has_one_with_attributes(key, data, save_associations: sync_options[:save])

data/motion-prime/models/association_collection.rb

@@ -17,7 +17,9 @@ module MotionPrime
         options[:class_name] == inverse_relation.class_name_without_kvo
       end.try(:first)
 
-      data = bag.store.present? ? find(*args) : filter(*args)
+      # when use #find() nested children will be reallocated and their bags will be empty
+      # data = stored? ? find(*args) : filter(*args)
+      data = filter(*args)
       super data
     end
 
@@ -69,7 +71,7 @@ module MotionPrime
     # @params sort_options [Hash] sorting options.
     # @return Array<MotionPrime::Model> association records
     def find(find_options = {}, sort_options = nil)
-      raise "Use `filter` method when bag has not been saved yet" unless bag.store.present?
+      raise "Use `filter` method when bag has not been saved yet" unless stored?
 
       find_options = build_find_options(find_options)
       sort_options = build_sort_options(sort_options)
@@ -103,6 +105,10 @@ module MotionPrime
       all.each { |obj| obj.delete }
     end
 
+    def stored?
+      bag.store.present?
+    end
+
     private
       def build_find_options(options)
         options ||= {}

data/motion-prime/sections/_async_form_mixin.rb

@@ -1,6 +1,7 @@
 module Prime
   module AsyncFormMixin
     def reload_table_data
+      # FIXME: duplicated cells (see cached_cell error)
       return super unless async_data?
       sections = NSMutableIndexSet.new
       number_of_groups.times do |section_id|

data/motion-prime/sections/_async_table_mixin.rb

@@ -31,7 +31,7 @@ module Prime
       @preloader_next_starts_from = nil
     end
 
-    def height_for_index(table, index)
+    def height_for_index(index)
       section = cell_section_by_index(index)
       unless section
         Prime.logger.debug "could not find section with index #{index} for #{self.to_s}"
@@ -41,7 +41,7 @@ module Prime
       section.container_height
     end
 
-    def render_cell(index, table)
+    def render_cell(index)
       preload_sections_after(index)
       super
     end

data/motion-prime/sections/_cell_section_mixin.rb

@@ -3,7 +3,7 @@ module MotionPrime
   module CellSectionMixin
     extend ::MotionSupport::Concern
 
-    include SectionWithContainerMixin
+    # include SectionWithContainerMixin # already included in draw_section_mixin
 
     attr_writer :table
     attr_reader :pending_display
@@ -64,6 +64,7 @@ module MotionPrime
     def cell
       container_view || begin
         first_element = elements.values.first
+        return unless first_element.is_a?(BaseElement) && first_element.view
         first_element.view.superview.superview
       end
     end

data/motion-prime/sections/base_section.rb

@@ -376,7 +376,7 @@ module MotionPrime
       def compute_container_options!
         raw_options = {}
         raw_options.merge!(self.class.container_options.try(:clone) || {})
-        raw_options.merge!(options.delete(:container) || {})
+        raw_options.merge!(options[:container] || {})
 
         # allow to pass styles as proc
         normalize_options(raw_options, elements_eval_object, nil, [:styles])

data/motion-prime/sections/form.rb

@@ -30,20 +30,19 @@ module MotionPrime
     end
 
     def hard_reload_cell_section(section)
-      field = section.name.to_sym
-      path = field_indexes[field]
-      section.cell.try(:removeFromSuperview)
+      field_name = section.name.to_sym
+      path = field_indexes[field_name]
+      deque_cell(section, at: path) # deque cached
 
-      fields[field] = load_field(self.class.fields_options[field])
-      fields[field].create_elements
+      fields[field_name] = load_field(self.class.fields_options[field_name])
+      fields[field_name].create_elements
       if flat_data?
-        @data[path.row] = fields[field]
+        @data[path.row] = fields[field_name]
       else
-        @data[path.section][path.row] = fields[field]
+        @data[path.section][path.row] = fields[field_name]
       end
 
-      set_data_stamp(fields[field].object_id)
-      table_view.reloadRowsAtIndexPaths([path], withRowAnimation: UITableViewRowAnimationNone)
+      self.performSelectorOnMainThread(:reload_cells, withObject: path, waitUntilDone: false)
     end
 
     # Returns element based on field name and element name
@@ -201,7 +200,7 @@ module MotionPrime
     # Table View Delegate
     # ---------------------
 
-    def number_of_groups(table = nil)
+    def number_of_groups
       has_many_sections? ? grouped_data.reject(&:nil?).count : 1
     end
 

data/motion-prime/sections/table.rb

@@ -80,12 +80,11 @@ module MotionPrime
     # @return [Boolean] true
     def reset_table_data
       @did_appear = false
+      Array.wrap(@data).flatten.each do |section|
+        section.container_element.try(:update_options, reuse_identifier: nil)
+      end
       @data = nil
       @data_stamp = nil
-      @reusable_cells.each do |object_id, cell|
-        cell.reuseIdentifier = nil
-      end if @reusable_cells
-      @reusable_cells = nil
       true
     end
 
@@ -93,10 +92,11 @@ module MotionPrime
     #
     # @param cell sections [Prime::Section, Array<Prime::Section>] cells which will be added to table view.
     # @return [Boolean] true
-    def add_cell_sections(sections)
+    def add_cell_sections(sections, index = nil)
       prepare_table_cell_sections(sections)
       @data ||= []
-      @data += sections
+      index ||= @data.count
+      @data.insert([index, @data.count].min, *sections)
       reload_table_data
     end
 
@@ -134,13 +134,21 @@ module MotionPrime
         next Prime.logger.debug("Reload section: `#{section.name}` is not in the list") unless index
         paths << index
         block.call(section, index, counter)
-        set_data_stamp(section.object_id)
+        deque_cell(section, at: path) # deque cached
         section.reload
       end
-      table_view.reloadRowsAtIndexPaths(paths, withRowAnimation: UITableViewRowAnimationFade)
+      self.performSelectorOnMainThread(:reload_cells, withObject: paths, waitUntilDone: false)
       paths
     end
 
+    # Forces TableView to reload Rows by index paths
+    #
+    # @param [Array<NSIndexPath>] index paths of cells to reload.
+    def reload_cells(*paths)
+      table_view.reloadRowsAtIndexPaths(Array.wrap(paths), withRowAnimation: UITableViewRowAnimationFade)
+      table_view.reloadData # do not use reload_table_data (due to async_form_mixin)
+    end
+
     # Changes height of cells with animation.
     #
     # @param cell sections [Prime::Section, Array<Prime::Section>] cells which will be updated.
@@ -262,8 +270,7 @@ module MotionPrime
       table_view.try(:show)
     end
 
-    def render_cell(index, table = nil)
-      table ||= table_view
+    def render_cell(index)
       section = cell_sections_for_group(index.section)[index.row]
       element = section.container_element || section.init_container_element(container_element_options_for(index))
 
@@ -271,8 +278,6 @@ module MotionPrime
         section.render
       end
 
-      @reusable_cells ||= {}
-      @reusable_cells[section.object_id] = view
       on_cell_render(view, index)
       view
     end
@@ -289,7 +294,7 @@ module MotionPrime
 
     def on_cell_render(cell, index); end
     def on_appear; end
-    def on_click(table, index); end
+    def on_click(index); end
 
     def has_many_sections?
       group_header_options.present? || data.try(:first).is_a?(Array)
@@ -307,7 +312,7 @@ module MotionPrime
       cell_sections_for_group(index.section)[index.row]
     end
 
-    def cell_name(table, index)
+    def cell_name(index)
       record = cell_section_by_index(index)
       "cell_#{record.object_id}_#{@data_stamp[record.object_id]}"
     end
@@ -315,12 +320,12 @@ module MotionPrime
     # Table View Delegate
     # ---------------------
 
-    def number_of_groups(table = nil)
+    def number_of_groups
       has_many_sections? ? data.count : 1
     end
 
-    def cell_for_index(table, index)
-      cell = cached_cell(index, table) || render_cell(index, table)
+    def cell_for_index(index)
+      cell = cached_cell(index) || render_cell(index)
       # run table view is appeared callback if needed
       if !@did_appear && index.row == cell_sections_for_group(index.section).size - 1
         on_appear
@@ -328,17 +333,17 @@ module MotionPrime
       cell.is_a?(UIView) ? cell : cell.view
     end
 
-    def height_for_index(table, index)
+    def height_for_index(index)
       section = cell_section_by_index(index)
       section.create_elements
       section.container_height
     end
 
-    def header_cell_in_group(table, group)
+    def header_cell_in_group(group)
       return unless header = header_section_for_group(group)
 
       reuse_identifier = "header_#{group}_#{@header_stamp}"
-      cached = table.dequeueReusableHeaderFooterViewWithIdentifier(reuse_identifier)
+      cached = table_view.dequeueReusableHeaderFooterViewWithIdentifier(reuse_identifier)
       return cached if cached.present?
 
       styles = cell_section_styles(header).values.flatten
@@ -355,7 +360,7 @@ module MotionPrime
       end
     end
 
-    def height_for_header_in_group(table, group)
+    def height_for_header_in_group(group)
       header_section_for_group(group).try(:container_height) || 0
     end
 
@@ -403,15 +408,27 @@ module MotionPrime
         @data
       end
 
-      def cached_cell(index, table = nil)
-        table ||= self.table_view
-        table.dequeueReusableCellWithIdentifier(cell_name(table, index))
+      def cached_cell(index)
+        table_view.dequeueReusableCellWithIdentifier(cell_name(index)) || begin
+          section = cell_section_by_index(index)
+          cell = section.try(:cell)
+          if cell.try(:superview)
+            Prime.logger.error "cell already exists: #{section.name}: #{cell}"
+            nil
+          end
+        end
+      end
+
+      def deque_cell(section, at: index)
+        table_view.dequeueReusableCellWithIdentifier(cell_name(index))
+        section.cell.try(:removeFromSuperview)
+        set_data_stamp(section.object_id)
       end
 
       def prepare_table_cell_sections(cells)
         Array.wrap(cells.flatten).each do |cell|
           Prime::Config.prime.cell_section.mixins.each do |mixin|
-            cell.class.send(:include, mixin)
+            cell.class.send(:include, mixin) unless (class << cell; self; end).included_modules.include?(mixin)
           end
           cell.screen ||= screen
           cell.table ||= self.weak_ref if cell.respond_to?(:table=)
@@ -421,7 +438,7 @@ module MotionPrime
       def container_element_options_for(index)
         cell_section = cell_section_by_index(index)
         {
-          reuse_identifier: cell_name(table_view, index),
+          reuse_identifier: cell_name(index),
           parent_view: table_view,
           bounds: {height: cell_section.container_height}
         }

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

@@ -20,7 +20,7 @@ module MotionPrime
     end
 
     def numberOfSectionsInTableView(table)
-      table_section.number_of_groups(table)
+      table_section.number_of_groups
     end
 
     def tableView(table, cellForRowAtIndexPath: index)
@@ -34,7 +34,7 @@ module MotionPrime
       @prev_call_time = cur_call_time
       @prev_call_offset = cur_call_offset
 
-      table_section.cell_for_index(table, index)
+      table_section.cell_for_index(index)
     end
 
     def tableView(table, numberOfRowsInSection: group)
@@ -42,19 +42,19 @@ module MotionPrime
     end
 
     def tableView(table, heightForRowAtIndexPath: index)
-      table_section.height_for_index(table, index)
+      table_section.height_for_index(index)
     end
 
     def tableView(table, didSelectRowAtIndexPath:index)
-      table_section.on_click(table, index)
+      table_section.on_click(index)
     end
 
     def tableView(table, viewForHeaderInSection: group)
-      table_section.header_cell_in_group(table, group)
+      table_section.header_cell_in_group(group)
     end
 
     def tableView(table, heightForHeaderInSection: group)
-      table_section.height_for_header_in_group(table, group)
+      table_section.height_for_header_in_group(group)
     end
 
     def scrollViewDidScroll(scroll)

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

data/motion-prime/views/view_styler.rb

@@ -44,6 +44,11 @@ module MotionPrime
     end
 
     def prepare_options!
+      if options[:size_to_fit]
+        options[:line_break_mode] ||= :word_wrap
+        options[:number_of_lines] ||= 0
+      end
+
       if options.slice(:html, :line_spacing, :line_height, :underline, :fragment_color).any?
         text_options = extract_attributed_text_options(options)
 
@@ -148,7 +153,7 @@ module MotionPrime
           view.setValue "UIControlContentHorizontalAlignment#{value.camelize}".constantize, forKey: camelize_factory(key)
           true
         elsif key == 'content_vertical_alignment' && value.is_a?(Symbol) && %[top bottom center fill].include?(value.to_s)
-          view.setValue "UIControlContentHorizontalAlignment#{value.camelize}".constantize, forKey: camelize_factory(key)
+          view.setValue "UIControlContentVerticalAlignment#{value.camelize}".constantize, forKey: camelize_factory(key)
           true
         elsif key.end_with?('alignment') && value.is_a?(Symbol)
           view.setValue value.nstextalignment, forKey: camelize_factory(key)

data/spec/factories/scaffold/sections/tasks/index_table.rb

@@ -5,7 +5,7 @@ class TasksIndexTableSection < Prime::TableSection
     end
   end
 
-  def on_click(table, index)
+  def on_click(index)
     section = data[index.row]
     screen.open_screen 'tasks#show', params: { model: section.model }
   end

data/spec/unit/models/associations_spec.rb

@@ -1,5 +1,5 @@
 describe "Prime::Model Associations" do
-   before do
+  before do
     MotionPrime::Store.connect
   end
 
@@ -27,6 +27,15 @@ describe "Prime::Model Associations" do
       todo.items.is_a?(MotionPrime::Bag).should == true
       todo.items.size.should == 0
     end
+
+    it "allows to reload bag" do
+      todo = Todo.create(:title => "Today Tasks")
+      todo.items = [TodoItem.new(:text => "Hi")]
+      todo.items.save
+      todo.items << [TodoItem.new(:text => "Foo"), TodoItem.new(:text => "Bar")]
+      todo.items.count.should == 3
+      todo.items(true).count.should == 1
+    end
   end
 
   describe "#save" do

data/spec/unit/models/bag_spec.rb

@@ -24,6 +24,26 @@ describe "Prime::Model Bag" do
       bag.saved.count.should.be == 1
       bag.changed?.should.be.false
     end
+
+    it "should raise error if item already exists" do
+      bag = Bag.bag
+      page = Page.new(:text => "Hello", :id => 1)
+      bag << page
+      lambda {
+        bag << page
+      }.should.raise(Prime::StoreError)
+      lambda {
+        bag << [page, page]
+      }.should.raise(Prime::StoreError)
+    end
+
+    it "should not add duplicated items without an error" do
+      bag = Bag.bag
+      page = Page.new(:text => "Hello", :id => 1)
+      bag << page
+      bag.add([page, page], silent_validation: true)
+      bag.count.should == 1
+    end
   end
 
   describe "#+" do

data/spec/unit/models/model_spec.rb

@@ -41,9 +41,9 @@ describe MotionPrime::Model do
     it "throw error when invalid parameter and validate_attribute_presence=true" do
       lambda {
         user = User.new({
-          name: "Eddie", 
-          age: 12, 
-          birthday: Time.now, 
+          name: "Eddie",
+          age: 12,
+          birthday: Time.now,
           gender: "m",
         }, validate_attribute_presence: true )
       }.should.raise(::MotionPrime::StoreError)
@@ -52,9 +52,9 @@ describe MotionPrime::Model do
     it "creates model when invalid parameter and validate_attribute_presence=false" do
       Prime.logger.disabled = true
       user = User.new({
-        name: "Eddie", 
-        age: 12, 
-        birthday: Time.now, 
+        name: "Eddie",
+        age: 12,
+        birthday: Time.now,
         gender: "m",
       })
       user.name.should == "Eddie"
@@ -250,4 +250,43 @@ describe MotionPrime::Model do
       autobot.release_at.should == release
     end
   end
+
+  describe "#fetch_has_many_with_attributes" do
+    before do
+      @organization = Organization.create(name: "Droid Labs")
+      @organization.projects << Project.new({id: 2, title: 'to_delete'})
+      @organization.projects << Project.new({id: 1, title: 'something'})
+      @organization.save
+    end
+
+    def process
+      @organization.fetch_has_many_with_attributes :projects, [{id: 1, title: 'to_save'}, {id: 3, title: 'to_add'}, {id: 4, title: 'to_add'}], save: true
+    end
+
+    it "should call #update_storage with valid params" do
+      @organization.mock!(:update_storage) do |bag_options, sync_options|
+        options = bag_options[:projects]
+        options[:delete].count.should == 1
+        options[:delete].first[:title].should == 'to_delete'
+
+        options[:add].count.should == 2
+        options[:add].all? { |to_add| to_add.title == 'to_add' }.should.be.true
+
+        options[:save].count.should == 3
+        to_save = options[:save] - options[:add]
+        to_save.count.should == 1
+        to_save.first[:title].should == 'to_save'
+        to_save.first[:id].should == 1
+      end
+      process
+    end
+
+    it "should update_storage" do
+      process
+      @organization.projects.count.should == 3
+      @organization.projects(id: 1).first.title.should == 'to_save'
+      @organization.projects(id: 3).first.title.should == 'to_add'
+      @organization.projects(id: 4).first.title.should == 'to_add'
+    end
+  end
 end

data/spec/unit/support/filter_mixin_spec.rb

@@ -0,0 +1,25 @@
+describe MotionPrime::FilterMixin do
+  def data
+    model_stub = Struct.new(:info, :id) # :id is used for sorting
+    data_array.map do |item|
+      model_stub.new(item, item[:id])
+    end
+  end
+
+  def data_array
+    [{id: 4, name: 'iPhone'}, {id: 5, name: 'MacBook'}]
+  end
+
+  it "should filter array by inclusion" do
+    MotionPrime::FilterMixin.new.filter_array(data, {id: %w[4 5]}).count.should.equal 2
+  end
+
+  it "should find a single record (case sensitive)" do
+    MotionPrime::FilterMixin.new.filter_array(data, {id: 4, name: 'iPhone'}).count.should.equal 1
+  end
+
+  it "order filtered records" do
+    result = MotionPrime::FilterMixin.new.filter_array(data, {id: %w[4 5]}, sort: {id: :desc})
+    result.first[:id].should.equal 5
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -408,6 +408,7 @@ files:
 - spec/unit/prime/logger.rb
 - spec/unit/screens/screen_spec.rb
 - spec/unit/sections/section_spec.rb
+- spec/unit/support/filter_mixin_spec.rb
 - travis.sh
 homepage: ''
 licenses:
@@ -465,3 +466,4 @@ test_files:
 - spec/unit/prime/logger.rb
 - spec/unit/screens/screen_spec.rb
 - spec/unit/sections/section_spec.rb
+- spec/unit/support/filter_mixin_spec.rb