ProMotion-form 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcb416dc082b4d3f8cabffafa1022c91388d41ef
-  data.tar.gz: 53d0c17cbcf4153f7ac2a03db88b635d281dd5de
+  metadata.gz: b922948c52029bb1454414b2e927d91b440d6e43
+  data.tar.gz: e10fcd0f56e5e7c26aa9a5734becfb985d5c7829
 SHA512:
-  metadata.gz: 578b3ea509bfa6d463f1e928e2756977d51639563f47d652855640cd3829ffd307af758983d9fc49e0640942e5529f2180f5efe0ad60370111008ecd994aed41
-  data.tar.gz: 84e44e8082b035e25d68ed4a7310a56cbb37442b5479475251d56b42e8f17915f3566b6b7a7336cb6dfc259a8dea0807a7df3c88eaafb87fee8549ef625f0687
+  metadata.gz: 9d5cd76b789dff0ef1f5e0b4a3a2ac7817913bd30f84397daec58603373b50e911deefcf24506706c7654c2b014baa3704cb7b3a15342447e75a74b35b97909f
+  data.tar.gz: 58a88eb9ea2edf44d47c19b0e368c23d8c9afe1b6ba7f9ae666aa24b97927f0865cadfc2690066be1d3374405e1dd371f9623077bb6665568ea6f30f1f3f2529

data/lib/ProMotion-form.rb

@@ -11,6 +11,6 @@ Motion::Project::App.setup do |app|
   app.files << File.join(lib_dir_path, "ProMotion/form/form_screen.rb")
 
   app.pods do
-    pod "FXForms"
+    pod "FXForms", "~> 1.2"
   end
 end

data/lib/ProMotion/form/form.rb

@@ -25,11 +25,10 @@ module ProMotion
       @fields ||= begin
         header = nil
         form_data.map do |section|
-          header = section[:title]
-          footer = section[:footer]
-          Array(section[:cells]).map do |input|
-            input_data(input, header, footer).tap{|i| header = nil; footer = nil }
-          end
+          rows = Array(section[:cells]).map{ |input| input_data(input) }
+          rows.first[:header] = section[:title] if section[:title] && rows.length > 0
+          rows.last[:footer] = section[:footer] if section[:footer] && rows.length > 0
+          rows
         end.flatten
       end
     end
@@ -39,16 +38,15 @@ module ProMotion
     end
 
     def values
-      fields.map{ |f| f[:value] }
+      fields.map{ |f| get_value(f) }
     end
 
     def form_fields
       fields.map{ |f| f.dup.tap{|f2| f2.delete(:value) } }
     end
 
-    def input_data(input, header, footer)
+    def input_data(input)
       data = {}
-      data[:header] = header if header
       data[:key] = input[:name] || input[:title].downcase.gsub(/[^0-9a-z]/i, '_').to_sym
       data[:type] = input[:type] if input[:type]
       data[:title] = input[:label] || input[:title] || input[:name].to_s
@@ -57,8 +55,19 @@ module ProMotion
       data[:default] = input[:default] if input[:default]
       data[:value] = input[:value] if input[:value]
       data[:action] = input[:action] if input[:action]
+      data[:cell] = input[:cell_class] if input[:cell_class]
       data
     end
+
+    def get_value(f)
+      f[:value] || begin
+        case f[:type]
+        when :date then NSDate.date
+        when :time then NSDate.date
+        else ""
+        end
+      end
+    end
   end
 end
 

data/lib/ProMotion/form/form_screen.rb

@@ -5,8 +5,8 @@ module ProMotion
     attr_reader :form_object
 
     def viewDidLoad
-      update_form_data
       super
+      update_form_data
     end
 
     def form_data
@@ -18,6 +18,7 @@ module ProMotion
       @form_object = PM::Form.new(self.form_data).build
       self.formController.form = @form_object
       self.formController.delegate = self
+      self.view.reloadData
     end
 
     def dismiss_keyboard

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-form
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jamon Holmgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-25 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion