formotion 0.5.1 → 1.0

data/lib/formotion/row_type/slider_row.rb

@@ -1,13 +1,14 @@
 module Formotion
   module RowType
     class SliderRow < Base
+      include BW::KVO
 
       SLIDER_VIEW_TAG = 1200
 
       def build_cell(cell)
         cell.selectionStyle = UITableViewCellSelectionStyleNone
         slideView = UISlider.alloc.initWithFrame(CGRectZero)
-        cell.accessoryView = slideView
+        cell.accessoryView = cell.editingAccessoryView = slideView
         row.range ||= (1..10)
         slideView.minimumValue = row.range.first
         slideView.maximumValue = row.range.last
@@ -16,9 +17,17 @@ module Formotion
         slideView.accessibilityLabel = row.title + " Slider"
 
         slideView.when(UIControlEventValueChanged) do
-          row.value = slideView.value
+          break_with_semaphore do
+            row.value = slideView.value
+          end
+        end
+        observe(self.row, "value") do |old_value, new_value|
+          break_with_semaphore do
+            slideView.setValue(row.value, animated:false)
+          end
         end
 
+
         cell.swizzle(:layoutSubviews) do
           def layoutSubviews
             old_layoutSubviews
@@ -29,9 +38,9 @@ module Formotion
 
             field_frame = formotion_field.frame
             field_frame.origin.y = 10
-            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + 20
-            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - 20
-            field_frame.size.height = self.frame.size.height - 20
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + FIELD_BUFFER
+            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - FIELD_BUFFER
+            field_frame.size.height = self.frame.size.height - FIELD_BUFFER
             formotion_field.frame = field_frame
           end
         end

data/lib/formotion/row_type/string_row.rb

@@ -1,6 +1,7 @@
 module Formotion
   module RowType
     class StringRow < Base
+      include BW::KVO
 
       # The new UITextField in a UITableViewCell
       # will be assigned this tag, if applicable.
@@ -21,8 +22,11 @@ module Formotion
         field = UITextField.alloc.initWithFrame(CGRectZero)
         field.tag = TEXT_FIELD_TAG
 
-        field.placeholder = row.placeholder
-        field.text = row.value.to_s
+        observe(self.row, "value") do |old_value, new_value|
+          break_with_semaphore do
+            update_text_field(new_value)
+          end
+        end
 
         field.clearButtonMode = UITextFieldViewModeWhileEditing
         field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
@@ -47,13 +51,15 @@ module Formotion
             formotion_field.sizeToFit
 
             field_frame = formotion_field.frame
-            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + 20
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + FIELD_BUFFER
             field_frame.origin.y = ((self.frame.size.height - field_frame.size.height) / 2.0).round
-            field_frame.size.width = self.frame.size.width - field_frame.origin.x - 20
+            field_frame.size.width = self.frame.size.width - field_frame.origin.x - FIELD_BUFFER
             formotion_field.frame = field_frame
           end
         end
 
+        field.placeholder = row.placeholder
+        field.text = row.value.to_s
         cell.addSubview(field)
         field
 
@@ -100,13 +106,19 @@ module Formotion
       end
 
       def on_change(text_field)
-        row.value = text_field.text
+        break_with_semaphore do
+          row.value = text_field.text
+        end
       end
 
       def on_select(tableView, tableViewDelegate)
         row.text_field.becomeFirstResponder
       end
 
+      # Used when row.value changes
+      def update_text_field(new_value)
+        self.row.text_field.text = new_value
+      end
     end
   end
 end

data/lib/formotion/row_type/subform_row.rb

@@ -0,0 +1,16 @@
+module Formotion
+  module RowType
+    class SubformRow < Base
+
+      def build_cell(cell)
+        cell.accessoryType = cell.editingAccessoryType = UITableViewCellAccessoryDisclosureIndicator
+      end
+
+      def on_select(tableView, tableViewDelegate)
+        subform = row.subform.to_form
+        row.form.controller.push_subform(subform)
+      end
+
+    end
+  end
+end

data/lib/formotion/row_type/submit_row.rb

@@ -1,29 +1,6 @@
 module Formotion
   module RowType
-    class SubmitRow < Base
-
-      def submit_button?
-        true
-      end
-
-      # Does a clever little trick to override #layoutSubviews
-      # for just this one UITableViewCell object, in order to
-      # center it's labels horizontally.
-      def build_cell(cell)
-        cell.swizzle(:layoutSubviews) do
-          def layoutSubviews
-            old_layoutSubviews
-
-            center = lambda {|frame, dimen|
-              ((self.frame.size.send(dimen) - frame.size.send(dimen)) / 2.0)
-            }
-
-            self.textLabel.center = CGPointMake(self.frame.size.width / 2 - 10, self.textLabel.center.y)
-            self.detailTextLabel.center = CGPointMake(self.frame.size.width / 2 - 10, self.detailTextLabel.center.y)
-          end
-        end
-        nil
-      end
+    class SubmitRow < Button
 
       def on_select(tableView, tableViewDelegate)
         tableViewDelegate.submit

data/lib/formotion/row_type/switch_row.rb

@@ -1,15 +1,23 @@
 module Formotion
   module RowType
     class SwitchRow < Base
+      include BW::KVO
 
       def build_cell(cell)
         cell.selectionStyle = UITableViewCellSelectionStyleNone
         switchView = UISwitch.alloc.initWithFrame(CGRectZero)
         switchView.accessibilityLabel = row.title + " Switch"
-        cell.accessoryView = switchView
+        cell.accessoryView = cell.editingAccessoryView = switchView
         switchView.setOn(row.value || false, animated:false)
         switchView.when(UIControlEventValueChanged) do
-          row.value = switchView.isOn
+          break_with_semaphore do
+            row.value = switchView.isOn
+          end
+        end
+        observe(self.row, "value") do |old_value, new_value|
+          break_with_semaphore do
+            switchView.setOn(row.value || false, animated: false)
+          end
         end
         nil
       end

data/lib/formotion/row_type/template_row.rb

@@ -0,0 +1,77 @@
+# Define template row:
+# {
+#   title: "Add nickname",
+#   key: :nicknames,
+#   type: :template,
+#   template: {
+#     title: 'Nickname %{index}',
+#     type: :string
+#   }
+#   value: ['Samy', 'Pamy']
+# }
+
+# row.value = ['Samy', 'Pamy']
+module Formotion
+  module RowType
+    class TemplateRow < Base
+
+      def cellEditingStyle
+        UITableViewCellEditingStyleInsert
+      end
+
+      def indentWhileEditing?
+        true
+      end
+
+      def build_cell(cell)
+        cell.selectionStyle = UITableViewCellSelectionStyleBlue
+        @add_button ||= begin
+          button = UIButton.buttonWithType(UIButtonTypeContactAdd)
+          button.when(UIControlEventTouchUpInside) do
+            self.on_select(nil, nil)
+          end
+          button
+        end
+        cell.accessoryView = @add_button
+
+        nil
+      end
+
+      def on_select(tableView, tableViewDelegate)
+        on_insert(tableView, tableViewDelegate)
+      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)
+      end
+
+      def build_new_row(options = {})
+        # build row
+        new_row = row.section.create_row(row.template.merge(options))
+        new_row.remove_on_delete = true
+        new_row.template_parent = self.row
+        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)
+
+        # reset indexes
+        row.section.refresh_row_indexes
+      end
+
+      def insert_row(new_row)
+        index_path = NSIndexPath.indexPathForRow(new_row.index, inSection:row.section.index)
+        tableView.beginUpdates
+        tableView.insertRowsAtIndexPaths [index_path], withRowAnimation:UITableViewRowAnimationBottom
+        tableView.endUpdates
+      end
+
+    end
+  end
+end

data/lib/formotion/row_type/text_row.rb

@@ -1,6 +1,7 @@
 module Formotion
   module RowType
     class TextRow < Base
+      include BW::KVO
 
       TEXT_VIEW_TAG=1000
 
@@ -30,8 +31,15 @@ module Formotion
           true
         end
 
+        observe(self.row, "value") do |old_value, new_value|
+          break_with_semaphore do
+            field.text = row.value
+          end
+        end
         field.on_change do |text_field|
-          row.value = text_field.text
+          break_with_semaphore do
+            row.value = text_field.text
+          end
         end
 
         field.on_end do |text_field|
@@ -52,9 +60,9 @@ module Formotion
 
             field_frame = formotion_field.frame
             field_frame.origin.y = 10
-            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + 20
-            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - 20
-            field_frame.size.height = self.frame.size.height - 20
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + FIELD_BUFFER
+            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - FIELD_BUFFER
+            field_frame.size.height = self.frame.size.height - FIELD_BUFFER
             formotion_field.frame = field_frame
           end
         end

data/lib/formotion/section/section.rb

@@ -51,6 +51,8 @@ module Formotion
       end
       row.section = self
       row.index = self.rows.count
+      # dont move to after the appending.
+      row.after_create
       self.rows << row
       row
     end
@@ -100,8 +102,14 @@ module Formotion
       nil
     end
 
+    def refresh_row_indexes
+      rows.each_with_index do |row, index|
+        row.index = index
+      end
+    end
+
     #########################
-    # Retreiving data    
+    # Retreiving data
     def to_hash
       h = super
       h[:rows] = self.rows.collect {|row| row.to_hash}

data/lib/formotion/version.rb

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

data/spec/form_spec.rb

@@ -68,6 +68,30 @@ describe "Forms" do
     @form.render[:email].should == 'something@email.com'
   end
 
+  it "render with subforms works correctly" do
+    @form = Formotion::Form.new(sections: [{
+     rows: [{
+       type: :subform,
+       key: :subform,
+       subform: {
+          sections: [{
+            rows: [{
+              key: :email,
+              type: :email,
+              editable: true,
+              title: 'Email'
+            }]
+          }]
+       }
+     }]}])
+
+    subform = @form.sections[0].rows[0].subform.to_form
+    row = subform.sections[0].rows[0]
+    row.value = 'something@email.com'
+
+    @form.render[:subform][:email].should == 'something@email.com'
+  end
+
   it "hashifying should be same as input" do
     h = {
       sections: [{

data/spec/formable_spec.rb

@@ -0,0 +1,100 @@
+class FormableTestModel
+  def self.the_transform
+    @transform ||= lambda { |value| value.to_i + 10 }
+  end
+
+  include Formotion::Formable
+
+  attr_accessor :my_name, :my_number
+
+  form_property :my_name, :string, title: "My Name"
+  form_property :my_number, :number, title: "My Number", :transform => the_transform
+
+  form_title "Custom Title"
+
+  def on_submit
+    @submitted = true
+  end
+end
+
+describe "Formotion::Formable" do
+  it "form_properties should have correct structure" do
+    FormableTestModel.form_properties.should == [{
+        property: :my_name, row_type: :string, title: "My Name"
+      }, {
+        property: :my_number, row_type: :number, title: "My Number", :transform => FormableTestModel.the_transform
+      }]
+  end
+
+  it "should set form_title" do
+    FormableTestModel.form_title.should == "Custom Title"
+  end
+
+  describe ".to_form" do
+    it "should have correct values" do
+      comparison_form = Formotion::Form.new({
+          title: "Custom Title",
+          sections: [{
+            rows: [{
+                title: "My Name",
+                key: :my_name,
+                type: :string,
+                value: nil
+              }, {
+                title: "My Number",
+                key: :my_number,
+                type: :number,
+                value: nil
+            }]
+          }]
+        })
+
+      model = FormableTestModel.new
+      model.to_form.to_hash.should == comparison_form.to_hash
+
+      model.my_name = "Clay"
+      model.my_number = 123
+
+      comparison_form = Formotion::Form.new({
+          title: "Custom Title",
+          sections: [{
+            rows: [{
+                title: "My Name",
+                key: :my_name,
+                type: :string,
+                value: "Clay"
+              }, {
+                title: "My Number",
+                key: :my_number,
+                type: :number,
+                value: 123
+            }]
+          }]
+        })
+
+      model.to_form.to_hash.should == comparison_form.to_hash
+    end
+
+    it "should have transformed render values" do
+      comparison_render = {
+        my_name: "Clay",
+        my_number: 133
+      }
+
+      model = FormableTestModel.new
+      model.my_name = "Clay"
+      model.my_number = 113
+
+      form = model.to_form
+      form.sections[0].rows[1].value = 123
+
+      form.render.should == comparison_render
+    end
+
+    it "should have correct submit" do
+      model = FormableTestModel.new
+      model.to_form.submit
+      model.instance_variable_get("@submitted").should == true
+    end
+  end
+end