vidl-toolbox 0.0.9 → 0.0.10

data/lib/toolbox/rendering.rb

@@ -26,6 +26,25 @@ module Toolbox
     end
 
 
+    # Get the field value out of a model object
+    # If the attribute method is defined and it's a symbol, this method is called on the model object
+    # If the attribute method is defined and it's a block (Proc), the block is called with the model object as parameter
+    # In all other cases, the field name is interpreted as method and called on the model object
+    def value(rec)
+      val = rec.send(@widget_config.model_method) if @widget_config.model_method && @widget_config.model_method.is_a?(Symbol)
+      val = @widget_config.model_method.call(rec) if @widget_config.model_method && @widget_config.model_method.is_a?(Proc)
+      unless val # fallback
+        a = @widget_config.name.to_s.split('.')
+        a.each do |t|
+          rec = rec.send(t)
+          break unless rec # stop if nil is returned
+        end
+        val = rec
+      end
+      val = nil if val == ''
+      val
+    end
+    
     # Renders the label of the widget.
     # If show_model is set to a model name, the model name of this widget
     # will be added in parenthesis if it differs to the value in show_model.
@@ -93,24 +112,6 @@ module Toolbox
       end
     end
 
-    # Get the field value out of a model object
-    # If the attribute method is defined and it's a symbol, this method is called on the model object
-    # If the attribute method is defined and it's a block (Proc), the block is called with the model object as parameter
-    # In all other cases, the field name is interpreted as method and called on the model object
-    def value(rec)
-      val = rec.send(@widget_config.model_method) if @widget_config.model_method && @widget_config.model_method.is_a?(Symbol)
-      val = @widget_config.model_method.call(rec) if @widget_config.model_method && @widget_config.model_method.is_a?(Proc)
-      unless val # fallback
-        a = @widget_config.name.to_s.split('.')
-        a.each do |t|
-          rec = rec.send(t)
-          break unless rec # stop if nil is returned
-        end
-        val = rec
-      end
-      val = nil if val == ''
-      val
-    end
 
     # Renders the value of an attribute of a given object.
     # Parameters:
@@ -282,7 +283,7 @@ module Toolbox
     end
 
     def render_textfield form, rec, options
-      val = rec.send @widget_config.name
+      val = value(rec) #rec.send @widget_config.name
       text = val.to_s
       text = val.to_s(:local_date) if val.instance_of? Date
       text = val.to_s(:local_time) if val.instance_of? Time
@@ -292,16 +293,16 @@ module Toolbox
 
     def render_textarea form, rec, options
       size = @widget_config.size || '40x10'
-      val = rec.send @widget_config.name
-      if val
-        row = 0
-        col = 0
-        val.each_line do |line|
-          row = row.succ
-          col = [col, line.length].max
-        end
-        size = "#{col}x#{row}"
-      end
+      #val = rec.send @widget_config.name
+      #if val
+      #  row = 0
+      #  col = 0
+      #  val.each_line do |line|
+      #    row = row.succ
+      #    col = [col, line.length].max
+      #  end
+      #  size = "#{col}x#{row}"
+      #end
       form.text_area @widget_config.name, options.merge({:size => size})
     end
 

data/lib/toolbox/version.rb

@@ -1,4 +1,4 @@
 
 module Toolbox
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vidl-toolbox
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - David Nyffenegger