ProMotion-XLForm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55924720d004b7e0a3e9bf60576b3803ef96cfbb
-  data.tar.gz: abf8c29c048a7db559d0decee91fdde5adaaf616
+  metadata.gz: 16f266fe44d16f2b3dbba9d3a854e57b61096782
+  data.tar.gz: b392bad7840ec083954aeb5938c7f508cd7a3252
 SHA512:
-  metadata.gz: 89a3c12aa9d571911681e0b54a85a91602218c5534c3c7fceaea08d4dadddf691957478cfd6a4dad4af0eb826556118f328b75c88b19f109b7b015393aac4ff5
-  data.tar.gz: fe7a80cedbebf1ecfcf1c540744f2bb5519ae978ea136c5d4e659d72a2df18c0a15c661abd399cd86faedf011d332a01b429dd66cfd0fa7cc14bc9c792991bd7
+  metadata.gz: 2e2cec121337790d06be52097d7cc6df47b6a9c5afdbb204d559d17b38a6a0d0cfc52ff9d751e88c5ac7d80ce5330cee3aaab0c7f8c37ca37f69c4a3a3c5b588
+  data.tar.gz: 7c7135483141be1e1f1285568c0095301b7208e0fa7c15d8b607836f1f79a29b8972b59693d1505b8a417abbe6d5464fe3cfa298d115b78a28f2386df9a3775a

data/lib/ProMotion/XLForm/value_transformer.rb

@@ -9,6 +9,7 @@ module ProMotion
     end
 
     def transformedValue(value)
+      return self.transformed_value(value) if self.respond_to?(:transformed_value)
       return nil if value.nil?
 
       # best effort

data/lib/ProMotion/XLForm/xl_form.rb

@@ -112,12 +112,11 @@ module ProMotion
           add_proc cell, :on_remove, cell_data[:on_remove] if cell_data[:on_remove]
 
           cell.selectorTitle   = cell_data[:selector_title] if cell_data[:selector_title]
-          options              = parse_options(cell_data[:options])
-          cell.selectorOptions = options
+          cell.options = cell_data[:options]
 
           value = cell_data[:value]
-          if value and options
-            options.each do |opt|
+          if value and cell.selectorOptions
+            cell.selectorOptions.each do |opt|
               if opt.formValue == value
                 value = opt
                 break
@@ -190,18 +189,6 @@ module ProMotion
       @blocks[tag][event] = block.respond_to?('weak!') ? block.weak! : block
     end
 
-    def parse_options(options)
-      return nil if options.nil? or options.empty?
-
-      options.map do |key, text|
-        val = key
-        if val.is_a? Symbol
-          val = val.to_s
-        end
-        XLFormOptionsObject.formOptionsObjectWithValue(val, displayText: text)
-      end
-    end
-
     def parse_section_options(options)
       return section_options(:none) if options.nil?
 

data/lib/ProMotion/XLForm/xl_form_patch.rb

@@ -26,4 +26,20 @@ class XLFormRowDescriptor
     row_descriptor_copy
   end
 
-end
+  def options=(options)
+    self.selectorOptions = parse_options(options)
+  end
+
+  def parse_options(options)
+   return nil if options.nil? or options.empty?
+
+   options.map do |key, text|
+     val = key
+     if val.is_a? Symbol
+       val = val.to_s
+     end
+     XLFormOptionsObject.formOptionsObjectWithValue(val, displayText: text)
+   end
+ end
+
+end

data/lib/ProMotion/XLForm/xl_form_screen.rb

@@ -225,8 +225,17 @@ module ProMotion
 
     def formRowDescriptorValueHasChanged(row, oldValue: old_value, newValue: new_value)
       super
+
       callback = @form_builder.get_callback(row, :on_change)
-      callback.call(old_value, new_value) if callback
+      if callback
+        if old_value.is_a? XLFormOptionsObject
+          old_value = old_value.formValue
+        end
+        if new_value.is_a? XLFormOptionsObject
+          new_value = new_value.formValue
+        end
+        callback.call(old_value, new_value)
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-XLForm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Benjamin Michotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion