tofulcrum 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTZhYTRjOTFhZmE1NTE3OWYzM2NkZTA4YjFmY2NjN2NjOTgzNzM3OA==
+    MzBhNzI3YWYyZTkxOTNmMjk5NmM4Yzg3ODBmODg5Y2E0NTJjNzA4MQ==
   data.tar.gz: !binary |-
-    NWU0YzI2OTRiOTMyMmM1YzRmZWUxMWQ3MjcyNjExZmU3NmIwYjY3OA==
+    Nzg5OTk3ZTAwMGI4NmRhNTliMTZmMzU5NDQ3OWRjZmZhYTRmMjI0MA==
 SHA512:
   metadata.gz: !binary |-
-    Mzk0MjE3MmNkYzJkYzk4ZDhiOWYyM2Q3MDFmOTJkMmY2NzJiOTUyM2U0ODU1
-    ZDhmMjZiOTAzZTkxNmUxM2QzZDk4MjRlNzdhNjZkMDIxYmUwOWY1M2M5NDE4
-    N2YwZDg5NWU2YWI5Mzc3YWFlYzNlYjgxMTRmNTQxNGE0NjAwOTc=
+    MTJmNGQ3YmUzYTQxN2Q1MDQyNDQ2ZjE3MGU3MGEwMWRjMDdiZGIzZjFjY2I1
+    ZGUzODZkN2E1OWU3YzhmNWI3ZGZmOGVkMGEwYjk0ZTY2Zjg3ZDhjYTk2MWRj
+    NDA1ODhmMjAwOGQ4Yjk2MGM1ZDU2M2MzMWZmNWRmMDhmNGExMGI=
   data.tar.gz: !binary |-
-    MTcxODZhN2ExZWVlMWZmZGM1NzEzNWQzZTc0ODhjYWQ4ODZkMzQxNjM2M2M5
-    ODhiZGYwYzg4MTgwMzliZmFiODk1ZDRhN2U1OTAzYjk4Yjg4N2M3MzUyMDJj
-    MGI0MTY5NzE2ZDI1MTRkYWYwNzdhMTdjMDBlY2Q2MjZmYTJiYmE=
+    ZTRhYjU1YzBmYjgwZmIzNmQ0MDRlZDNiYjQ5OGZmYjI3ZmZmNDc4NzM0Yjc4
+    MjBiNjJhYzljZmFmMmQ2YjdiODU3M2YyYjVlNDA2M2FlOTZhNTVhNzE4NDZk
+    NDg1YjBiMGQ1NjExMjk5YTMzYjg5MTJlNjE5MDEzNGQ3ZWE0OGQ=

data/lib/tofulcrum/fulcrum-xls-form/xls_reader.rb

@@ -27,12 +27,21 @@ module Fulcrum
     end
 
     def self.parse_schema(spreadsheet)
+      elements = make_elements(make_hash(spreadsheet.sheet('form')))
+
+      record_title_key = nil
+
+      if record_title_field = @metadata['record_title_field']
+        record_title_key = find_element(elements, record_title_field)[:key]
+      end
+
       form = { form: { name: @metadata['name'],
                        description: @metadata['description'],
                        status_field: @status_field,
-                       elements: make_elements(make_hash(spreadsheet.sheet('form'))) } }
+                       record_title_key: record_title_key,
+                       elements: elements } }
 
-      puts form.to_json
+      puts JSON.pretty_generate(form)
     end
 
     def self.make_elements(rows)
@@ -72,9 +81,16 @@ module Fulcrum
         when 'repeatable end'
           raise "repeatable end found without matching begin" if containers.count == 1
 
+          repeatable_title_field_key = nil
+
+          if (title_field = current_container[:title_field_key]) && title_field.present?
+            repeatable_title_field_key = find_element(current_container[:elements], title_field, include_repeatables: false)[:key]
+          end
+
+          current_container[:title_field_key] = repeatable_title_field_key
+
           containers = containers[0..-2]
           current_container = containers.last
-
         end
       end
 
@@ -97,6 +113,10 @@ module Fulcrum
         hash[:key] = SecureRandom.hex(2)
 
         case hash[:type]
+        when 'Section'
+          hash[:display] = row['display'] == 'drilldown' ? 'drilldown' : 'inline'
+        when 'Repeatable'
+          hash[:title_field_key] = row['title_field']
         when 'ChoiceField'
           hash[:choices] = @choices[row['choices']] if hash[:type] == 'ChoiceField'
           hash[:allow_other] = boolean_value(row[:allow_other])
@@ -246,5 +266,24 @@ module Fulcrum
 
       rows
     end
+
+    def self.find_element(elements, data_name, opts={})
+      all_elements(elements, opts).find do |e|
+        e[:data_name] == data_name
+      end
+    end
+
+    def self.all_elements(elements, opts={})
+      elements.inject([]) do |array, el|
+        array << el
+        exclude_repeatables = !!opts[:exclude_repeatables]
+        if exclude_repeatables
+          array += all_elements(el[:elements], opts) if el[:elements] && el[:type] != 'Repeatable'
+        else
+          array += all_elements(el[:elements], opts) if el[:elements]
+        end
+        array
+      end
+    end
   end
 end

data/lib/tofulcrum/version.rb

@@ -1,3 +1,3 @@
 module Tofulcrum
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tofulcrum
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Zac McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday