formotion 0.5 → 0.5.1

data/CHANGELOG.md

@@ -1,10 +1,20 @@
-### 0.5.0 - ?, 2012
+## 0.5.1 - July 19, 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
+- Add new row type for UIPickerView (:picker)
+
+### Bug Fixes
+
+- Bump required bubble-wrap version to 1.1.2 to fix a `lib` path issue.
+
+## 0.5.0 - July 18, 2012
+
+### Improvements
+
+- Add new row type for images (:image)
+- Add new row type for UISegmentedControl (:options)
+- Add new row type for UISlider (:slider)
+- Add new row type for multiline text (:text)
+- Add new row types for dates (:date)
 - Big code refactoring

data/Formotion.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "bubble-wrap"
+  s.add_dependency "bubble-wrap", ">= 1.1.2"
   s.add_development_dependency 'rake'
 end

data/Gemfile

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

data/app/app_delegate.rb

@@ -9,6 +9,12 @@ class AppDelegate
           title: "Photo",
           key: :photo,
           type: :image
+        },{
+          title: "Picker",
+          key: :pick,
+          type: :picker,
+          items: ["Ruby", "Motion", "Rocks"],
+          value: "Motion"
         },{
           title: "Email",
           key: :email,

data/lib/formotion/row_type/picker_row.rb

@@ -0,0 +1,50 @@
+# currently supports only one component
+
+module Formotion
+  module RowType
+    class PickerRow < StringRow
+
+      def after_build(cell)
+        self.row.text_field.inputView = self.picker
+      end
+
+      def picker
+        @picker ||= begin
+          picker = UIPickerView.alloc.initWithFrame(CGRectZero)
+          picker.showsSelectionIndicator = true
+          picker.hidden = false
+          picker.dataSource = self
+          picker.delegate = self
+
+          if self.row.value
+            picker_row = self.row.items.index(row.value)
+            picker.selectRow(picker_row, inComponent:0, animated:false)
+          end
+
+          picker
+        end
+      end
+
+      def numberOfComponentsInPickerView(pickerView)
+        1
+      end
+
+      def pickerView(pickerView, numberOfRowsInComponent:component)
+        self.row.items.size
+      end
+
+      def pickerView(pickerView, titleForRow:index, forComponent:component)
+        self.row.items[index]
+      end
+
+      def pickerView(pickerView, didSelectRow:index, inComponent:component)
+        update_row(self.row.items[index])
+      end
+
+      def update_row(value)
+        self.row.text_field && self.row.text_field.text = value
+      end
+
+    end
+  end
+end

data/lib/formotion/version.rb

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

data/spec/functional/picker_row_spec.rb

@@ -0,0 +1,61 @@
+describe "FormController/PickerRow" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Picker",
+      key: :picker,
+      type: :picker,
+      items: ["Ruby", "Motion"],
+      value: "Motion"
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def picker_row
+    @form.sections.first.rows.first
+  end
+
+  def picker
+    picker_row.object.picker
+  end
+
+  after do
+    picker_row.text_field.resignFirstResponder
+    wait 0.5 do
+    end
+  end
+
+  it "should open a the picker when tapped" do
+    notif = App.notification_center.observe UIKeyboardDidShowNotification do |notification|
+      @did_show = true
+    end
+
+    picker.superview.should == nil
+    tap("Picker")
+    picker.superview.should.not == nil
+
+    wait 0.5 do
+      @did_show.should == true
+    end
+  end
+
+  it "should change row value when picked" do
+    tap("Picker")
+
+    wait 0.5 do
+      picker.selectRow(0, inComponent: 0, animated: true)
+      picker_row.object.pickerView(picker, didSelectRow:0, inComponent:0)
+      wait 0.5 do
+        picker_row.value.should == "Ruby"
+      end
+    end
+  end
+end

data/spec/row_type/picker_spec.rb

@@ -0,0 +1,35 @@
+describe "Picker Row" do
+  before do
+    row_settings = {
+      title: "Picker",
+      key: :picker,
+      type: :picker,
+      items: ["Ruby", "Motion"],
+      value: "Motion"
+    }
+    @row = Formotion::Row.new(row_settings)
+    @row.reuse_identifier = 'test'
+  end
+
+  it "should initialize with correct settings" do
+    @row.object.class.should == Formotion::RowType::PickerRow
+  end
+
+  it "should build cell with picker as input view of text_field" do
+    cell = @row.make_cell
+
+    @row.text_field.inputView.class.should == UIPickerView
+  end
+
+  it "should start ui picker at custom value" do
+    cell = @row.make_cell
+
+    @row.text_field.inputView.selectedRowInComponent(0).should == 1
+  end
+
+  it "should have text field the custom value" do
+    cell = @row.make_cell
+
+    @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: '0.5'
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - 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/picker_row.rb
 - lib/formotion/row_type/row_type.rb
 - lib/formotion/row_type/slider_row.rb
 - lib/formotion/row_type/static_row.rb
@@ -107,6 +108,7 @@ files:
 - spec/functional/date_row_spec.rb
 - spec/functional/image_row_spec.rb
 - spec/functional/options_row_spec.rb
+- spec/functional/picker_row_spec.rb
 - spec/functional/slider_row_spec.rb
 - spec/functional/submit_row_spec.rb
 - spec/functional/switch_row_spec.rb
@@ -119,6 +121,7 @@ files:
 - spec/row_type/number_spec.rb
 - spec/row_type/options_spec.rb
 - spec/row_type/phone_spec.rb
+- spec/row_type/picker_spec.rb
 - spec/row_type/slider_spec.rb
 - spec/row_type/static_spec.rb
 - spec/row_type/string_spec.rb
@@ -141,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3547767700420537743
+      hash: -3180843362770153593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3547767700420537743
+      hash: -3180843362770153593
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -164,6 +167,7 @@ test_files:
 - spec/functional/date_row_spec.rb
 - spec/functional/image_row_spec.rb
 - spec/functional/options_row_spec.rb
+- spec/functional/picker_row_spec.rb
 - spec/functional/slider_row_spec.rb
 - spec/functional/submit_row_spec.rb
 - spec/functional/switch_row_spec.rb
@@ -176,6 +180,7 @@ test_files:
 - spec/row_type/number_spec.rb
 - spec/row_type/options_spec.rb
 - spec/row_type/phone_spec.rb
+- spec/row_type/picker_spec.rb
 - spec/row_type/slider_spec.rb
 - spec/row_type/static_spec.rb
 - spec/row_type/string_spec.rb