formotion 0.0.3 → 0.5

data/.gitignore

@@ -7,4 +7,5 @@ resources/*.storyboardc
 *.gem
 .bundle
 Gemfile.lock
-pkg/*
+pkg/*
+.rvmrc

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+### 0.5.0 - ?, 2012
+
+### Improvements
+
+- Add new row type for images
+- Add new row type for UISegmentedControl
+- Add new row type for UISlider
+- Add new row type for multiline text
+- Add new row types for dates
+- Big code refactoring

data/Gemfile

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

data/LIST_OF_ROW_TYPES.md

@@ -0,0 +1,163 @@
+**Character based**<br/>
+[String](#string)<br/>
+[Text](#text)<br/>
+[Email](#email)<br/>
+[Number](#number)<br/>
+[Date](#date)
+
+**Other**<br/>
+[Static](#static)<br/>
+[Switch](#switch)<br/>
+[Check](#check)<br/>
+[Slider](#slider)<br/>
+[Image](#image)<br/>
+[Options](#options)
+
+**Buttons**<br/>
+[Submit](#submit)
+
+## Character based
+
+### <a name="string"></a> String row
+![String row](https://github.com/clayallsopp/formotion/wiki/row-types/string.png)
+```ruby
+{
+  title: "Name",
+  key: :name,
+  type: :string,
+  placeholder: 'James Bond',
+  auto_correction: :no,
+  auto_capitalization: :none
+}
+```
+
+### <a name="text"></a> Text row
+![Text Row](https://github.com/clayallsopp/formotion/wiki/row-types/text.png)
+
+```ruby
+{
+  title: "Text",
+  key: :text,
+  type: :text,
+  placeholder: "Enter your text here",
+  rowHeight: 100
+}
+```
+
+### <a name="email"></a> Email row
+![Email row](https://github.com/clayallsopp/formotion/wiki/row-types/email.png)
+```ruby
+{
+  title: "Email",
+  key: :email,
+  type: :email,
+  placeholder: 'me@mail.com'
+}
+```
+
+### <a name="number"></a> Number row
+![Number row](https://github.com/clayallsopp/formotion/wiki/row-types/number.png)
+
+```ruby
+{
+  title: "Number",
+  key: :number,
+  placeholder: "12345",
+  type: :number
+}
+```
+
+### <a name="date"></a> Date row
+![Date row](https://github.com/clayallsopp/formotion/wiki/row-types/date.png)
+
+```ruby
+{
+  title: "Date",
+  value: 326937600,
+  key: :date_long,
+  type: :date,
+  format: :full
+}
+```
+
+## Other
+
+### <a name="static"></a> Static row
+![Static row](https://github.com/clayallsopp/formotion/wiki/row-types/static.png)
+```ruby
+{
+  title: "Static",
+  type: :static,
+}
+```
+
+### <a name="switch"></a> Switch row
+![Switch row](https://github.com/clayallsopp/formotion/wiki/row-types/switch.png)
+
+```ruby
+{
+  title: "Remember?",
+  key: :remember,
+  type: :switch,
+}
+```
+
+### <a name="check"></a> Check row
+![Check row](https://github.com/clayallsopp/formotion/wiki/row-types/check.png)
+
+```ruby
+{
+  title: "Check",
+  key: :check,
+  type: :check,
+  value: true
+}
+```
+
+### <a name="slider"></a> Slider row
+![Slider row](https://github.com/clayallsopp/formotion/wiki/row-types/slider.png)
+
+```ruby
+{
+  title: "Slider",
+  key: :slider,
+  type: :slider,
+  range: (1..100),
+  value: 25
+}
+```
+
+### <a name="image"></a> Image row
+![Image row](https://github.com/clayallsopp/formotion/wiki/row-types/image.png)
+
+```ruby
+{
+  title: "Image",
+  key: :image,
+  type: :image
+}
+```
+
+### <a name="options"></a> Options row
+![Options row](https://github.com/clayallsopp/formotion/wiki/row-types/options.png)
+
+```ruby
+{
+  title: "options",
+  key: :options,
+  type: :options,
+  items: ['One', 'Two']
+}
+```
+
+## Buttons
+
+### <a name="submit"></a> Submit row
+![Submit row](https://github.com/clayallsopp/formotion/wiki/row-types/submit.png)
+
+```ruby
+{
+  title: "Submit",
+  type: :submit,
+}
+```

data/NEW_ROW_TYPES.md

@@ -0,0 +1,73 @@
+# Creating New Row Types
+
+We've tried to make Formotion as extensible as possible so you can create new row types. If you think others could use it, feel free to submit a [pull request](https://github.com/clayallsopp/formotion/pulls).
+
+## Steps
+
+### 1 - Subclass
+
+Add a subclass of `RowType::Base` to the `Formotion::RowType` module and conform your class name to the form `____Row`.
+
+Example:
+
+```ruby
+module Formotion
+  module RowType
+    class MyNewRow < Base
+    end
+  end
+end
+```
+
+`RowType.for` looks for classes inside the module with match that name form (see `row_type.rb`). This allows you to refer to your new type in the Formotion hashes as an underscored version of your class name:
+
+```ruby
+Formotion::Form.new({
+  sections: [{
+    rows: [{
+      title: "MyNewRow Example",
+      type: :my_new
+    }]
+  }]
+})
+```
+
+### 2 - Override
+
+The flow of using `RowType` is:
+
+1. `row.make_cell` is called, which calls...
+2. `Formotion::RowCellBuilder.make_cell(row)`, which calls...
+3. `row.object.build_cell(cell)` **This is where you come in**
+4. `YourRowType#build_cell(<#UITableViewCell>)` should setup the cell however you need to.
+5. `build_cell` should return an instance of UITextField if necessary. See `StringRow#build_cell` for an example.
+6. Lastly, `YourRowType#after_build(#<UITableViewCell>)` is called when the `row` object is entirely setup and right before it's passed back to the table view for drawing.
+
+So the meat of your overrides should happen in **build_cell**.
+
+Ex:
+
+```ruby
+module Formotion
+  module RowType
+    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
+
+        # return nil because no UITextField added.
+        nil
+      end
+    end
+  end
+end
+```
+
+### 3 - Callbacks And Defaults
+
+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`

data/README.md

@@ -107,6 +107,14 @@ Then attach it to a `Formotion::FormController` and you're ready to rock and rol
 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).
+
+To add your own, check [the guide to adding new row types](https://github.com/clayallsopp/formotion/blob/master/NEW_ROW_TYPES.md).
+
+`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).
+
 ### Retreive
 
 You have `form#submit`, `form#on_submit`, and `form#render` at your disposal. Here's an example:
@@ -126,7 +134,7 @@ class PeopleController < Formotion::FormController
 end
 ```
 
-Why would you use `form#on_submit`? In case you want to use `Formotion::RowType::SUBMIT`. Ex:
+Why would you use `form#on_submit`? In case you want to use `type: :submit`. Ex:
 
 ```ruby
 @form = Formotion::Form.new({
@@ -135,7 +143,7 @@ Why would you use `form#on_submit`? In case you want to use `Formotion::RowType:
   }, {
     rows: [{
       title: "Save",
-      type: Formotion::RowType::SUBMIT
+      type: :submit
     }]
   }]
 })
@@ -147,14 +155,6 @@ end
 
 `form#submit` just triggers `form#on_submit`.
 
-### Data Types
-
-Formotion current supports static and editable text, switches, and checkboxes.
-
-`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).
-
-See the [KitchenSink example](https://github.com/clayallsopp/formotion/tree/master/examples/KitchenSink) for a bunch of options 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,7 +162,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)
-- More data entry types (dates, etc)
-- More tests
-- Styling/overriding the form for custom UITableViewDelegate/Data Source behaviors.
-- Custom cell text field alignments
+- Styling/overriding the form for custom UITableViewDelegate/Data Source behaviors.

data/Rakefile

@@ -1,6 +1,7 @@
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project'
 require "bundler/gem_tasks"
+require "bundler/setup"
 
 $:.unshift("./lib/")
 require './lib/formotion'
@@ -8,4 +9,9 @@ require './lib/formotion'
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'Formotion'
+
+  # Temporary, until RubyMotion patches its test loader
+  spec_files = app.spec_files + Dir.glob(File.join(app.specs_dir, '**/*.rb'))
+  spec_files.uniq!
+  app.instance_variable_set(:@spec_files, spec_files)
 end

data/app/app_delegate.rb

@@ -6,6 +6,10 @@ class AppDelegate
       sections: [{
         title: "Register",
         rows: [{
+          title: "Photo",
+          key: :photo,
+          type: :image
+        },{
           title: "Email",
           key: :email,
           placeholder: "me@mail.com",
@@ -29,6 +33,24 @@ class AppDelegate
           title: "Switch",
           key: :switch,
           type: :switch,
+        }, {
+          title: "Bio",
+          key: :bio,
+          type: :text,
+          placeholder: "Enter your Bio here...",
+          rowHeight: 100
+        }, {
+          title: "Date Full",
+          value: 326937600,
+          key: :date_full,
+          type: :date,
+          format: :full
+        }, {
+          title: "Date Short",
+          placeholder: "03/26/92",
+          key: :date_short,
+          type: :date,
+          format: :short
         }]
       }, {
         title: "Account Type",

data/examples/KitchenSink/Rakefile

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

data/examples/KitchenSink/app/app_delegate.rb

@@ -6,6 +6,7 @@ class AppDelegate
       title: "Kitchen Sink",
       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,
@@ -16,6 +17,11 @@ class AppDelegate
           type: :email,
           auto_correction: :no,
           auto_capitalization: :none
+        }, {
+          title: "Gender",
+          key: :gender,
+          type: :options,
+          items: ['Female', 'Male']
         }, {
           title: "Password",
           key: :password,
@@ -43,10 +49,54 @@ class AppDelegate
           placeholder: "required",
           type: :string,
           secure: true
+        }, {
+          title: "Row Height",
+          key: :row_height,
+          placeholder: "60px",
+          type: :string,
+          rowHeight: 60
+        }, {
+          title: "Text",
+          key: :text,
+          type: :text,
+          placeholder: "Enter your text here",
+          rowHeight: 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: "Select One",
@@ -74,8 +124,6 @@ class AppDelegate
       }]
     })
 
-    @navigation_controller = UINavigationController.alloc.init
-
     @view_controller = Formotion::FormController.alloc.initWithForm(@form)
     @view_controller.form.on_submit do |form|
       form.active_row && form.active_row.text_field.resignFirstResponder