ProMotion-XLForm 0.0.7 → 0.0.8

data/lib/ProMotion/XLForm/xl_form_helper.rb

@@ -0,0 +1,65 @@
+module ProMotion
+  module XLFormHelper
+
+    def configure_hidden(cell_or_section, predicate)
+      tag = operand = value = nil
+      if predicate.is_a?(Hash)
+        tag = predicate[:name]
+        operand = case predicate[:is]
+                    when :equal
+                      '=='
+                    when :not_equal
+                      '!='
+                    when :contains
+                      'contains'
+                    when :not_contains
+                      'not contains'
+                    else
+                      predicate[:is]
+                  end
+        value = predicate[:value]
+      else
+        match = /(:?[a-zA-Z_]+)\s+(==|!=|contains|not contains)\s+(.*)/.match(predicate)
+        if match && match.length == 4
+          # todo better than ignore ?
+          tag = match[1]
+          operand = match[2]
+          value = match[3]
+          if value =~ /"(.*)"/
+            value = value[1, value.length - 2]
+          end
+        end
+      end
+
+      if tag && operand
+        if tag.is_a?(Symbol)
+          tag = tag.to_s
+        elsif tag.start_with?(':')
+          tag[0] = ''
+        end
+        value = case value
+                  when nil
+                    'nil'
+                  when 'true', :true, true
+                    0
+                  when 'false', :false, false
+                    1
+                  when String
+                    "\"#{value}\""
+                  else
+                    value
+                end
+
+        if operand == 'contains'
+          cell_or_section.hidden = "$#{tag} contains[c] #{value}"
+        elsif operand == 'not contains'
+          cell_or_section.hidden = "not($#{tag} contains[c] #{value})"
+        else
+          cell_or_section.hidden = "$#{tag} #{operand} #{value}"
+        end
+      else
+        mp predicate: predicate.inspect, message: "predicate can not be parsed", force_color: :red
+      end
+    end
+  end
+end

data/lib/ProMotion/XLForm/xl_form_patch.rb

@@ -9,7 +9,7 @@ class XLFormAction
   def copyWithZone(zone)
     action_copy = old_copyWithZone(zone)
 
-    action_copy.cells    = self.cells.copy
+    action_copy.cells = self.cells.copy
     action_copy.required = self.required
     action_copy
   end
@@ -17,20 +17,88 @@ end
 
 class XLFormRowDescriptor
 
+  attr_accessor :cell_data
+
+  alias :old_copyWithZone :copyWithZone
+
+  def copyWithZone(zone)
+    row_copy = old_copyWithZone(zone)
+    row_copy.cell_data = cell_data
+    row_copy
+  end
+
   def options=(options)
     self.selectorOptions = parse_options(options)
   end
 
   def parse_options(options)
-   return nil if options.nil? or options.empty?
+    return nil if options.nil? || options.empty?
+
+    options.map do |key, text|
+      val = key
+      if val.is_a? Symbol
+        val = val.to_s
+      end
+      XLFormOptionsObject.formOptionsObjectWithValue(val, displayText: text)
+    end
+  end
+end
+
+class XLFormSectionDescriptor
+  attr_accessor :section_data, :options
+
+  def self.section(section_data)
+    title = section_data[:title]
+
+    options = section_data.fetch(:options, :none)
+    options = parse_section_options(options)
+    insert_mode = section_insert_mode(section_data[:insert_mode])
+
+    section = XLFormSectionDescriptor.formSectionWithTitle(title, sectionOptions: options, sectionInsertMode: insert_mode)
+    section.section_data = section_data
+    section.options = options
+    section
+  end
+
+  def options=(value)
+    @options = self.class.parse_section_options(value)
+  end
+
+  def options
+    @options
+  end
+
+  def sectionOptions
+    options
+  end
 
-   options.map do |key, text|
-     val = key
-     if val.is_a? Symbol
-       val = val.to_s
-     end
-     XLFormOptionsObject.formOptionsObjectWithValue(val, displayText: text)
-   end
- end
+  def self.parse_section_options(options)
+    return section_options(:none) if options.nil?
 
+    opts = section_options(:none)
+    unless options.is_a?(Array)
+      options = [options]
+    end
+    options.each do |opt|
+      opts |= section_options(opt)
+    end
+
+    opts
+  end
+
+  def self.section_insert_mode(symbol)
+    {
+      last_row: XLFormSectionInsertModeLastRow,
+      button: XLFormSectionInsertModeButton
+    }[symbol] || symbol || XLFormSectionInsertModeLastRow
+  end
+
+  def self.section_options(symbol)
+    {
+      none: XLFormSectionOptionNone,
+      insert: XLFormSectionOptionCanInsert,
+      delete: XLFormSectionOptionCanDelete,
+      reorder: XLFormSectionOptionCanReorder
+    }[symbol] || symbol || XLFormSectionOptionNone
+  end
 end

data/lib/ProMotion/XLForm/xl_form_screen.rb

@@ -13,33 +13,33 @@ module ProMotion
 
       if form_options[:on_cancel]
         on_cancel = form_options[:on_cancel]
-        title     = NSLocalizedString('Cancel', nil)
-        item      = :cancel
+        title = NSLocalizedString('Cancel', nil)
+        item = :cancel
         if on_cancel.is_a? Hash
           title = on_cancel[:title] if on_cancel[:title]
-          item  = on_cancel[:item] if on_cancel[:item]
+          item = on_cancel[:item] if on_cancel[:item]
         end
 
         set_nav_bar_button :left, {
-                                    system_item: item,
-                                    title:       title,
-                                    action:      'on_cancel:'
+                                  system_item: item,
+                                  title: title,
+                                  action: 'on_cancel:'
                                 }
       end
 
       if form_options[:on_save]
         on_cancel = form_options[:on_save]
-        title     = NSLocalizedString('Save', nil)
-        item      = :save
+        title = NSLocalizedString('Save', nil)
+        item = :save
         if on_cancel.is_a? Hash
           title = on_cancel[:title] if on_cancel[:title]
-          item  = on_cancel[:item] if on_cancel[:item]
+          item = on_cancel[:item] if on_cancel[:item]
         end
 
         set_nav_bar_button :right, {
-                                     system_item: item,
-                                     title:       title,
-                                     action:      'on_save:'
+                                   system_item: item,
+                                   title: title,
+                                   action: 'on_save:'
                                  }
       end
 
@@ -53,30 +53,34 @@ module ProMotion
 
     def update_form_data
       form_options = self.class.get_form_options
-      title        = self.class.title
-      required     = form_options[:required]
+      title = self.class.title
+      required = form_options[:required]
 
       @form_builder = PM::XLForm.new(self.form_data,
                                      {
-                                         title:    title,
-                                         required: required
+                                       title: title,
+                                       required: required
                                      })
-      @form_object  = @form_builder.build
-      self.form     = @form_object
+      @form_object = @form_builder.build
+      self.form = @form_object
     end
 
     def values
       values = {}
       formValues.each do |key, value|
-        if value.is_a? XLFormOptionsObject
-          value = value.formValue
-        end
-        values[key] = value
+        values[key] = clean_value(value)
       end
 
       values
     end
 
+    def value_for_cell(tag)
+      if tag.respond_to?(:to_s)
+        tag = tag.to_s
+      end
+      values.has_key?(tag) ? values[tag] : nil
+    end
+
     def valid?
       validation_errors.empty?
     end
@@ -91,23 +95,31 @@ module ProMotion
       end
 
       if NSFoundationVersionNumber > NSFoundationVersionNumber_iOS_7_1
-        alert  = UIAlertController.alertControllerWithTitle(NSLocalizedString('Error', nil),
-                                                            message:        errors.join(', '),
-                                                            preferredStyle: UIAlertControllerStyleAlert)
+        alert = UIAlertController.alertControllerWithTitle(NSLocalizedString('Error', nil),
+                                                           message: errors.join(', '),
+                                                           preferredStyle: UIAlertControllerStyleAlert)
         action = UIAlertAction.actionWithTitle(NSLocalizedString('OK', nil),
-                                               style:   UIAlertActionStyleDefault,
+                                               style: UIAlertActionStyleDefault,
                                                handler: nil)
         alert.addAction(action)
         presentViewController(alert, animated: true, completion: nil)
       else
-        alert         = UIAlertView.new
-        alert.title   = NSLocalizedString('Error', nil)
+        alert = UIAlertView.new
+        alert.title = NSLocalizedString('Error', nil)
         alert.message = errors.join(', ')
         alert.addButtonWithTitle(NSLocalizedString('OK', nil))
         alert.show
       end
     end
 
+    def section_with_tag(tag)
+      if tag.respond_to? :to_s
+        tag = tag.to_s
+      end
+      self.form.formSections.select { |section| section.multivaluedTag && section.multivaluedTag == tag }
+        .first
+    end
+
     def cell_with_tag(tag)
       if tag.respond_to? :to_s
         tag = tag.to_s
@@ -202,28 +214,32 @@ module ProMotion
     end
 
     ## XLFormDescriptorDelegate
-    def formSectionHasBeenAdded(section, atIndex: _)
+    def formSectionHasBeenAdded(section, atIndex: index)
       super
-      callback = @form_builder.get_callback(section, :on_add)
-      callback.call if callback
+      action = @form_builder.get_callback(section, :on_add)
+      return if action.nil?
+      trigger_action(action, row, index_path)
     end
 
-    def formSectionHasBeenRemoved(section, atIndex: _)
+    def formSectionHasBeenRemoved(section, atIndex: index)
       super
-      callback = @form_builder.get_callback(section, :on_remove)
-      callback.call if callback
+      action = @form_builder.get_callback(section, :on_remove)
+      return if action.nil?
+      trigger_action(action, section, index)
     end
 
-    def formRowHasBeenAdded(row, atIndexPath: _)
+    def formRowHasBeenAdded(row, atIndexPath: index_path)
       super
-      callback = @form_builder.get_callback(row, :on_add)
-      callback.call if callback
+      action = @form_builder.get_callback(row, :on_add)
+      return if action.nil?
+      trigger_action(action, row, index_path)
     end
 
-    def formRowHasBeenRemoved(row, atIndexPath: _)
+    def formRowHasBeenRemoved(row, atIndexPath: index_path)
       super
-      callback = @form_builder.get_callback(row, :on_remove)
-      callback.call if callback
+      action = @form_builder.get_callback(row, :on_remove)
+      return if action.nil?
+      trigger_action(action, row, index_path)
     end
 
     def formRowDescriptorValueHasChanged(row, oldValue: old_value, newValue: new_value)
@@ -241,5 +257,37 @@ module ProMotion
       end
     end
 
+    def formRowFormMultivaluedFormSection(section)
+      if section.multivaluedRowTemplate
+        cell_data = section.multivaluedRowTemplate.cell_data
+      else
+        cell_data = section.section_data[:cells].first
+      end
+
+      @form_builder.create_cell(cell_data)
+    end
+
+    private
+    def trigger_action(action, section_or_row, index_path)
+      case arity = action.arity
+        when 0 then
+          action.call # Just call the proc or the method
+        when 2 then
+          action.call(section_or_row, index_path) # Send arguments and index path
+        else
+          mp("Action should not have optional parameters: #{action.to_s}", force_color: :yellow) if arity < 0
+          action.call(section_or_row)
+      end
+    end
+
+    def clean_value(value)
+      if value.is_a? XLFormOptionsObject
+        value = value.formValue
+      elsif value.is_a? Array
+        value = value.map { |v| clean_value(v) }
+      end
+
+      value
+    end
   end
 end

data/lib/ProMotion/XLForm/xl_form_section_builder.rb

@@ -0,0 +1,48 @@
+module ProMotion
+  module XLFormSectionBuilder
+
+    def create_section(section_data)
+      section = XLFormSectionDescriptor.section(section_data)
+
+      tag = section_data[:name]
+      if tag.respond_to? :to_s
+        tag = tag.to_s
+      end
+      unless section.options.nil?
+        mp("MutliValued section with no :name option", force_color: :red) unless tag
+      end
+
+      # force a tag for procs
+      if tag.nil?
+        @section_index ||= 0
+        tag = "section_#{@section_index}"
+      end
+      section.multivaluedTag = tag
+
+      section.footerTitle = section_data[:footer] if section_data[:footer]
+
+      add_proc tag, :on_add, section_data[:on_add] if section_data[:on_add]
+      add_proc tag, :on_remove, section_data[:on_remove] if section_data[:on_remove]
+
+      # section visible
+      if section_data[:hidden]
+        configure_hidden(section, section_data[:hidden])
+      end
+
+      section_data[:cells].each do |cell_data|
+        cell = create_cell(cell_data)
+
+        section.addFormRow(cell)
+
+        # multi sections
+        if section.multivaluedTag
+          cell.action.required = @required
+          section.multivaluedRowTemplate = cell.copy
+        end
+      end
+
+      section
+    end
+
+  end
+end

data/lib/ProMotion/XLForm/xl_form_view_controller.rb

@@ -43,7 +43,7 @@ module ProMotion
       self.should_autorotate
     end
 
-    def willRotateToInterfaceOrientation(orientation, duration:duration)
+    def willRotateToInterfaceOrientation(orientation, duration: duration)
       self.will_rotate(orientation, duration)
     end
 

data/lib/ProMotion/XLForm/xl_sub_form_screen.rb

@@ -4,34 +4,34 @@ module ProMotion
 
     def form_data
       [
-          {
-              title: rowDescriptor.title,
-              cells: rowDescriptor.action.cells.map do |cell|
-                tag = cell[:name]
-                if tag.respond_to? :to_s
-                  tag = tag.to_s
-                end
-                if rowDescriptor and rowDescriptor.value and rowDescriptor.value[tag]
-                  cell.merge({ value: rowDescriptor.value[tag] })
-                else
-                  cell
-                end
-              end
-          }
+        {
+          title: rowDescriptor.title,
+          cells: rowDescriptor.action.cells.map do |cell|
+            tag = cell[:name]
+            if tag.respond_to? :to_s
+              tag = tag.to_s
+            end
+            if rowDescriptor && rowDescriptor.value && rowDescriptor.value[tag]
+              cell.merge({ value: rowDescriptor.value[tag] })
+            else
+              cell
+            end
+          end
+        }
       ]
     end
 
     def update_form_data
-      title        = rowDescriptor.title
-      required     = rowDescriptor.action.required
+      title = rowDescriptor.title
+      required = rowDescriptor.action.required
 
       @form_builder = PM::XLForm.new(self.form_data,
                                      {
-                                         title:    title,
-                                         required: required
+                                       title: title,
+                                       required: required
                                      })
-      @form_object  = @form_builder.build
-      self.form     = @form_object
+      @form_object = @form_builder.build
+      self.form = @form_object
     end
 
     ## XLFormDescriptorDelegate
@@ -40,4 +40,4 @@ module ProMotion
       rowDescriptor.value = values
     end
   end
-end
+end