tao_form 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9a951958b8d6408a62dd613cff484e3a4eea372
-  data.tar.gz: dc859b737204349fc678dffe0b1e5713e5247637
+  metadata.gz: a18d71951470969052ba69f555372147c3cfda5e
+  data.tar.gz: 4aaa0ee030e0dff122ae174f827e253153e0446e
 SHA512:
-  metadata.gz: 0237c0c8f66519bc89a0683c2b88fcc9ac96e1ec055496dfcfa64b952b9e428e382ee6cb056a3b4d153642d6cb06878929e6a75cc327673dcfa35f1d60aec4c6
-  data.tar.gz: c84b3b14ba4f44f676d617044b90645b192c895e35b881261b6f8f748257dfb9ead5f02eb7b39e3308c449c1ad3703e61f55e1f0803d5bd65c6715415229f67f
+  metadata.gz: 84a379df38b149e8529540d19ffdf1c1d39a345510b7ac45bd29c433e9cee3972a7180669448afff7e05039ed4ab3b95dc5f70cbac5c8731d4d8e103d39e6179
+  data.tar.gz: 0407113bca1f6cd55c74288b4bc8e35bd2f20e0dc8fd464675832129f9638d21236006e1d286c5885d50dffcb02355e711ff9db0f7363aa65c88ba79b257bf86

data/lib/tao_form/components/check_box_component.rb

@@ -2,7 +2,7 @@ module TaoForm
   module Components
     class CheckBoxComponent < FieldComponent
 
-      attr_reader :checked_value, :unchecked_value, :checked, :disabled
+      attr_reader :checked_value, :unchecked_value, :checked, :disabled, :field_options
 
       def initialize view, builder = nil, attribute_name = nil, options = {}
         super view, builder, attribute_name, options
@@ -10,6 +10,8 @@ module TaoForm
         @unchecked_value = @options.delete(:unchecked_value)
         @checked = @options.delete(:checked)
         @disabled = @options.delete(:disabled)
+
+        init_field_options
       end
 
       def self.component_name
@@ -21,14 +23,23 @@ module TaoForm
           super
         elsif builder && attribute_name
           super {
-            builder.check_box attribute_name, {
-              checked: checked,
-              disabled: disabled
-            }, checked_value, unchecked_value
+            builder.check_box attribute_name, field_options, checked_value, unchecked_value
           }
         end
       end
 
+      private
+
+      def init_field_options
+        @field_options = {
+          disabled: disabled
+        }
+
+        unless checked.nil?
+          @field_options[:checked] = checked
+        end
+      end
+
     end
   end
 end

data/lib/tao_form/components/radio_button_component.rb

@@ -2,7 +2,7 @@ module TaoForm
   module Components
     class RadioButtonComponent < FieldComponent
 
-      attr_reader :checked_value, :unchecked_value, :checked, :disabled
+      attr_reader :checked_value, :unchecked_value, :checked, :disabled, :field_options
 
       def initialize view, builder = nil, attribute_name = nil, options = {}
         super view, builder, attribute_name, options
@@ -10,6 +10,8 @@ module TaoForm
         @unchecked_value = @options.delete(:unchecked_value)
         @checked = @options.delete(:checked)
         @disabled = @options.delete(:disabled)
+
+        init_field_options
       end
 
       def self.component_name
@@ -19,16 +21,25 @@ module TaoForm
       def render &block
         if block_given?
           super
-        else
+        elsif builder && attribute_name
           super {
-            builder.radio_button attribute_name, {
-              checked: checked,
-              disabled: disabled
-            }, checked_value, unchecked_value
+            builder.radio_button attribute_name, field_options, checked_value, unchecked_value
           }
         end
       end
 
+      private
+
+      def init_field_options
+        @field_options = {
+          disabled: disabled
+        }
+
+        unless checked.nil?
+          @field_options[:checked] = checked
+        end
+      end
+
     end
   end
 end

data/lib/tao_form/version.rb

@@ -1,3 +1,3 @@
 module TaoForm
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tao_form
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - your name