formio 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e723660a1d929c17bcce26839fac021b49bab899eb1313e4e77c72ea6aa0df
-  data.tar.gz: ba45f9dad1f78441598eeacfdc4a85ef679d87c4507b8c51485c1cb0978ec620
+  metadata.gz: a62254bee25b872f3fdc2bebb1fcf3a32369bd50e26d64187b05253e27c801ed
+  data.tar.gz: 89acbf0a2b5252d7625e4cbb1c22fbacd5ed0abf5ee562690d3de269341106e9
 SHA512:
-  metadata.gz: 9f05f279f1ad25a23a1173b7a165b19f42c3deb60d2fc65fa1737e9b7c30c235960accb1a90d36b2d0c9b8516ae70cfd4b77c4a159324df91eddc4676f636cfc
-  data.tar.gz: 867a03cdc1fb9addadd66a40fd45e9597bb93c58c6c6cb6813ebf9cb0c1dd2b08877be2e3d802ef316bd2427d900aedc374d21133c795248abe7ddd2ae7af49c
+  metadata.gz: '0389a6f60470c24b5d69d28d798ff1ce31d08e887f9f1acde6ea88bdbb11efe9ebebae9cb8c41adc04e97b2dee3b6e09c56b3ae6725a06c9161ba919853ea105'
+  data.tar.gz: e14141b9ba60906d96bc38e9ad34cfaa03e6212b03a54e9c2b64dcdd44ab67daadbfebfaa3d59589e13b4b3230a2b3934c3ba88c5d88d5db8a4078e5a1c15732

data/lib/formio/client.rb

@@ -36,13 +36,13 @@ module Formio
       end
     end
 
-    def update(record)
+    def update(record, max_depth: 2)
       raise "Must supply a formio form" unless record.is_a?(Record)
       response = connection.put do |req|
         req.url "/#{record.form_name}/submission/#{record.id}"
         req.url "/form/#{record.form_id}/submission/#{record.id}" if record.form_id
         set_headers(req)
-        req.body = record.to_json
+        req.body = compact_formio_hash(record.formio_hash, max_depth).to_json
       end
 
       return update(record) if response.status == 502
@@ -51,6 +51,10 @@ module Formio
       else
         parse_response(response.body)['details'].map { |x| x['message'] }
       end
+
+    rescue Net::OpenTimeout
+      binding.pry
+      retry
     end
 
     def find_by_id(form, submission_id)
@@ -176,6 +180,9 @@ module Formio
       @connection ||= Faraday::Connection.new(project_url,
         ssl: { verify: true }
       ) do |builder|
+        require 'faraday_curl'
+        # require 'faraday-detailed_logger'
+        require 'faraday-cookie_jar'
         # builder.request  :multipart
         # builder.use ::FaradayMiddleware::ParseJson, content_type: 'application/json'
         # builder.request  :url_encoded
@@ -197,27 +204,40 @@ module Formio
     def login
       @auth_token ||= begin
         return unless email
-        Rails.cache.fetch("formio_login_" + email, expires_in: 12.hours) do
-          formio_conn = Faraday::Connection.new("https://formio.form.io", ssl: { verify: true })
-
-          login_response = formio_conn.post do |req|
-            req.url "/user/login"
-            req.headers['Content-Type'] = 'application/json'
-            req.headers['Accept'] = 'application/json'
-            req.body = {
-              data: {
-                email: email,
-                password: password
-              }
-            }.to_json
-          end
-          login_response.headers['x-jwt-token']
+        formio_conn = Faraday::Connection.new("https://formio.form.io", ssl: { verify: true })
+
+        login_response = formio_conn.post do |req|
+          req.url "/user/login"
+          req.headers['Content-Type'] = 'application/json'
+          req.headers['Accept'] = 'application/json'
+          req.body = {
+            data: {
+              email: email,
+              password: password
+            }
+          }.to_json
         end
+        login_response.headers['x-jwt-token']
       end
     end
     alias auth_token login
 
-    private
     attr_reader :email, :password, :project_url
+
+    def compact_formio_hash(data, max_level=2)
+      return unless data.is_a?(Hash) || data.is_a?(Array)
+      data.each do |k,v|
+        if max_level <= 0
+          data.delete k
+        else
+          if(v.is_a?(Hash))
+            compact_formio_hash(v, max_level - 1)
+          end
+          if(v.is_a?(Array))
+            v.each { |elem| compact_formio_hash(elem, max_level) }
+          end
+        end
+      end.compact
+    end
   end
-end
+end

data/lib/formio/record.rb

@@ -16,6 +16,10 @@ module Formio
       end
     end
 
+    def present?
+      true
+    end
+
     def to_json
       formio_hash.to_json
     end
@@ -46,11 +50,15 @@ module Formio
       def initialize
         @_id = @id = nil
         @form_id = nil
-        @formio_hash = nil
+        @formio_hash = {data: {}}
         @form_name = nil
         @created_at = nil
         @updated_at = nil
       end
+
+      def present?
+        false
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formio
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jonathan Frias
@@ -9,7 +9,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-03-04 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-cookie_jar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_curl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-detailed_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby adapter for the form.io platform
 email: jonathan.frias1@gmail.com
 executables: []
@@ -40,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby adapter for the form.io platform