red_cap 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23e77e89b7534b408882b97f3a0f2ef6481bd48d
-  data.tar.gz: 100d5e1c4e9c069e6c8b8ffe4d51de9caad67015
+  metadata.gz: aa2bdc0735b838f2fd8f193c93c60b7e3cc365f5
+  data.tar.gz: 3b0e83dcace8e17baf0d367fe4ad8fdbf32ccece
 SHA512:
-  metadata.gz: 3cea82c792788f6e28ddc5e67931fd2c8d3157bb54fef4adb8b4b0de2d9bce70eb07fe6e94c8fa8e360ebe4724f9950043ef00cf3c0ae3090191f00c7c58d20d
-  data.tar.gz: cfe34f23aeb1e38667633f13b831556c423adc5b7b7b5512fd4f788d9fd20ba048b1d035c96b792c1c51d6072627312fa2f18f7df85697e357b0704c8607eedc
+  metadata.gz: 6c75397662f37a89705320130c0c4c6ce93226412d29afaaa05915c8fcd52a0a9e444a2cceadf5c3f4610aad53b156c90a0e85ee2515163b451915a59e22647c
+  data.tar.gz: 0ddac355f3b6757a9ed17df062a31fba45b575d1d12207da616623d58eee4c6345ecc6efe46f05f60caba29c72c952c1a13b019e6fd72d3aaa98a939fd145e16

data/lib/red_cap/form/fields.rb

@@ -51,7 +51,11 @@ module REDCap
     end
 
     class Text < Field; end
-    class Notes < Field; end
+    class Notes < Text
+      def text?
+        true
+      end
+    end
     class Descriptive < Field; end
     class Dropdown < Field; end
     class Sql < Field; end
@@ -109,16 +113,20 @@ module REDCap
     class CheckboxesWithOther < Checkboxes
       def value
         selected_options.map do |key, value|
-          if key == "501" # Other
-            "#{value}: #{other_text_field&.value}"
+          if other?(key)
+            "#{value}: #{other_text_field(key).value}"
           else
             value
           end
         end
       end
 
-      def other_text_field
-        associated_fields_for_key("501").find(&:text?)
+      def other_text_field key
+        associated_fields_for_key(key).find(&:text?)
+      end
+
+      def other? key
+        other_text_field(key)
       end
     end
 
@@ -127,11 +135,15 @@ module REDCap
 
     class CheckboxesWithRadioButtonsOrOther < CheckboxesWithOther
       def value
-        radio_values = selected_options.keys.map do |key|
-          radio_field_for(key).value
+        radio_or_other_values = selected_options.keys.map do |key|
+          if other?(key)
+            other_text_field(key)&.value
+          else
+            radio_field_for(key)&.value
+          end
         end
 
-        Hash[super.zip(radio_values)]
+        Hash[selected_options.values.zip(radio_or_other_values)]
       end
 
       private
@@ -150,7 +162,7 @@ module REDCap
         end
 
         if selected_options.keys.include?("501")
-          right[-1] = [other_text_field&.value]
+          right[-1] = [other_text_field("501")&.value]
         end
 
         Hash[left.zip(right)]

data/lib/red_cap/version.rb

@@ -1,3 +1,3 @@
 module REDCap
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_cap
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-02 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday