formotion 1.1.2 → 1.1.3

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.1.3 - ??
+
+### Features
+
+- Support a generic `:button` `RowType` which can be used in conjunction with a `Row`'s `on_tap` method.
+
+### Bug Fixes
+
+- Fixed bug where pushing a subform inherited from current controller class, which could cause expected behavior.
+
+- Fixed crash when a Slider or Switch row type had an empty :title
+
+- Fixed device crash when taking photo
+
+- Fixed problems related to KVO-ing `Formable` objects.
+
 ## 1.1.2 - October 6, 2012
 
 ### Bug Fixes

data/LIST_OF_ROW_TYPES.md

@@ -18,6 +18,7 @@
 [Template](#template)
 
 **Buttons**<br/>
+[Button](#button)<br/>
 [Submit](#submit)<br/>
 [Back](#back)<br/>
 [Edit](#edit)<br/>
@@ -343,6 +344,22 @@ Use a `:display_key` to show the value of the subform in the row:
 
 ## Buttons
 
+### <a name="button"></a> Button row
+
+```ruby
+{
+  title: "Any Button",
+  type: :button,
+}
+
+# later...
+form.sections[0].rows[0].on_tap do |row|
+  # do something when tapped
+end
+```
+
+The `SubmitRow` triggers the `form.submit` which triggers the defined `on_submit` callback.
+
 ### <a name="submit"></a> Submit row
 ![Submit row](https://github.com/clayallsopp/formotion/wiki/row-types/submit.png)
 

data/lib/formotion/controller/form_controller.rb

@@ -50,7 +50,6 @@ module Formotion
       @form.controller = self
     end
 
-
     def viewWillAppear(animated)
       super
 
@@ -59,7 +58,7 @@ module Formotion
 
     # Subview Methods
     def push_subform(form)
-      @subform_controller = self.class.alloc.initWithForm(form)
+      @subform_controller = Formotion::FormController.alloc.initWithForm(form)
 
       if self.navigationController
         self.navigationController.pushViewController(@subform_controller, animated: true)

data/lib/formotion/form/form.rb

@@ -1,7 +1,7 @@
 module Formotion
   class Form < Formotion::Base
-    extend BW::KVO
-    include BW::KVO
+    extend BubbleWrap::KVO
+    include BubbleWrap::KVO
 
     PROPERTIES = [
       # By default, Formotion::Controller will set it's title to this

data/lib/formotion/model/formable.rb

@@ -9,6 +9,8 @@ module Formotion
         attr_accessor prop
       end
 
+      # Does NOT get called when KVO occurs.
+      # (KVO uses isa swizzling and not proper subclassing)
       def inherited(subclass)
         INHERITABLE_ATTRIBUTES.each do |inheritable_attribute|
           instance_var = "@#{inheritable_attribute}"
@@ -17,6 +19,7 @@ module Formotion
       end
 
       def form_properties
+        @form_properties ||= self.superclass.form_properties if is_kvo_subclass?
         @form_properties ||= []
       end
 
@@ -38,9 +41,16 @@ module Formotion
       # EX
       # form_title "Some Settings"
       def form_title(title = -1)
+        @form_title ||= self.superclass.form_title if is_kvo_subclass?
         @form_title = title if title != -1
         @form_title
       end
+
+      private
+      # Terrible, terrible hack.
+      def is_kvo_subclass?
+        self.to_s =~ /^NSKVONotifying_/
+      end
     end
 
     # Creates a Formotion::Form out of the model

data/lib/formotion/row/row.rb

@@ -103,6 +103,9 @@ module Formotion
     # callback for what happens when the user
     # starts editing #text_field.
     attr_accessor :on_begin_callback
+    # callback for what happens when the user
+    # taps a ButtonRow
+    attr_accessor :on_tap_callback
 
     # RowType object
     attr_accessor :object
@@ -226,6 +229,11 @@ module Formotion
       self.on_begin_callback = block
     end
 
+    # Used in :button type rows
+    def on_tap(&block)
+      self.on_tap_callback = block
+    end
+
     #########################
     # Methods for making cells
     # Called in UITableViewDataSource methods

data/lib/formotion/row_type/back_row.rb

@@ -1,6 +1,6 @@
 module Formotion
   module RowType
-    class BackRow < Button
+    class BackRow < ButtonRow
 
       def on_select(tableView, tableViewDelegate)
         row.form.controller.pop_subform

data/lib/formotion/row_type/button.rb

@@ -1,7 +1,6 @@
 module Formotion
   module RowType
-    class Button < Base
-
+    class ButtonRow < Base
       def button?
         true
       end
@@ -25,6 +24,12 @@ module Formotion
         nil
       end
 
+      def on_select(tableView, tableViewDelegate)
+        # Override in subclasses
+        if self.row.on_tap_callback
+          self.row.on_tap_callback.call(self.row)
+        end
+      end
     end
   end
 end

data/lib/formotion/row_type/edit_row.rb

@@ -1,6 +1,6 @@
 module Formotion
   module RowType
-    class EditRow < Button
+    class EditRow < ButtonRow
       def on_select(tableView, tableViewDelegate)
         was_editing = tableView.isEditing
         if row.alt_title

data/lib/formotion/row_type/image_row.rb

@@ -75,7 +75,7 @@ module Formotion
         end
 
         if source
-          @camera = BW::Device.camera.any
+          @camera = BW::Device.camera.send((source == :camera) ? :rear : :any)
           @camera.picture(source_type: source, media_types: [:image]) do |result|
             if result[:original_image]
               row.value = result[:original_image]

data/lib/formotion/row_type/slider_row.rb

@@ -14,7 +14,7 @@ module Formotion
         slideView.maximumValue = row.range.last
         slideView.tag = SLIDER_VIEW_TAG
         slideView.setValue(row.value, animated:true) if row.value
-        slideView.accessibilityLabel = row.title + " Slider"
+        slideView.accessibilityLabel = (row.title || "") + " Slider"
 
         slideView.when(UIControlEventValueChanged) do
           break_with_semaphore do

data/lib/formotion/row_type/submit_row.rb

@@ -1,6 +1,6 @@
 module Formotion
   module RowType
-    class SubmitRow < Button
+    class SubmitRow < ButtonRow
 
       def on_select(tableView, tableViewDelegate)
         tableViewDelegate.submit

data/lib/formotion/row_type/switch_row.rb

@@ -6,7 +6,7 @@ module Formotion
       def build_cell(cell)
         cell.selectionStyle = UITableViewCellSelectionStyleNone
         switchView = UISwitch.alloc.initWithFrame(CGRectZero)
-        switchView.accessibilityLabel = row.title + " Switch"
+        switchView.accessibilityLabel = (row.title || "") + " Switch"
         cell.accessoryView = cell.editingAccessoryView = switchView
         switchView.setOn(row.value || false, animated:false)
         switchView.when(UIControlEventValueChanged) do

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/spec/formable/kvo_spec.rb

@@ -0,0 +1,45 @@
+class User
+  include Formotion::Formable
+
+  attr_accessor :name, :score, :team
+
+  form_property :name, :string
+  form_property :score, :number, transform: lambda { |value| value.to_i }
+
+  form_property :team, :picker, items: ["Red", "Blue", "Green"]
+
+  form_title "Edit User"
+
+  def initialize(name, score, team)
+    self.name = name
+    self.score = score
+    self.team = team
+  end
+end
+
+class ObserverTest
+  include BubbleWrap::KVO
+
+  def users
+    @users ||= [User.new("Harry", 100, "Green"),
+                User.new("Ron", 80, "Blue"),
+                User.new("Hermione", 120, "Red")]
+  end
+
+  def start_observing
+    observe(self.users.first, "team") do |old_value, new_value|
+    end
+  end
+end
+
+describe "Formotion::Formable w/ KVO" do
+  it "should work" do
+    test = ObserverTest.new
+    test.start_observing
+
+    test.users[0].to_form.title.should == test.users[1].to_form.title
+    test.users[0].class.form_properties.should == test.users[1].class.form_properties
+
+    test.unobserve_all
+  end
+end

data/spec/formable/subclass_spec.rb

@@ -0,0 +1,31 @@
+class User
+  include Formotion::Formable
+
+  attr_accessor :name, :score, :team
+
+  form_property :name, :string
+  form_property :score, :number, transform: lambda { |value| value.to_i }
+
+  form_property :team, :picker, items: ["Red", "Blue", "Green"]
+
+  form_title "Edit User"
+
+  def initialize(name, score, team)
+    self.name = name
+    self.score = score
+    self.team = team
+  end
+end
+
+class AwesomeUser < User
+end
+
+describe "Formotion::Formable w/ Subclasses" do
+  it "should work" do
+    user = User.new("Harry", 100, "Green")
+    awesome = AwesomeUser.new("Clay", 200, "Red")
+
+    user.to_form.title.should == awesome.to_form.title
+    user.class.form_properties.should == awesome.class.form_properties
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-06 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -145,6 +145,8 @@ files:
 - lib/formotion/version.rb
 - spec/form/persist_spec.rb
 - spec/form_spec.rb
+- spec/formable/kvo_spec.rb
+- spec/formable/subclass_spec.rb
 - spec/formable_spec.rb
 - spec/functional/character_spec.rb
 - spec/functional/check_row_spec.rb
@@ -194,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1236886504313804300
+      hash: 397181298113025173
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1236886504313804300
+      hash: 397181298113025173
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -213,6 +215,8 @@ summary: Making iOS Forms insanely great with RubyMotion
 test_files:
 - spec/form/persist_spec.rb
 - spec/form_spec.rb
+- spec/formable/kvo_spec.rb
+- spec/formable/subclass_spec.rb
 - spec/formable_spec.rb
 - spec/functional/character_spec.rb
 - spec/functional/check_row_spec.rb