formotion 1.1.5 → 1.2

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.2 - January 3, 2013
+
+### Features
+
+- Added `:picker_mode` row property which lets you choose what type of date picker you're using (i.e. `:date`, `:time`, `:date_time`, or `:countdown`)
+
+- Added `:text_alignment` row property which controls how a row's input field's text is aligned (i.e. `:right` (default), `:left`, or `:center`).
+
+- Added `:editable` row property which controls if a user can interact with the row's control (a text input, slider, etc)
+
+### Bug Fixes
+
+- Fixed size issue with iPhone apps running @2x on an iPad (see `row_type/base.rb#field_buffer`)
+
+- Fixed bug in `PickerRow` where KVOing `:value` changes woulnd't reflect in the picker UI.
+
+- Fixed bug in a `UITextView` patch that removed copy and paste by default for all `UITextView`s.
+
 ## 1.1.5 - November 9, 2012
 
 ### Features

data/README.md

@@ -116,7 +116,7 @@ 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).
 
-### Retreive
+### Retrieve
 
 You have `form#submit`, `form#on_submit`, and `form#render` at your disposal. Here's an example:
 

data/app/app_delegate.rb

@@ -140,7 +140,8 @@ class AppDelegate
             type: :string,
             placeholder: 'Enter here',
             indented: true,
-            deletable: true
+            deletable: true,
+            text_alignment: :left
           }
         }]
       }, {

data/examples/Persistence/app/app_delegate.rb

@@ -2,184 +2,9 @@ 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 =AccountSettingsController.alloc.initController
 
-    @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')
+    @view_controller.navigationItem.leftBarButtonItem = UIBarButtonItem.alloc.initWithTitle("Render", style: UIBarButtonItemStyleBordered, target:self, action:'reset_form')
 
     @navigation_controller = UINavigationController.alloc.initWithRootViewController(@view_controller)
 
@@ -190,10 +15,10 @@ class AppDelegate
   end
 
   def submit
-    @form.submit
+    @view_controller.form.submit
   end
 
   def reset_form
-    @form.reset
+    AccountSettingsController.set_api_url_and_key_from_saved_settings
   end
 end

data/examples/Persistence/app/controller.rb

@@ -0,0 +1,53 @@
+class AccountSettingsController < Formotion::FormController
+  PERSIST_AS = :account_settings
+
+  API_SERVER = "hello_world"
+  API_KEY = "123123secret"
+
+  SETTINGS_HASH = {
+      title: "Application",
+      persist_as: PERSIST_AS,
+      sections: [{
+        rows: [{
+          title: "Server",
+          type: :string,
+          key: :server,
+          value: API_SERVER,
+          auto_correction: :no,
+          auto_capitalization: :none
+        }, {
+          title: "API Key",
+          value: API_KEY,
+          type: :string,
+          key: :api_key,
+          secure: false,
+          auto_correction: :no,
+          auto_capitalization: :none
+        }]
+      }]
+    }
+
+  def self.set_api_url_and_key_from_saved_settings
+    form = Formotion::Form.new(SETTINGS_HASH)
+    form.open
+    server_url_str = form.render[:server]
+    server_api_key = form.render[:api_key]
+    p "server_url_str #{server_url_str}"
+    p "server_api_key #{server_api_key}"
+    if server_url_str && server_api_key
+      if NSURLConnection.canHandleRequest(NSURLRequest.requestWithURL(NSURL.URLWithString(server_url_str)))
+        #Tillless::ApiHelper.set_api_url(server_url_str)
+        #Tillless::ApiHelper.set_api_key(server_api_key)
+      else
+        NSLog "Unable to set url from saved config in app_delegate: #{server_url_str}"
+      end
+    else
+      NSLog "No configuration found"
+    end
+  end
+
+  def initController
+    f = Formotion::Form.persist(SETTINGS_HASH)
+    initWithForm(f)
+  end
+end

data/lib/formotion/form/form.rb

@@ -229,18 +229,20 @@ module Formotion
     # 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
+        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
+
+              observe(row, "value") do |old_value, new_value|
+                self.save
+              end
             end
           end
         end
@@ -260,15 +262,16 @@ module Formotion
       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
+        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]
+
+            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
         end
       }

data/lib/formotion/patch/ui_text_view.rb

@@ -18,7 +18,7 @@ class UITextView
   attr_accessor :menu_options_enabled
 
   def canPerformAction(action, withSender:sender)
-    self.menu_options_enabled
+    self.menu_options_enabled.nil? ? true : self.menu_options_enabled
   end
 
   # block takes argument textView; should return true/false

data/lib/formotion/row/row.rb

@@ -13,14 +13,26 @@ module Formotion
       # either Formotion::RowType or a string/symbol representation of one
       # see row_type.rb
       :type,
+      # Stores possible date pickers mode; corresponds to UIDatePickerMode______
+      # OPTIONS: :time, :date, :date_time, :countdown
+      # DEFAULT is :date
+      :picker_mode,
       # Stores possible formatting information (used by date pickers, etc)
       #   if :type == :date, accepts values in [:short, :medium, :long, :full]
       :format,
       # alternative title for row (only used in EditRow for now)
       :alt_title,
+      # determines if the user can edit the row
+      # OPTIONS: true, false
+      # DEFAULT: true
+      :editable,
 
       # The following apply only to text-input fields
 
+      # text alignment of the input field
+      # OPTIONS: :left, :right, :center
+      # DEFAULT is :right
+      :text_alignment,
       # placeholder text
       :placeholder,
       # whether or not the entry field is secure (like a password)
@@ -169,7 +181,7 @@ module Formotion
     end
 
     def subform?
-      self.type == :subform
+      self.type.to_s == "subform"
     end
 
     #########################
@@ -218,6 +230,33 @@ module Formotion
       @clear_button = const_int_get("UITextFieldViewMode", value)
     end
 
+    def text_alignment=(alignment)
+      @text_alignment = const_int_get("UITextAlignment", alignment)
+    end
+
+    def editable=(editable)
+      case editable
+      when TrueClass
+      when FalseClass
+      when NSNull
+        editable = false
+      when NilClass
+        editable = false
+      when NSString
+        editable = (editable == "true")
+      else
+        raise Formotion::InvalidClassError, "Invalid class for `Row#editable`: #{editable.inspect}; should be TrueClass, FalseCLass, or NSString"
+      end
+      @editable = editable
+    end
+
+    def editable?
+      if !self.editable.nil?
+        return self.editable
+      end
+      true
+    end
+
     #########################
     # setters for callbacks
 
@@ -305,8 +344,9 @@ module Formotion
         UIReturnKeyYahoo, UIReturnKeyDone, UIReturnKeyEmergencyCall,
         UITextFieldViewModeNever, UITextFieldViewModeAlways, UITextFieldViewModeWhileEditing,
         UITextFieldViewModeUnlessEditing, NSDateFormatterShortStyle, NSDateFormatterMediumStyle,
-        NSDateFormatterLongStyle, NSDateFormatterFullStyle
+        NSDateFormatterLongStyle, NSDateFormatterFullStyle,
+        UITextAlignmentRight, UITextAlignmentCenter, UITextAlignmentLeft
       ]
     end
   end
-end
+end

data/lib/formotion/row_type/base.rb

@@ -3,7 +3,13 @@ module Formotion
     class Base
       attr_accessor :row, :tableView
 
-      FIELD_BUFFER = Device.iphone? ? 20 : 64
+      def self.field_buffer
+        if Device.iphone? or App.window.size.width <= 320
+          20
+        else
+          64
+        end
+      end
 
       def tableView
         @tableView ||= self.row.form.table

data/lib/formotion/row_type/button.rb

@@ -17,8 +17,8 @@ module Formotion
               ((self.frame.size.send(dimen) - frame.size.send(dimen)) / 2.0)
             }
 
-            self.textLabel.center = CGPointMake(self.frame.size.width / 2 - (FIELD_BUFFER / 2), self.textLabel.center.y)
-            self.detailTextLabel.center = CGPointMake(self.frame.size.width / 2 - (FIELD_BUFFER / 2), self.detailTextLabel.center.y)
+            self.textLabel.center = CGPointMake(self.frame.size.width / 2 - (Formotion::RowType::Base.field_buffer / 2), self.textLabel.center.y)
+            self.detailTextLabel.center = CGPointMake(self.frame.size.width / 2 - (Formotion::RowType::Base.field_buffer / 2), self.detailTextLabel.center.y)
           end
         end
         nil

data/lib/formotion/row_type/check_row.rb

@@ -20,6 +20,9 @@ module Formotion
       end
 
       def on_select(tableView, tableViewDelegate)
+        if !row.editable?
+          return
+        end
         if row.section.select_one and !row.value
           row.section.rows.each do |other_row|
             other_row.value = (other_row == row)

data/lib/formotion/row_type/date_row.rb

@@ -26,16 +26,13 @@ module Formotion
           if date_style && date_style.to_s[-5..-1] != "style"
             date_style = (date_style.to_s + "_style").to_sym
           end
+
           formatter.dateStyle = self.row.send(:const_int_get, "NSDateFormatter", date_style || NSDateFormatterShortStyle)
+          formatter.timeStyle = NSDateFormatterNoStyle
           formatter
         end
       end
 
-      def formatted_value
-        return formatter.stringFromDate(self.date_value) if self.date_value
-        self.row.value
-      end
-
       def after_build(cell)
         self.row.text_field.inputView = self.picker
         update
@@ -44,12 +41,16 @@ module Formotion
       def picker
         @picker ||= begin
           picker = UIDatePicker.alloc.initWithFrame(CGRectZero)
-          picker.datePickerMode = UIDatePickerModeDate
+          picker.datePickerMode = self.picker_mode
           picker.hidden = false
           picker.date = self.date_value || NSDate.date
 
           picker.when(UIControlEventValueChanged) do
-            self.row.value = @picker.date.timeIntervalSince1970.to_i
+            if self.row.picker_mode == :countdown
+              self.row.value = @picker.countDownDuration
+            else
+              self.row.value = @picker.date.timeIntervalSince1970.to_i
+            end
             update
           end
 
@@ -57,10 +58,63 @@ module Formotion
         end
       end
 
+      def picker_mode
+        case self.row.picker_mode
+        when :time
+          UIDatePickerModeTime
+        when :date_time
+          UIDatePickerModeDateAndTime
+        when :countdown
+          UIDatePickerModeCountDownTimer
+        else
+          UIDatePickerModeDate
+        end
+      end
+
+      def formatted_value
+        if self.date_value
+          return case self.row.picker_mode
+            when :time
+              old_date_style = formatter.dateStyle
+              formatter.dateStyle = NSDateFormatterNoStyle
+              formatter.timeStyle = NSDateFormatterShortStyle
+              formatted = formatter.stringFromDate(self.date_value)
+              formatter.dateStyle = old_date_style
+              formatter.timeStyle = NSDateFormatterNoStyle
+              formatted
+            when :date_time
+              old_date_style = formatter.dateStyle
+              formatter.dateStyle = NSDateFormatterShortStyle
+              formatter.timeStyle = NSDateFormatterShortStyle
+              formatted = formatter.stringFromDate(self.date_value)
+              formatter.dateStyle = old_date_style
+              formatter.timeStyle = NSDateFormatterNoStyle
+              formatted
+            when :countdown
+              time = self.row.value
+              date = NSDate.dateWithTimeIntervalSinceReferenceDate(time)
+              old_date_style = formatter.dateStyle
+              old_time_zone = formatter.timeZone
+
+              formatter.dateFormat = "HH:mm"
+              formatter.timeZone = NSTimeZone.timeZoneForSecondsFromGMT(0)
+              formatted = formatter.stringFromDate(date)
+
+              formatter.dateStyle = old_date_style
+              formatter.timeZone = old_time_zone
+              formatter.dateFormat = nil
+              formatted
+            else
+              formatter.stringFromDate(self.date_value)
+            end
+        end
+        self.row.value
+      end
+
       # Used when row.value changes
       def update_text_field(new_value)
         self.row.text_field.text = self.formatted_value
       end
     end
   end
-end
+end

data/lib/formotion/row_type/image_row.rb

@@ -36,15 +36,18 @@ 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 + 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
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + Formotion::RowType::Base.field_buffer
+            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - Formotion::RowType::Base.field_buffer
+            field_frame.size.height = self.frame.size.height - Formotion::RowType::Base.field_buffer
             formotion_field.frame = field_frame
           end
         end
       end
 
       def on_select(tableView, tableViewDelegate)
+        if !row.editable?
+          return
+        end
         @action_sheet = UIActionSheet.alloc.init
         @action_sheet.delegate = self
 

data/lib/formotion/row_type/options_row.rb

@@ -10,6 +10,7 @@ module Formotion
         segmentedControl = UISegmentedControl.alloc.initWithItems(item_names || [])
         segmentedControl.selectedSegmentIndex = name_index_of_value(row.value) if row.value
         segmentedControl.segmentedControlStyle = UISegmentedControlStyleBar
+        segmentedControl.userInteractionEnabled = row.editable?
         cell.accessoryView = cell.editingAccessoryView = segmentedControl
 
         segmentedControl.when(UIControlEventValueChanged) do

data/lib/formotion/row_type/picker_row.rb

@@ -18,17 +18,12 @@ module Formotion
           picker.dataSource = self
           picker.delegate = self
 
-          if self.row.value
-            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}'"
-            end
-          end
-
           picker
         end
+
+        select_picker_value(row.value) if self.row.value
+
+        @picker
       end
 
       def numberOfComponentsInPickerView(pickerView)
@@ -55,6 +50,16 @@ module Formotion
 
       def update_text_field(new_value)
         self.row.text_field.text = name_for_value(new_value)
+        select_picker_value(new_value)
+      end
+
+      def select_picker_value(new_value)
+        picker_row = name_index_of_value(new_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}'"
+        end
       end
 
       def row_value

data/lib/formotion/row_type/slider_row.rb

@@ -15,6 +15,7 @@ module Formotion
         slideView.tag = SLIDER_VIEW_TAG
         slideView.setValue(row.value, animated:true) if row.value
         slideView.accessibilityLabel = (row.title || "") + " Slider"
+        slideView.userInteractionEnabled = row.editable?
 
         slideView.when(UIControlEventValueChanged) do
           break_with_semaphore do
@@ -38,9 +39,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 + 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
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + Formotion::RowType::Base.field_buffer
+            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - Formotion::RowType::Base.field_buffer
+            field_frame.size.height = self.frame.size.height - Formotion::RowType::Base.field_buffer
             formotion_field.frame = field_frame
           end
         end

data/lib/formotion/row_type/string_row.rb

@@ -30,7 +30,7 @@ module Formotion
 
         field.clearButtonMode = UITextFieldViewModeWhileEditing
         field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
-        field.textAlignment = UITextAlignmentRight
+        field.textAlignment = row.text_alignment || UITextAlignmentRight
 
         field.keyboardType = keyboardType
 
@@ -39,6 +39,7 @@ module Formotion
         field.autocapitalizationType = row.auto_capitalization if row.auto_capitalization
         field.autocorrectionType = row.auto_correction if row.auto_correction
         field.clearButtonMode = row.clear_button || UITextFieldViewModeWhileEditing
+        field.enabled = row.editable?
 
         add_callbacks(field)
 
@@ -51,9 +52,9 @@ module Formotion
             formotion_field.sizeToFit
 
             field_frame = formotion_field.frame
-            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + FIELD_BUFFER
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + Formotion::RowType::Base.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 - FIELD_BUFFER
+            field_frame.size.width = self.frame.size.width - field_frame.origin.x - Formotion::RowType::Base.field_buffer
             formotion_field.frame = field_frame
           end
         end
@@ -127,6 +128,9 @@ module Formotion
       end
 
       def on_select(tableView, tableViewDelegate)
+        if !row.editable?
+          return
+        end
         row.text_field.becomeFirstResponder
       end
 

data/lib/formotion/row_type/switch_row.rb

@@ -14,6 +14,7 @@ module Formotion
             row.value = switchView.isOn
           end
         end
+        switchView.userInteractionEnabled = row.editable?
         observe(self.row, "value") do |old_value, new_value|
           break_with_semaphore do
             switchView.setOn(row.value || false, animated: false)

data/lib/formotion/row_type/text_row.rb

@@ -20,6 +20,7 @@ module Formotion
         field.autocapitalizationType = row.auto_capitalization if row.auto_capitalization
         field.autocorrectionType = row.auto_correction if row.auto_correction
         field.placeholder = row.placeholder
+        field.enabled = row.editable?
 
         field.on_begin do |text_field|
           row.on_begin_callback && row.on_begin_callback.call
@@ -60,9 +61,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 + 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
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + Formotion::RowType::Base.field_buffer
+            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - Formotion::RowType::Base.field_buffer
+            field_frame.size.height = self.frame.size.height - Formotion::RowType::Base.field_buffer
             formotion_field.frame = field_frame
           end
         end
@@ -72,6 +73,9 @@ module Formotion
       end
 
       def on_select(tableView, tableViewDelegate)
+        if !row.editable?
+          return
+        end
         field.becomeFirstResponder
       end
 

data/lib/formotion/version.rb

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

data/spec/form/persist_spec.rb

@@ -1,8 +1,11 @@
 describe "Form Persisting" do
 
   it "works" do
+    key = "test_#{rand(255)}"
+    App::Persistence["FORMOTION_#{key}"] = nil
+    App::Persistence["FORMOTION_#{key}_ORIGINAL"] = nil
     f = Formotion::Form.persist({
-      persist_as: "test_#{rand(255)}",
+      persist_as: key,
       sections: [
         rows: [ {
             key: "first",
@@ -24,8 +27,11 @@ describe "Form Persisting" do
   end
 
   it "works with subforms" do
-    f = Formotion::Form.persist({
-      persist_as: "test_#{rand(255)}",
+    key = "test_#{rand(255)}"
+    App::Persistence["FORMOTION_#{key}"] = nil
+    App::Persistence["FORMOTION_#{key}_ORIGINAL"] = nil
+    hash = {
+      persist_as: key,
       sections: [
         rows: [ {
             key: :subform,
@@ -44,7 +50,9 @@ describe "Form Persisting" do
           }
         ]
       ]
-    })
+    }
+    f = Formotion::Form.persist(hash)
+    f.to_hash.should == hash
 
     r = f.sections[0].rows[0].subform.to_form.sections[0].rows[0]
     r.value = "new value"

data/spec/functional/slider_row_spec.rb

@@ -24,4 +24,4 @@ describe "FormController/SliderRow" do
     drag("Slider Slider", :from => :left)
     @form.sections[0].rows[0].value.should == 100
   end
-end
+end

data/spec/row_type/date_spec.rb

@@ -59,4 +59,24 @@ describe "Date Row" do
       @row.text_field.text.should == expected_output
     end
   end
-end
+
+  # Modes
+  {
+    :date => '1/1/00',
+    :time => '12:57 AM',
+    :date_time => '1/1/00, 12:57 AM',
+    :countdown => '00:57'
+  }.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.trigger UIControlEventValueChanged
+
+      @row.text_field.text.should == expected_output
+    end
+  end
+
+end

data/spec/support/ui_control_wrap_extension.rb

@@ -3,7 +3,6 @@ module UIControlWrap
   # that was previously defined by #when
   def trigger(events)
     @callback ||= {}
-    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.1.5
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -81,6 +81,7 @@ files:
 - examples/Persistence/README.md
 - examples/Persistence/Rakefile
 - examples/Persistence/app/app_delegate.rb
+- examples/Persistence/app/controller.rb
 - examples/Persistence/spec/main_spec.rb
 - gh-pages/assets/css/bootstrap-responsive.css
 - gh-pages/assets/css/bootstrap-responsive.min.css
@@ -197,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1737578013626732185
+      hash: 3006402350062917066
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1737578013626732185
+      hash: 3006402350062917066
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23