formotion 0.0.3 → 0.5

data/spec/row_type/static_spec.rb

@@ -0,0 +1,15 @@
+describe "Static Row" do
+  before do
+    row_settings = {
+      title: "Static",
+      key: :static,
+      type: :static,
+    }
+    @row = Formotion::Row.new(row_settings)
+    @row.reuse_identifier = 'test'
+  end
+
+  it "should initialize with correct settings" do
+    @row.object.class.should == Formotion::RowType::StaticRow
+  end
+end

data/spec/row_type/string_spec.rb

@@ -0,0 +1,52 @@
+# Tests character row behavior on a string type
+describe "String Row Type" do
+  before do
+    row_settings = {
+      title: "String",
+      key: :string,
+      type: :string,
+    }
+    @row = Formotion::Row.new(row_settings)
+    @row.reuse_identifier = 'test'
+  end
+
+  it "should initialize with correct settings" do
+    @row.object.class.should == Formotion::RowType::StringRow
+  end
+
+  it "should build cell with textfield" do
+    cell = @row.make_cell
+    @row.text_field.class.should == UITextField
+  end
+
+  # Value
+  it "should have no value by default" do
+    cell = @row.make_cell
+    @row.text_field.text.should == ''
+  end
+
+  it "should use custom value" do
+    @row.value = 'init value'
+    cell = @row.make_cell
+
+    @row.text_field.text.should == 'init value'
+  end
+
+  # Placeholder
+  it "should have no placeholder by default" do
+    cell = @row.make_cell
+    @row.text_field.placeholder.should == nil
+  end
+
+  it "should use custom placeholder" do
+    @row.placeholder = 'placeholder'
+    cell = @row.make_cell
+    @row.text_field.placeholder.should == 'placeholder'
+  end
+
+  # Keyboard
+  it "should use default keyboard" do
+    cell = @row.make_cell
+    @row.text_field.keyboardType.should == UIKeyboardTypeDefault
+  end
+end

data/spec/row_type/submit_spec.rb

@@ -0,0 +1,28 @@
+describe "Submit Row" do
+  before do
+    row_settings = {
+      title: "Submit",
+      key: :submit,
+      type: :submit,
+    }
+    @row = Formotion::Row.new(row_settings)
+    @row.reuse_identifier = 'test'
+  end
+
+  it "should initialize with correct settings" do
+    @row.object.class.should == Formotion::RowType::SubmitRow
+  end
+
+  it "should submit on select" do
+    fake_delegate = FakeDelegateClass.new
+    @row.object.on_select(nil, fake_delegate)
+    fake_delegate.submit_called.should == true
+  end
+end
+
+class FakeDelegateClass
+  attr_accessor :submit_called
+  def submit
+    self.submit_called = true
+  end
+end

data/spec/row_type/switch_spec.rb

@@ -0,0 +1,27 @@
+describe "Switch Row" do
+  before do
+    row_settings = {
+      title: "Switch",
+      key: :switch,
+      type: :switch,
+    }
+    @row = Formotion::Row.new(row_settings)
+    @row.reuse_identifier = 'test'
+  end
+
+  it "should initialize with correct settings" do
+    @row.object.class.should == Formotion::RowType::SwitchRow
+  end
+
+  # Value
+  it "should be off by default" do
+    cell = @row.make_cell
+    cell.accessoryView.on?.should == false
+  end
+
+  it "should be on when true" do
+    @row.value = true
+    cell = @row.make_cell
+    cell.accessoryView.on?.should == true
+  end
+end

data/spec/row_type/text_spec.rb

@@ -0,0 +1,41 @@
+describe "Text Row" do
+  before do
+    row_settings = {
+      title: "Text",
+      key: :text,
+      type: :text,
+    }
+    @row = Formotion::Row.new(row_settings)
+    @row.reuse_identifier = 'test'
+  end
+
+  it "should initialize with correct settings" do
+    @row.object.class.should == Formotion::RowType::TextRow
+  end
+
+  # Value
+  it "should have no value by default" do
+    cell = @row.make_cell
+    @row.text_field.text.should == ''
+  end
+
+  it "should use custom value" do
+    @row.value = 'init value'
+    cell = @row.make_cell
+
+    @row.text_field.text.should == 'init value'
+  end
+
+  # Placeholder
+  it "should have no placeholder by default" do
+    cell = @row.make_cell
+    @row.text_field.placeholder.should == nil
+  end
+
+  it "should use custom placeholder" do
+    @row.placeholder = 'placeholder'
+    cell = @row.make_cell
+    @row.text_field.placeholder.should == 'placeholder'
+  end
+
+end

data/spec/support/ui_control_wrap_extension.rb

@@ -0,0 +1,7 @@
+module UIControlWrap
+  # 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
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -51,8 +51,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Formotion.gemspec
+- Gemfile
 - LICENSE
+- LIST_OF_ROW_TYPES.md
+- NEW_ROW_TYPES.md
 - README.md
 - Rakefile
 - app/app_delegate.rb
@@ -61,21 +65,68 @@ files:
 - examples/KitchenSink/Rakefile
 - examples/KitchenSink/app/app_delegate.rb
 - examples/KitchenSink/spec/main_spec.rb
+- examples/Login/.gitignore
+- examples/Login/Rakefile
+- examples/Login/app/app_delegate.rb
+- examples/Login/app/login_controller.rb
+- examples/Login/app/user_controller.rb
+- examples/Login/spec/main_spec.rb
 - lib/formotion.rb
 - lib/formotion/base.rb
 - lib/formotion/exceptions.rb
-- lib/formotion/form.rb
+- lib/formotion/form/form.rb
+- lib/formotion/form/form_delegate.rb
 - lib/formotion/form_controller.rb
-- lib/formotion/form_delegate.rb
+- lib/formotion/patch/object.rb
+- lib/formotion/patch/ui_action_sheet.rb
 - lib/formotion/patch/ui_text_field.rb
-- lib/formotion/row.rb
-- lib/formotion/row_cell_builder.rb
-- lib/formotion/row_type.rb
-- lib/formotion/section.rb
+- lib/formotion/patch/ui_text_view.rb
+- lib/formotion/patch/ui_text_view_placeholder.rb
+- lib/formotion/row/row.rb
+- lib/formotion/row/row_cell_builder.rb
+- lib/formotion/row_type/base.rb
+- lib/formotion/row_type/check_row.rb
+- lib/formotion/row_type/date_row.rb
+- lib/formotion/row_type/email_row.rb
+- lib/formotion/row_type/image_row.rb
+- lib/formotion/row_type/number_row.rb
+- lib/formotion/row_type/options_row.rb
+- lib/formotion/row_type/phone_row.rb
+- lib/formotion/row_type/row_type.rb
+- lib/formotion/row_type/slider_row.rb
+- lib/formotion/row_type/static_row.rb
+- lib/formotion/row_type/string_row.rb
+- lib/formotion/row_type/submit_row.rb
+- lib/formotion/row_type/switch_row.rb
+- lib/formotion/row_type/text_row.rb
+- lib/formotion/section/section.rb
 - lib/formotion/version.rb
 - spec/form_spec.rb
+- spec/functional/character_spec.rb
+- spec/functional/check_row_spec.rb
+- spec/functional/date_row_spec.rb
+- spec/functional/image_row_spec.rb
+- spec/functional/options_row_spec.rb
+- spec/functional/slider_row_spec.rb
+- spec/functional/submit_row_spec.rb
+- spec/functional/switch_row_spec.rb
+- spec/functional/text_row_spec.rb
 - spec/row_spec.rb
+- spec/row_type/check_spec.rb
+- spec/row_type/date_spec.rb
+- spec/row_type/email_spec.rb
+- spec/row_type/image_spec.rb
+- spec/row_type/number_spec.rb
+- spec/row_type/options_spec.rb
+- spec/row_type/phone_spec.rb
+- spec/row_type/slider_spec.rb
+- spec/row_type/static_spec.rb
+- spec/row_type/string_spec.rb
+- spec/row_type/submit_spec.rb
+- spec/row_type/switch_spec.rb
+- spec/row_type/text_spec.rb
 - spec/section_spec.rb
+- spec/support/ui_control_wrap_extension.rb
 homepage: https://github.com/clayallsopp/Formotion
 licenses: []
 post_install_message: 
@@ -88,12 +139,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3547767700420537743
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3547767700420537743
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -102,6 +159,28 @@ specification_version: 3
 summary: Making iOS Forms insanely great with RubyMotion
 test_files:
 - spec/form_spec.rb
+- spec/functional/character_spec.rb
+- spec/functional/check_row_spec.rb
+- spec/functional/date_row_spec.rb
+- spec/functional/image_row_spec.rb
+- spec/functional/options_row_spec.rb
+- spec/functional/slider_row_spec.rb
+- spec/functional/submit_row_spec.rb
+- spec/functional/switch_row_spec.rb
+- spec/functional/text_row_spec.rb
 - spec/row_spec.rb
+- spec/row_type/check_spec.rb
+- spec/row_type/date_spec.rb
+- spec/row_type/email_spec.rb
+- spec/row_type/image_spec.rb
+- spec/row_type/number_spec.rb
+- spec/row_type/options_spec.rb
+- spec/row_type/phone_spec.rb
+- spec/row_type/slider_spec.rb
+- spec/row_type/static_spec.rb
+- spec/row_type/string_spec.rb
+- spec/row_type/submit_spec.rb
+- spec/row_type/switch_spec.rb
+- spec/row_type/text_spec.rb
 - spec/section_spec.rb
-has_rdoc: 
+- spec/support/ui_control_wrap_extension.rb

data/lib/formotion/row_cell_builder.rb

@@ -1,168 +0,0 @@
-#################
-#
-# Formotion::RowCellBuilder
-# RowCellBuilder handles taking Formotion::Rows
-# and configuring UITableViewCells based on their properties.
-#
-#################
-module Formotion
-  class RowCellBuilder
-    # The new UITextField in a UITableViewCell
-    # will be assigned this tag, if applicable.
-    TEXT_FIELD_TAG=1000
-
-    # PARAMS row.is_a? Formotion::Row
-    # RETURNS [cell configured to that row, a UITextField for that row if applicable or nil]
-    def self.make_cell(row)
-      cell, text_field = nil
-
-      cell = UITableViewCell.alloc.initWithStyle(UITableViewCellStyleSubtitle, reuseIdentifier:row.reuse_identifier)
-
-      cell.accessoryType = UITableViewCellAccessoryNone
-      cell.textLabel.text = row.title
-      cell.detailTextLabel.text = row.subtitle
-
-      if row.submit_button?
-        make_submit_cell(row, cell)
-      elsif row.switchable?
-        make_switch_cell(row, cell)
-      elsif row.checkable?
-        make_check_cell(row, cell)
-      elsif row.editable?
-        text_field = make_text_field(row, cell)
-      end
-      [cell, text_field]
-    end
-
-    # This is actually called whenever again cell is checked/unchecked
-    # in the UITableViewDelegate callbacks. So (for now) don't
-    # instantiate long-lived objects in them.
-    # Maybe that logic should be moved elsewhere?
-    def self.make_check_cell(row, cell)
-      cell.accessoryType = row.value ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone
-    end
-
-    def self.make_switch_cell(row, cell)
-      cell.selectionStyle = UITableViewCellSelectionStyleNone
-      switchView = UISwitch.alloc.initWithFrame(CGRectZero)
-      cell.accessoryView = switchView
-      switchView.setOn(row.value || false, animated:false)
-      switchView.when(UIControlEventValueChanged) do
-        row.value = switchView.isOn
-      end
-    end
-
-    # Does a clever little trick to override #layoutSubviews
-    # for just this one UITableViewCell object, in order to
-    # center it's labels horizontally.
-    def self.make_submit_cell(row, cell)
-      cell.class.send(:alias_method, :old_layoutSubviews, :layoutSubviews)
-      cell.instance_eval 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
-    end
-
-    # Configures the cell to have a new UITextField
-    # which is used to enter data. Consists of
-    # 1) setting up that field with the appropriate properties
-    # specified by `row` 2) configures the callbacks on the field
-    # to call any callbacks `row` listens for.
-    # Also does the layoutSubviews swizzle trick
-    # to size the UITextField so it won't bump into the titleLabel.
-    def self.make_text_field(row, cell)
-      field = UITextField.alloc.initWithFrame(CGRectZero)
-      field.tag = TEXT_FIELD_TAG
-
-      field.placeholder = row.placeholder
-      field.text = row.value
-
-      field.clearButtonMode = UITextFieldViewModeWhileEditing
-      field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
-      field.textAlignment = UITextAlignmentRight 
-
-      case row.type
-      when RowType::EMAIL
-        field.keyboardType = UIKeyboardTypeEmailAddress
-      when RowType::PHONE
-        field.keyboardType = UIKeyboardTypePhonePad
-      when RowType::NUMBER
-        field.keyboardType = UIKeyboardTypeDecimalPad
-      else
-        field.keyboardType = UIKeyboardTypeDefault
-      end
-      
-      field.secureTextEntry = true if row.secure?
-      field.returnKeyType = row.return_key || UIReturnKeyNext
-      field.autocapitalizationType = row.auto_capitalization if row.auto_capitalization
-      field.autocorrectionType = row.auto_correction if row.auto_correction
-      field.clearButtonMode = row.clear_button || UITextFieldViewModeWhileEditing
-
-      if row.on_enter_callback
-        field.should_return? do |text_field|
-          if row.on_enter_callback.arity == 0
-            row.on_enter_callback.call
-          elsif row.on_enter_callback.arity == 1
-            row.on_enter_callback.call(row)
-          end
-          false
-        end
-      elsif field.returnKeyType == UIReturnKeyDone
-        field.should_return? do |text_field|
-          text_field.resignFirstResponder
-          false
-        end
-      else
-        field.should_return? do |text_field|
-          if row.next_row && row.next_row.text_field
-            row.next_row.text_field.becomeFirstResponder
-          else
-            text_field.resignFirstResponder
-          end
-          true
-        end
-      end
-
-      field.on_begin do |text_field|
-        row.on_begin_callback && row.on_begin_callback.call
-      end
-
-      field.should_begin? do |text_field|
-        row.section.form.active_row = row
-        true
-      end
-
-      field.on_change do |text_field|
-        row.value = text_field.text
-      end
-
-      cell.class.send(:alias_method, :old_layoutSubviews, :layoutSubviews)
-      cell.instance_eval do
-        def layoutSubviews
-          old_layoutSubviews
-
-          # viewWithTag is terrible, but I think it's ok to use here...
-          formotion_field = self.viewWithTag(Formotion::RowCellBuilder::TEXT_FIELD_TAG)
-          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.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
-          formotion_field.frame = field_frame
-        end
-      end
-
-      cell.addSubview(field)
-      field
-    end
-  end
-end