formotion 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3407c939ef975c1f7e97164c26689e0110507891
-  data.tar.gz: 996472e335ea5b2be05e62fccc4499402e21b6a0
+  metadata.gz: 71061dad41a80a78a4e7b26faa6fb78d284beaee
+  data.tar.gz: 4d6462cfe38e455077bf4736376beb84ef1ba46a
 SHA512:
-  metadata.gz: ac0469bebf08738e7ec88465b6b72fce94625f02b65eb5815f85650a5671046266f90beee6100f6cf16d8849ebcd6100eb58f9c74d23ac2b669238de29a233c5
-  data.tar.gz: e16aeb3fbd30d8407bb19b7bd102b04b90274c2f1540056d110371bfbab3a4709ee0afb33838267ebf4b214b16a2772b0b6e460471e8fd808903d10e37cc6948
+  metadata.gz: 0217c216bf843420d86d38f2ef6120af5f4057d68328cae4bb28aa65d0628aeb78a8c5af21eeef22fa90a944713fae98f2827b21dc1750dc11400947b83ea4e9
+  data.tar.gz: 116b36b2b66855546e79d7033fcf1473926c8d3085e049c14ff8b803a8e7e737768decb49b29ffff9ebc6144e4ed5510da27afc542f309524deec2e9a185600c

data/.gitignore

@@ -8,4 +8,5 @@ resources/*.storyboardc
 .bundle
 Gemfile.lock
 pkg/*
-.rvmrc
+.rvmrc
+vendor

data/.travis.yml

@@ -1,6 +1,3 @@
 language: objective-c
-before_install:
-  - rvm install ruby-1.9.3-p429
-  - rvm use 1.9.3
 install: bundle install
 script: bundle exec rake spec:units

data/Gemfile

@@ -3,5 +3,8 @@ source 'https://rubygems.org'
 gem 'guard-motion'
 gem 'rb-fsevent'
 
+gem "motion-cocoapods"
+gem "cocoapods"
+
 # Specify your gem's dependencies in motion-settings.gemspec
-gemspec
+gemspec

data/LIST_OF_ROW_TYPES.md

@@ -19,6 +19,7 @@
 [Subform](#subform)<br/>
 [Template](#template)<br/>
 [MapView](#mapview)<br/>
+[WebLink](#weblink)<br/>
 [WebView](#webview)<br/>
 [PagedImage](#pagedimage)<br/>
 [Tags](#tags)<br/>
@@ -38,6 +39,8 @@ All row types accept following properties:
   value:      'Some Value',   # The initial value passed to the row
   title:      'Title',        # Title of the row
   subtitle:   'Subtitle',     # Subtitle of the row
+  image:      nil,            # Image for the cell's imageView. Accepts a string, UIImage, URL string, or NSURL
+  image_placeholder: nil      # Used only when you are loading remote images. Accpets a string or UIImage
   type:       :string,        # The type of row (string, phone, switch, etc)
   row_height: 100             # Height of the row
 }
@@ -70,11 +73,12 @@ All character based row types accept following properties:
   type: :string,
   placeholder: 'James Bond',
   auto_correction: :no,
-  auto_capitalization: :none
+  auto_capitalization: :none,
+  input_accessory: :done
 }
 ```
 
-The `StringRow` is a simple text input row and opens a `UIKeyboardTypeDefault` keyboard when editing.
+The `StringRow` is a simple text input row and opens a `UIKeyboardTypeDefault` keyboard when editing. `input_accessory` can be nil or `:done`, and shows a toolbar with a done button above the keyboard.
 
 
 ### <a name="text"></a> Text row
@@ -355,7 +359,8 @@ The `SliderRow` takes a ruby range as `range` property that defines the min and
   key: :pick,
   type: :picker,
   items: ["Ruby", "Motion", "Rocks"],
-  value: "Motion"
+  value: "Motion",
+  input_accessory: :done
 }
 ```
 
@@ -432,13 +437,60 @@ Use a `:display_key` to show the value of the subform in the row:
 ```ruby
 {
   title: "Map",
-  type: :map_view,
-  value: coordinates,  # of type CLLocationCoordinate2D
+  type: :map,
+  value: coordinates,  # of type CLLocationCoordinate2D, CLCircularRegion, or a Hash of options
   row_height: 200      # for better viewing
 }
 ```
 
-Shows a map with a pin at the coordinates from value.
+Shows a map with a pin at the coordinates from value. If you pass a `CLLocationCoordinate2D` or `CLCircularRegion`, a pin will be placed at the coordinates. You can pass a hash of options like this:
+
+```ruby
+{
+  title: "Map",
+  type: :map,
+  value: {
+    coord: coordinates,
+    enabled: true, # Whether the user can interact with the map.
+    type: MKMapTypeStandard, # The type of map to show. See MKMapType documentation.
+    animated: true, # Whether setting the region should animate. This property also applies to annotation titles.
+    pin: {
+      coord: coordinates, # Must be a CLLocationCoordinate2D
+      title: nil, # Title of the annotation
+      subtitle: nil # Subtitle of the annotation
+    }
+  }
+  row_height: 200 # for better viewing
+}
+```
+
+If you pass `pin: nil` the map will not display an annotation. Annotations with titles will automatically pop open the annotation. _Note: If you set a title on an annotation it will automatically invalidate `enabled:false` and the map will be interactable._
+
+### <a name="weblink"></a> WebLink row
+```ruby
+{
+  title: "My Awesome Site",
+  type: :web_link,
+  value: "http://www.myawesomesite.com" # URL to be opened. Can also be an NSURL
+}
+```
+
+You can also allow the user to confirm leaving your app:
+```ruby
+{
+  title: "My Awesome Site",
+  type: :web_link,
+  warn: true,
+  # or pass a hash to :warn. 
+  # Here are the default values (Bubblewrap alert options):
+  # warn: {
+  #   title: "Leaving #{App.name}",
+  #   message: "This action will leave #{App.name} and open Safari.",
+  #   buttons: ["Cancel", "OK"]
+  # }  
+  value: "http://www.myawesomesite.com", # URL to be opened
+}
+```
 
 
 ### <a name="webview"></a> WebView row

data/Rakefile

@@ -1,8 +1,8 @@
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 require "bundler/gem_tasks"
 require "bundler/setup"
-
+Bundler.require
 $:.unshift("./lib/")
 require './lib/formotion'
 require 'guard/motion'
@@ -10,6 +10,10 @@ require 'guard/motion'
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'Formotion'
+
+  app.pods do
+    pod 'JMImageCache'
+  end
 end
 
 namespace :spec do

data/app/app_delegate.rb

@@ -11,6 +11,7 @@ class AppDelegate
           title: "Photo",
           key: :photo,
           type: :image,
+          image: "camera",
           deletable: true
         },{
           title: "Picker",
@@ -31,6 +32,11 @@ class AppDelegate
           placeholder: "required",
           type: :string,
           secure: true
+        }, {
+          title: "Remote Loaded Image",
+          type: :static,
+          image: "http://placekitten.com/80/80?t=#{Time.now.to_i}",
+          image_placeholder: "camera"
         }, {
           title: "Password",
           subtitle: "Confirmation",

data/examples/KitchenSink/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'formotion', path: '../..'
+gem 'formotion', path: '../..'
+gem 'motion-cocoapods'

data/examples/KitchenSink/Rakefile

@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project'
+require 'motion/project/template/ios'
 
-require 'rubygems'
-require 'bundler'
-Bundler.require :default
+begin
+  require 'bundler'
+  Bundler.require
+rescue LoadError
+end
 
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'KitchenSink'
+  app.pods do
+    pod 'SDWebImage'
+  end
 end

data/examples/KitchenSink/app/app_delegate.rb

@@ -14,15 +14,28 @@ class AppDelegate
           title: "Email",
           key: :email,
           placeholder: "me@mail.com",
+          image: "email",
           type: :email,
           auto_correction: :no,
-          auto_capitalization: :none
+          auto_capitalization: :none,
+          input_accessory: :done
+        }, {
+          title: "Image Accessory",
+          subtitle: "You can add an image to any row type",
+          image: "arrow-up",
+          type: :static
+        }, {
+          title: "Image from URL",
+          subtitle: "Or from a URL!",
+          image: "http://placekitten.com/80/80?t=#{Time.now.to_i}",
+          type: :static
         }, {
           title: "Gender",
           key: :gender,
           type: :picker,
-          items: [['Female', 'f'], ['Male', 'm']],
-          value: 'm'
+          items: [['Female', 'f'],['fds', 'df'],['fddfsfds', 'f3'],['fdfafds', 'f33'], ['Male', 'm']],
+          value: 'm',
+          input_accessory: :done
         }, {
           title: "Password",
           key: :password,
@@ -35,14 +48,16 @@ class AppDelegate
           placeholder: "555-555-5555",
           type: :phone,
           auto_correction: :no,
-          auto_capitalization: :none
+          auto_capitalization: :none,
+          input_accessory: :done
         }, {
           title: "Number",
           key: :number,
           placeholder: "12345",
           type: :number,
           auto_correction: :no,
-          auto_capitalization: :none
+          auto_capitalization: :none,
+          input_accessory: :done
         }, {
           title: "Subtitle",
           subtitle: "Confirmation",

data/examples/Persistence/app/app_delegate.rb

@@ -6,6 +6,8 @@ class AppDelegate
 
     @view_controller.navigationItem.leftBarButtonItem = UIBarButtonItem.alloc.initWithTitle("Render", style: UIBarButtonItemStyleBordered, target:self, action:'reset_form')
 
+    @view_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle("Save", style: UIBarButtonItemStyleBordered, target:self, action:'submit')
+
     @navigation_controller = UINavigationController.alloc.initWithRootViewController(@view_controller)
 
     @window.rootViewController = @navigation_controller

data/examples/Persistence/app/controller.rb

@@ -4,6 +4,41 @@ class AccountSettingsController < Formotion::FormController
   API_SERVER = "hello_world"
   API_KEY = "123123secret"
 
+  SPECIAL_OPTIONS_HASH = {
+    title: "Special options",
+    sections: [{
+      rows: [{
+        title: "Phone Number",
+        value: "555-555-5555",
+        type: "phone",
+        key: "phone"
+      }, {
+        title: "Address",
+        value: "90210",
+        type: "string",
+        key: "address"
+      }]
+    }]
+  }
+
+  DISPLAY_KEY_HASH = {
+    title: "Alert Sounds",
+    sections: [{
+      key: :sound,
+      select_one: true,
+      rows: [{
+        title: "Beeps",
+        key: :Beeps,
+        value: true,
+        type: :check
+      },{
+        title: "Boops",
+        key: :Boops,
+        type: :check
+      }]
+    }]
+  }
+
   SETTINGS_HASH = {
       title: "Application",
       persist_as: PERSIST_AS,
@@ -24,6 +59,37 @@ class AccountSettingsController < Formotion::FormController
           auto_correction: :no,
           auto_capitalization: :none
         }]
+      }, {
+        rows: [{
+          title: "Name",
+          type: :string,
+          key: :name,
+          value: "Clay",
+          auto_correction: :no,
+          auto_capitalization: :none
+        }, {
+          title: "Password",
+          value: "Secret",
+          type: :string,
+          key: :password,
+          secure: false,
+          auto_correction: :no,
+          auto_capitalization: :none
+        }]
+      }, {
+        title: "w/ Subforms",
+        rows: [{
+          title: "Special Options",
+          type: :subform,
+          key: :special_options,
+          subform: SPECIAL_OPTIONS_HASH
+        }, {
+          title: "w/ Display Key",
+          type: :subform,
+          key: :alert_sound,
+          display_key: :sound,
+          subform: DISPLAY_KEY_HASH
+        }]
       }]
     }
 

data/lib/formotion/controller/form_controller.rb

@@ -49,7 +49,7 @@ module Formotion
       # Setting @form.controller assigns
       # @form as the datasource and delegate
       # and reloads the data.
-      @form.controller = self
+      @form.controller = WeakRef.new(self)
     end
 
     def viewWillAppear(animated)

data/lib/formotion/form/form.rb

@@ -267,19 +267,26 @@ module Formotion
     end
 
     def open
-      @form_observer ||= lambda { |form, saved_render|
+      @form_observer ||= ->(form, saved_render, uses_display_key = false) {
+        no_saved_render = saved_render.nil?
+        saved_render ||= {}
+
         form.sections.each_with_index do |section, s_index|
           section.rows.each_with_index do |row, index|
             next if row.templated?
             saved_row_value = saved_render[row.key]
 
+            if uses_display_key && section.select_one && saved_render.include?(section.key.to_s)
+              saved_row_value = row.key.to_s == saved_render[section.key.to_s].to_s
+            end
+
             if row.subform?
-              @form_observer.call(row.subform.to_form, saved_row_value)
+              @form_observer.call(row.subform.to_form, saved_row_value, !!row.display_key)
             elsif row.type == :template
               row.value = saved_row_value
               row.object.update_template_rows
             else
-              row.value = saved_row_value
+              row.value = saved_row_value if !no_saved_render
             end
           end
         end
@@ -294,8 +301,10 @@ module Formotion
 
     # places hash of values into application persistance
     def save
-      App::Persistence[persist_key] = render
-      App::Persistence[original_persist_key] ||= render
+      rendered = render
+      recursive_delete_nil(rendered)
+      App::Persistence[persist_key] = rendered
+      App::Persistence[original_persist_key] ||= rendered
     end
 
     def reset

data/lib/formotion/model/formable.rb

@@ -54,7 +54,7 @@ module Formotion
     end
 
     # Creates a Formotion::Form out of the model
-    def to_form
+    def to_form_hash
       rows = self.class.form_properties.collect { |options|
         {
           title: options[:property].capitalize,
@@ -63,14 +63,16 @@ module Formotion
           value: self.send(options[:property])
         }.merge(options)
       }
-      form_hash = {
+      return {
         title: self.class.form_title || self.class.to_s.capitalize,
         sections: [{
-          rows: rows
-        }]
+            rows: rows
+          }]
       }
+    end
 
-      form = Formotion::Form.new(form_hash)
+    def to_form
+      form = Formotion::Form.new(to_form_hash)
       form.on_submit do
         self.on_submit
       end
@@ -96,4 +98,4 @@ module Formotion
       p "need to implement on_submit in your Formable model #{self.class.to_s}"
     end
   end
-end
+end