baldr 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df0a17440cfb3baa2f037e24845b926b4816d30
-  data.tar.gz: 979604044c2acbb52acf452e08d58019aed6d8eb
+  metadata.gz: 45a6b3c30dcf0b9d15ae32c00575134e9b42c2cd
+  data.tar.gz: 65f4a8135a825d22941f76cd44bff4fe6b2bd0cd
 SHA512:
-  metadata.gz: b5ed5fb413e74c146ff3eb9e79acf5f2fdd210b5892c8ae756c13e6d99b975ae45cf288756695e4642a7f6c5d9d8a3d6bf64ec50c6849e282b4011d491815b0b
-  data.tar.gz: 9418ff8ad79a7fd193e52d37ec29b859dbbc0cf54079bf0856ad2c314bb551c9c69d1c4ec314c4f1836191a7d395224f34e72753af52f2fe899fcb4a80fad7c0
+  metadata.gz: a82bfc2c6415dbd7e9fe69e071a192ebdd0ba40ed078435ccc52100283afdbabd82d72b0967827055bf49ae21b2d8f53997dc584f1fe3f6294a6b3fcb26c4aa8
+  data.tar.gz: d93c530113a011246537c2c7616b27778cd82c30c298d645f94404c0a67bcb334ff2514d5472f63a29f739e88ecb250ea80f772fa06e147d785d3b68ed5cb854

data/lib/baldr/types.rb

@@ -43,12 +43,22 @@ module Baldr::Types
   def convert_before_render!(envelope, grammar)
     convert_tree!(envelope, grammar) do |record_def, element|
       case record_def[:type]
+        when :real
+          if element.is_a? String
+            element
+          else
+            if (element - element.floor).zero?
+              element.truncate.to_s
+            else
+              element.round(2).to_s
+            end
+          end
         when :number
           if element.is_a? String
             element
           else
             if record_def[:decimals] == 0
-              element
+              element.to_s
             else
               (element * (10.0 ** record_def[:decimals])).round.to_s
             end

data/lib/baldr/validator.rb

@@ -64,7 +64,6 @@ module Baldr::Validator
 
   def check_id(r, element)
     check_max_and_min_for_string(r, element)
-
   end
 
   def check_max_and_min_for_string(r, element)
@@ -78,23 +77,36 @@ module Baldr::Validator
   end
 
   def check_time(r, element)
-
+    if r[:max] && element.length > r[:max]
+      raise Baldr::Error::ValidationError,  "#{r[:id]} is too long: #{element.length} characters, maximum #{r[:max]}"
+    end
   end
 
   def check_date(r, element)
-
+    if r[:max] && element.length > r[:max]
+      raise Baldr::Error::ValidationError,  "#{r[:id]} is too long: #{element.length} characters, maximum #{r[:max]}"
+    end
   end
 
   def check_number(r, element)
-
+    value = element.to_s
+    if r[:max] && value.length > r[:max]
+      raise Baldr::Error::ValidationError,  "#{r[:id]} is too long: #{value.length} characters, maximum #{r[:max]}"
+    end
+    if value.match(/[^\d-]/)
+      raise Baldr::Error::ValidationError,  "#{r[:id]} has invalid symbols: #{value}"
+    end
   end
 
   def check_real(r, element)
-
+    value = element.to_s
+    if r[:max] && value.length > r[:max]
+      raise Baldr::Error::ValidationError,  "#{r[:id]} is too long: #{value.length} characters, maximum #{r[:max]}"
+    end
   end
 
   def check_complex(r, element)
 
   end
 
-end
+end

data/lib/baldr/version.rb

@@ -1,3 +1,3 @@
 module Baldr
-  VERSION = '0.3.19'
+  VERSION = '0.3.20'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baldr
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - Stanislav Spiridonov