dry-elastic_model 0.1.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22daff8f3ddd6c86ca64c773a341229917bc9930bd0897c3090fe8bc51dbd3c6
-  data.tar.gz: f6abb2425966e98eb112ada1da931831a21da6e4641de261431d8c01b1326148
+  metadata.gz: 0c47c5ef6440828b4a4831171717c9e722b08ea032b55b0c819b015b2e76c255
+  data.tar.gz: 8cf4efdf8b275b1c383653d258975e0f021b0bdcb04ebbe98eb25718e3d85c85
 SHA512:
-  metadata.gz: 943f4654fc39e200de139ed30e9afa48262b1795ef845699b18764b1c60e011d536b5c873d1202d5388d3e6b0fa036977977e0abf47a92d263639c97422579b8
-  data.tar.gz: 2d9e317a152a567a1ea583922b3e01b607b24d2b5192bf834b439613b771cb8cde90cc5bad70d73e4baab9db22c6a462271e6c5479a42e4b06b78017445cd1b6
+  metadata.gz: 7d1b30ff6ab233453824c3fb9d0760b60dfd4943d36cb175b4367659adfd1233ded6ef7e108c818966ec62c1b3bed2fe7d7a878c51cc0eb0e95127d7a8e08abd
+  data.tar.gz: f4a470ba333f261daaa902ec8b58420112759fba05e9a6fe5ef9766b2daf5e198ce3ac94bb0d502c1fee18a59169aaaf1d467e9671d9e53be494a67b405d5da1

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    dry-elastic_model (0.1.4)
+    dry-elastic_model (0.5.0)
       dry-struct (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.1)
-    dry-configurable (0.9.0)
+    dry-configurable (0.11.5)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.4, >= 0.4.7)
+      dry-equalizer (~> 0.2)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
@@ -21,20 +22,20 @@ GEM
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.5)
+    dry-logic (1.0.6)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-struct (1.1.1)
-      dry-core (~> 0.4, >= 0.4.3)
-      dry-equalizer (~> 0.2)
-      dry-types (~> 1.0)
+    dry-struct (1.3.0)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-types (~> 1.3)
       ice_nine (~> 0.11)
-    dry-types (1.2.1)
+    dry-types (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.2, >= 0.2.2)
+      dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     ice_nine (0.11.2)
@@ -77,4 +78,4 @@ DEPENDENCIES
   simplecov-lcov (~> 0)
 
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/README.md

@@ -37,6 +37,7 @@ Sample model:
 ```ruby
   class FooBar < Dry::ElasticModel::Base
     field :text_field, :text
+    field :newly_added_text_field, :text, allow_missing: true
     field :keyword_field, :keyword, index: false
     field :date_field, :date
     field :long_field, :long
@@ -58,6 +59,10 @@ This corresponds to following Elasticsearch mapping (calling `Foo.mapping.to_jso
         "type": "text",
         "index": "not_analyzed"
       },
+      "newly_added_text_field": {
+        "type": "text",
+        "index": "not_analyzed"
+      },
       "keyword_field": {
         "type": "keyword",
         "index": false

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.5.0

data/lib/dry/elastic_model/attributes.rb

@@ -4,6 +4,7 @@ module Dry
   module ElasticModel
     module Attributes
       def field(name, type, opts = {})
+        allow_missing = opts.delete(:allow_missing)
         type_definition = Types::TYPES.fetch(type.to_sym)
 
         type_options_klass = type_definition.meta[:type_options]
@@ -15,26 +16,54 @@ module Dry
                   end
 
         default_opts = type_definition.meta[:opts] || {}
-        attribute(name,
-                  type_definition.meta(opts: default_opts.merge(options.to_h)))
+        define_attribute(
+          name,
+          type_definition.meta(opts: default_opts.merge(options.to_h)),
+          allow_missing: allow_missing
+        )
       end
 
       def range(name, type, opts = {})
+        allow_missing = allow_missing
         member = Types::RANGE_TYPES.fetch(type.to_sym)
 
         type_definition = Types::Range.call(member)
 
         default_opts = type_definition.meta[:opts] || {}
-        attribute(name, type_definition.meta(opts: default_opts.merge(opts)))
+        define_attribute(
+          name,
+          type_definition.meta(opts: default_opts.merge(opts)),
+          allow_missing: opts[:allow_missing]
+        )
       end
 
       def list(name, type, opts = {})
+        allow_missing = opts.delete(:allow_missing)
         member = Types::TYPES.fetch(type.to_sym)
 
         type_definition = Types::Array.call(member)
 
         default_opts = type_definition.meta[:opts] || {}
-        attribute(name, type_definition.meta(opts: default_opts.merge(opts)))
+        define_attribute(
+          name,
+          type_definition.meta(opts: default_opts.merge(opts)),
+          allow_missing: allow_missing
+        )
+      end
+
+      private
+
+      def define_attribute(name, type_definition, allow_missing:)
+        public_send(
+          attr_definition_method(allow_missing),
+          name,
+          type_definition
+        )
+      end
+
+      def attr_definition_method(allow_missing)
+        allow_missing = false if allow_missing.nil?
+        allow_missing ? :attribute? : :attribute
       end
     end
   end

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,46 +46,46 @@ 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])
+        Types::Strict::Array.of(type).meta(es_name: type.meta[:es_name]).optional
       end
 
       Range = lambda do |type|
@@ -84,14 +98,15 @@ module Dry
                       type_options: TypeOptions::Range)
       end
 
-      ObjectType = Types::Strict::Hash.meta(es_name: "object",
-                                            type_options: TypeOptions::Object)
+      ObjectType = Types::Strict::Hash.optional.meta(es_name: "object",
+                                                     type_options: TypeOptions::Object)
 
       TYPES = {
         text: Text,
         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.5.0
 platform: ruby
 authors:
 - Konrad Oleksiuk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -168,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Create Elasticsearch models and mappings from code.