marty 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a37db175af12ba24970850bb7cac05afec9ab8f92cae6889129b31bbe076bd8
-  data.tar.gz: ec4925a70626ae5e172bf59668b5aa613b2c082b1c0b78fbae7729aab39172f4
+  metadata.gz: d525319e98d55b25d7ac47f40a085b1d3759f67bf400bfcecd3908fb6ed8c6e8
+  data.tar.gz: e3276f7391957c7fa615f2af1702944ff7a43aefd253d9e660e5c0f3cb637f1d
 SHA512:
-  metadata.gz: abcabb81af0dcd128cf8754cb2a60d14eae67c6058c4945c9ec92a0f214825debecb2d240bde8351a3218c7b6566cd525c2ec48341bf9270734762d7635f85ab
-  data.tar.gz: 643c7313f0c3fd074dc626d330c0f7e67889a9b61e89c1211a31ff25456369315b1bbb278d14a09260685b249e9e1887aabdcf312e1616cc330f5a9ff9244808
+  metadata.gz: 17a54c4a4e197cd114665cf83113eac00d16350501739e435080b68666ce8f78845a09d38af5cede910187b44736f4a8a0e715d2a37df7b19c541b202361e560
+  data.tar.gz: 92f6af0854f0d5965203669164c63370a7ad70a5d1666d9115d13a540a11828f4cfe64a69c45ac0c27a9c40e660cdff23e77440113b2cd2bef8b734248b31bd3

data/config/locales/en.yml

@@ -174,4 +174,4 @@ en:
   netzke:
     grid:
       base:
-        view_record: "%{model} (Locked)"
+        view_record: "%{model} (Read-only)"

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.6.3'
+  VERSION = '2.6.4'
 end

data/other/marty/api/base.rb

@@ -65,6 +65,19 @@ class Marty::Api::Base
       return { error: e.message }
     end
 
+    # if schema was found
+    if input_schema.is_a?(Hash)
+      # fix numbers types
+      numbers = @@numbers[schema_key] ||=
+                  Marty::JsonSchema.get_numbers(input_schema)
+
+      # modify params in place
+      Marty::JsonSchema.fix_numbers(params[:params], numbers)
+    elsif !input_schema.include?('Schema not defined')
+      # else if some error besides schema not defined, fail
+      return { error: input_schema }
+    end
+
     # validate input schema
     if config[:input_validated]
 
@@ -84,19 +97,6 @@ class Marty::Api::Base
         schema_errors
     end
 
-    # if schema was found
-    if input_schema.is_a?(Hash)
-      # fix numbers types
-      numbers = @@numbers[schema_key] ||=
-                  Marty::JsonSchema.get_numbers(input_schema)
-
-      # modify params in place
-      Marty::JsonSchema.fix_numbers(params[:params], numbers)
-    elsif !input_schema.include?('Schema not defined')
-      # else if some error besides schema not defined, fail
-      return { error: input_schema }
-    end
-
     # get script engine
     begin
       engine = Marty::ScriptSet.new(params[:tag]).get_engine(params[:script])

data/spec/controllers/rpc_controller_spec.rb

@@ -397,9 +397,8 @@ A:
                              "f15_number"  : {"type": "number", "minimum": 0 },
                              "f16_array": {
                                   "type"        : "array",
-                                  "uniqueItems" : true,
                                   "minItems"    : 0,
-                                  "maxItems"    : 1,
+                                  "maxItems"    : 5,
                                   "items": {
                                       "type"       : "number",
                                       "minimum"    : 0,
@@ -409,9 +408,8 @@ A:
                                       }}}}}},
        "f7_array": {
                "type"        : "array",
-               "uniqueItems" : true,
                "minItems"    : 0,
-               "maxItems"    : 1,
+               "maxItems"    : 5,
                "items": {
                    "type"       : "number",
                    "minimum"    : 0,
@@ -1267,6 +1265,14 @@ describe Marty::RpcController do
     api.app_name = 'TestApp'
     api.script_name = 'M11'
     api.save!
+    Marty::ApiConfig.create!(script: 'M11',
+                             node: 'A',
+                             attr: nil,
+                             logged: false,
+                             input_validated: true,
+                             output_validated: false,
+                             strict_validate: false)
+
     p = File.expand_path('../../fixtures/json', __FILE__)
     f = '%s/%s' % [p, 'rpc_controller.json']
     begin

data/spec/fixtures/json/rpc_controller.json

@@ -155,21 +155,5 @@
     {"attr": "v0",
      "request": {"f_bool":true},
      "result": {"f_bool":true}
-    },
-     {"attr": "v0",
-      "request": {"f4_number": "bad"},
-      "result": {"f4_number": "bad"}
-     },
-    {"attr": "v0",
-     "request": {"f7_array": [1,"bad",3]},
-      "result": {"f7_array": [1.0,"bad",3.0]}
-    },
-     {"attr": "v0",
-      "request": {"f4_number": true},
-      "result": {"f4_number": true}
-     },
-    {"attr": "v0",
-     "request": {"f7_array": [1,true,3]},
-      "result": {"f7_array": [1.0,true,3.0]}
     }
 ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg