dry-elastic_model 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22daff8f3ddd6c86ca64c773a341229917bc9930bd0897c3090fe8bc51dbd3c6
-  data.tar.gz: f6abb2425966e98eb112ada1da931831a21da6e4641de261431d8c01b1326148
+  metadata.gz: 8730a0d70a0298649084d06ce66c94013da17d86feaf2983aa7ba16658617a3c
+  data.tar.gz: ea585bf95b6e9469cd02a83d67ffcb79c605442cca13c7de53208f39d77343da
 SHA512:
-  metadata.gz: 943f4654fc39e200de139ed30e9afa48262b1795ef845699b18764b1c60e011d536b5c873d1202d5388d3e6b0fa036977977e0abf47a92d263639c97422579b8
-  data.tar.gz: 2d9e317a152a567a1ea583922b3e01b607b24d2b5192bf834b439613b771cb8cde90cc5bad70d73e4baab9db22c6a462271e6c5479a42e4b06b78017445cd1b6
+  metadata.gz: 2ab98478042ae1f7148357cf89db527fcde378a0050d1dcf230781d52ee2d63372f28c1ec0af4d8ca4d6f36a0eaa4306a7502a4946aee3b23eeb84245f3d2224
+  data.tar.gz: 3abd42cfbcf4553b697e50ad7f472c248e64f7578aede523a7d256bf96bddeefecc19073dbb3b2035dd4dd4ef03a5b49ae5d1846000dde24c6db6945a0255689

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/dry/elastic_model/types.rb

@@ -10,21 +10,35 @@ module Dry
 
       # rubocop:disable Metrics/LineLength
       # String datatypes
-      Text = Types::Strict::String.meta(es_name: "text",
+      Text = (Types::Strict::String | Types::Strict::Nil).optional.meta(es_name: "text",
                                         type_options: TypeOptions::Text,
                                         opts: { index: "not_analyzed" })
-      Keyword = (Types::Strict::String | Types::Strict::Symbol).
+      Keyword = (Types::Strict::String | Types::Strict::Symbol).optional.
                 meta(type_options: TypeOptions::Keyword, es_name: "keyword")
 
       # Binary datatype
       # TODO: Verify if correct Base64
-      Binary = Types::Strict::String.meta(es_name: "binary",
-                                          type_options: TypeOptions::Binary)
+      Binary = Types::Strict::String.optional.
+               meta(
+                 es_name: "binary",
+                 type_options: TypeOptions::Binary
+               )
 
       # Date datatype
-      # TODO: Test strings
-      Date = (Types::Strict::Date | Types::Strict::Time | Types.Value("now")).
-             meta(es_name: "date", type_options: TypeOptions::Date)
+      Date = (
+        Types::Strict::Date |
+        Types::JSON::Date |
+        Types.Value("now")
+      ).optional.meta(es_name: "date", type_options: TypeOptions::Date)
+
+      MAX_UNIX_TIME = 2147468400000 # 2038-01-19
+      DateTime = (
+        Types::Strict::Time |
+        Types::Strict::DateTime |
+        Types::JSON::DateTime |
+        Types::Integer.constrained(gteq: 0, lteq:  MAX_UNIX_TIME) |
+        Types.Value("now")
+      ).optional.meta(es_name: "date", type_options: TypeOptions::Date)
 
       # Numeric datatypes
       LONG_LIMIT = 2**63
@@ -32,43 +46,43 @@ module Dry
       SHORT_LIMIT = 2**15
       BYTE_LIMIT = 2**8
 
-      Long = Types::Strict::Integer.
+      Long = Types::Strict::Integer.optional.
              constrained(gteq: -LONG_LIMIT, lteq: LONG_LIMIT - 1).
              meta(type_options: TypeOptions::Numeric, es_name: "long")
 
-      Integer = Types::Strict::Integer.
+      Integer = Types::Strict::Integer.optional.
                 constrained(gteq: -INTEGER_LIMIT, lteq: INTEGER_LIMIT - 1).
                 meta(type_options: TypeOptions::Numeric, es_name: "integer")
 
-      Short = Types::Strict::Integer.
+      Short = Types::Strict::Integer.optional.
               constrained(gteq: -SHORT_LIMIT, lteq: SHORT_LIMIT - 1).
               meta(type_options: TypeOptions::Numeric, es_name: "short")
 
-      Byte = Types::Strict::Integer.
+      Byte = Types::Strict::Integer.optional.
              constrained(gteq: -BYTE_LIMIT, lteq: BYTE_LIMIT - 1).
              meta(type_options: TypeOptions::Numeric, es_name: "byte")
 
-      Double = (Types::Strict::Integer | Types::Strict::Float).
+      Double = (Types::Strict::Integer | Types::Strict::Float).optional.
                meta(es_name: "double")
-      Float = (Types::Strict::Integer | Types::Strict::Float).
+      Float = (Types::Strict::Integer | Types::Strict::Float).optional.
               meta(type_options: TypeOptions::Numeric, es_name: "float")
 
-      HalfFloat = (Types::Strict::Integer | Types::Strict::Float).
+      HalfFloat = (Types::Strict::Integer | Types::Strict::Float).optional.
                   meta(type_options: TypeOptions::Numeric, es_name: "half_float")
 
-      ScaledFloat = (Types::Strict::Integer | Types::Strict::Float).
+      ScaledFloat = (Types::Strict::Integer | Types::Strict::Float).optional.
                     meta(type_options: TypeOptions::ScaledFloat,
                          es_name: "scaled_float")
 
       # Boolean datatype
-      Boolean = (Types::Strict::Bool | Types.Value("true") | Types.Value("false")).
+      Boolean = (Types::Strict::Bool | Types.Value("true") | Types.Value("false")).optional.
                 meta(es_name: "boolean", type_options: TypeOptions::Boolean)
 
       # IP datatype
       IP = (
         Types::Strict::String.constrained(format: Resolv::IPv4::Regex) |
         Types::Strict::String.constrained(format: Resolv::IPv6::Regex)
-      ).meta(es_name: "ip", type_options: TypeOptions::IP)
+      ).optional.meta(es_name: "ip", type_options: TypeOptions::IP)
 
       Array = lambda do |type|
         Types::Strict::Array.of(type).meta(es_name: type.meta[:es_name])
@@ -92,6 +106,7 @@ module Dry
         binary: Binary,
         keyword: Keyword,
         date: Date,
+        datetime: DateTime,
         long: Long,
         integer: Integer,
         short: Short,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-elastic_model
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Konrad Oleksiuk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct