formotion 0.0.1 → 0.0.2

data/README.md

@@ -4,7 +4,7 @@ Make this:
 
 ![Complex data form](http://i.imgur.com/TMwXI.png)
 
-using just this:
+using this:
 
 ```ruby
 @form = Formotion::Form.new({
@@ -25,7 +25,7 @@ using just this:
       secure: true
     }, {
       title: "Password",
-      subtitle: "Confirmation"
+      subtitle: "Confirmation",
       key: :confirm,
       placeholder: "required",
       type: :string,
@@ -61,7 +61,7 @@ using just this:
   }]
 })
 
-@form_controller = FormController.alloc.initWithForm(@form)
+@form_controller = Formotion::FormController.alloc.initWithForm(@form)
 @window.rootViewController = @form_controller
 ```
 
@@ -100,10 +100,10 @@ form.build_section do |section|
 end
 ```
 
-Then attach it to a `Formotion::Controller` and you're ready to rock and roll:
+Then attach it to a `Formotion::FormController` and you're ready to rock and roll:
 
 ```ruby
-@controller = Formotion::Controller.alloc.initWithForm(form)
+@controller = Formotion::FormController.alloc.initWithForm(form)
 self.navigationController.pushViewController(@controller, animated: true)
 ```
 
@@ -112,7 +112,7 @@ self.navigationController.pushViewController(@controller, animated: true)
 You have `form#submit`, `form#on_submit`, and `form#render` at your disposal. Here's an example:
 
 ```ruby
-class PeopleController < Formotion::Controller
+class PeopleController < Formotion::FormController
   def viewDidLoad
     self.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithBarButtonSystemItem(UIBarButtonSystemItemSave, target:self, action:'submit')
   end

data/lib/formotion.rb

@@ -1,6 +1,9 @@
 require "formotion/version"
 require 'bubble-wrap/core'
 
-Dir.glob(File.join(File.dirname(__FILE__), 'formotion/**/*.rb')).each do |file|
-  BW.require file
-end
+BW.require File.expand_path('../formotion/**/*.rb', __FILE__) do
+  ['form.rb', 'row.rb', 'section.rb'].each {|file|
+    file("lib/formotion/#{file}").depends_on 'lib/formotion/base.rb'
+  }
+  file("lib/formotion/form_controller.rb").depends_on 'lib/formotion/patch/ui_text_field.rb'
+end

data/lib/formotion/form_controller.rb

@@ -34,12 +34,10 @@ module Formotion
       super
 
       # via https://gist.github.com/330916, could be wrong.
-      tabBarHeight = self.tabBarController && self.tabBarController.tabBar.bounds.size.height
-      tabBarHeight ||= 0
       navBarHeight = self.navigationController && (self.navigationController.isNavigationBarHidden ? 0.0 : self.navigationController.navigationBar.bounds.size.height)
       navBarHeight ||= 0
       frame = self.view.frame
-      frame.size.height = frame.size.height - navBarHeight - tabBarHeight
+      frame.size.height = frame.size.height - navBarHeight - tab_bar_height
       self.view.frame = frame
 
       self.title = self.form.title
@@ -79,12 +77,13 @@ module Formotion
       curve = userInfo[UIKeyboardAnimationCurveUserInfoKey].intValue
       keyboardFrame = userInfo[UIKeyboardFrameEndUserInfoKey].CGRectValue
 
-      view_frame = @table_view.frame;
+      view_frame = self.view.frame;
 
       if @keyboard_state == UIKeyboardWillHideNotification
         view_frame.size.height = self.view.bounds.size.height
       else
         view_frame.size.height -= keyboardFrame.size.height
+        view_frame.size.height += tab_bar_height
       end
 
       UIView.beginAnimations(nil, context: nil)
@@ -98,5 +97,11 @@ module Formotion
 
       UIView.commitAnimations
     end
+
+    private
+    def tab_bar_height
+      tabBarHeight = self.tabBarController && self.tabBarController.tabBar.bounds.size.height
+      tabBarHeight ||= 0
+    end
   end
 end

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -103,3 +103,4 @@ test_files:
 - spec/form_spec.rb
 - spec/row_spec.rb
 - spec/section_spec.rb
+has_rdoc: