motion-prime 1.0.3 → 1.0.4

data/motion-prime/helpers/has_normalizer.rb

@@ -29,7 +29,8 @@ module MotionPrime
       end
     end
 
-    def normalize_value(object, receiver)
+    def normalize_value(object, receiver = nil)
+      receiver ||= self
       if element?
         receiver.send(:instance_exec, section || screen, self, &object)
       else

data/motion-prime/helpers/has_style_options.rb

@@ -0,0 +1,16 @@
+module MotionPrime
+  module HasStyleOptions
+    def extract_font_from(options, prefix = nil)
+      options ||= {}
+      return options[:font] if options[:font].present?
+
+      name_key = [prefix, 'font_name'].compact.join('_').to_sym
+      size_key = [prefix, 'font_size'].compact.join('_').to_sym
+      if options.slice(size_key, name_key).any?
+        font_name = options[name_key] || :system
+        font_size = options[size_key] || 14
+        font_name.uifont(font_size)
+      end
+    end
+  end
+end

data/motion-prime/helpers/has_styles.rb

@@ -3,10 +3,14 @@ module MotionPrime
     def prepare_gradient(options)
       colors = options[:colors].map(&:uicolor).map(&:cgcolor)
       locations = options[:locations] if options[:locations]
+      type = options[:type].to_s
 
       if self.is_a?(ViewStyler)
         gradient = CAGradientLayer.layer
-
+        if type == 'horizontal'
+          gradient.startPoint = CGPointMake(0, 0.5)
+          gradient.endPoint = CGPointMake(1.0, 0.5)
+        end
         gradient.frame = if options[:frame_width]
           CGRectMake(options[:frame_x].to_f, options[:frame_y].to_f, options[:frame_width].to_f, options[:frame_height].to_f)
         else

data/motion-prime/models/_association_mixin.rb

@@ -6,6 +6,15 @@ module MotionPrime
       @_bags ||= {}
     end
 
+    def bags_attributes
+      # retrieving has_one/has_many bag keys
+      self.class._associations.keys.inject({}) do |result, association_name|
+        key = :"#{association_name.pluralize}_bag"
+        result[key] = self.info[key] if self.info[key].present?
+        result
+      end
+    end
+
     def bag_key_for(bag_name)
       self.info[bag_name]
     end
@@ -13,7 +22,7 @@ module MotionPrime
     # Saves model and all associations to store.
     #
     # @return [Prime::Model] model
-    def save
+    def save!
       _bags.values.each do |bag|
         bag.store = self.store
         bag.save
@@ -78,9 +87,10 @@ module MotionPrime
           value
         end
         define_method("#{association_name}_attributes=") do |value|
+          bags_attributes = self.send(association_name).try(:bags_attributes) || {}
           self.send(bag_name).clear
-
           association = association_name.classify.constantize.new
+          association.info.merge!(bags_attributes)
           association.fetch_with_attributes(value)
           self.send(:"#{bag_name}") << association
           association
@@ -102,11 +112,16 @@ module MotionPrime
         self._associations[association_name] = options.merge(type: :many)
 
         define_method("#{association_name}_attributes=") do |value|
+          bags_attributes = self.send(bag_name).to_a.inject({}) do |result, item|
+            result[item.id] = item.bags_attributes if item.id
+            result
+          end
           self.send(bag_name).clear
 
           pending_save_counter = 0
           collection = value.inject({}) do |result, attrs|
             model = association_name.classify.constantize.new
+            model.info.merge!(bags_attributes.fetch(attrs[:id], {}))
             model.fetch_with_attributes(attrs)
             unique_key = model.id || "pending_#{pending_save_counter+=1}"
             result.merge(unique_key => model)

data/motion-prime/models/_base_mixin.rb

@@ -6,10 +6,14 @@ module MotionPrime
       base.class_attribute :default_sort_options
     end
 
+    def save
+      self.performSelectorOnMainThread :save!, withObject: nil, waitUntilDone: true
+    end
+
     # Saves model to default store.
     #
     # @return [Prime::Model] model
-    def save
+    def save!
       set_default_id_if_needed
       raise StoreError, 'No store provided' unless self.store
       error_ptr = Pointer.new(:id)

data/motion-prime/models/_dirty_mixin.rb

@@ -47,7 +47,7 @@ module MotionPrime
       end
     end
 
-    def save
+    def save!
       super
       reset_changed_attributes
       self

data/motion-prime/models/_nano_bag_mixin.rb

@@ -34,8 +34,9 @@ module MotionPrime
     # @return self [Prime::Model]
     def add(object_or_array, options = {})
       error_ptr = Pointer.new(:id)
-      options[:existed_ids] ||= []
-      options[:existed_ids] += filter_array(self.to_a, bag_key: self.key).map(&:id)
+      options[:existed_ids] ||= filter_array(self.to_a, bag_key: self.key).inject({}) do |result, item|
+        result.merge(item.id => item)
+      end
       prepared = prepare_for_store(object_or_array, options)
 
       if object_or_array.is_a?(Array)
@@ -54,9 +55,17 @@ module MotionPrime
         object.map { |entity| prepare_for_store(entity, options) }.compact
       else
         object.bag_key = self.key
-        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}"
+        if object.id.present? && options[:existed_ids].include?(object.id)
+          if options[:silent_validation]
+            return
+          elsif options[:replace]
+            replace = options[:existed_ids][object.id]
+            replace.delete
+            delete_key(replace.key)
+            object
+          else
+            raise StoreError, "duplicated item added `#{object.class_name_without_kvo}` with `id` = #{object.id}"
+          end
         end
         object
       end
@@ -117,6 +126,10 @@ module MotionPrime
     end
 
     def save
+      self.performSelectorOnMainThread :save!, withObject: nil, waitUntilDone: true
+    end
+
+    def save!
       self.store ||= MotionPrime::Store.shared_store
       error_ptr = Pointer.new(:id)
       result = self.saveAndReturnError(error_ptr)

data/motion-prime/models/_sync_mixin.rb

@@ -124,10 +124,10 @@ module MotionPrime
 
       method = options[:method] || (persisted? ? :put : :post)
       api_client.send(method, url, post_data, options) do |data, status_code|
-        save_response = !options.has_key?(:save_response) || options[:save_response]
-        if save_response && status_code.to_s =~ /20\d/ && data.is_a?(Hash)
+        assign_response_data = options.fetch(:save_response, true)
+        if assign_response_data && status_code.to_s =~ /20\d/ && data.is_a?(Hash)
           set_attributes_from_response(data)
-          save
+          save if options[:save_response]
         end
         block.call(data, status_code, data) if use_callback
       end

data/motion-prime/models/_timestamps_mixin.rb

@@ -6,7 +6,7 @@ module MotionPrime
       base.class_attribute :_timestamp_attributes
     end
 
-    def save
+    def save!
       time = Time.now
       trigger_timestamp(:save, time)
       trigger_timestamp(:create, time) if new_record?
@@ -18,13 +18,13 @@ module MotionPrime
       return unless field
       self.send(:"#{field}=", time)
     end
-    
+
     module ClassMethods
       def timestamp_attributes(actions = nil)
         self._timestamp_attributes ||= {}
         actions ||= {save: :saved_at, create: :created_at}
         actions.each do |action_name, field|
-          _timestamp_attributes[action_name.to_sym] = field
+          self._timestamp_attributes[action_name.to_sym] = field
           self.attribute field, type: :time
         end
       end

data/motion-prime/sections/_draw_section_mixin.rb

@@ -28,6 +28,14 @@ module MotionPrime
       end
     end
 
+    def before_element_render(element)
+      return unless element == container_element
+      self.container_gesture_recognizers = nil
+      elements_to_draw.values.each(&:on_container_render)
+    end
+
+    def after_element_render(element); end
+
     def bind_gesture_on_container_for(element, action, receiver = nil)
       self.container_gesture_recognizers ||= begin
         set_container_gesture_recognizer
@@ -87,7 +95,11 @@ module MotionPrime
           end
           CGRectContainsPoint(element.computed_frame, point)
         end
-        (target[:receiver] || self).send(target[:action], recognizer, target[:element]) if target
+        stop_propagation = false
+        if target
+          stop_propagation = !(target[:receiver] || self).send(target[:action], recognizer, target[:element])
+        end
+        recognizer.cancelsTouchesInView = stop_propagation
       end
 
       def draw_elements(rect)
@@ -103,8 +115,13 @@ module MotionPrime
         background_color = options[:background_color].try(:uicolor)
 
         if gradient_options = options[:gradient]
-          start_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect))
-          end_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect))
+          if gradient_options[:type].to_s == 'horizontal'
+            start_point = CGPointMake(0, 0.5)
+            end_point = CGPointMake(1.0, 0.5)
+          else
+            start_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect))
+            end_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect))
+          end
 
           # CGContextSaveGState(context)
           CGContextAddRect(context, rect)

data/motion-prime/sections/_section_with_container_mixin.rb

@@ -18,7 +18,7 @@ module MotionPrime
           has_drawn_content: true
         })
         container_element_options = self.class.container_element_options.clone
-        options = (container_element_options || {}).merge(options)
+        options = (container_element_options || {}).deep_merge(options)
         type = options.delete(:type)
         MotionPrime::BaseElement.factory(type, options)
       end

data/motion-prime/sections/abstract_collection.rb

@@ -93,7 +93,9 @@ module MotionPrime
     def reset_collection_data
       @did_appear = false
       Array.wrap(@data).flatten.each do |section|
-        section.container_element.try(:update_options, reuse_identifier: nil)
+        next unless element = section.container_element
+        element.update_options(reuse_identifier: nil)
+        element.view.try(:removeFromSuperview)
       end
       @data = nil
       @data_stamp = nil
@@ -225,7 +227,9 @@ module MotionPrime
       display_pending_cells
     end
 
-    def scroll_view_did_scroll(scroll)
+    def scroll_view_did_scroll(scroll); end
+
+    def update_pull_to_refresh_after_scroll(scroll)
       return unless refresh_view = collection_view.try(:pullToRefreshView)
       return refresh_view.alpha = 1 if refresh_view.state == SVPullToRefreshStateLoading
 

data/motion-prime/sections/base_section.rb

@@ -199,7 +199,7 @@ module MotionPrime
 
     def render(container_options = {}, force = false)
       force ? create_elements! : create_elements
-      self.container_options.merge!(container_options)
+      self.container_options.deep_merge!(container_options)
       run_callbacks :render do
         render!
       end
@@ -209,12 +209,12 @@ module MotionPrime
       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)
+    def after_element_render(element)
+      super
       return unless callbacks = elements_callbacks.try(:[], element.name)
       callbacks.each do |options|
         options[:method].to_proc.call(options[:target] || self)
@@ -375,15 +375,15 @@ module MotionPrime
 
       def compute_container_options!
         raw_options = {}
-        raw_options.merge!(self.class.container_options.try(:clone) || {})
-        raw_options.merge!(options[:container] || {})
+        raw_options.deep_merge!(self.class.container_options.try(:clone) || {})
+        raw_options.deep_merge!(options[:container] || {})
         # allow to pass styles as proc
         normalize_options(raw_options, elements_eval_object, nil, [:styles])
         @container_options = raw_options # must be here because section_styles may use container_options for custom styles
 
         container_options_from_styles = Styles.for(section_styles.values.flatten)[:container] if section_styles
         if container_options_from_styles.present?
-          @container_options = container_options_from_styles.merge(@container_options)
+          @container_options = container_options_from_styles.deep_merge(@container_options)
         end
         normalize_options(@container_options, elements_eval_object)
       end

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

@@ -5,13 +5,14 @@ module MotionPrime
 
     def initialize(options)
       self.collection_section = options[:section].try(:weak_ref)
+      @_section_info = collection_section.to_s
       @section_instance = collection_section.to_s
     end
 
-    # def dealloc
-    #   pp 'Deallocating collection_delegate for ', @section_instance
-    #   super
-    # end
+    def dealloc
+      Prime.logger.dealloc_message :collection_delegate, @_section_info
+      super
+    end
 
     def numberOfSectionsInCollectionView(table)
       collection_section.number_of_groups
@@ -45,6 +46,7 @@ module MotionPrime
 
     def scrollViewDidScroll(scroll)
       collection_section.scroll_view_did_scroll(scroll)
+      collection_section.update_pull_to_refresh_after_scroll(scroll)
     end
 
     def scrollViewWillBeginDragging(scroll)

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

@@ -156,6 +156,14 @@ module MotionPrime
       observing_errors_for.errors.info.slice(*errors_observer_fields).values.flatten
     end
 
+    def style_suffixes
+      suffixes = @options[:style_suffixes]
+      suffixes = normalize_value(suffixes, collection_section) if suffixes.is_a?(Proc)
+      suffixes = Array.wrap(suffixes).clone
+      suffixes << 'with_errors' if has_errors?
+      suffixes
+    end
+
     def reload_section
       clear_observers
       form.hard_reload_cell_section(self)

data/motion-prime/sections/page_view.rb

@@ -27,17 +27,26 @@ module MotionPrime
     end
 
     def set_page(index, animated = false, &block)
-      block ||= proc{|a|}
       page = page_for_index(index)
-      current_index = index_for_page(page_controller.viewControllers.last).to_i
-      direction = current_index <= index ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse
-      page_controller.setViewControllers([page], direction: direction, animated: animated, completion: block)
+      set_view_controllers([page], animated, &block)
     end
 
     def reload_collection_data
-      page_controller.setViewControllers(page_controller.viewControllers, direction: UIPageViewControllerNavigationDirectionForward, animated: false, completion: proc{|a|})
+      set_view_controllers(page_controller.viewControllers, false)
     end
 
+    def set_view_controllers(controllers, animated = false, &completion)
+      completion ||= proc{|a|}
+      index = index_for_page(controllers.last)
+      current_index = index_for_page(page_controller.viewControllers.last).to_i
+      direction = current_index <= index ? UIPageViewControllerNavigationDirectionForward : UIPageViewControllerNavigationDirectionReverse
+      page_controller.setViewControllers(controllers, direction: direction, animated: animated, completion: completion)
+      page_did_set(index)
+    end
+
+    def page_did_set(index); end
+    def page_will_set(index); end
+
     def add_pages(sections, follow = false)
       @data += Array.wrap(sections)
       if follow
@@ -50,6 +59,10 @@ module MotionPrime
       end
     end
 
+    def current_page_id
+      index_for_page(page_controller.viewControllers.last)
+    end
+
     # Delegate
     def page_for_index(index)
       return nil if !index || data.length == 0 || index < 0 || index >= data.size
@@ -58,6 +71,7 @@ module MotionPrime
         @view_controllers[index]
       else
         controller = MotionPrime::Screen.new
+        controller.parent_screen = self.screen
         section = data[index]
         section.screen = controller.weak_ref
         controller.set_section :main, instance: section

data/motion-prime/sections/page_view/page_view_delegate.rb

@@ -5,13 +5,14 @@ module MotionPrime
 
     def initialize(options)
       self.collection_section = options[:section].try(:weak_ref)
+      @_section_info = collection_section.to_s
       @section_instance = collection_section.to_s
     end
 
-    # def dealloc
-    #   pp 'Deallocating page_view_delegate for ', @section_instance
-    #   super
-    # end
+    def dealloc
+      Prime.logger.dealloc_message :collection_delegate, @_section_info
+      super
+    end
 
     def viewControllerAtIndex(index, storyboard:storyboard)
       collection_section.page_for_index(index)
@@ -39,7 +40,7 @@ module MotionPrime
                     UIDevice.currentDevice.orientation == UIDeviceOrientationPortraitUpsideDown ||
                     UIDevice.currentDevice.orientation == UIDeviceOrientationUnknown
       if is_portrait
-        page_view_controller.setViewControllers([current], direction:UIPageViewControllerNavigationDirectionForward, animated:true, completion:lambda{|a|})
+        collection_section.reload_collection_data
         page_view_controller.doubleSided = false
         return UIPageViewControllerSpineLocationMin
       else
@@ -51,10 +52,22 @@ module MotionPrime
           prev_vc = pageViewController(page_view_controller, viewControllerBeforeViewController: current)
           viewControllers = [prev_vc, current]
         end
-        page_view_controller.setViewControllers(viewControllers, direction:UIPageViewControllerNavigationDirectionForward, animated:true, completion:lambda{|a|})
+        collection_section.set_view_controllers(viewControllers, true)
         page_view_controller.doubleSided = true
         return UIPageViewControllerSpineLocationMid
       end
     end
+
+    def pageViewController(pvc, didFinishAnimating: finished, previousViewControllers: previous_view_controllers, transitionCompleted: completed)
+      if completed
+        index = collection_section.index_for_page(collection_section.page_controller.viewControllers.last)
+        collection_section.page_did_set(index)
+      end
+    end
+
+    def pageViewController(pvc, willTransitionToViewControllers: pending_view_controllers)
+      index = collection_section.index_for_page(pending_view_controllers.last)
+      collection_section.page_will_set(index)
+    end
   end
 end