red_cap 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ecb494d6572d7ce1d1a8f4b0a25508d1c1781334d020b5cd7b2732fd44a762
-  data.tar.gz: ffc47b7831555756738e98972ea2398759c5ad5bdaa4d3b41687410f11107790
+  metadata.gz: aff79d0a3d8f11d798bc3ea044f6e9ecaf6120f104b8b9d619a4c9b4f8f08db3
+  data.tar.gz: 7171c90ea289a8706c800d0df102065b84cb9cdc7754afdd0c5b4d327925d7a4
 SHA512:
-  metadata.gz: 79053ec2d7a4dce9135ee884cac5d9a33806bc8808655cd22a2626b9b39851ecfa2f3cdcf740e7c08c4c1b602314079f3e987c0e3103982b682d117951a30e0b
-  data.tar.gz: 0d1c4c81c6e94559316662794feb9d93a011382eb318f6559b9372610a956a46da006b824bb815a82bd02e95e0fe11db290ff66e405ce22a35fe8fd9f4583545
+  metadata.gz: 53a38cf69401b1820e148d42d0c32ac748f4b034a4f98bba960c74e808f78f0d6e209a35e7c6df648cc8650ddab6a32f8a204c33de96c73c18b0f85455d89ffa
+  data.tar.gz: d05eee71134492e2925db33fc85705ed3c77cd167e5d2dbbf9105860f83fc7b3280a099e288f167ab257d32009a08e780625ee35532c817d95ed51ff716fc680

data/lib/red_cap/client.rb

@@ -10,12 +10,17 @@ module REDCap
     end
 
     def records filter=nil
-      study_ids =
-        json_api_request(content: "record", fields: "study_id", filterLogic: filter)
-          .map { |hash| hash["study_id"] }
-
-      study_ids.in_groups_of(@per_page, false).flat_map do |study_ids|
-        json_api_request(content: "record", records: study_ids.join(","))
+      enumerator = fetch_study_ids(filter).in_groups_of(@per_page, false)
+      if block_given?
+        enumerator.each do |study_ids|
+          json_api_request(content: "record", records: study_ids.join(",")).each do |record|
+            yield record
+          end
+        end
+      else
+        enumerator.flat_map do |study_ids|
+          json_api_request(content: "record", records: study_ids.join(","))
+        end
       end
     end
 
@@ -38,6 +43,11 @@ module REDCap
 
     private
 
+    def fetch_study_ids filter=nil
+      json_api_request(content: "record", fields: "study_id", filterLogic: filter)
+        .map { |hash| hash["study_id"] }
+    end
+
     def json_api_request options
       response = base_request(options.reverse_merge({
         format: "json",

data/lib/red_cap/form/fields.rb

@@ -2,7 +2,7 @@ require "active_support/core_ext/object/blank"
 
 module REDCap
   class Form
-    class Field < Struct.new(:form, :attributes, :responses, :options)
+    class Field < Struct.new(:attributes, :options, :associated_fields)
       KEYS = [
         :field_name,
         :form_name,
@@ -28,7 +28,7 @@ module REDCap
         end
       end
 
-      def value
+      def value responses
         responses[field_name]
       end
 
@@ -44,7 +44,7 @@ module REDCap
       private
 
       def associated_fields_for_key key
-        form.fields.select do |field|
+        associated_fields.select do |field|
           field.branching_logic == %{[#{field_name}(#{key})]="1"}
         end
       end
@@ -61,15 +61,15 @@ module REDCap
     class Sql < Field; end
 
     class File < Field
-      def value
-        if responses[field_name].present?
+      def value responses
+        if super.present?
           field_name
         end
       end
     end
 
     class Yesno < Field
-      def value
+      def value responses
         if options.has_key?(:default) && super == ""
           options[:default]
         else
@@ -79,8 +79,8 @@ module REDCap
     end
 
     class RadioButtons < Field
-      def value
-        options[responses[field_name]]
+      def value responses
+        options[super]
       end
 
       def options
@@ -97,13 +97,13 @@ module REDCap
     Radio = RadioButtons
 
     class Checkboxes < RadioButtons
-      def value
-        selected_options.values
+      def value responses
+        selected_options(responses).values
       end
 
       private
 
-      def selected_options
+      def selected_options responses
         options.select do |key, value|
           responses["#{field_name}___#{key}"] == "1"
         end
@@ -111,10 +111,10 @@ module REDCap
     end
 
     class CheckboxesWithOther < Checkboxes
-      def value
-        selected_options.map do |key, value|
+      def value responses
+        selected_options(responses).map do |key, value|
           if other?(key)
-            "#{value}: #{other_text_field(key).value}"
+            "#{value}: #{other_text_field(key).value(responses)}"
           else
             value
           end
@@ -134,16 +134,16 @@ module REDCap
     Checkbox = CheckboxesWithOther
 
     class CheckboxesWithRadioButtonsOrOther < CheckboxesWithOther
-      def value
-        radio_or_other_values = selected_options.keys.map do |key|
+      def value responses
+        radio_or_other_values = selected_options(responses).keys.map do |key|
           if other?(key)
-            other_text_field(key)&.value
+            other_text_field(key)&.value(responses)
           else
-            radio_field_for(key)&.value
+            radio_field_for(key)&.value(responses)
           end
         end
 
-        Hash[selected_options.values.zip(radio_or_other_values)]
+        Hash[selected_options(responses).values.zip(radio_or_other_values)]
       end
 
       private
@@ -154,15 +154,17 @@ module REDCap
     end
 
     class CheckboxesWithCheckboxesOrOther < CheckboxesWithOther
-      def value
-        left = selected_options.values
+      def value responses
+        left = selected_options(responses).values
 
-        right = selected_options.keys.map do |key|
-          checkbox_fields_for(key).map(&:value)
+        right = selected_options(responses).keys.map do |key|
+          checkbox_fields_for(key).map do |field|
+            field.value(responses)
+          end
         end
 
         if selected_options.keys.include?("501")
-          right[-1] = [other_text_field("501")&.value]
+          right[-1] = [other_text_field("501")&.value(responses)]
         end
 
         Hash[left.zip(right)]

data/lib/red_cap/form.rb

@@ -3,12 +3,11 @@ require "active_support/core_ext/string/inflections"
 
 module REDCap
   class Form
-    def initialize data_dictionary, responses
+    def initialize data_dictionary
       @data_dictionary = data_dictionary
-      @responses = responses
     end
 
-    attr_reader :data_dictionary, :responses
+    attr_accessor :data_dictionary, :responses
 
     # field accessors
     def method_missing method, *args, **kwargs, &block
@@ -19,7 +18,7 @@ module REDCap
         field_class = lookup_field_class(field_class.to_s)
       end
       if field = find_field(key, field_class, options)
-        field.value
+        field.value(responses)
       else
         super
       end
@@ -27,15 +26,23 @@ module REDCap
 
     def find_field key, field_class, options
       field = fields.find { |field| field.field_name == key }
-      field = field_class.new(self, field.attributes, responses) if field_class
+      field = field_class.new(field.attributes) if field_class
       field.options = options
       field
     end
 
     def fields
-      @fields ||= data_dictionary.map do |attributes|
-        klass = lookup_field_class(attributes["field_type"])
-        klass.new(self, attributes, responses)
+      @fields ||= begin
+        fs = data_dictionary.map do |attributes|
+          klass = lookup_field_class(attributes["field_type"])
+          klass.new(attributes)
+        end
+        fs.each do |field|
+          field.associated_fields = fs.select do |f|
+            f.branching_logic =~ /^\[#{field.field_name}\(.+\)\]="1"$/
+          end
+        end
+        fs
       end
     end
 

data/lib/red_cap/version.rb

@@ -1,3 +1,3 @@
 module REDCap
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: red_cap
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday