red_cap 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 17f8b084c1543f1c9ebda525009e0b117e4376ca
-  data.tar.gz: 861b0f0b47d80da062846a58a0216c3d365b68b0
+SHA256:
+  metadata.gz: d3d586cf781b2e55fa4d879708049bc78be1cdd3f15b69d9779316aef52403d9
+  data.tar.gz: 4e5490c8e2e3447014f9df6d9fb23b1055227c1f36a584e734f3e8a1943018d4
 SHA512:
-  metadata.gz: 6958e11b0de0d79a1770fcddc68a5639338fc4f933b973643d57160468bd6f1c07a7870eaae68d91fd2d03629c70a627083158bd5aa38b9cc190bd248418a3a8
-  data.tar.gz: f19581696f6463a2daf2ccbaaf9993ea3d694999f5f20768df5724e0577c937a3a181fd65864458135ea838a6b47e236d5fc7fef4f4b1664784ff54e2e75532d
+  metadata.gz: 9ff3598b19c883f62409dc6dd6819686019b4fc72e08725e611d33cce284cfd24cc1bda21c2ff8bfd61d85f109bf07f5b188168ca88d132c4710712b237c0ff9
+  data.tar.gz: 65c5e4440ef12ae2a127ace752730a1687900b989eb4a070dc16eb72088f71945910a9921d4c8d1e965174b371c6d03c86263ebe85b561c141e3468e94753b88

data/lib/red_cap/client.rb

@@ -23,7 +23,7 @@ module REDCap
         record: record_id,
         field: file_id,
       })
-      _, type, filename = *response.headers["content-type"].match(/\A(.+); name=\"(.+)\"\z/)
+      _, type, filename = *response.headers["content-type"].match(/\A(.+); name=\"(.+)\"/)
       File.new(response.body, type, filename)
     end
 
@@ -40,9 +40,15 @@ module REDCap
 
     def base_request options
       connection = Faraday.new(url: @url)
-      connection.post(nil, options.reverse_merge({
+      response = connection.post(nil, options.reverse_merge({
         token: @token,
       }))
+      if error_message = response.body[/<error>(.+?)<\/error>/, 1]
+        raise Error.new(error_message)
+      end
+      response
     end
+
+    class Error < StandardError; end
   end
 end

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.3.0"
+  VERSION = "0.5.1"
 end

data/red_cap.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday"
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-03 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,44 +42,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Library for connecting to REDCap and parsing forms and data
 email:
 - micah@botandrose.com
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Library for connecting to REDCap and parsing forms and data