marty 1.0.42 → 1.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9b9b42bbdeeada46c3064d29dc28140076dbb2a
-  data.tar.gz: afa5534bdeb008725d64f7ac81c342ad58c6a7f9
+  metadata.gz: b66276891458efd498648be59d402697d007be05
+  data.tar.gz: 6fd5ee9414488b17042c87bb1439ca1021d371b6
 SHA512:
-  metadata.gz: 578d03d84c806f58c5ac5caca2f25535de98e0499cb78cda5c2329ce25a50218cf500114e332ecd9cbdc3b696dd3ac881f28ceac69fa184c5d50d543496276d3
-  data.tar.gz: 54991e5001815e0adcfd5eea4108cd15cdd234dc7a698bafffae8299fcc9434f5c33e62e6a99133deab0030aa78459b005396e718b5c0c5653cc763294ad5d61
+  metadata.gz: acff2e6a1842b34ed8ec5c17e8d15bd314723eae74cc11e043ca8f4f23bee95da6c0a46a56dca72bec7e248878f2849b517fb8f8397f3f1873ffd3658bd6c0d5
+  data.tar.gz: b596a59fd785a72531318a652dc9f20c71944df9a433e5b8db183316d4434015c974cc0276940ca7c3d418f94e49fbd07d6fbc228447c2fd63172f03bab0ff4c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.0.39)
+    marty (1.0.43)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.1)
@@ -224,4 +224,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.15.4
+   1.16.0.pre.2

data/app/controllers/marty/rpc_controller.rb

@@ -34,6 +34,24 @@ class Marty::RpcController < ActionController::Base
     end
   end
 
+  def _get_errors(errs)
+    if errs.is_a?(Array)
+      errs.map { |err| _get_errors(err) }
+    elsif errs.is_a?(Hash)
+      if !errs.include?(:failed_attribute)
+        errs.map { |k, v| _get_errors(v) }
+      else
+        fa, message, errors = errs.values_at(:failed_attribute,
+                                             :message, :errors)
+        (['AllOf','AnyOf','Not'].include?(fa) ? [] : [message]) +
+          _get_errors(errors || {})
+      end
+    end
+  end
+  def get_errors(errs)
+    _get_errors(errs).flatten
+  end
+
   def do_eval(sname, tag, node, attrs, params, api_key, background)
     return {error: "Malformed attrs"} unless attrs.is_a?(String)
 
@@ -95,7 +113,8 @@ class Marty::RpcController < ActionController::Base
         rescue => ex
           return {error: "#{attr}: #{ex.message}"}
         end
-        validation_error[attr] = er.map{ |e| e[:message] } if er.size > 0
+
+        validation_error[attr] = get_errors(er) if er.size > 0
         err_count += er.size
       end
     end

data/lib/marty/migrations.rb

@@ -187,6 +187,7 @@ EOSQL
         encode(line.encoding, :crlf_newline => true)
     end
   end
+
   def self.generate_sql_migrations(migrations_dir, sql_files_dir)
     sd = Rails.root.join(sql_files_dir)
     md = Rails.root.join(migrations_dir)
@@ -218,7 +219,8 @@ EOSQL
       newbase = "#{timestamp}_#{klass}"
       mig_name = File.join(md, "#{newbase}.rb")
       sql_snap_literal = Rails.root.join(md, 'sql', "#{newbase}.sql")
-      sql_snap_call =  "Rails.root.join('#{migrations_dir}', 'sql', '#{newbase}.sql')"
+      sql_snap_call =
+        "Rails.root.join('#{migrations_dir}', 'sql', '#{newbase}.sql')"
 
       File.open(sql_snap_literal, "w") do |f|
         f.print sql_lines.join

data/lib/marty/schema_helper.rb

@@ -0,0 +1,42 @@
+class Marty::SchemaHelper
+  include Delorean::Model
+  delorean_fn :enum_is, sig: 2 do
+    |var, value|
+    {"properties"=> {var => { "enum"=> value}}}
+  end
+  delorean_fn :bool_is, sig: 2 do
+    |var, value|
+    {"properties"=> {var => { "type"=> "boolean", "enum"=> [value]}}}
+  end
+
+  delorean_fn :or, sig: [1, 20] do
+    |*args|
+    {"anyOf"=>args}
+  end
+
+  delorean_fn :and, sig: [1, 20] do
+    |*args|
+    {"allOf"=>args}
+  end
+
+  delorean_fn :not, sig: 1 do
+    |arg|
+    {"not"=>{"allOf"=>[arg]}}
+  end
+
+  # if conds is true, var_array columns we be required
+  delorean_fn :required_if, sig: [2, 20] do
+    |var_array, *conds_array|
+    {"anyOf"=>[{"not"=>{"allOf"=> conds_array}},
+               {"required"=>var_array}]}
+  end
+
+  # if dep_column is present, checks must pass
+  delorean_fn :dep_check, sig: [2, 20] do
+    |dep_column, *checks|
+    {"dependencies"=> {dep_column =>
+                       {"type"=>"object",
+                        "allOf"=> checks}}}
+  end
+
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.42"
+  VERSION = "1.0.43"
 end

data/spec/controllers/rpc_controller_spec.rb

@@ -89,6 +89,35 @@ A:
     result = [{"a": 1, "b": res}, {"a": 789, "b": res}]
 eof
 
+sample_script10 = <<eof
+A:
+    opt1 =?
+    optn =?
+    opttf =?
+    opttrue =?
+    optfalse =?
+    req1 =?
+    req2 =?
+    req3 =?
+
+    optif = if opttf == true
+               then opttrue
+               else if opttf == false
+                    then optfalse
+                    else nil
+
+    v1 = if req1 == 'no opts'
+            then req2
+            else if req1 == "opt1"
+                    then opt1
+                    else if req2 != 'no opts'
+                            then optn
+                            else if req3 == "opttf"
+                                   then optif
+                                   else 'req3'
+
+eof
+
 script3_schema = <<eof
 A:
     pc = { "properties : {
@@ -227,6 +256,56 @@ A:
           }
 eof
 
+script10_schema = <<eof
+A:
+    properties = {
+              "opt1" :     { "type" : "string" },
+              "opttf" :    { "type" : "boolean" },
+              "opttrue" :  { "type" : "string" },
+              "optfalse" : { "type" : "string" },
+              "req1" :     { "pg_enum" : "CondEnum" },
+              "req2" :     { "pg_enum" : "CondEnum" }
+         }
+
+    req1_is_opt1 = Marty::SchemaHelper.enum_is('req1', ['opt1'])
+    req2_is_not_no_opts = Marty::SchemaHelper.not(
+                            Marty::SchemaHelper.enum_is('req2', ['no opts']))
+    req3_is_opttf = Marty::SchemaHelper.enum_is('req3', ['opttf'])
+    opttf_is_true = Marty::SchemaHelper.bool_is('opttf', true)
+    opttf_is_false = Marty::SchemaHelper.bool_is('opttf', false)
+
+    # opt1 is required if req1 == 'opt1'
+    opt1_check = Marty::SchemaHelper.required_if(['opt1'], req1_is_opt1)
+
+    # optn is required if req2 != 'no opts'
+    optn_check = Marty::SchemaHelper.required_if(['optn'], req2_is_not_no_opts)
+
+    # opttf is required if req3 == 'opttf'
+    opttf_check = Marty::SchemaHelper.required_if(['opttf'], req3_is_opttf)
+
+    # opttrue is required if opttf is true
+    opttrue_check = Marty::SchemaHelper.required_if(['opttrue'], opttf_is_true)
+
+    # optfalse is required if opttf is false
+    optfalse_check = Marty::SchemaHelper.required_if(['optfalse'],
+                                                     opttf_is_false)
+
+    # opttf is optional (contingent on req3) so eval of opttrue_check
+    # and optfalse_check is dependent upon opttf existing
+    opttruefalse_check = Marty::SchemaHelper.dep_check('opttf',
+                                                    opttrue_check,
+                                                    optfalse_check)
+
+    v1 = { "properties": properties,
+           "required": ["req1", "req2", "req3"],
+           "allOf": [
+                     opt1_check,
+                     optn_check,
+                     opttf_check,
+                     opttruefalse_check
+             ] }
+eof
+
 describe Marty::RpcController do
   before(:each) {
     @routes = Marty::Engine.routes
@@ -250,6 +329,7 @@ describe Marty::RpcController do
                          "M7" => sample_script7,
                          "M8" => sample_script8,
                          "M9" => sample_script9,
+                         "M10" => sample_script10,
                          "M3Schemas" => script3_schema,
                          "M4Schemas" => script4_schema,
                          "M5Schemas" => script5_schema,
@@ -257,6 +337,7 @@ describe Marty::RpcController do
                          "M7Schemas" => script7_schema,
                          "M8Schemas" => script8_schema,
                          "M9Schemas" => script9_schema,
+                         "M10Schemas" => script10_schema,
                        }, Date.today + 1.minute)
 
     @p1 = Marty::Posting.do_create("BASE", Date.today + 2.minute, 'a comment')
@@ -792,6 +873,9 @@ describe Marty::RpcController do
   class FruitsEnum
     VALUES=Set['Apple', 'Banana', 'Orange']
   end
+  class CondEnum
+    VALUES=Set['no opts','opt1','opt2','opttf']
+  end
 
   it "validates schema with a pg_enum (Positive)" do
     Marty::ApiConfig.create!(script: "M5",
@@ -1033,6 +1117,61 @@ describe Marty::RpcController do
     expect(response.body).to match(/"error":"Permission denied"/)
   end
 
+  context "conditional validation" do
+    before(:all) do
+      Marty::ApiConfig.create!(script: "M10",
+                               node: "A",
+                               attr: nil,
+                               logged: false,
+                               input_validated: true,
+                               output_validated: false,
+                               strict_validate: false)
+    end
+    def do_call(req1, req2, req3, optionals={})
+      attrs = ["v1"].to_json
+      params = optionals.merge({"req1" => req1,
+                                "req2"=> req2,
+                                "req3"=> req3}).to_json
+      get 'evaluate', {
+            format: :json,
+            script: "M10",
+            node: "A",
+            attrs: attrs,
+            params: params
+          }
+    end
+
+    it "does conditional" do
+      aggregate_failures "conditionals" do
+        [# first group has all required fields
+          [['opt1', 'no opts', 'no opts', opt1: 'hi mom'], "hi mom"],
+          [['no opts', 'no opts', 'no opts', opt1: 'hi mom'], "no opts"],
+          [['opt2', 'opt2', 'no opts', optn: 'foo'], 'foo'],
+          [['opt2', 'no opts', 'opt2'], 'req3'],
+          [['opt2', 'no opts', 'opttf', opttf: true, opttrue: 'bar'], 'bar'],
+          [['opt2', 'no opts', 'opttf', opttf: false, optfalse: 'baz'], 'baz'],
+          # second group is missing fields
+          [['opt1', 'no opts', 'no opts'],
+           "did not contain a required property of 'opt1'"],
+          [['opt2', 'opt2', 'no opts',],
+           "did not contain a required property of 'optn'"],
+          [['opt2', 'no opts', 'opttf'],
+           "did not contain a required property of 'opttf'"],
+          [['opt2', 'no opts', 'opttf', opttf: true],
+           "did not contain a required property of 'opttrue'"],
+          [['opt2', 'no opts', 'opttf', opttf: false],
+           "did not contain a required property of 'optfalse'"],
+        ].each do
+          |a, exp|
+          do_call(*a)
+          res_hash = JSON.parse(response.body)
+          got = res_hash.is_a?(Array) ? res_hash[0] : res_hash["error"]
+          expect(got).to include(exp)
+        end
+      end
+    end
+  end
+
   context "error handling" do
     it 'returns bad attrs if attrs is not a string' do
       get :evaluate, format: :json, attrs: 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.42
+  version: 1.0.43
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -499,6 +499,7 @@ files:
 - lib/marty/railtie.rb
 - lib/marty/relation.rb
 - lib/marty/rpc_call.rb
+- lib/marty/schema_helper.rb
 - lib/marty/util.rb
 - lib/marty/version.rb
 - lib/marty/xl.rb