formotion 1.0 → 1.1

data/CHANGELOG.md

@@ -1,7 +1,15 @@
-## 1.1 - ???
+## 1.1 - September 20, 2012
+
+### Features
+
+-:display_key for subform row; when given, the value for that key in the subform's `#render` will be displayed alongside the chevron.
+
+-`Formotion::Form.persist` and `:persist_as` to automatically synchronize your form to the disk.
 
 ### Bug Fixes
 
+- Fix problems with inheriting Formable models.
+
 ## 1.0 - August 11, 2012
 
 ### Features

data/LIST_OF_ROW_TYPES.md

@@ -2,6 +2,7 @@
 [String](#string)<br/>
 [Text](#text)<br/>
 [Email](#email)<br/>
+[Phone](#phone)<br/>
 [Number](#number)<br/>
 [Date](#date)
 
@@ -11,14 +12,49 @@
 [Check](#check)<br/>
 [Slider](#slider)<br/>
 [Image](#image)<br/>
-[Options](#options)
+[Option](#option)<br/>
+[Picker](#picker)<br/>
+[Subform](#subform)<br/>
+[Template](#template)
 
 **Buttons**<br/>
-[Submit](#submit)
+[Submit](#submit)<br/>
+[Back](#back)<br/>
+[Edit](#edit)<br/>
+
+## General
+
+All row types accept following properties:
+```ruby
+{
+  key:        :user_name,     # Unique identifier for the row
+  value:      'Some Value',   # The initial value passed to the row
+  title:      'Title',        # Title of the row
+  subtitle:   'Subtitle',     # Subtitle of the row
+  type:       :string,        # The type of row (string, phone, switch, etc)
+  row_height: 100             # Height of the row
+}
+```
+
+The `type` property will define what kind of row type will get built. It looks for any Class within the `Formotion::RowType` namespace that has the constantized name (e.g. Formotion::RowType::StringRow).
+
 
 ## Character based
 
+All character based row types accept following properties:
+```ruby
+{
+  placeholder:         'James Bond',     # Placeholder before a value exists
+  auto_correction:     :no,              # Disable auto correction
+  auto_capitalization: :none,            # Disable auto capitalization
+  secure:              true,             # Enable secure input (Password)
+  clear_button:        :while_editing,   # Enable clear button
+  return_key:          :google,          # Define return key
+}
+```
+
 ### <a name="string"></a> String row
+
 ![String row](https://github.com/clayallsopp/formotion/wiki/row-types/string.png)
 ```ruby
 {
@@ -31,6 +67,9 @@
 }
 ```
 
+The `StringRow` is a simple text input row and opens a `UIKeyboardTypeDefault` keyboard when editing.
+
+
 ### <a name="text"></a> Text row
 ![Text Row](https://github.com/clayallsopp/formotion/wiki/row-types/text.png)
 
@@ -44,6 +83,10 @@
 }
 ```
 
+The `TextRow` is a multiline text input row and opens the default keyboard when editing.
+To define the height of the row set the property `row_height`.
+
+
 ### <a name="email"></a> Email row
 ![Email row](https://github.com/clayallsopp/formotion/wiki/row-types/email.png)
 ```ruby
@@ -55,6 +98,23 @@
 }
 ```
 
+The `EmailRow` is a string input row for an email address and opens a `UIKeyboardTypeEmailAddress` keyboard when editing.
+
+
+### <a name="phone"></a> Phone row
+![Email row](https://github.com/clayallsopp/formotion/wiki/row-types/phone.png)
+```ruby
+{
+  title: "Phone",
+  key: :phone,
+  type: :phone,
+  placeholder: '+01 877 412 7753'
+}
+```
+
+The `PhoneRow` is a string input row for a phone number and opens a `UIKeyboardTypePhonePad` keyboard when editing.
+
+
 ### <a name="number"></a> Number row
 ![Number row](https://github.com/clayallsopp/formotion/wiki/row-types/number.png)
 
@@ -67,6 +127,9 @@
 }
 ```
 
+The `NumberRow` is a string input row for a number and opens a `UIKeyboardTypeDecimalPad` keyboard when editing.
+
+
 ### <a name="date"></a> Date row
 ![Date row](https://github.com/clayallsopp/formotion/wiki/row-types/date.png)
 
@@ -80,6 +143,19 @@
 }
 ```
 
+The `DateRow` is a string input row for a date and opens a `UIDatePicker` when editing.
+You can pass one of following formats as property:
+```ruby
+  :no       # NSDateFormatterNoStyle - Specifies no style.
+  :short    # NSDateFormatterShortStyle - Specifies a short style, typically numeric only, such as “11/23/37” or “3:30pm”.
+  :medium   # NSDateFormatterMediumStyle - Specifies a medium style, typically with abbreviated text, such as “Nov 23, 1937”.
+  :long     # NSDateFormatterLongStyle - Specifies a long style, typically with full text, such as “November 23, 1937” or “3:30:32pm”.
+  :full     # NSDateFormatterFullStyle -Specifies a full style with complete details, such as “Tuesday, April 12, 1952 AD” or “3:30:42pm PST”.
+```
+
+The `value` is a `NSDate.timeIntervalSince1970` as an integer.
+
+
 ## Other
 
 ### <a name="static"></a> Static row
@@ -91,6 +167,9 @@
 }
 ```
 
+The `StaticRow` has no input funcitonality and therefore needs no `key` property. It is used for static text display like in Settings > General > About on your iOS device.
+
+
 ### <a name="switch"></a> Switch row
 ![Switch row](https://github.com/clayallsopp/formotion/wiki/row-types/switch.png)
 
@@ -102,6 +181,9 @@
 }
 ```
 
+The `SwitchRow` is a on/off switch that has the `value` true or false.
+
+
 ### <a name="check"></a> Check row
 ![Check row](https://github.com/clayallsopp/formotion/wiki/row-types/check.png)
 
@@ -114,6 +196,32 @@
 }
 ```
 
+The `CheckRow` is a row you can check and uncheck by tapping on it. It has either the `value` true or false.
+You can create a radio button style group by defining a section with `select_one: true` like this:
+
+```ruby
+{
+  title: "Account Type",
+  key: :account_type,
+  select_one: true,
+  rows: [{
+    title: "Free",
+    key: :free,
+    type: :check,
+  }, {
+    title: "Basic",
+    value: true,
+    key: :basic,
+    type: :check,
+  }, {
+    title: "Pro",
+    key: :pro,
+    type: :check,
+  }]
+}
+```
+
+
 ### <a name="slider"></a> Slider row
 ![Slider row](https://github.com/clayallsopp/formotion/wiki/row-types/slider.png)
 
@@ -127,6 +235,8 @@
 }
 ```
 
+The `SliderRow` takes a ruby range as `range` property that defines the min and max value of the slider.
+
 ### <a name="image"></a> Image row
 ![Image row](https://github.com/clayallsopp/formotion/wiki/row-types/image.png)
 
@@ -143,10 +253,91 @@
 
 ```ruby
 {
-  title: "options",
-  key: :options,
+  title: "Account Type",
+  key: :account_type,
   type: :options,
-  items: ['One', 'Two']
+  items: ["Free", "Basic", "Pro"]
+}
+```
+
+
+### <a name="picker"></a> Picker row
+![Picker row](https://github.com/clayallsopp/formotion/wiki/row-types/picker.png)
+
+```ruby
+{
+  title: "Picker",
+  key: :pick,
+  type: :picker,
+  items: ["Ruby", "Motion", "Rocks"],
+  value: "Motion"
+}
+```
+
+
+### <a name="subform"></a> Subform row
+![Subform row](https://github.com/clayallsopp/formotion/wiki/row-types/subform.gif)
+
+```ruby
+{
+  title: "Advanced",
+  type: :subform,
+  key: :advanced,
+  subform: {
+    title: "Advanced",
+    sections: [{
+      title: "Advanced Settings",
+      rows: [{
+        title: "Server URL",
+        key: :server,
+        placeholder: "example.com",
+        type: :string,
+      }]
+    }, {
+      rows: [{
+        title: 'Back',
+        type: :back
+      }]
+    }]
+  }
+}
+```
+
+Use a `:display_key` to show the value of the subform in the row:
+
+![Subform row with display](http://i.imgur.com/FoDo1.png)
+
+```ruby
+{
+  title: "Subform",
+  subtitle: "With display_key",
+  type: :subform,
+  display_key: :type,
+  subform: {
+    ...
+  }
+}
+```
+
+### <a name="template"></a> Template row
+![Template row](https://github.com/clayallsopp/formotion/wiki/row-types/template.gif)
+
+```ruby
+{
+  title: 'Your nicknames',
+  rows: [{
+    title: "Add nickname",
+    key: :nicknames,
+    type: :template,
+    value: ['Nici', 'Sam'],
+    template: {
+      title: 'Nickname',
+      type: :string,
+      placeholder: 'Enter here',
+      indented: true,
+      deletable: true
+    }
+  }]
 }
 ```
 
@@ -160,4 +351,33 @@
   title: "Submit",
   type: :submit,
 }
-```
+```
+
+The `SubmitRow` triggers the `form.submit` which triggers the defined `on_submit` callback.
+
+
+### <a name="back"></a> Back row
+![Submit row](https://github.com/clayallsopp/formotion/wiki/row-types/back.png)
+
+```ruby
+{
+  title: "Back",
+  type: :back,
+}
+```
+
+The `BackRow` is used in subforms to go back to the parent form.
+
+
+### <a name="edit"></a> Edit row
+![Submit row](https://github.com/clayallsopp/formotion/wiki/row-types/edit.png)
+
+```ruby
+{
+  title: "Edit",
+  alt_title: "View",
+  type: :edit,
+}
+```
+
+The `EditRow` is used to switch between edit and view mode. It's mainly used for the `TemplateRow`.

data/README.md

@@ -109,7 +109,7 @@ self.navigationController.pushViewController(@controller, animated: true)
 
 ### Data Types
 
-See [the visual list of support row types](https://github.com/clayallsopp/formotion/blob/master/LIST_OF_ROW_TYPES.md).
+See [the visual list of support row types](https://github.com/clayallsopp/formotion/wiki/List-of-all-the-row-types).
 
 To add your own, check [the guide to adding new row types](https://github.com/clayallsopp/formotion/blob/master/NEW_ROW_TYPES.md).
 
@@ -155,6 +155,25 @@ end
 
 `form#submit` just triggers `form#on_submit`.
 
+### Persistence
+
+You can easily synchronize a `Form`'s state to disk using the `persist_as` key in conjunction with the `persist` method. When your user edits the form, any changes will be immediately saved. For example:
+
+```ruby
+@form = Formotion::Form.persist({
+  persist_as: :settings,
+  sections: ...
+})
+```
+
+This will load the form if it exists, or create it if necessary. If you use `Formotion::Form.new`, then the form will not be loaded and any changes you make will override existing saved forms.
+
+Your form values and state are automatically persisted across application loads, no save buttons needed.
+
+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.
+     
 ## Forking
 
 Feel free to fork and submit pull requests! And if you end up using Formotion in your app, I'd love to hear about your experience.
@@ -162,4 +181,4 @@ Feel free to fork and submit pull requests! And if you end up using Formotion in
 ## Todo
 
 - Not very efficient right now (creates a unique reuse idenitifer for each cell)
-- Styling/overriding the form for custom UITableViewDelegate/Data Source behaviors.
+- Styling/overriding the form for custom UITableViewDelegate/Data Source behaviors.

data/app/app_delegate.rb

@@ -68,6 +68,7 @@ class AppDelegate
           title: "Account type",
           type: :subform,
           key: :account,
+          display_key: :type,
           subform: {
             title: "Account Type",
             sections: [{
@@ -75,16 +76,16 @@ class AppDelegate
               select_one: true,
               rows: [{
                 title: "Free",
-                key: :free,
+                key: :Free,
                 type: :check,
               }, {
                 title: "Basic",
                 value: true,
-                key: :basic,
+                key: :Basic,
                 type: :check,
               }, {
                 title: "Pro",
-                key: :pro,
+                key: :Pro,
                 type: :check,
               }]
             }, {

data/examples/KitchenSink/app/app_delegate.rb

@@ -116,6 +116,73 @@ class AppDelegate
           key: :c,
           type: :check,
         }]
+      }, {
+        title: "Subforms",
+        rows: [{
+          title: "Subform",
+          subtitle: "With display_key",
+          type: :subform,
+          key: :subform,
+          display_key: :type,
+          subform: {
+            title: "Account Type",
+            sections: [{
+              key: :type,
+              select_one: true,
+              rows: [{
+                title: "Free",
+                key: :Free,
+                type: :check,
+              }, {
+                title: "Basic",
+                value: true,
+                key: :Basic,
+                type: :check,
+              }, {
+                title: "Pro",
+                key: :Pro,
+                type: :check,
+              }]
+            }, {
+              rows: [{
+                title: "Advanced",
+                type: :subform,
+                key: :advanced,
+                subform: {
+                  title: "Advanced",
+                  sections: [{
+                    key: :currency,
+                    select_one: true,
+                    rows: [{
+                      title: "USD",
+                      value: true,
+                      key: :usd,
+                      type: :check,
+                    }, {
+                      title: "EUR",
+                      key: :eur,
+                      type: :check,
+                    }, {
+                      title: "CHF",
+                      key: :chf,
+                      type: :check,
+                    }]
+                  }, {
+                    rows: [{
+                      title: 'Back',
+                      type: :back
+                    }]
+                  }]
+                }
+              }]
+            }, {
+              rows: [{
+                title: 'Back',
+                type: :back
+              }]
+            }]
+          }
+        }]
       }, {
         rows: [{
           title: "Submit",

data/examples/Persistence/.gitignore

@@ -0,0 +1,5 @@
+.repl_history
+build
+resources/*.nib
+resources/*.momd
+resources/*.storyboardc

data/examples/Persistence/README.md

@@ -0,0 +1,3 @@
+# Persistence example in Formotion
+
+![Persistence](http://i.imgur.com/fdCfV.png)

data/examples/Persistence/Rakefile

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project'
+require '../../lib/formotion'
+
+Motion::Project::App.setup do |app|
+  # Use `rake config' to see complete project settings.
+  app.name = 'KitchenSink'
+end

data/examples/Persistence/app/app_delegate.rb

@@ -0,0 +1,199 @@
+class AppDelegate
+  def application(application, didFinishLaunchingWithOptions:launchOptions)
+    @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+
+    @form = Formotion::Form.persist({
+      title: "Persist Example",
+      persist_as: "example",
+      sections: [{
+        title: "Section Title",
+        footer: "This is the footer for the section. It's good for displaying detailed data about the section.",
+        rows: [{
+          title: "Static",
+          type: :static,
+        }, {
+          title: "Email",
+          key: :email,
+          placeholder: "me@mail.com",
+          type: :email,
+          auto_correction: :no,
+          auto_capitalization: :none
+        }, {
+          title: "Gender",
+          key: :gender,
+          type: :options,
+          items: ['Female', 'Male']
+        }, {
+          title: "Password",
+          key: :password,
+          placeholder: "required",
+          type: :string,
+          secure: true
+        }, {
+          title: "Phone",
+          key: :phone,
+          placeholder: "555-555-5555",
+          type: :phone,
+          auto_correction: :no,
+          auto_capitalization: :none
+        }, {
+          title: "Number",
+          key: :number,
+          placeholder: "12345",
+          type: :number,
+          auto_correction: :no,
+          auto_capitalization: :none
+        }, {
+          title: "Subtitle",
+          subtitle: "Confirmation",
+          key: :confirm,
+          placeholder: "required",
+          type: :string,
+          secure: true
+        }, {
+          title: "Row Height",
+          key: :row_height,
+          placeholder: "60px",
+          type: :string,
+          row_height: 60
+        }, {
+          title: "Text",
+          key: :text,
+          type: :text,
+          placeholder: "Enter your text here",
+          row_height: 100
+        }, {
+          title: "Check",
+          key: :check,
+          type: :check,
+          value: true
+        }, {
+          title: "Remember?",
+          key: :remember,
+          type: :switch,
+        }, {
+          title: "Date Full",
+          subtitle: "w/ :value",
+          value: 326937600,
+          key: :date_long,
+          type: :date,
+          format: :full
+        }, {
+          title: "Date Medium",
+          subtitle: "w/ :value",
+          value: 1341273600,
+          key: :date_medium,
+          type: :date,
+          format: :medium
+        }, {
+          title: "Date Short",
+          subtitle: "w/ :placeholder",
+          placeholder: "DOB",
+          key: :date_short,
+          type: :date,
+          format: :short
+        }, {
+          title: "Slider",
+          key: :slider,
+          type: :slider,
+          range: (1..100),
+          value: 25
+        }]
+      }, {
+        title: "Subforms",
+        rows: [{
+          title: "Subform",
+          subtitle: "With display_key",
+          type: :subform,
+          key: :subform,
+          display_key: :type,
+          subform: {
+            title: "Account Type",
+            sections: [{
+              key: :type,
+              select_one: true,
+              rows: [{
+                title: "Free",
+                key: :Free,
+                type: :check,
+              }, {
+                title: "Basic",
+                value: true,
+                key: :Basic,
+                type: :check,
+              }, {
+                title: "Pro",
+                key: :Pro,
+                type: :check,
+              }]
+            }, {
+              rows: [{
+                title: "Advanced",
+                type: :subform,
+                key: :advanced,
+                subform: {
+                  title: "Advanced",
+                  sections: [{
+                    key: :currency,
+                    select_one: true,
+                    rows: [{
+                      title: "USD",
+                      value: true,
+                      key: :usd,
+                      type: :check,
+                    }, {
+                      title: "EUR",
+                      key: :eur,
+                      type: :check,
+                    }, {
+                      title: "CHF",
+                      key: :chf,
+                      type: :check,
+                    }]
+                  }, {
+                    rows: [{
+                      title: 'Back',
+                      type: :back
+                    }]
+                  }]
+                }
+              }]
+            }, {
+              rows: [{
+                title: 'Back',
+                type: :back
+              }]
+            }]
+          }
+        }]
+      }]
+    })
+
+    @view_controller = Formotion::FormController.alloc.initWithForm(@form)
+    @view_controller.form.on_submit do |form|
+      form.active_row && form.active_row.text_field.resignFirstResponder
+      alert = UIAlertView.alloc.init
+      alert.title = "@form.render"
+      alert.message = @form.render.to_s
+      alert.addButtonWithTitle("OK")
+      alert.show
+    end
+
+    @view_controller.navigationItem.leftBarButtonItem = UIBarButtonItem.alloc.initWithTitle("Reset", style: UIBarButtonItemStyleBordered, target:self, action:'reset_form')
+
+    @navigation_controller = UINavigationController.alloc.initWithRootViewController(@view_controller)
+
+    @window.rootViewController = @navigation_controller
+    @window.makeKeyAndVisible
+
+    true
+  end
+
+  def submit
+    @form.submit
+  end
+
+  def reset_form
+    @form.reset
+  end
+end

data/examples/Persistence/spec/main_spec.rb

@@ -0,0 +1,9 @@
+describe "Application 'KitchenSink'" do
+  before do
+    @app = UIApplication.sharedApplication
+  end
+
+  it "has one window" do
+    @app.windows.size.should == 1
+  end
+end

data/gh-pages/assets/css/formotion.css

@@ -114,4 +114,8 @@ hr.hidden-desktop {
 
 .install-instruct {
   margin-bottom: 20px;
+}
+
+#maintained {
+  margin-bottom: 20px;
 }

data/gh-pages/index.html

@@ -199,6 +199,22 @@
 
       <hr />
 
+      <div class="row">
+        <div class="span12" id="maintained">
+          <h1>Maintained By</h1>
+        </div>
+        <div class="span3">
+          <a href="https://twitter.com/clayallsopp" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @clayallsopp</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+        </div>
+        <div class="span3">
+          <a href="https://twitter.com/mordaroso" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @mordaroso</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+        </div>
+      </div>
+
+      <hr />
+
 
     </div> <!-- /container -->
   </body>

data/lib/formotion/controller/form_controller.rb

@@ -17,6 +17,7 @@ module Formotion
       self.form = form
       #self.view.setEditing true, animated: true
       self.tableView.allowsSelectionDuringEditing = true
+
       self
     end
 
@@ -49,6 +50,13 @@ module Formotion
       @form.controller = self
     end
 
+
+    def viewWillAppear(animated)
+      super
+
+      self.tableView.reloadData
+    end
+
     # Subview Methods
     def push_subform(form)
       @subform_controller = self.class.alloc.initWithForm(form)
@@ -68,4 +76,4 @@ module Formotion
       end
     end
   end
-end
+end

data/lib/formotion/form/form.rb

@@ -1,11 +1,16 @@
 module Formotion
   class Form < Formotion::Base
+    extend BW::KVO
+    include BW::KVO
+
     PROPERTIES = [
       # By default, Formotion::Controller will set it's title to this
       # (so navigation bars will reflect it).
       :title,
       # If you want to have some internal id to track the form.
-      :id
+      :id,
+      # [STRING/SYMBOL] used to store your form's state on disk
+      :persist_as
     ]
     PROPERTIES.each {|prop|
       attr_accessor prop
@@ -15,6 +20,12 @@ module Formotion
     # them to be pased in the hash
     SERIALIZE_PROPERTIES = PROPERTIES + [:sections]
 
+    def self.persist(params = {})
+      form = new(params)
+      form.open && form.save
+      form
+    end
+
     def initialize(params = {})
       # super takes care of initializing the ::PROPERTIES in params
       super
@@ -104,7 +115,6 @@ module Formotion
     # as shown above.
     def submit
       if @on_submit_callback.nil?
-        p "`Form#submit` invoked without a callback, doing nothing."
         return
       end
 
@@ -184,7 +194,95 @@ module Formotion
       kv
     end
 
+    #########################
+    # 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|
+        form.send(:each_row) do |row, index|
+          s_index = row.section.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)
+          else
+            row.value = temp_row.value
+
+            observe(row, "value") do |old_value, new_value|
+              self.save
+            end
+          end
+        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
+    end
+
+    def reset
+      App::Persistence[persist_key] = nil
+
+      @form_resetter ||= lambda { |form, original_form|
+        form.send(:each_row) do |row, index|
+          s_index = row.section.index
+          temp_row = original_form.sections[s_index].rows[index]
+
+          if row.subform?
+            original_subform = temp_row.subform.to_form
+            @form_resetter.call(row.subform.to_form, original_subform)
+          else
+            row.value = temp_row.value
+          end
+        end
+      }
+
+      temp_form = Formotion::Form.new(App::Persistence[original_persist_key].unarchive)
+      @form_resetter.call(self, temp_form)
+
+      self.save
+    end
+
     private
+    def persist_key
+      "FORMOTION_#{self.persist_as}"
+    end
+
+    def original_persist_key
+      "#{persist_key}_ORIGINAL"
+    end
+
+    def load_state
+      begin
+        state = App::Persistence[persist_key] && App::Persistence[persist_key].unarchive
+      rescue
+        self.save
+      end
+      
+      state ||= self.to_hash
+    end
+
+    def each_row(&block)
+      self.sections.each_with_index do |section, s_index|
+        section.rows.each_with_index do |row, index|
+          case block.arity
+          when 1
+            block.call(row)
+          when 2
+            block.call(row, index)
+          end
+        end
+      end
+    end
+
     def recursive_delete_nil(h)
       delete_empty = Proc.new { |k, v|
         v.delete_if(&delete_empty) if v.kind_of?(Hash)
@@ -193,4 +291,4 @@ module Formotion
       h.delete_if &delete_empty
     end
   end
-end
+end

data/lib/formotion/form/form_delegate.rb

@@ -65,6 +65,8 @@ module Formotion
         row.make_cell
       end
 
+      row.update_cell(cell)
+
       cell
     end
 

data/lib/formotion/model/formable.rb

@@ -5,6 +5,21 @@ module Formotion
     end
 
     module ClassMethods
+      INHERITABLE_ATTRIBUTES = [:form_properties, :form_title].each do |prop|
+        attr_accessor prop
+      end
+
+      def inherited(subclass)
+        INHERITABLE_ATTRIBUTES.each do |inheritable_attribute|
+          instance_var = "@#{inheritable_attribute}"
+          subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+        end
+      end
+
+      def form_properties
+        @form_properties ||= []
+      end
+
       # Relates a property to a RowType.
       # @param property is the name of the attribute to KVO
       # @param row_type is the Formotion::RowType to use for that attribute
@@ -19,10 +34,6 @@ module Formotion
         self.form_properties << { property: property, row_type: row_type}.merge(options)
       end
 
-      def form_properties
-        @form_properties ||= []
-      end
-
       # Sets the top bar title for this model
       # EX
       # form_title "Some Settings"

data/lib/formotion/patch/object.rb

@@ -6,4 +6,14 @@ class Object
     self.class.send(:alias_method, "old_#{method.to_s}".to_sym, method)
     self.instance_eval &block
   end
-end
+
+  def to_archived_data
+    NSKeyedArchiver.archivedDataWithRootObject(self)
+  end
+end
+
+class NSData
+  def unarchive
+    NSKeyedUnarchiver.unarchiveObjectWithData(self)
+  end
+end

data/lib/formotion/patch/ui_text_view_placeholder.rb

@@ -19,7 +19,13 @@ class UITextView
   def setup
     @foreground_observer = NSNotificationCenter.defaultCenter.observe UITextViewTextDidChangeNotification do |notification|
       updateShouldDrawPlaceholder
-    end  
+    end
+  end
+
+  alias_method :old_dealloc, :dealloc
+  def dealloc
+    NSNotificationCenter.defaultCenter.unobserve @foreground_observer
+    old_dealloc
   end
 
   alias_method :old_drawRect, :drawRect
@@ -62,4 +68,4 @@ class UITextView
 
     self.setNeedsDisplay if (prev != @shouldDrawPlaceholder)
   end
-end
+end

data/lib/formotion/row/row.rb

@@ -53,6 +53,11 @@ module Formotion
       # A hash for a Form used for subforms
       # DEFAULT is nil
       :subform,
+      # Used in a subform row; when given,
+      # will display the value of the matching key
+      # of the subform's rendering.
+      # DEFAULT is nil
+      :display_key,
       # A hash for a Row used for templates
       # DEFAULT is nil
       :template,
@@ -160,6 +165,19 @@ module Formotion
       object.button?
     end
 
+    def subform?
+      self.type == :subform
+    end
+
+    #########################
+    #  getter overrides
+    def items
+      if @items.respond_to?(:call)
+        @items = @items.call
+      end
+      @items
+    end
+
     #########################
     #  setter overrides
     def type=(type)
@@ -167,6 +185,20 @@ module Formotion
       @type = type
     end
 
+    def range=(range)
+      if range
+        case range
+        when Range
+          # all good
+        when Array
+          range = Range.new(range[0], range[1])
+        else
+          raise Formotion::InvalidClassError, "Attempted Row.range = #{range.inspect} should be of type Range or Array"
+        end
+      end
+      @range = range
+    end
+
     def return_key=(value)
       @return_key = const_int_get("UIReturnKey", value)
     end
@@ -205,10 +237,24 @@ module Formotion
       cell
     end
 
+    # Called on every tableView:cellForRowAtIndexPath:
+    # so keep implementation details minimal
+    def update_cell(cell)
+      self.object.update_cell(cell)
+      cell
+    end
+
     #########################
     # Retreiving data
     def to_hash
-      super
+      h = super
+      if h[:range] && h[:range].is_a?(Range)
+        h[:range] = [self.range.begin, self.range.end]
+      end
+      if subform?
+        h[:subform] = self.subform.to_form.to_hash
+      end
+      h
     end
 
     def subform=(subform)
@@ -225,6 +271,7 @@ module Formotion
           @hash_subform ||= self
         end
       end
+      @subform
     end
 
     private

data/lib/formotion/row_type/base.rb

@@ -43,6 +43,11 @@ module Formotion
       def after_build(cell)
       end
 
+      # Called on every tableView:cellForRowAtIndexPath:
+      # so keep implementation details minimal
+      def update_cell(cell)
+      end
+
       # method gets triggered when tableView(tableView, didSelectRowAtIndexPath:indexPath)
       # in UITableViewDelegate is executed
       def on_select(tableView, tableViewDelegate)

data/lib/formotion/row_type/picker_row.rb

@@ -18,7 +18,11 @@ module Formotion
 
           if self.row.value
             picker_row = self.row.items.index(row.value)
-            picker.selectRow(picker_row, inComponent:0, animated:false)
+            if picker_row
+              picker.selectRow(picker_row, inComponent:0, animated:false)
+            else
+              warn "Picker item '#{row.value}' not found in #{row.items.inspect} for '#{row.key}'"
+            end
           end
 
           picker

data/lib/formotion/row_type/subform_row.rb

@@ -2,8 +2,36 @@ module Formotion
   module RowType
     class SubformRow < Base
 
+      LABEL_TAG=1001
+
       def build_cell(cell)
         cell.accessoryType = cell.editingAccessoryType = UITableViewCellAccessoryDisclosureIndicator
+
+        cell.contentView.addSubview(self.display_key_label)
+
+        cell.swizzle(:layoutSubviews) do
+          def layoutSubviews
+            old_layoutSubviews
+
+            formotion_label = self.viewWithTag(LABEL_TAG)
+            formotion_label.sizeToFit
+
+            field_frame = formotion_label.frame
+            # HARDCODED CONSTANT
+            field_frame.origin.x = self.contentView.frame.size.width - field_frame.size.width - 10
+            field_frame.origin.y = ((self.contentView.frame.size.height - field_frame.size.height) / 2.0).round
+            formotion_label.frame = field_frame
+          end
+        end
+
+        display_key_label.highlightedTextColor = cell.textLabel.highlightedTextColor
+      end
+
+      def update_cell(cell)
+        subform = row.subform.to_form
+        if row.display_key and subform.render[row.display_key]
+          self.display_key_label.text = subform.render[row.display_key]
+        end
       end
 
       def on_select(tableView, tableViewDelegate)
@@ -11,6 +39,15 @@ module Formotion
         row.form.controller.push_subform(subform)
       end
 
+      def display_key_label
+        @display_key_label ||= begin
+          label = UILabel.alloc.initWithFrame(CGRectZero)
+          label.textColor = "#385387".to_color
+          label.tag = LABEL_TAG
+          label.backgroundColor = UIColor.clearColor
+          label
+        end
+      end
     end
   end
 end

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

data/spec/form/persist_spec.rb

@@ -0,0 +1,58 @@
+describe "Form Persisting" do
+
+  it "works" do
+    f = Formotion::Form.persist({
+      persist_as: "test_#{rand(255)}",
+      sections: [
+        rows: [ {
+            key: "first",
+            type: "string",
+            value: "initial value"
+          }
+        ]
+      ]
+    })
+
+    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
+
+    f.reset
+    r.value.should == "initial value"
+  end
+
+  it "works with subforms" do
+    f = Formotion::Form.persist({
+      persist_as: "test_#{rand(255)}",
+      sections: [
+        rows: [ {
+            key: :subform,
+            type: :subform,
+            title: "Subform",
+            subform: {
+              title: "New Page",
+              sections: [
+                rows: [{
+                  key: "second",
+                  type: "string",
+                  value: "initial value"
+                }]
+              ]
+            }
+          }
+        ]
+      ]
+    })
+
+    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
+
+    f.reset
+    r.value.should == "initial value"
+  end
+end

data/spec/functional/formable_controller_spec.rb

@@ -7,6 +7,15 @@ class TestModel
   form_property :my_number, :number, title: "My Number", :transform => lambda { |value| value.to_i + 10 }
 end
 
+class AdditionalTestModel
+  include Formotion::Formable
+
+  attr_accessor :my_other_name, :my_other_number
+
+  form_property :my_other_name, :string
+  form_property :my_other_number, :number
+end
+
 describe "FormableController" do
   tests Formotion::FormableController
 

data/spec/row_spec.rb

@@ -22,4 +22,13 @@ describe "Rows" do
       r.title?.should == true
     }
   end
+
+  it "should allow arrays and blocks for items" do
+    r = Formotion::Row.new()
+    r.items = [1, 2, 3]
+    r.items.should == [1, 2, 3]
+
+    r.items = lambda { [1, 2, 3].reverse }
+    r.items.should == [3, 2, 1]
+  end
 end

data/spec/support/ui_control_wrap_extension.rb

@@ -1,7 +1,9 @@
 module UIControlWrap
-  # adds ability to trigger a defined callback that was previously defined by when
+  # adds ability to trigger a defined callback
+  # that was previously defined by #when
   def trigger(events)
     @callback ||= {}
-    @callback[events].call if @callback.has_key? events
+    p "Callback #{@callback}"
+    @callback[events].map(&:call) if @callback.has_key? events
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -77,6 +77,11 @@ files:
 - examples/Login/app/login_controller.rb
 - examples/Login/app/user_controller.rb
 - examples/Login/spec/main_spec.rb
+- examples/Persistence/.gitignore
+- examples/Persistence/README.md
+- examples/Persistence/Rakefile
+- examples/Persistence/app/app_delegate.rb
+- examples/Persistence/spec/main_spec.rb
 - gh-pages/assets/css/bootstrap-responsive.css
 - gh-pages/assets/css/bootstrap-responsive.min.css
 - gh-pages/assets/css/bootstrap.css
@@ -138,6 +143,7 @@ files:
 - lib/formotion/row_type/text_row.rb
 - lib/formotion/section/section.rb
 - lib/formotion/version.rb
+- spec/form/persist_spec.rb
 - spec/form_spec.rb
 - spec/formable_spec.rb
 - spec/functional/character_spec.rb
@@ -188,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 84446603769905079
+      hash: 4038020492425824062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 84446603769905079
+      hash: 4038020492425824062
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -205,6 +211,7 @@ signing_key:
 specification_version: 3
 summary: Making iOS Forms insanely great with RubyMotion
 test_files:
+- spec/form/persist_spec.rb
 - spec/form_spec.rb
 - spec/formable_spec.rb
 - spec/functional/character_spec.rb