formotion 1.2 → 1.3

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.3 - March 25, 2013
+
+### Features
+
+- Added `:currency` row type, which automatically presents an entered number into the current locale's format (i.e. "$4,003.45" or "€ 3.004,35")
+
+- Added `on_delete` callback for when a `Row` is deleted
+
+- Correctly handle `on_tap` for `Row` objects, regardless of whether or not they are `:button`s.
+
+### Bug Fixes
+
+- Fixed a crash that occured when rapidly serializing a form.
+
+- Template rows are now persisted correctly.
+
+- `ImageRow`s which are disabled will not show the "plus" icon
+
 ## 1.2 - January 3, 2013
 
 ### Features

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'bubble-wrap', ">=1.1.4"
+gem 'guard-motion'
+gem 'rb-fsevent'
 
 # Specify your gem's dependencies in motion-settings.gemspec
 gemspec

data/Guardfile

@@ -0,0 +1,7 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'motion' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/[^/]+/(.+)\.rb$})     { |m| "./spec/#{m[1]}_spec.rb" }
+end

data/LIST_OF_ROW_TYPES.md

@@ -4,6 +4,7 @@
 [Email](#email)<br/>
 [Phone](#phone)<br/>
 [Number](#number)<br/>
+[Currency](#currency)<br/>
 [Date](#date)
 
 **Other**<br/>
@@ -131,6 +132,21 @@ The `PhoneRow` is a string input row for a phone number and opens a `UIKeyboardT
 The `NumberRow` is a string input row for a number and opens a `UIKeyboardTypeDecimalPad` keyboard when editing.
 
 
+### <a name="currency"></a> Currency Row
+![Currency row](https://github.com/clayallsopp/formotion/wiki/row-types/currency_row.png)
+
+```ruby
+{
+  title: "Amount",
+  key: :amount,
+  placeholder: "0.00",
+  type: :currency
+}
+```
+
+The `CurrentyRow` is a string input row with a number keyboard that restricts users to entering valid currency without tapping the decimal key on the keyboard.
+
+
 ### <a name="date"></a> Date row
 ![Date row](https://github.com/clayallsopp/formotion/wiki/row-types/date.png)
 
@@ -156,6 +172,19 @@ You can pass one of following formats as property:
 
 The `value` is a `NSDate.timeIntervalSince1970` as an integer.
 
+Note that you can pass a `:picker_mode` argument to affect what kind of date picker is displayed:
+
+```ruby
+  :time          # UIDatePickerModeTime
+  :date_time     # UIDatePickerModeDateAndTime
+  :countdown     # UIDatePickerModeCountDownTimer
+```
+
+If none of these are specified, `UIDatePickerModeDate` is used.
+
+Note: If you use `:date_time` or `:time` for the type, `:minute_interval` will be applied to the time picker if you specify a value for it.
+the default is the Apple default of 1.
+
 
 ## Other
 
@@ -222,6 +251,13 @@ You can create a radio button style group by defining a section with `select_one
 }
 ```
 
+This would result in a form's `render` as:
+
+```ruby
+{
+  account_type: :basic
+}
+```
 
 ### <a name="slider"></a> Slider row
 ![Slider row](https://github.com/clayallsopp/formotion/wiki/row-types/slider.png)
@@ -397,4 +433,4 @@ The `BackRow` is used in subforms to go back to the parent form.
 }
 ```
 
-The `EditRow` is used to switch between edit and view mode. It's mainly used for the `TemplateRow`.
+The `EditRow` is used to switch between edit and view mode. It's mainly used for the `TemplateRow`.

data/NEW_ROW_TYPES.md

@@ -53,8 +53,8 @@ module Formotion
     class MyNewRow < Base
       def build_cell(cell)
         blue_box = UIView.alloc.initWithFrame [[10, 10], [30, 30]]
-        blux_box.backgroundColor = UIColor.blueColor
-        cell.addSubview = blue_box
+        blue_box.backgroundColor = UIColor.blueColor
+        cell.addSubview blue_box
 
         # return nil because no UITextField added.
         nil
@@ -70,4 +70,4 @@ Your subclass can override these methods:
 
 `#on_select(tableView, tableViewDelegate)` - Called when the row is tapped by the user.
 
-`#cell_style` - The `UITableViewCellStyle` for the row type. By default is `UITableViewCellStyleSubtitle`
+`#cell_style` - The `UITableViewCellStyle` for the row type. By default is `UITableViewCellStyleSubtitle`

data/README.md

@@ -116,6 +116,25 @@ To add your own, check [the guide to adding new row types](https://github.com/cl
 
 `Formotion::Form`, `Formotion::Section`, and `Formotion::Row` all respond to a `::PROPERTIES` attribute. These are settable as an attribute (ie `section.title = 'title'`) or in the initialization hash (ie `{sections: [{title: 'title', ...}]}`). Check the comments in the 3 main files (`form.rb`, `section.rb`, and `row.rb` for details on what these do).
 
+### Setting Initial Values
+
+Forms, particularly edit forms, have default initial values. You can supply these in the `:value` attribute for a given row. So, for example:
+
+```ruby
+{
+  title: "Email",
+  key: :email,
+  placeholder: "me@mail.com",
+  type: :email,
+  auto_correction: :no,
+  auto_capitalization: :none,
+  value: 'zippity_dippity@doo.com'
+}
+```
+
+Setting values for non-string types can be tricky, so you need to watch what the particular field expects. In particular, date types require
+the number of seconds from the beginning of the epoch as a number.
+
 ### Retrieve
 
 You have `form#submit`, `form#on_submit`, and `form#render` at your disposal. Here's an example:
@@ -175,7 +194,28 @@ Your form values and state are automatically persisted across application loads,
 
 To reset the form, `persist` it and call `reset`, which restores it to the original state.
 
-View the [Persistence Example](./formotion/tree/master/examples/Persistence) to see it in action.
+View the [Persistence Example](./examples/Persistence) to see it in action.
+
+### Callbacks
+
+`Row` objects support the following callbacks:
+
+```ruby
+row.on_tap do |row|
+  p "I'm tapped!"
+end
+
+row.on_delete do |row|
+  p "I'm called before the delete animation"
+end
+
+row.on_begin do |row|
+  p "I'm called when my text field begins editing"
+end
+
+row.on_enter do |row|
+  p "I'm called when the user taps the return key while typing in my text field"
+end
      
 ## Forking
 

data/Rakefile

@@ -5,6 +5,7 @@ require "bundler/setup"
 
 $:.unshift("./lib/")
 require './lib/formotion'
+require 'guard/motion'
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.

data/examples/KitchenSink/app/app_delegate.rb

@@ -92,6 +92,13 @@ class AppDelegate
           key: :date_short,
           type: :date,
           format: :short
+        }, {
+          title: "Date (Time)",
+          subtitle: "w/picker_mode => :time",
+          key: :date_time_short,
+          type: :date,
+          picker_mode: :time,
+          format: :short
         }, {
           title: "Slider",
           key: :slider,

data/lib/formotion.rb

@@ -1,4 +1,4 @@
-require "formotion/version"
+require File.expand_path(File.join(File.dirname(__FILE__), "formotion/version"))
 require 'bubble-wrap/core'
 require 'bubble-wrap/camera'
 
@@ -17,6 +17,11 @@ BW.require File.expand_path('../formotion/**/*.rb', __FILE__) do
   ['date_row', 'email_row', 'number_row', 'phone_row'].each {|file|
     file("lib/formotion/row_type/#{file}.rb").depends_on 'lib/formotion/row_type/string_row.rb'
   }
+
+  ['currency_row'].each {|file|
+    file("lib/formotion/row_type/#{file}.rb").depends_on 'lib/formotion/row_type/number_row.rb'
+  }
+  
   ['submit_row', 'back_row'].each {|file|
     file("lib/formotion/row_type/#{file}.rb").depends_on 'lib/formotion/row_type/button.rb'
   }
@@ -25,4 +30,4 @@ BW.require File.expand_path('../formotion/**/*.rb', __FILE__) do
     file("lib/formotion/#{file}").depends_on 'lib/formotion/base.rb'
   }
   file("lib/formotion/controller/form_controller.rb").depends_on 'lib/formotion/patch/ui_text_field.rb'
-end
+end

data/lib/formotion/form/form.rb

@@ -22,7 +22,8 @@ module Formotion
 
     def self.persist(params = {})
       form = new(params)
-      form.open && form.save
+      form.open
+      form.init_observer_for_save
       form
     end
 
@@ -65,8 +66,8 @@ module Formotion
     # EX
     # @form.create_section(:title => 'Section Title')
     def create_section(hash = {})
+      hash = hash.merge({:form => self})
       section = Formotion::Section.new(hash)
-      section.form = self
       section.index = self.sections.count
       self.sections << section
       section
@@ -168,13 +169,12 @@ module Formotion
         else
           section.rows.each {|row|
             next if row.button?
-            if row.template_parent
+            if row.templated?
               # If this row is part of a template
               # use the parent's key
-              kv[row.template_parent.key] ||= []
-              kv[row.template_parent.key] << row.value
+              kv[row.template_parent.key] = row.template_parent.value
             else
-              kv[row.key] ||= row.value
+              kv[row.key] ||= row.value_for_save_hash
             end
           }
         end
@@ -200,7 +200,7 @@ module Formotion
           # see if one of the select one value is used
           unless (section.rows.map{ |r| r.key } & data.keys).empty?
             section.rows.each { |row|
-              row.value = data.has_key?(row.key) ? true : nil 
+              row.value = data.has_key?(row.key) ? true : nil
             }
           end
         else
@@ -221,25 +221,20 @@ module Formotion
     end
 
     alias_method :fill_out, :values=
-  
+
     #########################
     # Persisting Forms
 
     # loads the given settings into the the form, and
     # places observers to save on changes
-    def open
-      @form_observer ||= lambda { |form, saved_form|
+
+    def init_observer_for_save
+      @form_save_observer ||= lambda { |form|
         form.sections.each_with_index do |section, s_index|
           section.rows.each_with_index do |row, index|
-            temp_row = saved_form.sections[s_index].rows[index]
-
             if row.subform?
-              @saved_subform = temp_row.subform.to_form
-              @form_observer.call(row.subform.to_form, @saved_subform)
-              @saved_subform = nil
-            else
-              row.value = temp_row.value
-
+              @form_save_observer.call(row.subform.to_form)
+            elsif !row.templated?
               observe(row, "value") do |old_value, new_value|
                 self.save
               end
@@ -248,41 +243,48 @@ module Formotion
         end
       }
 
-      saved_hash = load_state
-      @form_observer.call(self, Formotion::Form.new(saved_hash))
-    end
-
-    # places hash of values into application persistance
-    def save
-      App::Persistence[persist_key] = to_hash.to_archived_data
-      App::Persistence[original_persist_key] ||= self.to_hash.to_archived_data
+      @form_save_observer.call(self)
     end
 
-    def reset
-      App::Persistence[persist_key] = nil
-
-      @form_resetter ||= lambda { |form, original_form|
+    def open
+      @form_observer ||= lambda { |form, saved_render|
         form.sections.each_with_index do |section, s_index|
           section.rows.each_with_index do |row, index|
-            temp_row = original_form.sections[s_index].rows[index]
+            next if row.templated?
+            saved_row_value = saved_render[row.key]
 
             if row.subform?
-              original_subform = temp_row.subform.to_form
-              @form_resetter.call(row.subform.to_form, original_subform)
+              @form_observer.call(row.subform.to_form, saved_row_value)
+            elsif row.type == :template
+              row.value = saved_row_value
+              row.object.update_template_rows
             else
-              row.value = temp_row.value
+              row.value = saved_row_value
             end
           end
         end
       }
+      rendered_data = load_state
+      if rendered_data
+        @form_observer.call(self, rendered_data)
+      else
+        save
+      end
+    end
 
-      temp_form = Formotion::Form.new(App::Persistence[original_persist_key].unarchive)
-      @form_resetter.call(self, temp_form)
+    # places hash of values into application persistance
+    def save
+      App::Persistence[persist_key] = render
+      App::Persistence[original_persist_key] ||= render
+    end
 
-      self.save
+    def reset
+      App::Persistence[persist_key] = App::Persistence[original_persist_key]
+      open
     end
 
     private
+
     def persist_key
       "FORMOTION_#{self.persist_as}"
     end
@@ -292,13 +294,16 @@ module Formotion
     end
 
     def load_state
-      begin
-        state = App::Persistence[persist_key] && App::Persistence[persist_key].unarchive
-      rescue
-        self.save
+      state = App::Persistence[persist_key]
+      # support old archived format
+      if state.respond_to? :unarchive
+        begin
+          form = Formotion::Form.new(state.unarchive)
+          state = form.render
+          p "Old archived data found: #{state}"
+        end
       end
-      
-      state ||= self.to_hash
+      state
     end
 
     def each_row(&block)

data/lib/formotion/form/form_delegate.rb

@@ -18,7 +18,7 @@ module Formotion
     def controller=(controller)
       @controller = controller
       @controller.title = self.title
-      self.table = controller.respond_to?(:table_view) ? controller.table_view : controller.tableView
+      self.table = @controller.tableView
     end
 
     def table=(table_view)
@@ -104,4 +104,4 @@ module Formotion
       row.object.indentWhileEditing?
     end
   end
-end
+end

data/lib/formotion/patch/ui_text_field.rb

@@ -15,12 +15,6 @@
 # end
 
 class UITextField
-  attr_accessor :menu_options_enabled
-
-  def canPerformAction(action, withSender:sender)
-    self.menu_options_enabled
-  end
-
   # block takes argument textField; should return true/false
   def should_begin?(&block)
     add_delegate_method do
@@ -155,4 +149,4 @@ class UITextField_Delegate
     end
     true
   end
-end
+end

data/lib/formotion/patch/ui_text_view.rb

@@ -15,12 +15,6 @@
 # end
 
 class UITextView
-  attr_accessor :menu_options_enabled
-
-  def canPerformAction(action, withSender:sender)
-    self.menu_options_enabled.nil? ? true : self.menu_options_enabled
-  end
-
   # block takes argument textView; should return true/false
   def should_begin?(&block)
     add_delegate_method do

data/lib/formotion/row/row.rb

@@ -82,7 +82,10 @@ module Formotion
       # When a row is deleted, actually remove the row from UI
       # instead of just nil'ing the value.
       # DEFAULT is false EXCEPT for template-generated rows
-      :remove_on_delete
+      :remove_on_delete,
+      # In a date/time or time picker, the minute interval can
+      # be set. That allows picking by every 15 minutes, etc.
+      :minute_interval
     ]
     PROPERTIES.each {|prop|
       attr_accessor prop
@@ -118,12 +121,15 @@ module Formotion
     # callback for what happens when the user
     # taps a ButtonRow
     attr_accessor :on_tap_callback
+    # callback for when a row is tapped
+    attr_accessor :on_delete_callback
 
     # RowType object
     attr_accessor :object
 
     # Owning template row, if applicable
     attr_accessor :template_parent
+    attr_accessor :template_children
 
     def initialize(params = {})
       super
@@ -131,20 +137,27 @@ module Formotion
       BOOLEAN_PROPERTIES.each { |prop|
         Formotion::Conditions.assert_nil_or_boolean(self.send(prop))
       }
+      @template_children = []
     end
 
     # called after section and index have been assigned
     def after_create
-      if self.type == :template and (self.value && self.value.any?)
-        self.value.each do |value|
-          new_row = self.object.build_new_row({:value => value})
-        end
+      if self.type == :template
+        self.object.update_template_rows
       end
     end
 
     #########################
     # pseudo-properties
 
+    def value_for_save_hash
+      if self.object.respond_to? :value_for_save_hash
+        self.object.value_for_save_hash
+      else
+        self.value
+      end
+    end
+
     def index_path
       NSIndexPath.indexPathForRow(self.index, inSection:self.section.index)
     end
@@ -184,6 +197,10 @@ module Formotion
       self.type.to_s == "subform"
     end
 
+    def templated?
+      !!self.template_parent
+    end
+
     #########################
     #  getter overrides
     def items
@@ -273,6 +290,10 @@ module Formotion
       self.on_tap_callback = block
     end
 
+    def on_delete(&block)
+      self.on_delete_callback = block
+    end
+
     #########################
     # Methods for making cells
     # Called in UITableViewDataSource methods

data/lib/formotion/row_type/base.rb

@@ -57,15 +57,26 @@ module Formotion
       # method gets triggered when tableView(tableView, didSelectRowAtIndexPath:indexPath)
       # in UITableViewDelegate is executed
       def on_select(tableView, tableViewDelegate)
-        # implement in row class
+        # row class should call super and proceed if false is return (not handled here)
+        if row.on_tap_callback
+          # Not all row types will want to define on_tap, but call it if so
+          row.on_tap_callback.call(self.row)
+          true
+        else
+          false
+        end
       end
 
       # called when the delete editing style was triggered tableView:commitEditingStyle:forRowAtIndexPath:
       def on_delete(tableView, tableViewDelegate)
+        if row.on_delete_callback
+          row.on_delete_callback.call(self.row)
+        end
         if row.remove_on_delete?
           row.section.rows.delete_at(row.index)
           row.section.refresh_row_indexes
           delete_row
+          after_delete
         else
           row.value = nil
           self.tableView.reloadData
@@ -78,6 +89,9 @@ module Formotion
         tableView.endUpdates
       end
 
+      def after_delete
+      end
+
       def break_with_semaphore(&block)
         return if @semaphore
         with_semaphore(&block)
@@ -90,4 +104,4 @@ module Formotion
       end
     end
   end
-end
+end

data/lib/formotion/row_type/button.rb

@@ -23,13 +23,6 @@ module Formotion
         end
         nil
       end
-
-      def on_select(tableView, tableViewDelegate)
-        # Override in subclasses
-        if self.row.on_tap_callback
-          self.row.on_tap_callback.call(self.row)
-        end
-      end
     end
   end
-end
+end

data/lib/formotion/row_type/currency_row.rb

@@ -0,0 +1,43 @@
+module Formotion
+  module RowType
+    class CurrencyRow < NumberRow
+      def on_change(text_field)
+        break_with_semaphore do
+          edited_text = text_field.text
+          entered_digits = edited_text.gsub %r{\D+}, ''
+          decimal_num = 0.0
+
+          if !entered_digits.empty?
+            decimal_num = entered_digits.to_i * (10 ** currency_scale.to_i)
+            decimal_num = decimal_num.to_f
+          end
+
+          row.value = decimal_num
+          text_field.text = row_value
+        end
+      end
+
+      def row_value
+        number_formatter.stringFromNumber super.to_f
+      end
+
+      def value_for_save_hash
+        number_formatter.numberFromString(row_value)
+      end
+
+      private
+      def number_formatter
+        @number_formatter ||= begin
+          formatter = NSNumberFormatter.alloc.init
+          formatter.numberStyle = NSNumberFormatterCurrencyStyle
+          formatter.locale = NSLocale.currentLocale
+          formatter
+        end
+      end
+
+      def currency_scale
+        @currency_scale ||= number_formatter.maximumFractionDigits * -1
+      end
+    end
+  end
+end

data/lib/formotion/row_type/date_row.rb

@@ -12,7 +12,7 @@ module Formotion
       def date_value
         value = self.row.value
         if value.is_a? Numeric
-          NSDate.dateWithTimeIntervalSince1970(value.to_i)
+          Time.at value
         else
           nil
         end
@@ -43,13 +43,14 @@ module Formotion
           picker = UIDatePicker.alloc.initWithFrame(CGRectZero)
           picker.datePickerMode = self.picker_mode
           picker.hidden = false
-          picker.date = self.date_value || NSDate.date
+          picker.date = self.date_value || Time.now
+          picker.minuteInterval = self.row.minute_interval if self.row.minute_interval
 
           picker.when(UIControlEventValueChanged) do
             if self.row.picker_mode == :countdown
               self.row.value = @picker.countDownDuration
             else
-              self.row.value = @picker.date.timeIntervalSince1970.to_i
+              self.row.value = Time.at(@picker.date).to_i 
             end
             update
           end

data/lib/formotion/row_type/image_row.rb

@@ -1,12 +1,18 @@
 module Formotion
   module RowType
     class ImageRow < Base
+      TAKE = BW.localized_string("Take", nil)
+      DELETE = BW.localized_string("Delete", nil)
+      CHOOSE = BW.localized_string("Choose", nil)
+      CANCEL = BW.localized_string("Cancel", nil)
+
       include BW::KVO
 
       IMAGE_VIEW_TAG=1100
 
       def build_cell(cell)
-        add_plus_accessory(cell)
+        # only show the "plus" when editable
+        add_plus_accessory(cell) if row.editable?
 
         observe(self.row, "value") do |old_value, new_value|
           @image_view.image = new_value
@@ -15,7 +21,8 @@ module Formotion
             cell.accessoryView = cell.editingAccessoryView = nil
           else
             self.row.row_height = 44
-            add_plus_accessory(cell)
+            # only show the "plus" when editable
+            add_plus_accessory(cell) if row.editable?
           end
           row.form.reload_data
         end
@@ -51,10 +58,10 @@ module Formotion
         @action_sheet = UIActionSheet.alloc.init
         @action_sheet.delegate = self
 
-        @action_sheet.destructiveButtonIndex = (@action_sheet.addButtonWithTitle "Delete") if row.value
-        @action_sheet.addButtonWithTitle "Take" if BW::Device.camera.front? or BW::Device.camera.rear?
-        @action_sheet.addButtonWithTitle "Choose"
-        @action_sheet.cancelButtonIndex = (@action_sheet.addButtonWithTitle "Cancel")
+        @action_sheet.destructiveButtonIndex = (@action_sheet.addButtonWithTitle DELETE) if row.value
+        @action_sheet.addButtonWithTitle TAKE if BW::Device.camera.front? or BW::Device.camera.rear?
+        @action_sheet.addButtonWithTitle CHOOSE
+        @action_sheet.cancelButtonIndex = (@action_sheet.addButtonWithTitle CANCEL)
 
         @action_sheet.showInView @image_view
       end
@@ -68,11 +75,11 @@ module Formotion
         end
 
         case actionSheet.buttonTitleAtIndex(index)
-        when "Take"
+        when TAKE
           source = :camera
-        when "Choose"
+        when CHOOSE
           source = :photo_library
-        when "Cancel"
+        when CANCEL
         else
           p "Unrecognized button title #{actionSheet.buttonTitleAtIndex(index)}"
         end
@@ -99,4 +106,4 @@ module Formotion
       end
     end
   end
-end
+end

data/lib/formotion/row_type/phone_row.rb

@@ -8,4 +8,4 @@ module Formotion
 
     end
   end
-end
+end

data/lib/formotion/row_type/string_row.rb

@@ -128,16 +128,21 @@ module Formotion
       end
 
       def on_select(tableView, tableViewDelegate)
+        super or _on_select(tableView, tableViewDelegate)
+      end
+
+      def _on_select(tableView, tableViewDelegate)
         if !row.editable?
           return
+        else
+          row.text_field.becomeFirstResponder
         end
-        row.text_field.becomeFirstResponder
       end
 
       # Used when row.value changes
       def update_text_field(new_value)
-        self.row.text_field.text = new_value
+        self.row.text_field.text = row_value
       end
     end
   end
-end
+end

data/lib/formotion/row_type/template_row.rb

@@ -14,6 +14,7 @@
 module Formotion
   module RowType
     class TemplateRow < Base
+      include BubbleWrap::KVO
 
       def cellEditingStyle
         UITableViewCellEditingStyleInsert
@@ -33,7 +34,6 @@ module Formotion
           button
         end
         cell.accessoryView = @add_button
-
         nil
       end
 
@@ -42,7 +42,6 @@ module Formotion
       end
 
       def on_insert(tableView, tableViewDelegate)
-        @template_index = row.section.rows.count
         new_row = build_new_row
         move_row_in_list(new_row)
         insert_row(new_row)
@@ -51,27 +50,76 @@ module Formotion
       def build_new_row(options = {})
         # build row
         new_row = row.section.create_row(row.template.merge(options))
+        new_row.object.instance_eval do
+          def after_delete
+            template_value = row.template_parent.value
+            template_value.delete_at(row.index)
+            row.template_parent.value = template_value
+          end
+        end
         new_row.remove_on_delete = true
-        new_row.template_parent = self.row
+        new_row.template_parent = row
+        row.template_children ||= []
+        row.template_children << new_row
+        observe(new_row, "value") do |old_value, new_value|
+          template_value = row.value.dup
+          template_value[new_row.index] = new_row.value
+          row.value = template_value
+        end
         new_row
       end
 
       def move_row_in_list(new_row)
         # move to top
         row.section.rows.pop
-        row.section.rows.insert(@template_index - 1, new_row)
+        row.section.rows.insert(row.template_children.count - 1, new_row)
 
         # reset indexes
         row.section.refresh_row_indexes
       end
 
-      def insert_row(new_row)
-        index_path = NSIndexPath.indexPathForRow(new_row.index, inSection:row.section.index)
+      def insert_row(template_row, with_animation = true)
+        animation = with_animation ? UITableViewRowAnimationBottom : UITableViewRowAnimationNone
+        index_path = NSIndexPath.indexPathForRow(template_row.index, inSection:row.section.index)
+        tableView.beginUpdates
+        tableView.insertRowsAtIndexPaths [index_path], withRowAnimation:animation
+        tableView.endUpdates
+      end
+
+      def delete_row(template_row, with_animation = true)
+        animation = with_animation ? UITableViewRowAnimationTop : UITableViewRowAnimationNone
+        index_path = NSIndexPath.indexPathForRow(template_row.index, inSection:row.section.index)
         tableView.beginUpdates
-        tableView.insertRowsAtIndexPaths [index_path], withRowAnimation:UITableViewRowAnimationBottom
+        tableView.deleteRowsAtIndexPaths [index_path], withRowAnimation:animation
         tableView.endUpdates
       end
 
+      def update_template_rows
+        row.value ||= []
+        if row.value.count > row.template_children.count
+          row.value[row.template_children.count..-1].each do |value|
+            new_row = build_new_row({:value => value})
+            move_row_in_list(new_row)
+            insert_row(new_row) if tableView
+          end
+        elsif row.value.count < row.template_children.count
+          row.template_children[row.value.count..-1].each do |row_to_delete|
+            row.section.rows.delete(row_to_delete)
+            row.template_children.delete(row_to_delete)
+            row.section.refresh_row_indexes
+            delete_row(row_to_delete) if tableView
+          end
+        end
+
+        row.value.dup.each_with_index do |new_value, index|
+          template_child = row.template_children[index]
+          old_value = template_child.value
+          if old_value != new_value
+            template_child.value = new_value
+          end
+        end
+      end
+
     end
   end
 end

data/lib/formotion/section/section.rb

@@ -29,7 +29,7 @@ module Formotion
 
     def initialize(params = {})
       super
-
+      self.form = params[:form]
       Formotion::Conditions.assert_nil_or_boolean(self.select_one)
 
       rows = params[:rows] || params["rows"]
@@ -112,7 +112,10 @@ module Formotion
     # Retreiving data
     def to_hash
       h = super
-      h[:rows] = self.rows.collect {|row| row.to_hash}
+      h[:rows] = []
+      self.rows.each do |row|
+        h[:rows] << row.to_hash if row.template_parent.nil?
+      end
       h
     end
   end

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.2"
+  VERSION = "1.3"
 end

data/spec/form/persist_spec.rb

@@ -19,8 +19,8 @@ describe "Form Persisting" do
     r = f.sections[0].rows[0]
     r.value = "new value"
 
-    saved = Formotion::Form.new(f.send(:load_state))
-    saved.sections[0].rows[0].value.should == r.value
+    saved = f.send(:load_state)
+    saved["first"] == r.value
 
     f.reset
     r.value.should == "initial value"
@@ -57,10 +57,45 @@ describe "Form Persisting" do
     r = f.sections[0].rows[0].subform.to_form.sections[0].rows[0]
     r.value = "new value"
 
-    saved = Formotion::Form.new(f.send(:load_state))
-    saved.sections[0].rows[0].subform.to_form.sections[0].rows[0].value.should == r.value
+    saved = f.send(:load_state)
+    saved[:subform]["second"].should == r.value
 
     f.reset
     r.value.should == "initial value"
   end
+
+  it "works with templates" do
+    key = "test_#{rand(255)}"
+    App::Persistence["FORMOTION_#{key}"] = nil
+    App::Persistence["FORMOTION_#{key}_ORIGINAL"] = nil
+    hash = {
+      persist_as: key,
+      sections: [
+        rows: [{
+          title: "Add nickname",
+          key: :nicknames,
+          type: :template,
+          value: ['Nici', 'Sam'],
+          template: {
+            title: 'Nickname',
+            type: :string,
+            placeholder: 'Enter here',
+            indented: true,
+            deletable: true
+          }
+        }]
+      ]
+    }
+    f = Formotion::Form.persist(hash)
+    f.render.should == { :nicknames => ['Nici', 'Sam'] }
+
+    r = f.sections[0].rows[0]
+    r.value = "Sandra"
+
+    saved = f.send(:load_state)
+    saved[:nicknames].should == ["Sandra", "Sam"]
+
+    f.reset
+    r.value.should == "Nici"
+  end
 end

data/spec/row_type/base_spec.rb

@@ -0,0 +1,38 @@
+module Formotion
+  module RowType
+    class DummyRow < Base
+    end
+  end
+end
+
+describe "Base Row Type" do
+
+  describe '#on_select' do
+    tests_row :dummy
+
+    it "should return false if callback is not defined" do
+      @row.object.on_select(nil, nil).should == false
+    end
+
+    describe 'when on_tap_callback is set' do
+      tests_row :dummy do |row|
+        row.on_tap { |row| @called = true }
+      end
+
+      before do
+        @called = false
+      end
+
+      it "should return true" do
+        @row.object.on_select(nil, nil).should == true
+      end
+
+      it "should call the callback" do
+        @row.object.on_select(nil, nil)
+        @called.should == true
+      end
+
+    end
+
+  end
+end

data/spec/row_type/currency_spec.rb

@@ -0,0 +1,49 @@
+describe "Number Row" do
+  tests_row :currency
+
+  def set_formatter_locale(locale)
+    formatter = NSNumberFormatter.alloc.init
+    formatter.numberStyle = NSNumberFormatterCurrencyStyle
+    formatter.locale = NSLocale.alloc.initWithLocaleIdentifier(locale)
+    @row.object.instance_variable_set("@number_formatter", formatter)
+  end
+
+  it "should initialize with correct settings" do
+    cell = @row.make_cell
+    @row.object.class.should == Formotion::RowType::CurrencyRow
+    set_formatter_locale("en_US")
+    @row.value.should == 0.0
+    @row.object.row_value.should == "$0.00"
+    @row.value_for_save_hash.should == 0.0
+  end
+
+  it "should work when row#value is changed" do
+    cell = @row.make_cell
+    set_formatter_locale("en_US")
+    @row.value = 4.35
+    @row.text_field.text.should == "$4.35"
+  end
+
+  it "should work when text_field#text is changed" do
+    cell = @row.make_cell
+    set_formatter_locale("en_US")
+    @row.text_field.setText("$100.45")
+    @row.text_field.delegate.on_change(@row.text_field)
+    @row.value.should == 100.45
+  end
+
+  it "should work with different locale" do
+    cell = @row.make_cell
+    set_formatter_locale("it_IT")
+    @row.value = 3004.35
+    @row.text_field.text.should == "€ 3.004,35"
+  end
+
+  it "should work with different locale and setting text_field#text" do
+    cell = @row.make_cell
+    set_formatter_locale("it_IT")
+    @row.text_field.setText("€ 3.100,35")
+    @row.text_field.delegate.on_change(@row.text_field)
+    @row.value.should == 3100.35
+  end
+end

data/spec/row_type/date_spec.rb

@@ -1,4 +1,4 @@
-MILLENIUM = 946684672
+MILLENIUM = 946684772 # Time.at(MILLENIUM) => 1999-12-31 18:59:32 -0500
 TIME_ZONE = NSTimeZone.timeZoneWithName "Europe/Paris"
 
 describe "Date Row" do
@@ -34,7 +34,7 @@ describe "Date Row" do
   it "should update value when date is picked" do
     cell = @row.make_cell
 
-    @row.object.picker.date = NSDate.dateWithTimeIntervalSince1970(MILLENIUM)
+    @row.object.picker.date = Time.at MILLENIUM
     @row.object.picker.trigger UIControlEventValueChanged
 
     @row.value.should == MILLENIUM
@@ -63,16 +63,16 @@ describe "Date Row" do
   # Modes
   {
     :date => '1/1/00',
-    :time => '12:57 AM',
-    :date_time => '1/1/00, 12:57 AM',
-    :countdown => '00:57'
+    :time => '12:59 AM',
+    :date_time => '1/1/00, 12:59 AM',
+    :countdown => '00:59'
   }.each do |mode, expected_output|
 
     it "should display chosen mode #{mode} date/time format #{expected_output}" do
       @row.format = :short
       @row.picker_mode = mode
       cell = @row.make_cell
-      @row.object.picker.date = NSDate.dateWithTimeIntervalSince1970(MILLENIUM)
+      @row.object.picker.date = Time.at MILLENIUM
       @row.object.picker.trigger UIControlEventValueChanged
 
       @row.text_field.text.should == expected_output

data/spec/row_type/string_spec.rb

@@ -53,4 +53,33 @@ describe "String Row Type" do
     cell = @row.make_cell
     @row.text_field.keyboardType.should == UIKeyboardTypeDefault
   end
-end
+
+  describe "on_select" do
+
+    it "should call _on_select" do
+      @row.object.instance_variable_set("@called_on_select", false)
+      def (@row.object)._on_select(a, b); @called_on_select = true end
+      @row.object.on_select(nil, nil)
+      @row.object.instance_variable_get("@called_on_select").should == true
+    end
+
+    describe "when on_tap callback is set" do
+      tests_row :string do |row|
+        @on_tap_called = false
+        row.on_tap { |row| @on_tap_called = true }
+      end
+
+      it "should return true" do
+        @row.object.on_select(nil, nil).should == true
+      end
+
+      it "should call the callback" do
+        @row.object.on_select(nil, nil)
+        @on_tap_called.should == true
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -54,6 +54,7 @@ files:
 - CHANGELOG.md
 - Formotion.gemspec
 - Gemfile
+- Guardfile
 - LICENSE
 - LIST_OF_ROW_TYPES.md
 - NEW_ROW_TYPES.md
@@ -125,6 +126,7 @@ files:
 - lib/formotion/row_type/base.rb
 - lib/formotion/row_type/button.rb
 - lib/formotion/row_type/check_row.rb
+- lib/formotion/row_type/currency_row.rb
 - lib/formotion/row_type/date_row.rb
 - lib/formotion/row_type/edit_row.rb
 - lib/formotion/row_type/email_row.rb
@@ -166,7 +168,9 @@ files:
 - spec/helpers/row_test_helpers.rb
 - spec/row_spec.rb
 - spec/row_type/back_spec.rb
+- spec/row_type/base_spec.rb
 - spec/row_type/check_spec.rb
+- spec/row_type/currency_spec.rb
 - spec/row_type/date_spec.rb
 - spec/row_type/email_spec.rb
 - spec/row_type/image_spec.rb
@@ -198,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3006402350062917066
+      hash: -3419813869520045411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3006402350062917066
+      hash: -3419813869520045411
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -236,7 +240,9 @@ test_files:
 - spec/helpers/row_test_helpers.rb
 - spec/row_spec.rb
 - spec/row_type/back_spec.rb
+- spec/row_type/base_spec.rb
 - spec/row_type/check_spec.rb
+- spec/row_type/currency_spec.rb
 - spec/row_type/date_spec.rb
 - spec/row_type/email_spec.rb
 - spec/row_type/image_spec.rb