formotion 1.1.4 → 1.1.5

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.1.5 - November 9, 2012
+
+### Features
+
+- Added `form.values = { key: "value" }`, which will set all of the form's `value`s for each specified `key` en-masse.
+
+- `:options` and `:picker` rows support a mapping between the displayed value and the row's value. Ex: `row.items = [["User 1", user1_id], ["User 2", user2_id]]
+
+- `:static` rows are now able to use `:placeholder` and `:value` attributes to display text along the right-hand side.
+
 ## 1.1.4 - October 27, 2012
 
 ### Features

data/examples/KitchenSink/app/app_delegate.rb

@@ -20,8 +20,9 @@ class AppDelegate
         }, {
           title: "Gender",
           key: :gender,
-          type: :options,
-          items: ['Female', 'Male']
+          type: :picker,
+          items: [['Female', 'f'], ['Male', 'm']],
+          value: 'm'
         }, {
           title: "Password",
           key: :password,

data/lib/formotion/form/form.rb

@@ -194,6 +194,34 @@ module Formotion
       kv
     end
 
+    def values=(data)
+      self.sections.each {|section|
+        if section.select_one?
+          # 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 
+            }
+          end
+        else
+          section.rows.each {|row|
+            next if row.button?
+            if row.template_parent
+              # If this row is part of a template
+              # use the parent's key
+              row.value = data[row.template_parent_key] if data.has_key?(row.template_parent_key)
+            elsif row.subform
+              row.subform.to_form.values = data
+            else
+              row.value = data[row.key] if data.has_key?(row.key)
+            end
+          }
+        end
+      }
+    end
+
+    alias_method :fill_out, :values=
+  
     #########################
     # Persisting Forms
 

data/lib/formotion/row_type/items_mapper.rb

@@ -0,0 +1,43 @@
+module Formotion
+  module RowType
+    module ItemsMapper
+      def items
+        if !row.items
+          []
+        elsif row.items[0].is_a?(Enumerable)
+          row.items
+        else
+          row.items.map {|i| [i, i]}
+        end
+      end
+
+      def item_names
+        self.items.map { |name, value| name }
+      end
+
+      def item_names_hash
+        hash = {}
+        self.items.each do |name, value|
+          hash[name] = value
+        end
+        hash
+      end
+
+      def name_index_of_value(value)
+        item_names.index(item_names_hash.invert[value])
+      end
+
+      def value_for_name_index(index)
+        item_names_hash[item_names[index]]
+      end
+
+      def value_for_name(name)
+        item_names_hash[name]
+      end
+
+      def name_for_value(value)
+        item_names_hash.invert[value].to_s
+      end
+    end
+  end
+end

data/lib/formotion/row_type/options_row.rb

@@ -2,23 +2,25 @@ module Formotion
   module RowType
     class OptionsRow < Base
       include BW::KVO
+      include RowType::ItemsMapper
 
       def build_cell(cell)
         cell.selectionStyle = UITableViewCellSelectionStyleNone
-        segmentedControl = UISegmentedControl.alloc.initWithItems(row.items || [])
-        segmentedControl.selectedSegmentIndex = row.items.index(row.value) if row.value
+
+        segmentedControl = UISegmentedControl.alloc.initWithItems(item_names || [])
+        segmentedControl.selectedSegmentIndex = name_index_of_value(row.value) if row.value
         segmentedControl.segmentedControlStyle = UISegmentedControlStyleBar
         cell.accessoryView = cell.editingAccessoryView = segmentedControl
 
         segmentedControl.when(UIControlEventValueChanged) do
           break_with_semaphore do
-            row.value = row.items[segmentedControl.selectedSegmentIndex]
+            row.value = value_for_name_index(segmentedControl.selectedSegmentIndex)
           end
         end
         observe(self.row, "value") do |old_value, new_value|
           break_with_semaphore do
             if row.value
-              segmentedControl.selectedSegmentIndex = row.items.index(row.value)
+              segmentedControl.selectedSegmentIndex = name_index_of_value(row.value)
             else
               segmentedControl.selectedSegmentIndex = UISegmentedControlNoSegment
             end
@@ -27,8 +29,6 @@ module Formotion
 
         nil
       end
-
-
     end
   end
 end

data/lib/formotion/row_type/picker_row.rb

@@ -3,9 +3,11 @@
 module Formotion
   module RowType
     class PickerRow < StringRow
+      include RowType::ItemsMapper
 
       def after_build(cell)
         self.row.text_field.inputView = self.picker
+        self.row.text_field.text = name_for_value(row.value).to_s
       end
 
       def picker
@@ -17,8 +19,8 @@ module Formotion
           picker.delegate = self
 
           if self.row.value
-            picker_row = self.row.items.index(row.value)
-            if picker_row
+            picker_row = name_index_of_value(row.value)
+            if picker_row != nil
               picker.selectRow(picker_row, inComponent:0, animated:false)
             else
               warn "Picker item '#{row.value}' not found in #{row.items.inspect} for '#{row.key}'"
@@ -34,21 +36,30 @@ module Formotion
       end
 
       def pickerView(pickerView, numberOfRowsInComponent:component)
-        self.row.items.size
+        self.items.size
       end
 
       def pickerView(pickerView, titleForRow:index, forComponent:component)
-        self.row.items[index]
+        self.item_names[index]
       end
 
       def pickerView(pickerView, didSelectRow:index, inComponent:component)
-        update_row(self.row.items[index])
+        update_text_field(value_for_name_index(index))
       end
 
-      def update_row(value)
-        self.row.text_field && self.row.text_field.text = value
+      def on_change(text_field)
+        break_with_semaphore do
+          row.value = value_for_name(text_field.text)
+        end
+      end
+
+      def update_text_field(new_value)
+        self.row.text_field.text = name_for_value(new_value)
       end
 
+      def row_value
+        name_for_value(row.value)
+      end
     end
   end
 end

data/lib/formotion/row_type/static_row.rb

@@ -1,6 +1,9 @@
 module Formotion
   module RowType
-    class StaticRow < Base
+    class StaticRow < StringRow
+      def after_build(cell)
+        self.row.text_field.enabled = false
+      end
     end
   end
 end

data/lib/formotion/row_type/string_row.rb

@@ -69,12 +69,17 @@ module Formotion
         end
 
         field.placeholder = row.placeholder
-        field.text = row.value.to_s
+        field.text = row_value
         cell.addSubview(field)
         field
 
       end
 
+      # overriden in subclasses
+      def row_value
+        row.value.to_s
+      end
+
       def add_callbacks(field)
         if row.on_enter_callback
           field.should_return? do |text_field|

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/form_spec.rb

@@ -68,6 +68,75 @@ describe "Forms" do
     @form.render[:email].should == 'something@email.com'
   end
 
+  it "fills out form values correctly" do
+    @form = Formotion::Form.new(sections: [{
+     rows: [{
+       key: :email,
+       type: :email,
+       editable: true,
+       title: 'Email'
+     }]}])
+
+    @form.values = { :email => 'something@email.com' }
+
+    row = @form.sections[0].rows[0]
+    row.value.should == 'something@email.com'
+  end
+
+  it "fills out form values correctly with a select one" do
+    @form = Formotion::Form.new(sections: [{
+      select_one: true,
+      rows: [{
+        title: "A",
+        key: :a,
+        type: :check,
+        value: true
+      }, {
+        title: "B",
+        key: :b,
+        type: :check,
+      }, {
+        title: "C",
+        key: :c,
+        type: :check,
+      }]
+     }])
+
+    @form.values = { :b => true }
+
+    row = @form.sections[0].rows[0]
+    row.value.should == nil
+    row = @form.sections[0].rows[1]
+    row.value.should == true
+    row = @form.sections[0].rows[2]
+    row.value.should == nil
+  end
+
+  it "fills out form values correctly with a template" do
+    @form = Formotion::Form.new(sections: [
+    {
+      title: 'Your nicknames',
+      rows: [{
+        title: "Add nickname",
+        key: :nicknames,
+        type: :template,
+        template: {
+          title: 'Nickname',
+          type: :string,
+          placeholder: 'Enter here',
+          indented: true,
+          deletable: true
+        }
+      }]
+    }])
+
+
+    @form.values = { :nicknames => ["Nici", "Sam"] }
+
+    row = @form.sections[0].rows[0]
+    row.value.should == ["Nici", "Sam"]
+  end
+
   it "render with subforms works correctly" do
     @form = Formotion::Form.new(sections: [{
      rows: [{
@@ -92,6 +161,30 @@ describe "Forms" do
     @form.render[:subform][:email].should == 'something@email.com'
   end
 
+  it "fills out subform values correctly" do
+   @form = Formotion::Form.new(sections: [{
+     rows: [{
+       type: :subform,
+       key: :subform,
+       subform: {
+          sections: [{
+            rows: [{
+              key: :email,
+              type: :email,
+              editable: true,
+              title: 'Email'
+            }]
+          }]
+       }
+     }]}])
+
+    @form.values = { :email => 'something@email.com' }
+
+    subform = @form.sections[0].rows[0].subform.to_form
+    row = subform.sections[0].rows[0]
+    row.value.should == 'something@email.com'
+  end
+
   it "hashifying should be same as input" do
     h = {
       sections: [{

data/spec/row_type/options_spec.rb

@@ -42,4 +42,16 @@ describe "Options Row" do
     @row.value = nil
     cell.accessoryView.selectedSegmentIndex.should == UISegmentedControlNoSegment
   end
+
+  it "should work with name-value items" do
+    @row = Formotion::Row.new(title: "Options", key: :options, type: :options,
+            items: [["First", 1], ["Second", 2]], value: 1)
+    @row.reuse_identifier = 'test'
+    cell = @row.make_cell
+
+    cell.accessoryView.selectedSegmentIndex.should == 0
+
+    @row.value = 2
+    cell.accessoryView.selectedSegmentIndex.should == 1
+  end
 end

data/spec/row_type/picker_spec.rb

@@ -23,4 +23,16 @@ describe "Picker Row" do
 
     @row.text_field.text.should == "Motion"
   end
+
+  it "should work with name-value items" do
+    @row = Formotion::Row.new(title: "Picker", key: :picker, type: :picker,
+            items: [["Ruby", 1], ["Motion", 2]], value: 1)
+    @row.reuse_identifier = 'test'
+    cell = @row.make_cell
+
+    @row.text_field.text.should == "Ruby"
+
+    @row.value = 2
+    @row.text_field.text.should == "Motion"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -128,6 +128,7 @@ files:
 - lib/formotion/row_type/edit_row.rb
 - lib/formotion/row_type/email_row.rb
 - lib/formotion/row_type/image_row.rb
+- lib/formotion/row_type/items_mapper.rb
 - lib/formotion/row_type/number_row.rb
 - lib/formotion/row_type/options_row.rb
 - lib/formotion/row_type/phone_row.rb
@@ -196,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4124450526448919813
+      hash: 1737578013626732185
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4124450526448919813
+      hash: 1737578013626732185
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23