formotion 1.3 → 1.3.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmNhMGY5ZTMyZWUwYWIzMzhlMTVhYmQ0ODk2NGQ3YTBlYzRmNGI5NQ==
+  data.tar.gz: !binary |-
+    ODI0MWFkNzkwOTAxNGFmZjM1Yjg5ZjVkYTMwYzkzMTdhMWZhMzZiOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDkzMzM3YWE2MTNjZjMwOGI5MWUzN2ZlZWNmYWNkMGMwMTczNDY3YzA4Njli
+    NmEzMzQzYjZkYjNkYzI5NTQxNDI2MjM3OWUwZGM3MTkxZTBjNDJlYmJiNjk4
+    NjI2NjY2YjJlOTMyNmI5YTZmYTgyYmQ0NzNiMzBhZTc4ODEzYTc=
+  data.tar.gz: !binary |-
+    MDM3ODUyZWI5MmE5ZTQxOGQyN2YxY2ZhZDI0MzUyNjI5ZDU4M2QyMjI1ODk5
+    ZDA5ZTM5Y2ZlY2QyMmI5YWVjMjhjYzE3MjliYmVhMWIzYTY1NTBkNmQ0ZWQ4
+    MWIyYTVjMjJmNzM0MWRlMzFmM2VlMjI4MTMwZTlkMDJjYmQ0ZDY=

data/.travis.yml

@@ -0,0 +1,5 @@
+language: objective-c
+before_install:
+  - rvm use 1.9.3
+install: bundle install
+script: bundle exec rake spec:units

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.3.1 - April 15, 2013
+
+### Features
+
+- Added `:input_accessory` property, which currently accepts `:done` as the value. This will add a `UIToolbar` above the keyboard with a "Done" button the user can tap to dismiss the keyboard.
+
+- Added `Row#on_delete` callback which occurs when a row is swipe-to-delete'd.
+
+### Bug Fixes
+
+-  `:image` rows which are not editable do not show the "plus" icon.
+
+- Fixed bugs in `:template` rows (see [#100](https://github.com/clayallsopp/formotion/issues/100) and [#101](https://github.com/clayallsopp/formotion/pull/101)).
+
 ## 1.3 - March 25, 2013
 
 ### Features

data/Formotion.gemspec

@@ -15,5 +15,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "bubble-wrap", ">= 1.1.4"
+  s.add_dependency "motion-require", "~> 0.0.3"
   s.add_development_dependency 'rake'
 end

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'bubble-wrap', ">=1.1.4"
 gem 'guard-motion'
 gem 'rb-fsevent'
 

data/README.md

@@ -1,5 +1,7 @@
 # Formotion
 
+[![Build Status](https://travis-ci.org/clayallsopp/formotion.png)](https://travis-ci.org/clayallsopp/formotion)
+
 Make this:
 
 ![Complex data form](http://i.imgur.com/TMwXI.png)

data/lib/formotion.rb

@@ -2,32 +2,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "formotion/version"))
 require 'bubble-wrap/core'
 require 'bubble-wrap/camera'
 
-BW.require File.expand_path('../formotion/**/*.rb', __FILE__) do
-  base_row_type = 'lib/formotion/row_type/base.rb'
+require 'motion-require'
 
-  # hack to make sure base row type is compiled early
-  file('lib/formotion/base.rb').depends_on base_row_type
-
-  row_types = Dir.glob('lib/formotion/row_type/**/*.rb')
-  row_types.each {|file|
-    next if file == base_row_type
-    file(file).depends_on base_row_type
-  }
-
-  ['date_row', 'email_row', 'number_row', 'phone_row'].each {|file|
-    file("lib/formotion/row_type/#{file}.rb").depends_on 'lib/formotion/row_type/string_row.rb'
-  }
-
-  ['currency_row'].each {|file|
-    file("lib/formotion/row_type/#{file}.rb").depends_on 'lib/formotion/row_type/number_row.rb'
-  }
-  
-  ['submit_row', 'back_row'].each {|file|
-    file("lib/formotion/row_type/#{file}.rb").depends_on 'lib/formotion/row_type/button.rb'
-  }
-
-  ['form/form.rb', 'row/row.rb', 'section/section.rb'].each {|file|
-    file("lib/formotion/#{file}").depends_on 'lib/formotion/base.rb'
-  }
-  file("lib/formotion/controller/form_controller.rb").depends_on 'lib/formotion/patch/ui_text_field.rb'
-end
+Motion::Require.all(Dir.glob(File.expand_path('../formotion/**/*.rb', __FILE__)))

data/lib/formotion/base.rb

@@ -1,3 +1,5 @@
+motion_require 'row_type/base'
+
 module Formotion
   class Base
     def initialize(params = {})

data/lib/formotion/controller/form_controller.rb

@@ -1,3 +1,5 @@
+motion_require '../patch/ui_text_field'
+
 #################
 #
 # Formotion::FormController

data/lib/formotion/form/form.rb

@@ -1,3 +1,5 @@
+motion_require "../base"
+
 module Formotion
   class Form < Formotion::Base
     extend BubbleWrap::KVO

data/lib/formotion/form/form_delegate.rb

@@ -1,3 +1,5 @@
+motion_require "../base"
+
 module Formotion
   class Form < Formotion::Base
     attr_reader :table

data/lib/formotion/row/row.rb

@@ -1,3 +1,5 @@
+motion_require "../base"
+
 module Formotion
   class Row < Formotion::Base
     PROPERTIES = [
@@ -85,7 +87,11 @@ module Formotion
       :remove_on_delete,
       # In a date/time or time picker, the minute interval can
       # be set. That allows picking by every 15 minutes, etc.
-      :minute_interval
+      :minute_interval,
+      # Display an inputAccessoryView when editing a StringRow.
+      # OPTIONS: :done (a black translucent toolbar with a right-aligned "Done" button)
+      # DEFAULT is nil
+      :input_accessory
     ]
     PROPERTIES.each {|prop|
       attr_accessor prop

data/lib/formotion/row_type/back_row.rb

@@ -1,3 +1,5 @@
+motion_require 'button'
+
 module Formotion
   module RowType
     class BackRow < ButtonRow

data/lib/formotion/row_type/button.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class ButtonRow < Base

data/lib/formotion/row_type/check_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class CheckRow < Base

data/lib/formotion/row_type/currency_row.rb

@@ -1,3 +1,5 @@
+motion_require 'number_row'
+
 module Formotion
   module RowType
     class CurrencyRow < NumberRow

data/lib/formotion/row_type/date_row.rb

@@ -1,3 +1,5 @@
+motion_require 'string_row'
+
 module Formotion
   module RowType
     class DateRow < StringRow

data/lib/formotion/row_type/edit_row.rb

@@ -1,3 +1,5 @@
+motion_require 'button'
+
 module Formotion
   module RowType
     class EditRow < ButtonRow

data/lib/formotion/row_type/email_row.rb

@@ -1,3 +1,5 @@
+motion_require 'string_row'
+
 module Formotion
   module RowType
     class EmailRow < StringRow

data/lib/formotion/row_type/image_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class ImageRow < Base

data/lib/formotion/row_type/number_row.rb

@@ -1,3 +1,5 @@
+motion_require 'string_row'
+
 module Formotion
   module RowType
     class NumberRow < StringRow

data/lib/formotion/row_type/options_row.rb

@@ -1,3 +1,6 @@
+motion_require 'base'
+motion_require 'items_mapper'
+
 module Formotion
   module RowType
     class OptionsRow < Base

data/lib/formotion/row_type/phone_row.rb

@@ -1,3 +1,5 @@
+motion_require 'string_row'
+
 module Formotion
   module RowType
     class PhoneRow < StringRow

data/lib/formotion/row_type/picker_row.rb

@@ -1,4 +1,5 @@
 # currently supports only one component
+motion_require 'string_row'
 
 module Formotion
   module RowType

data/lib/formotion/row_type/slider_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class SliderRow < Base

data/lib/formotion/row_type/static_row.rb

@@ -1,3 +1,5 @@
+motion_require 'string_row'
+
 module Formotion
   module RowType
     class StaticRow < StringRow

data/lib/formotion/row_type/string_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class StringRow < Base
@@ -40,6 +42,7 @@ module Formotion
         field.autocorrectionType = row.auto_correction if row.auto_correction
         field.clearButtonMode = row.clear_button || UITextFieldViewModeWhileEditing
         field.enabled = row.editable?
+        field.inputAccessoryView = input_accessory_view(row.input_accessory) if row.input_accessory
 
         add_callbacks(field)
 
@@ -143,6 +146,43 @@ module Formotion
       def update_text_field(new_value)
         self.row.text_field.text = row_value
       end
+
+      # Creates the inputAccessoryView to show
+      # if input_accessory property is set on row.
+      # :done is currently the only supported option.
+      def input_accessory_view(input_accessory)
+        case input_accessory
+        when :done
+          @input_accessory ||= begin
+            tool_bar = UIToolbar.alloc.initWithFrame([[0, 0], [0, 44]])
+            tool_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+            tool_bar.barStyle = UIBarStyleBlack
+            tool_bar.translucent = true
+
+            left_space = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
+                UIBarButtonSystemItemFlexibleSpace,
+                target: nil,
+                action: nil)
+
+            done_button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
+                UIBarButtonSystemItemDone,
+                target: self,
+                action: :done_editing)
+
+            tool_bar.items = [left_space, done_button]
+
+            tool_bar
+          end
+        else
+          nil
+        end
+      end
+
+      # Callback for "Done" button in input_accessory_view
+      def done_editing
+        self.row.text_field.endEditing(true)
+      end
+
     end
   end
 end

data/lib/formotion/row_type/subform_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class SubformRow < Base

data/lib/formotion/row_type/submit_row.rb

@@ -1,3 +1,5 @@
+motion_require 'button'
+
 module Formotion
   module RowType
     class SubmitRow < ButtonRow

data/lib/formotion/row_type/switch_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class SwitchRow < Base

data/lib/formotion/row_type/template_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 # Define template row:
 # {
 #   title: "Add nickname",
@@ -55,6 +57,7 @@ module Formotion
             template_value = row.template_parent.value
             template_value.delete_at(row.index)
             row.template_parent.value = template_value
+            row.template_parent.template_children.delete_at(row.index)
           end
         end
         new_row.remove_on_delete = true

data/lib/formotion/row_type/text_row.rb

@@ -1,3 +1,5 @@
+motion_require 'base'
+
 module Formotion
   module RowType
     class TextRow < Base

data/lib/formotion/section/section.rb

@@ -1,3 +1,5 @@
+motion_require "../base"
+
 module Formotion
   class Section < Formotion::Base
     PROPERTIES = [
@@ -38,20 +40,26 @@ module Formotion
       }
     end
 
-    def build_row(&block)
-      row = create_row
-      block.call(row)
-      row
-    end
-
-    def create_row(hash = {})
+    def generate_row(hash = {})
       row = hash
       if hash.class == Hash
         row = Formotion::Row.new(hash)
       end
       row.section = self
       row.index = self.rows.count
-      # dont move to after the appending.
+      row
+    end
+
+    def build_row(&block)
+      row = generate_row
+      block.call(row)
+      row.after_create
+      self.rows << row
+      row
+    end
+
+    def create_row(hash = {})
+      row = generate_row(hash)
       row.after_create
       self.rows << row
       row

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.3"
+  VERSION = "1.3.1"
 end

data/spec/functional/template_row_spec.rb

@@ -33,6 +33,28 @@ describe "FormController/TemplateRow" do
     @controller = nil
   end
 
+  it "should work with DSL" do
+    @form = Formotion::Form.new
+
+    @form.build_section do |section|
+      section.build_row do |row|
+        row.title = "Add element"
+        row.type = :template
+        row.key = :template
+        row.value = ["Value 1", "Value 2"]
+        row.template = {
+          title: 'Element',
+          type: :string,
+          indented: true,
+          deletable: true
+        }
+      end
+    end
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+    @form.render[:template].should == ['Value 1', 'Value 2']
+  end
+
   it "should insert row" do
     tap("Add element")
     @form.sections.first.rows.size.should == 3

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: '1.3'
-  prerelease: 
+  version: 1.3.1
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,15 +20,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: motion-require
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -51,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Formotion.gemspec
 - Gemfile
@@ -190,33 +200,26 @@ files:
 - spec/support/ui_control_wrap_extension.rb
 homepage: https://github.com/clayallsopp/Formotion
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3419813869520045411
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3419813869520045411
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Making iOS Forms insanely great with RubyMotion
 test_files:
 - spec/form/persist_spec.rb