motion-prime 0.9.6 → 0.9.7

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

@@ -11,7 +11,7 @@ module MotionPrime
     end
     element :error_message, type: :error_message, text: proc { |field| field.observing_errors? and field.all_errors.join("\n") }
 
-    after_render :bind_select_button
+    after_element_render :button, :bind_select_button
 
     def bind_select_button
       view(:button).on :touch_down do

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

@@ -9,7 +9,7 @@ module MotionPrime
     end
 
     element :error_message, type: :error_message, text: proc { |field| field.all_errors.join("\n") if field.observing_errors? }
-    after_render :bind_text_input
+    after_element_render :input, :bind_text_input
 
     def value
       view(:input).text

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

@@ -5,7 +5,7 @@ module MotionPrime
     end
     element :error_message, type: :error_message, text: proc { |field| field.all_errors.join("\n") if field.observing_errors? }
 
-    after_render :bind_button
+    after_element_render :button, :bind_button
 
     def bind_button
       view(:button).on :touch do

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

@@ -8,7 +8,7 @@ module MotionPrime
     end
 
     element :error_message, type: :error_message, text: proc { |field| field.observing_errors? and field.all_errors.join("\n") }
-    after_render :bind_text_input
+    after_element_render :input, :bind_text_input
 
     def value
       view(:input).text

data/motion-prime/sections/table.rb

@@ -14,7 +14,7 @@ module MotionPrime
     before_render :render_table
     after_render :init_pull_to_refresh
     delegate :init_pull_to_refresh, to: :table_delegate
-
+    delegate :set_options, :update_options, to: :table_element, allow_nil: true
 
     # Return sections which will be used to render as table cells.
     #
@@ -49,7 +49,7 @@ module MotionPrime
     #
     # @return [Boolean] true
     def reload_data
-      reset_data
+      reset_table_data
       reload_table_data
     end
 
@@ -60,7 +60,7 @@ module MotionPrime
       reload_data
     end
 
-    # Reload table view
+    # Reload table view data
     #
     # @return [Boolean] true
     def reload_table_data
@@ -78,7 +78,7 @@ module MotionPrime
     # Reset all table data.
     #
     # @return [Boolean] true
-    def reset_data
+    def reset_table_data
       @did_appear = false
       @data = nil
       @data_stamp = nil
@@ -104,7 +104,7 @@ module MotionPrime
     #
     # @param cell sections [Prime::Section, Array<Prime::Section>] cells which will be removed from table view.
     # @return [Array<NSIndexPath>] index paths of removed cells.
-    def delete_cell_sections(sections)
+    def delete_cell_sections(sections, &block)
       paths = []
       Array.wrap(sections).each do |section|
         index = index_for_cell_section(section)
@@ -113,13 +113,46 @@ module MotionPrime
         delete_from_data(index)
       end
       if paths.any?
-        table_view.beginUpdates
-        table_view.deleteRowsAtIndexPaths(paths, withRowAnimation: UITableViewRowAnimationLeft)
-        table_view.endUpdates
+        UIView.animate(duration: 0, after: block) do
+          table_view.beginUpdates
+          table_view.deleteRowsAtIndexPaths(paths, withRowAnimation: UITableViewRowAnimationLeft)
+          table_view.endUpdates
+        end
       end
       paths
     end
 
+    # Reloads cells with animation, executes given block before reloading.
+    #
+    # @param cell sections [Prime::Section, Array<Prime::Section>] cells which will be updated.
+    # @param around callback [Proc] Callback which will be executed before reloading.
+    # @return [Array<NSIndexPath>] index paths of reloaded cells.
+    def reload_cell_sections(sections, &block)
+      paths = []
+      Array.wrap(sections).each_with_index do |section, counter|
+        index = index_for_cell_section(section)
+        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)
+        section.reload
+      end
+      table_view.reloadRowsAtIndexPaths(paths, withRowAnimation: UITableViewRowAnimationFade)
+      paths
+    end
+
+    # Changes height of cells with animation.
+    #
+    # @param cell sections [Prime::Section, Array<Prime::Section>] cells which will be updated.
+    # @param height [Integer, Array<Integer>] new height of all cells, or height for each cell.
+    # @return [Array<NSIndexPath>] index paths of removed cells.
+    def resize_cell_sections(sections, height)
+      reload_cell_sections(sections) do |section, index, counter|
+        container_height = height.is_a?(Array) ? height[counter] : height
+        section.container_options[:height] = container_height
+      end
+    end
+
     # Delete section from data at index
     #
     # @param index [NSIndexPath] index of cell which will be removed from table data.
@@ -127,24 +160,18 @@ module MotionPrime
       if flat_data?
         delete_from_flat_data(index)
       else
-        delete_from_groped_data(index)
+        delete_from_grouped_data(index)
       end
     end
 
-    def delete_from_flat_data(index)
-      @data[index.row] = nil
-      @data.delete_at(index.row)
-    end
-
-    def delete_from_groped_data(index)
-      @data[index.section][index.row] = nil
-      @data[index.section].delete_at(index.row)
-    end
-
+    # Get index path for cell section
+    #
+    # @param section [Prime::Section] cell section.
+    # @return index [NSIndexPath] index of cell section.
     def index_for_cell_section(section)
       if flat_data?
         row = @data.try(:index, section)
-        NSIndexPath.indexPathForRow(row, inSection: 0)
+        NSIndexPath.indexPathForRow(row, inSection: 0) if row
       else
         (@data || []).each_with_index do |cell_sections, group|
           row = cell_sections.index(section)
@@ -153,12 +180,6 @@ module MotionPrime
       end
     end
 
-    def reload_cell_section(section)
-      section.elements.values.each(&:compute_options!)
-      section.cached_draw_image = nil
-      # TODO: reset date stamps, reload row
-    end
-
     def table_styles
       type = self.is_a?(FormSection) ? :base_form : :base_table
 
@@ -326,7 +347,7 @@ module MotionPrime
         styles: styles,
         parent_view: table_view,
         reuse_identifier: reuse_identifier,
-        section: header
+        section: header.weak_ref
       )
       wrapper.render do |container_view, container_element|
         header.container_element = container_element
@@ -355,6 +376,16 @@ module MotionPrime
     end
 
     private
+      def delete_from_flat_data(index)
+        @data[index.row] = nil
+        @data.delete_at(index.row)
+      end
+
+      def delete_from_grouped_data(index)
+        @data[index.section][index.row] = nil
+        @data[index.section].delete_at(index.row)
+      end
+
       def display_pending_cells
         table_view.visibleCells.each do |cell_view|
           if cell_view.section && cell_view.section.pending_display

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

@@ -4,7 +4,7 @@ module MotionPrime
       screen.automaticallyAdjustsScrollViewInsets = false
 
       table_view.addPullToRefreshWithActionHandler(block) # block must be a variable
-      screen.set_options table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
+      screen.set_options_for table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
     end
 
     def finish_pull_to_refresh

data/motion-prime/services/logger.rb

@@ -5,50 +5,89 @@ module MotionPrime
     LOGGER_DEBUG_LEVEL = 2
     LOGGER_DEALLOC_LEVEL = 3
 
+    COLORS = {
+      red:    [ "\e[0;31m", "\e[0m" ],
+      green:  [ "\e[0;32m", "\e[0m" ],
+      yellow: [ "\e[0;33m", "\e[0m" ],
+      blue:   [ "\e[0;34m", "\e[0m" ],
+      none:   [ "", ""]
+    }
+
     class_attribute :level, :dealloc_items
+    attr_accessor :disabled
 
     def initialize
       @default_level = Config.logger.level.nil? ? :info : Config.logger.level
+      @disabled = false
+    end
+
+    # Log message, colorized if using simulator.
+    # @param message [Array<String>, String] Message or array of messages to log.
+    # @param color [Symbol] Color of message: red, green, yellow, blue.
+    # @return message [Array<String>, String] Logged message
+    def log(objects, label = '', color = :none)
+      message = "#{label || 'PRIME_LOG'} : " + Array.wrap(objects).map(&:inspect).join(',')
+      if Device.simulator?
+        color_parts = COLORS[color] || COLORS[:none]
+        output(color_parts.first + message + color_parts.last)
+      else
+        output(message)
+      end
+      objects
+    end
+
+    # Output message, using "puts" for simulator and NSLog for Device.
+    # @param message [String] Message or array of messages to output.
+    # @return message [Array<String>, String] Message
+    def output(message)
+      return if disabled
+      if Device.simulator?
+        puts(message)
+      else
+        NSLog(message)
+      end
+      message
     end
 
     def error(*args)
-      pp("PRIME_ERROR", *args) if LOGGER_ERROR_LEVEL <= current_level
+      log(args, "PRIME_ERROR", :red) if LOGGER_ERROR_LEVEL <= current_level
     end
 
     def info(*args)
-      pp("PRIME_INFO", *args) if LOGGER_INFO_LEVEL <= current_level
+      log(args, "PRIME_INFO", :green) if LOGGER_INFO_LEVEL <= current_level
     end
 
     def debug(*args)
-      pp("PRIME_DEBUG", *args) if LOGGER_DEBUG_LEVEL <= current_level
+      log(args, "PRIME_DEBUG", :yellow) if LOGGER_DEBUG_LEVEL <= current_level
     end
 
     def dealloc_message(type, object, *args)
       if LOGGER_DEALLOC_LEVEL <= current_level
         if dealloc_items.include?(type.to_s)
-          pp "Deallocating #{type}", object.object_id, object.to_s, *args
+          log([object.object_id, object.to_s] + args, "DEALLOC #{type}", :yellow)
         end
       end
     end
 
-    def dealloc_items
-      self.class.dealloc_items || []
-    end
+    private
+      def dealloc_items
+        self.class.dealloc_items || []
+      end
 
-    def current_level
-      current_level = self.class.level || @default_level
-      case current_level.to_s
-      when 'error'
-        LOGGER_ERROR_LEVEL
-      when 'info'
-        LOGGER_INFO_LEVEL
-      when 'debug'
-        LOGGER_DEBUG_LEVEL
-      when 'dealloc'
-        LOGGER_DEALLOC_LEVEL
-      else
-        2
+      def current_level
+        current_level = self.class.level || @default_level
+        case current_level.to_s
+        when 'error'
+          LOGGER_ERROR_LEVEL
+        when 'info'
+          LOGGER_INFO_LEVEL
+        when 'debug'
+          LOGGER_DEBUG_LEVEL
+        when 'dealloc'
+          LOGGER_DEALLOC_LEVEL
+        else
+          2
+        end
       end
-    end
   end
 end

data/motion-prime/support/consts.rb

@@ -0,0 +1,11 @@
+# this constants should be listed here to be accessible in constantize
+
+UIControlContentHorizontalAlignmentCenter
+UIControlContentHorizontalAlignmentLeft
+UIControlContentHorizontalAlignmentRight
+UIControlContentHorizontalAlignmentFill
+
+UIControlContentVerticalAlignmentCenter
+UIControlContentVerticalAlignmentTop
+UIControlContentVerticalAlignmentBottom
+UIControlContentVerticalAlignmentFill

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/motion-prime/views/layout.rb

@@ -18,7 +18,7 @@ module MotionPrime
       view = builder.view
       insert_index = options.delete(:at_index)
 
-      set_options(view, options, &block)
+      set_options_for(view, options, &block)
       if superview = render_target || view_stack.last
         insert_index ? superview.insertSubview(view, atIndex: insert_index) : superview.addSubview(view)
       end
@@ -26,16 +26,17 @@ module MotionPrime
       view
     end
 
-    def set_options(view, options = {}, &block)
+    def set_options_for(view, options = {}, &block)
       ViewStyler.new(view, options.delete(:parent_bounds), options).apply
       view_stack.push(view)
       block.call(view) if block_given?
       view_stack.pop
     end
+    alias_method :update_options_for, :set_options_for
 
     def setup(view, options = {}, &block)
-      puts "DEPRECATION: screen#setup is deprecated, please use screen#set_options instead"
-      set_options(view, options, &block)
+      puts "DEPRECATION: screen#setup is deprecated, please use screen#set_options_for instead"
+      set_options_for(view, options, &block)
     end
 
     def view_stack

data/motion-prime/views/view_styler.rb

@@ -147,6 +147,9 @@ module MotionPrime
         if key == 'content_horizontal_alignment' && value.is_a?(Symbol) && %[left right center fill].include?(value.to_s)
           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)
+          true
         elsif key.end_with?('alignment') && value.is_a?(Symbol)
           view.setValue value.uitextalignment, forKey: camelize_factory(key)
           true

data/spec/{helpers → factories}/delegates.rb

@@ -1,6 +1,3 @@
-# motion_require '../../motion-prime/helpers/has_authorization'
-# motion_require './../motion-prime/delegate/_base_mixin'
-# motion_require './../motion-prime/delegate/_navigation_mixin'
 AppDelegate.send :include, MotionPrime::HasAuthorization
 AppDelegate.send :include, MotionPrime::DelegateBaseMixin
 AppDelegate.send :include, MotionPrime::DelegateNavigationMixin

data/spec/factories/scaffold/models/task.rb

@@ -0,0 +1,4 @@
+class Task < Prime::Model 
+  timestamp_attributes
+  attribute :title
+end

data/spec/factories/scaffold/screens/tasks.rb

@@ -0,0 +1,45 @@
+class TasksScreen < Prime::Screen
+  title "Tasks"
+
+  # open_screen "tasks#index"
+  def index
+    set_title "Tasks"
+    set_navigation_right_button 'New' do
+      open_screen "tasks#new"
+    end
+    set_section :tasks_index_table
+  end
+
+  # open_screen "tasks#show"
+  def show
+    @model = params[:model]
+    set_title "Show Task"
+    set_navigation_back_button 'Back'
+    set_navigation_right_button 'Edit' do
+      open_screen "tasks#edit", params: { model: @model }
+    end
+    set_section :tasks_show, model: @model
+  end
+
+  # open_screen "tasks#edit"
+  def edit
+    @model = params[:model]
+    set_title "Edit Task"
+    set_navigation_back_button 'Cancel'
+    set_section :tasks_form, model: @model
+  end
+
+  # open_screen "tasks#new"
+  def new
+    @model = Task.new
+    set_title "New Task"
+    set_navigation_back_button 'Cancel'
+    set_section :tasks_form, model: @model
+  end
+
+  def on_return
+    if action?(:index) || action?(:show)
+      refresh
+    end
+  end
+end