motion-prime 0.6.0 → 0.7.0

data/motion-prime/models/_nano_bag_mixin.rb

@@ -107,7 +107,7 @@ module MotionPrime
       if retry_count == 3
         raise StoreError, e.description
       else
-        send (:store=, store, retry_count + 1)
+        send(:store=, store, retry_count + 1)
       end
     end
 

data/motion-prime/models/_sync_mixin.rb

@@ -9,8 +9,8 @@ module MotionPrime
     end
 
     # Get normalized sync url of this Prime::Model
-    # 
-    # @param method [Symbol] http method 
+    #
+    # @param method [Symbol] http method
     # @return url [String] url to use in model sync
     def sync_url(method = :get, options = {})
       url = self.class.sync_url
@@ -19,7 +19,7 @@ module MotionPrime
     end
 
     # Get normalized sync url of associated Prime::Model
-    # 
+    #
     # @param key [Symbol] association name
     # @return url [String] url to use in model association sync
     def association_sync_url(key, options)
@@ -29,7 +29,7 @@ module MotionPrime
     end
 
     # Destroy model on server and delete on local
-    # 
+    #
     # @param block [Proc] block to be executed after destroy
     # @return self[Prime::Model] deleted model.
     def destroy(&block)
@@ -41,13 +41,13 @@ module MotionPrime
     end
 
     # Fetch model from server and save on local
-    # 
+    #
     def fetch!(options = {}, &block)
       fetch(options.merge(save: true), &block)
     end
 
     # Fetch model from server
-    # 
+    #
     # @param options [Hash] fetch options
     # @option options [Symbol] :method Http method to calculate url, `:get` by default
     # @option options [Boolean] :associations Also fetch associations
@@ -60,8 +60,9 @@ module MotionPrime
 
       will_fetch_model = !url.blank?
       will_fetch_associations = !options.has_key?(:associations) || options[:associations]
+      will_fetch_associations = false unless has_associations_to_fetch?
 
-      fetch_with_url url do |data, status_code|
+      fetch_with_url url, options do |data, status_code|
         save if options[:save]
         block.call(data, status_code, data) if use_callback && !will_fetch_associations
       end if will_fetch_model
@@ -98,10 +99,12 @@ module MotionPrime
     #
     # @param url [String] url to fetch
     # @param block [Proc] block to be executed after fetch
-    def fetch_with_url(url, &block)
+    def fetch_with_url(url, options = {}, &block)
       use_callback = block_given?
       api_client.get(url) do |data, status_code|
-        fetch_with_attributes(data, &block) if data.present?
+        if data.present?
+          fetch_with_attributes(data, save_associations: options[:save], &block)
+        end
         block.call(data, status_code, data) if use_callback
       end
     end
@@ -114,12 +117,10 @@ module MotionPrime
       use_callback = block_given?
       filtered_attributes = filtered_updatable_attributes(options)
 
+      attributes = attributes_to_post_data(model_name, filtered_attributes)
+
       post_data = options[:params_root] || {}
-      post_data[:files] = {}
-      filtered_attributes.delete(:files).each do |file_name, file|
-        post_data[:files][[model_name, file_name].join] = file
-      end
-      post_data[model_name] = filtered_attributes
+      post_data.merge!(attributes)
 
       method = options[:method] || (persisted? ? :put : :post)
       api_client.send(method, url, post_data, options) do |data, status_code|
@@ -171,12 +172,17 @@ module MotionPrime
       self
     end
 
+    def associations
+      @associations ||= (self.class._associations || {}).clone
+    end
+
+    def associations_to_fetch
+      @associations_to_fetch ||= associations.select { |key, v| fetch_association?(key) }
+    end
+
     def fetch_associations(sync_options = {}, &block)
       use_callback = block_given?
-      associations = self.class._associations || {}
-      association_keys = associations.keys.select { |key| fetch_association?(key) }
-
-      association_keys.each_with_index do |key, index|
+      associations_to_fetch.keys.each_with_index do |key, index|
         if use_callback && associations.count - 1 == index
           fetch_association(key, sync_options, &block)
         else
@@ -185,19 +191,23 @@ module MotionPrime
       end
     end
 
+    def has_associations_to_fetch?
+      associations_to_fetch.present?
+    end
+
     def has_association?(key)
-      !(self.class._associations || {})[key.to_sym].nil?
+      !associations[key.to_sym].nil?
     end
 
     def fetch_association?(key)
-      options = self.class._associations[key]
+      options = associations[key.to_sym]
       return false if options[:if] && !options[:if].to_proc.call(self)
       association_sync_url(key, options).present?
     end
 
     def fetch_association(key, sync_options = {}, &block)
       return unless fetch_association?(key)
-      options = self.class._associations[key]
+      options = associations[key.to_sym]
       if options[:type] == :many
         fetch_has_many(key, options, sync_options, &block)
       else
@@ -206,12 +216,12 @@ module MotionPrime
     end
 
     def fetch_association_with_attributes(key, data, sync_options = {})
-      options = (self.class._associations || {})[key.to_sym]
+      options = associations[key.to_sym]
       return unless options
       if options[:type] == :many
-        fetch_has_many_with_attributes(key, data, sync_options)
+        fetch_has_many_with_attributes(key, data || [], sync_options)
       else
-        fetch_has_one_with_attributes(key, data, sync_options)
+        fetch_has_one_with_attributes(key, data || {}, sync_options)
       end
     end
 
@@ -290,13 +300,11 @@ module MotionPrime
       updatable_attributes = self.class.updatable_attributes
 
       if updatable_attributes.blank?
-        attrs =  slice_attributes ? attributes_hash.slice(*slice_attributes) : attributes_hash
-        return attrs.merge(files: {})
+        return slice_attributes ? attributes_hash.slice(*slice_attributes) : attributes_hash
       end
 
       updatable_attributes = updatable_attributes.slice(*slice_attributes) if slice_attributes
-      updatable_attributes.to_a.inject({files: {}}) do |hash, attribute|
-        key, options = *attribute
+      updatable_attributes.inject({}) do |hash, (key, options)|
         next hash if options[:if] && !send(options[:if])
         value = if block = options[:block]
           block.call(self, hash)
@@ -304,14 +312,7 @@ module MotionPrime
           info[key]
         end
 
-        if key.to_s.starts_with?('file_')
-          value.to_a.each do |file_data|
-            file_name, file = file_data.to_a
-            hash[:files]["[#{key.partition('_').last}]#{file_name}"] = file
-          end
-        else
-          hash.merge!(key => value)
-        end
+        hash[key] = value
         hash
       end
     end
@@ -320,6 +321,20 @@ module MotionPrime
       normalize_object(url).to_s.gsub(':id', id.to_s)
     end
 
+    def attributes_to_post_data(root_name, attributes)
+      result = {:_files => [], root_name => attributes}
+
+      result[root_name].each do |name, field_attrs|
+        next unless field_attrs.is_a?(Hash)
+        files = Array.wrap(field_attrs.delete(:_files)).map do |file|
+          file[:name].insert(0, "#{root_name}[#{name}]")
+          file
+        end
+        result[:_files] += files
+      end
+      result
+    end
+
     module ClassMethods
       def fetch_all_with_attributes(data)
         data.map do |attrs|
@@ -348,7 +363,7 @@ module MotionPrime
       def updatable_attributes(*attrs)
         return self._updatable_attributes if attrs.blank?
         attrs.each do |attribute|
-          updatable_attribute attribute
+          updatable_attribute(attribute)
         end
       end
 

data/motion-prime/screens/_base_mixin.rb

@@ -17,6 +17,10 @@ module MotionPrime
       UIApplication.sharedApplication.delegate
     end
 
+    def parent_screen=(value)
+      @parent_screen = value.try(:weak_ref)
+    end
+
     # Setup the screen, this method will be called when you run MPViewController.new
     # @param options [hash] Options passed to setup
     # @return [MotionPrime::Screen] Ready to use screen

data/motion-prime/screens/_navigation_mixin.rb

@@ -49,7 +49,7 @@ module MotionPrime
     end
 
     def wrap_in_navigation?
-      options[:navigation] || options[:navigation].nil?
+      options.fetch(:navigation, true)
     end
 
     def wrap_in_navigation
@@ -63,11 +63,11 @@ module MotionPrime
     end
 
     def navigation_controller
-      @navigation_controller ||= self.navigationController
+      @navigation_controller ||= self.navigationController.try(:weak_ref)
     end
 
     def navigation_controller=(val)
-      @navigation_controller = val
+      @navigation_controller = val.try(:weak_ref)
     end
 
     private

data/motion-prime/screens/screen.rb

@@ -47,7 +47,7 @@ module MotionPrime
     def dealloc
       pp 'Deallocating Screen', self.object_id, self.to_s
       # FIXME: calling instance_eval in title method (_base_screen_mixin) instance variables need to be cleared manually
-      clear_instance_variables
+      clear_instance_variables(except: [:_search_bar])
       super
     end
 

data/motion-prime/sections/base_section.rb

@@ -37,7 +37,7 @@ module MotionPrime
     end
 
     def dealloc
-      # pp 'deallocating section', self.name, self.elements.try(:count), self.to_s, self.object_id
+      # pp 'Deallocating section', self.name, self.to_s, self.object_id
       NSNotificationCenter.defaultCenter.removeObserver self # unbinding events created in bind_keyboard_events
       super
     end
@@ -55,7 +55,7 @@ module MotionPrime
     end
 
     # Get computed container height
-    # 
+    #
     # @example
     #   class MySection < Prime::Section
     #     container height: proc { element(:title).content_outer_height }
@@ -63,42 +63,42 @@ module MotionPrime
     #   end
     #   section = MySection.new
     #   section.container_height # => 46
-    # 
+    #
     # @return height [Float, Integer] computed height
     def container_height
       container_options[:height] || DEFAULT_CONTENT_HEIGHT
     end
 
     # Get section default name, based on class name
-    # 
+    #
     # @example
     #   class ProfileSection < Prime::Section
     #   end
-    # 
+    #
     #   section = ProfileSection.new
     #   section.default_name # => 'profile'
     #   section.name         # => 'profile'
-    # 
+    #
     #   another_section = ProfileSection.new(name: 'another')
     #   another_section.default_name # => 'profile'
     #   another_section.name         # => 'another'
-    # 
+    #
     # @return name [String] section default name
     def default_name
       self.class_name_without_kvo.demodulize.underscore.gsub(/\_section$/, '')
     end
 
     # Get section elements options, where the key is element name.
-    # 
+    #
     # @return options [Hash] elements options
     def elements_options
       self.class.elements_options || {}
     end
 
     # Create elements if they are not created yet.
-    # This will not cause rendering elements, 
+    # This will not cause rendering elements,
     # they will be rendered immediately after that or rendered async later, based on type of section.
-    # 
+    #
     # @return result [Boolean] true if has been loaded by this thread.
     def load_section
       return if @section_loaded
@@ -113,7 +113,7 @@ module MotionPrime
     end
 
     # Force load section
-    # 
+    #
     # @return result [Boolean] true if has been loaded by this thread.
     def load_section!
       @section_loaded = false
@@ -267,7 +267,7 @@ module MotionPrime
       elements = Array.wrap(keyboard_close_bindings_options[:elements])
       views = Array.wrap(keyboard_close_bindings_options[:views])
 
-      elements.each do |el| 
+      elements.each do |el|
         views << el.view if %w[text_field text_view].include?(el.view_name) && el.view
       end
       views.compact.each(&:resignFirstResponder)

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

@@ -108,7 +108,6 @@ module MotionPrime
         focus
         form.on_input_change(view(:input))
       end
-      view(:input).delegate = self.form.table_delegate
     end
 
     def observing_errors?
@@ -154,6 +153,7 @@ module MotionPrime
         unobserve observing_errors_for.errors, observing_errors_for.errors.unique_key(field)
       }.weak!
       errors_observer_fields.each(&block)
+      # TODO: clear 'on' events
     end
 
     def container_height

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

@@ -20,5 +20,10 @@ module MotionPrime
         form.send(options[:action]) if options[:action]
       end
     end
+
+    def dealloc
+      picker.setDelegate nil
+      super
+    end
   end
 end

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

@@ -3,7 +3,7 @@ module MotionPrime
     element :label, type: :label do
       options[:label] || {}
     end
-    element :input, type: :text_field do
+    element :input, type: :text_field, delegate: proc { form.table_delegate } do
       {secure_text_entry: true}.merge(options[:input] || {})
     end
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }

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

@@ -4,7 +4,7 @@ module MotionPrime
       options[:label] || {}
     end
 
-    element :input, type: :text_field do
+    element :input, type: :text_field, delegate: proc { form.table_delegate } do
       options[:input] || {}
     end
 

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

@@ -3,7 +3,7 @@ module MotionPrime
     element :label, type: :label do
       options[:label] || {}
     end
-    element :input, type: :text_view do
+    element :input, type: :text_view, delegate: proc { form.table_delegate } do
       {editable: true}.merge(options[:input] || {})
     end
 

data/motion-prime/sections/table.rb

@@ -19,6 +19,13 @@ module MotionPrime
       []
     end
 
+    def dealloc
+      pp 'Deallocating table', self.to_s, self.table_view.to_s
+      table_delegate.clear_delegated
+      table_view.setDataSource nil
+      super
+    end
+
     def async_data?
       self.class.async_data_options
     end

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

@@ -3,12 +3,22 @@ module MotionPrime
     attr_accessor :table_section
     def initialize(options)
       self.table_section = options[:section].try(:weak_ref)
+      @section_instance = table_section.to_s
     end
 
-    # def dealloc
-    #   pp '@@ dealloc table_delegate'
-    #   super
-    # end
+    def delegated_by(view)
+      @delegated_views ||= []
+      @delegated_views << view
+    end
+
+    def clear_delegated
+      Array.wrap(@delegated_views).each { |view| view.setDelegate(nil) }
+    end
+
+    def dealloc
+      pp 'Deallocating table_delegate for ', @section_instance
+      super
+    end
 
     def init_pull_to_refresh
       return unless block = table_section.class.pull_to_refresh_block