formotion 1.4.0 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmYyOTdkNGExNDMzMzU5Mjg5NjMxZGIxZWE4NzcxY2NjNjM5ZDBjMA==
+    ZjFjOTExNWIyMWJiZGNkZWY0MDY2MWI1OWUwM2MxZTljMGU4ZTZlOQ==
   data.tar.gz: !binary |-
-    YWJmNzEwODljYmUzN2ZhN2I0MTE4YmFkYWI1ODhhMDkzOTQxYzNjZg==
+    ZDk5YmIzNmNjNDUyYTEzZjJmNWNlYjkxZmI3YTI5Njg3NGQwYjIzYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzYyMTNkZjI3MWE3YTFiMGY5MzBiMTc4MWEyOGVmNGE5NGE3Y2I5MDgxZjM1
-    MDMxZDliM2Y0OWY2ZjhkODFjMjczYTIyMDI2MDNkNWU0YzIzYzRiOTYzNzRk
-    Yjg3ZGRmN2UwZWY3OTdmODY5YjBiZTEzNWU1NDg3ZjE3NjFiYzE=
+    ZTk2ZTI5YmY3ZDRiNjAzOTdmZDAyMWRiOTM5MDA2NjdkMzY3NDlkMzZhNzI2
+    OGVkY2QxOGU2YWRmYWJmZTQwNTAxZWU1YzZhOTQyZjA2ZWY2ZGY5ZTgzYWRh
+    YjBkNjE3Mjk3OWI2OTdjMWYzNTViYjlkNTdiM2IyNzZiMzNjZTE=
   data.tar.gz: !binary |-
-    NzQzNzdmYmM5YjJkY2YxZDU5YjliM2RmYzUyZDIyMzIyM2NjYjVkYmViZTA2
-    MWZmYTgxMGEyMmY4NmM1NmJjZDA1NWE3YTE4ZDRkNWEwNzA5NzYxZTgzMzU2
-    ZTFkZWZkODQ0MWU4ZjViNzIyY2FkMTUyN2FjMjUwYzhlNjk0ZTk=
+    OWNhYjQ1NzgwMTY0MjhhNDY2ZWNmZTY1NDU0NDBkMjYxNWJiMjBhODViZGIx
+    MzgxZWYwMjllMzQzOTk1YzlmNzhlMDA2ZDI5ZDVkMGY3OGMxNGQ1YmZjMTI0
+    NjI4NjRhNTI4OTUxYjI5MzNkMzJhYjAxNGE2Mzc2MDEwZDI5Zjc=

data/README.md

@@ -112,7 +112,7 @@ self.navigationController.pushViewController(@controller, animated: true)
 
 ### Data Types
 
-See [the visual list of support row types](https://github.com/clayallsopp/formotion/wiki/List-of-all-the-row-types).
+See [the visual list of support row types](https://github.com/clayallsopp/formotion/blob/master/LIST_OF_ROW_TYPES.md).
 
 To add your own, check [the guide to adding new row types](https://github.com/clayallsopp/formotion/blob/master/NEW_ROW_TYPES.md).
 
@@ -181,20 +181,20 @@ end
 
 ### Persistence
 
-You can easily synchronize a `Form`'s state to disk using the `persist_as` key in conjunction with the `persist` method. When your user edits the form, any changes will be immediately saved. For example:
+You can easily synchronize a `Form`'s state to disk using the `persist_as` key in form properties. When your user edits the form, any changes will be immediately saved. For example:
 
 ```ruby
-@form = Formotion::Form.persist({
+@form = Formotion::Form.new({
   persist_as: :settings,
   sections: ...
 })
 ```
 
-This will load the form if it exists, or create it if necessary. If you use `Formotion::Form.new`, then the form will not be loaded and any changes you make will override existing saved forms.
+This will load the form if it exists, or create it if necessary. If you use remove the `persist_as` key, then the form will not be loaded and any changes you make will override existing saved forms.
 
 Your form values and state are automatically persisted across application loads, no save buttons needed.
 
-To reset the form, `persist` it and call `reset`, which restores it to the original state.
+To reset the form, call `reset`, which restores it to the original state.
 
 View the [Persistence Example](./examples/Persistence) to see it in action.
 

data/examples/Persistence/app/controller.rb

@@ -47,7 +47,7 @@ class AccountSettingsController < Formotion::FormController
   end
 
   def initController
-    f = Formotion::Form.persist(SETTINGS_HASH)
+    f = Formotion::Form.new(SETTINGS_HASH)
     initWithForm(f)
   end
 end

data/lib/formotion/form/form.rb

@@ -24,8 +24,6 @@ module Formotion
 
     def self.persist(params = {})
       form = new(params)
-      form.open
-      form.init_observer_for_save
       form
     end
 
@@ -37,6 +35,15 @@ module Formotion
       sections && sections.each_with_index {|section_hash, index|
         section = create_section(section_hash.merge({index: index}))
       }
+
+      initialize_persist unless self.persist_as.nil?
+
+    end
+
+    def initialize_persist
+      self.open
+      self.init_observer_for_save
+      self
     end
 
     # Use this as a DSL for building forms

data/lib/formotion/row/row.rb

@@ -37,6 +37,8 @@ module Formotion
       :text_alignment,
       # placeholder text
       :placeholder,
+      # accessibility label
+      :accessibility,
       # whether or not the entry field is secure (like a password)
       :secure,
       # given by a UIReturnKey___ integer, string, or symbol
@@ -306,10 +308,22 @@ module Formotion
     # Used in :button type rows
     def on_tap(&block)
       self.on_tap_callback = block
+      # set on_tap for all template children
+      if self.type == :template
+        for templ in self.template_children do
+          templ.on_tap_callback = block
+        end
+      end
     end
 
     def on_delete(&block)
       self.on_delete_callback = block
+      # set on_tap for all template children
+      if self.type == :template
+        for templ in self.template_children do
+          templ.on_delete_callback = block
+        end
+      end
     end
 
     #########################

data/lib/formotion/row/row_cell_builder.rb

@@ -20,6 +20,12 @@ module Formotion
       cell.detailTextLabel.text = row.subtitle
 
       edit_field = row.object.build_cell(cell)
+      
+      if edit_field and edit_field.respond_to?("accessibilityLabel=")
+        label = row.accessibility
+        label = row.title unless label
+        edit_field.accessibilityLabel = label if label
+      end
 
       [cell, edit_field]
     end

data/lib/formotion/row_type/image_row.rb

@@ -104,6 +104,7 @@ module Formotion
       def add_plus_accessory(cell)
         @add_button ||= begin
           button = UIButton.buttonWithType(UIButtonTypeContactAdd)
+          button.accessibilityLabel = BW.localized_string("add image", nil)
           button.when(UIControlEventTouchUpInside) do
             self._on_select(nil, nil)
           end

data/lib/formotion/row_type/map_row.rb

@@ -29,23 +29,40 @@ module Formotion
     end
     
     class MapRow < Base
+      include BW::KVO
 
       MAP_VIEW_TAG=1100
 
+      def set_pin
+        return unless row.value
+        coord = (row.value.is_a?(Array) and row.value.size==2) ? CLLocationCoordinate2D.new(row.value[0], row.value[1]) : row.value
+        if coord.is_a?(CLLocationCoordinate2D)
+          @map_view.removeAnnotation(@map_row_data) if @map_row_data
+          region = MKCoordinateRegionMakeWithDistance(coord, 400.0, 480.0)
+          @map_row_data = MapRowData.new(nil, nil, coord)
+          @map_view.setRegion(region, animated:true)
+          @map_view.addAnnotation(@map_row_data)
+        end
+      end
+      
+      def annotations
+        @map_view.annotations
+      end
+
       def build_cell(cell)
         cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
 
         @map_view = MKMapView.alloc.init
         @map_view.delegate = self
-        if row.value
-          coord = (row.value.is_a?(Array) and row.value.size==2) ? CLLocationCoordinate2D.new(row.value[0], row.value[1]) : row.value
-          if coord.is_a?(CLLocationCoordinate2D)
-            region = MKCoordinateRegionMakeWithDistance(coord, 400.0, 480.0)
-            @map_view.setRegion(region, animated:true)
-            m=MapRowData.new(nil, nil, coord)
-            @map_view.addAnnotation(m)
+        
+        set_pin
+        
+        observe(self.row, "value") do |old_value, new_value|
+          break_with_semaphore do
+            set_pin
           end
         end
+        
         @map_view.tag = MAP_VIEW_TAG
         @map_view.contentMode = UIViewContentModeScaleAspectFit
         @map_view.backgroundColor = UIColor.clearColor

data/lib/formotion/row_type/object_row.rb

@@ -5,19 +5,59 @@ module Formotion
     class ObjectRow < StringRow
 
       def build_cell(cell)
-        super.tap do |field|
-        
-          # "remove" the setText swizzle
-          if UIDevice.currentDevice.systemVersion >= "6.0" and field.respond_to?("old_setText")
-            unswizzle = Proc.new do
-              def setText(text)
-                old_setText(text)
-              end
-            end
-            field.instance_eval unswizzle
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
+        field = UITextField.alloc.initWithFrame(CGRectZero)
+        field.tag = TEXT_FIELD_TAG
+
+        observe(self.row, "value") do |old_value, new_value|
+          break_with_semaphore do
+            update_text_field(new_value)
           end
+        end
+
+        field.clearButtonMode = UITextFieldViewModeWhileEditing
+        field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
+        field.textAlignment = row.text_alignment || UITextAlignmentRight
+
+        field.keyboardType = keyboardType
+
+        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
+        field.enabled = row.editable?
+        field.inputAccessoryView = input_accessory_view(row.input_accessory) if row.input_accessory
+
+        add_callbacks(field)
 
+        cell.swizzle(:layoutSubviews) do
+          def layoutSubviews
+            old_layoutSubviews
+
+            # viewWithTag is terrible, but I think it's ok to use here...
+            formotion_field = self.viewWithTag(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 + Formotion::RowType::Base.field_buffer
+            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 - Formotion::RowType::Base.field_buffer
+            formotion_field.frame = field_frame
+          end
         end
+
+        field.font = BW::Font.new(row.font) if row.font
+        field.placeholder = row.placeholder
+        field.text = row_value.to_s
+        cell.addSubview(field)
+        field
+
+      end
+      
+      # Used when row.value changes
+      def update_text_field(new_value)
+        self.row.text_field.text = row_value.to_s
       end
 
       # overriden in subclasses

data/lib/formotion/row_type/paged_image_row.rb

@@ -130,6 +130,7 @@ module Formotion
       def add_plus_accessory(cell)
         @add_button ||= begin
           button = UIButton.buttonWithType(UIButtonTypeContactAdd)
+          button.accessibilityLabel = BW.localized_string("add image", nil)
           button.when(UIControlEventTouchUpInside) do
             @page_view.becomeFirstResponder
             take_photo

data/lib/formotion/row_type/tags_row.rb

@@ -82,6 +82,7 @@ module Formotion
       def add_plus_accessory(cell)
         @add_button ||= begin
           button = UIButton.buttonWithType(UIButtonTypeContactAdd)
+          button.accessibilityLabel = BW.localized_string("add tag", nil)
           button.when(UIControlEventTouchUpInside) do
             if row.on_tap_callback
               row.on_tap_callback.call(self.row)

data/lib/formotion/row_type/template_row.rb

@@ -60,6 +60,16 @@ module Formotion
             row.template_parent.template_children.delete_at(row.index)
           end
         end
+        
+        # inherit some infos to template child
+        if row.on_tap_callback
+          new_row.on_tap_callback = row.on_tap_callback
+        end
+        if row.on_delete_callback
+          new_row.on_delete_callback = row.on_delete_callback
+        end
+        new_row.key = "#{row.key}_template".to_sym
+        
         new_row.remove_on_delete = true
         new_row.template_parent = row
         row.template_children ||= []

data/lib/formotion/row_type/web_view_row.rb

@@ -3,14 +3,43 @@ motion_require 'base'
 module Formotion
   module RowType
     class WebViewRow < Base
+      include BW::KVO
 
       WEB_VIEW_TAG=1100
 
+      def set_page
+        if row.value =~/^https?:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\'\/\+&%\$#\=~])*$/
+          @loading = true
+          req = NSURLRequest.requestWithURL(NSURL.URLWithString(row.value))
+          @web_view.loadRequest(req)
+        else
+          @web_view.loadHTMLString(row.value, baseURL:nil) if row.value
+          @loading = false
+        end
+      end
+      
+      def stringByEvaluatingJavaScriptFromString(script)
+        @web_view.stringByEvaluatingJavaScriptFromString(script)
+      end
+      
+      def loading
+        @loading
+      end
+
       def build_cell(cell)
         cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
-
+        
+        @loading = true
         @web_view = UIWebView.alloc.init
-        @web_view.loadHTMLString(row.value, baseURL:nil) if row.value
+        @web_view.delegate = self
+        set_page
+        
+        observe(self.row, "value") do |old_value, new_value|
+          break_with_semaphore do
+            set_page
+          end
+        end
+        
         @web_view.tag = WEB_VIEW_TAG
         @web_view.contentMode = UIViewContentModeScaleAspectFit
         @web_view.backgroundColor = UIColor.clearColor
@@ -38,7 +67,17 @@ module Formotion
           return
         end
       end
+      
+      #def webView(web_view, didFailLoadWithError:error)
+      #end
 
+      #def webViewDidStartLoad(web_view)
+      #end
+
+      def webViewDidFinishLoad(web_view)
+        @loading = false
+      end
+      
     end
   end
 end

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/spec/functional/map_row_spec.rb

@@ -0,0 +1,45 @@
+describe "FormController/MapRow" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Map",
+      key: :map,
+      type: :map,
+      value: [47.5, 8.5]
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def map_row
+    @form.row(:map)
+  end
+  
+  it "should only one pin" do
+    map_row.object.annotations.size.should == 1
+  end
+
+  it "should be a pin at the predefined position" do
+    coord = map_row.object.annotations[0].coordinate
+    coord.latitude.should == 47.5
+    coord.longitude.should == 8.5
+  end
+  
+  it "should set a new pin with new position" do
+    map_row.value = CLLocationCoordinate2D.new(48.5, 9.5)
+    wait 1 do
+      map_row.object.annotations.size.should == 1
+      coord = map_row.object.annotations[0].coordinate
+      coord.latitude.should == 48.5
+      coord.longitude.should == 9.5
+    end
+  end
+
+end

data/spec/functional/template_row_ext_spec.rb

@@ -0,0 +1,131 @@
+describe "FormController/TemplateRowExt" do
+  tests Formotion::FormController
+
+  class Item
+    attr_accessor :name
+  
+    def initialize(name)
+      @name=name
+    end
+  
+    def to_s
+      @name
+    end
+  end
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    @item1 = Item.new("Value 1")
+    row_settings = {
+      title: "Add element",
+      key: :template,
+      type: :template,
+      value: [@item1],
+      template: {
+        title: 'Element',
+        type: :object,
+        indented: true,
+        deletable: true
+      }
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def new_row
+    @form.sections.first.rows[-2]
+  end
+
+  after do
+    @form = nil
+    @controller = nil
+  end
+
+  it "should work with DSL" do
+    @form = Formotion::Form.new
+
+    item2 = Item.new("Value 2")
+    @form.build_section do |section|
+      section.build_row do |row|
+        row.title = "Add element"
+        row.type = :template
+        row.key = :template
+        row.value = [@item1, item2]
+        row.template = {
+          title: 'Element',
+          type: :object,
+          indented: true,
+          deletable: true
+        }
+      end
+    end
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+    @form.render[:template].should == [@item1, item2]
+  end
+
+  it "should insert row" do
+    tap("Add element")
+    @form.sections.first.rows.size.should == 3
+  end
+
+  it "should remove row" do
+    tap("Add element")
+    new_row.object.on_delete(nil, nil)
+    @form.sections.first.rows.size.should == 2
+  end
+
+  it "should render values as array" do
+    tap("Add element")
+    item2 = Item.new("Value 2")
+    new_row.value = item2
+
+    tap("Add element")
+    item3 = Item.new("Value 3")
+    new_row.value = item3
+
+    @form.render[:template].should == [@item1, item2, item3]
+  end
+  
+  it "should call on_tap on the specific element" do
+    @tapped_item = nil
+    row = @form.row(:template)
+    row.on_tap do |row|
+      @tapped_item = row.value
+    end
+    
+    tap("Element")
+    wait 1 do
+      @tapped_item.class.should == Item
+      @tapped_item.to_s.should == "Value 1"
+    end
+      
+  end
+  
+  it "should call on_tap on a newly added element" do
+    @tapped_item = nil
+    row = @form.row(:template)
+    row.on_tap do |row|
+      @tapped_item = row.value
+    end
+    
+    # patch template to get an new title for the element
+    row.template[:title] = "Value 2"
+    tap("Add element")
+    item2 = Item.new("Value 2")
+    new_row.value = item2
+    
+    tap("Value 2")
+    wait 1 do
+      @tapped_item.class.should == Item
+      @tapped_item.to_s.should == "Value 2"
+    end
+      
+  end
+  
+end

data/spec/functional/web_view_row_spec.rb

@@ -0,0 +1,55 @@
+describe "FormController/WebViewRow" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "WebView",
+      key: :web_view,
+      type: :web_view,
+      value: "<html><body><b class=\"test\">This is a Test</b></body></html>"
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def webview_row
+    @form.row(:web_view)
+  end
+  
+  it "should display the html content" do
+    content = ""
+    wait 1 do
+      0.upto(6) do |i|
+        content = webview_row.object.stringByEvaluatingJavaScriptFromString("document.getElementsByClassName('test')[0].innerHTML;")
+        break if content != ""
+        sleep 1
+      end
+      content.should == "This is a Test"
+    end
+  end
+  
+  it "should load the google home page" do
+    webview_row.value = "https://www.google.com"
+    wait 1 do
+      while webview_row.object.loading
+        sleep 1
+      end
+      content = ""
+      0.upto(6) do |i|
+        content = webview_row.object.stringByEvaluatingJavaScriptFromString("document.body.innerHTML")
+        break if content != ""
+        sleep 1
+      end
+      content.index("google").should > 0
+    end
+  end
+
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -178,14 +178,17 @@ files:
 - spec/functional/date_row_spec.rb
 - spec/functional/formable_controller_spec.rb
 - spec/functional/image_row_spec.rb
+- spec/functional/map_row_spec.rb
 - spec/functional/options_row_spec.rb
 - spec/functional/picker_row_spec.rb
 - spec/functional/slider_row_spec.rb
 - spec/functional/subform_row.rb
 - spec/functional/submit_row_spec.rb
 - spec/functional/switch_row_spec.rb
+- spec/functional/template_row_ext_spec.rb
 - spec/functional/template_row_spec.rb
 - spec/functional/text_row_spec.rb
+- spec/functional/web_view_row_spec.rb
 - spec/helpers/row_test_helpers.rb
 - spec/row_spec.rb
 - spec/row_type/back_spec.rb
@@ -228,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Making iOS Forms insanely great with RubyMotion
@@ -243,14 +246,17 @@ test_files:
 - spec/functional/date_row_spec.rb
 - spec/functional/formable_controller_spec.rb
 - spec/functional/image_row_spec.rb
+- spec/functional/map_row_spec.rb
 - spec/functional/options_row_spec.rb
 - spec/functional/picker_row_spec.rb
 - spec/functional/slider_row_spec.rb
 - spec/functional/subform_row.rb
 - spec/functional/submit_row_spec.rb
 - spec/functional/switch_row_spec.rb
+- spec/functional/template_row_ext_spec.rb
 - spec/functional/template_row_spec.rb
 - spec/functional/text_row_spec.rb
+- spec/functional/web_view_row_spec.rb
 - spec/helpers/row_test_helpers.rb
 - spec/row_spec.rb
 - spec/row_type/back_spec.rb