isomorfeus-data 2.0.5 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 455e8b083641020d3d3dfa97b34d4144087fb19c11f551c240cdf4e946f60df0
-  data.tar.gz: 20f440fa635643a147bbcfb2571b9bcb0afcef57e57977de08725ac7cf732870
+  metadata.gz: 03adcad549502d3b374fa200b4c1a90b4a1963288a40e619a170ffb5190ec870
+  data.tar.gz: 000c496d28015877c52c84934d100827dea59740cda0f78b1b6f8b6c9eea5979
 SHA512:
-  metadata.gz: 46f6c764a5d12fe8b46730ee1cc1b18d8a99a52c56fff668143abcd30a4961b55813f9bbc8840c7ca80a8bf365b8faa3f3a06a6a0d0fc802dc2f4037f2a6a406
-  data.tar.gz: e34bd37b4b16359a2cf14a863fefd327cac00568f9048c1466c6061cc922072046bca750fcd36be150fac6e7876c96671d7d5f71c4b3715610e773b37f910cc6
+  metadata.gz: bdd85f149ef46ba89524c23045fa68cc5662786dcb16f07c9a8405e567edac87e4c87f679d1286164f0e1fee62e5b76b6299506c26f9a0ad25620a43d8632c24
+  data.tar.gz: 5bcac6b623211981f5d4e5adc83ef63257d022301cad48582bd7cecd43ecbd46054622ed133c3f7f158868823a36b8e5bbfcf488a6eab7fbbf7bf1553225f268

data/lib/data_uri/uri.rb

@@ -1,8 +1,8 @@
 module URI
   class Data < Generic
-    COMPONENT = [:scheme, :opaque].freeze
-    MIME_TYPE_RE = %r{^([-\w.+]+/[-\w.+]*)}.freeze
-    MIME_PARAM_RE = /^;([-\w.+]+)=([^;,]+)/.freeze
+    COMPONENT = [:scheme, :opaque]
+    MIME_TYPE_RE = %r{^([-\w.+]+/[-\w.+]*)}
+    MIME_PARAM_RE = /^;([-\w.+]+)=([^;,]+)/
 
     attr_reader :content_type, :data
 

data/lib/data_uri.rb

@@ -1,5 +1,4 @@
 require 'uri'
 require 'base64'
 require 'stringio'
-
 require 'data_uri/uri'

data/lib/isomorfeus/data/attribute_support.rb

@@ -11,8 +11,8 @@ module Isomorfeus
             @indexed_attributes ||= {}
           end
 
-          def valid_attribute?(attr_name, attr_value)
-            Isomorfeus::Props::Validator.new(self.name, attr_name, attr_value, attribute_conditions[attr_name]).validate!
+          def valid_attribute?(attr_name, val)
+            Isomorfeus::Props::Validator.new(self.name, attr_name, val, attribute_conditions[attr_name]).validate!
           rescue
             false
           end
@@ -21,23 +21,23 @@ module Isomorfeus
             Isomorfeus::Props::ValidateHashProxy.new
           end
 
-          def _validate_attribute(attr_name, attr_val)
+          def _validate_attribute(attr_name, val)
             Isomorfeus.raise_error(message: "#{self.name}: No such attribute declared: '#{attr_name}'!") unless attribute_conditions.key?(attr_name)
-            Isomorfeus::Props::Validator.new(self.name, attr_name, attr_val, attribute_conditions[attr_name]).validate!
+            Isomorfeus::Props::Validator.new(self.name, attr_name, val, attribute_conditions[attr_name]).validated_value
           end
 
           def _validate_attributes(attrs)
-            attribute_conditions.each_key do |attr|
-              if attribute_conditions[attr].key?(:required) && attribute_conditions[attr][:required] && !attrs.key?(attr)
-                Isomorfeus.raise_error(message: "Required attribute #{attr} not given!")
+            attribute_conditions.each_key do |attr_name|
+              if attribute_conditions[attr_name].key?(:required) && attribute_conditions[attr_name][:required] && !attrs.key?(attr_name)
+                Isomorfeus.raise_error(message: "Required attribute #{attr_name} not given!")
               end
+              attrs[attr_name] = _validate_attribute(attr_name, attrs[attr_name])
             end
-            attrs.each { |attr, val| _validate_attribute(attr, val) }
           end
         end
 
-        def _validate_attribute(attr_name, value)
-          self.class._validate_attribute(attr_name, value)
+        def _validate_attribute(attr_name, val)
+          self.class._validate_attribute(attr_name, val)
         end
 
         def _validate_attributes(attrs)
@@ -55,8 +55,7 @@ module Isomorfeus
         if RUBY_ENGINE == 'opal'
           base.instance_exec do
             def attribute(name, options = {})
-              indexed = options.delete(:index)
-              indexed_attributes[name] = indexed if indexed
+              indexed_attributes[name] = options.delete(:index) if options.key?(:index)
               attribute_conditions[name] = options
 
               define_method(name) do
@@ -64,7 +63,7 @@ module Isomorfeus
               end
 
               define_method("#{name}=") do |val|
-                _validate_attribute(name, val)
+                val = _validate_attribute(name, val)
                 changed!
                 @_changed_attributes[name] = val
               end
@@ -132,8 +131,7 @@ module Isomorfeus
         else
           base.instance_exec do
             def attribute(name, options = {})
-              indexed = options.delete(:index)
-              indexed_attributes[name] = indexed if indexed
+              indexed_attributes[name] = options.delete(:index) if options.key?(:index)
               attribute_conditions[name] = options
 
               define_method(name) do
@@ -141,7 +139,7 @@ module Isomorfeus
               end
 
               define_method("#{name}=") do |val|
-                _validate_attribute(name, val)
+                val = _validate_attribute(name, val)
                 changed!
                 @_raw_attributes[name] = val
               end

data/lib/isomorfeus/data/ferret_accelerator.rb

@@ -34,17 +34,23 @@ module Isomorfeus
         @index.add_document(document)
       end
 
-      def destroy_doc(id)
-        @index.delete(id)
+      def destroy_doc(key)
+        id = get_doc_id(key)
+        @index.delete(id) if id
         true
       end
 
-      def load_doc(id)
-        @index.doc(id)&.load
+      def load_doc(key)
+        id = get_doc_id(key)
+        @index.doc(id)&.load&.to_h if id
       end
 
-      def save_doc(id, document)
-        @index.update(id, document)
+      def save_doc(key, document)
+        id = get_doc_id(key)
+        if id
+          @index.update(id, document)
+          true
+        end
       end
 
       def search_each(query, options, &block)
@@ -53,13 +59,25 @@ module Isomorfeus
 
       private
 
+      def get_doc_id(key)
+        # special characters must be escaped, characters taken from the ferret query parser documentation
+        escaped_key = key.gsub(/([\\\&\:\(\)\[\]\{\}\!\"\~\^\|\<\>\=\*\?\+\-\s])/, '\\\\\1')
+        top_docs = @index.search("key:\"#{escaped_key}\"", limit: 1)
+        id = top_docs.hits[0].doc if top_docs.total_hits == 1
+      end
+
       def index_path
         File.expand_path(File.join(Isomorfeus.data_documents_path, @doc_class_name_u))
       end
 
       def open_index
         FileUtils.mkdir_p(Isomorfeus.data_documents_path) unless Dir.exist?(Isomorfeus.data_documents_path)
-        @index = Isomorfeus::Ferret::Index::Index.new(path: index_path, id_field: :key)
+        field_infos = Isomorfeus::Ferret::Index::FieldInfos.new(store: :yes, index: :yes, term_vector: :with_positions_offsets)
+        @index = Isomorfeus::Ferret::Index::Index.new(path: index_path, key: :key, auto_flush: true, lock_retry_time: 5)
+        @index.field_infos.add_field(:key, store: :yes, index: :yes, term_vector: :no) unless @index.field_infos[:key]
+        @doc_class.field_options.each do |field, options|
+          @index.field_infos.add_field(field, options) unless @index.field_infos[field]
+        end
       end
     end
   end

data/lib/isomorfeus/data/field_support.rb

@@ -7,9 +7,39 @@ module Isomorfeus
             @field_options ||= {}
           end
 
-          def valid_field?(field_name, field_value)
-            field_options.key?(field_name)
+          def field_conditions
+            @field_conditions ||= {}
           end
+
+          def valid_field?(field_name, val)
+            Isomorfeus::Props::Validator.new(self.name, field_name, val, field_conditions[field_name]).validate!
+          end
+
+          def validate
+            Isomorfeus::Props::ValidateHashProxy.new
+          end
+
+          def _validate_field(field_name, val)
+            Isomorfeus.raise_error(message: "#{self.name}: No such field declared: '#{field_name}'!") unless field_conditions.key?(field_name)
+            Isomorfeus::Props::Validator.new(self.name, field_name, val, field_conditions[field_name]).validated_value
+          end
+
+          def _validate_fields(fields)
+            field_conditions.each_key do |field_name|
+              if field_conditions[field_name].key?(:required) && field_conditions[field_name][:required] && !fields.key?(field_name)
+                Isomorfeus.raise_error(message: "Required field #{field_name} not given!")
+              end
+              fields[field_name] = _validate_field(field_name, fields[field_name])
+            end
+          end
+        end
+
+        def _validate_field(field_name, val)
+          self.class._validate_field(field_name, val)
+        end
+
+        def _validate_fields(fields)
+          self.class._validate_fields(fields)
         end
 
         def exclude_fields(*flds)
@@ -22,21 +52,52 @@ module Isomorfeus
 
         if RUBY_ENGINE == 'opal'
           base.instance_exec do
-            def field(name, options = nil)
-              field_options[name] = options
+            def field(name, options = {})
+              field_options[name] = {}
+              field_options[name][:default_boost] = options.delete(:default_boost) if options.key?(:default_boost)
+              field_options[name][:default_boost] = options.delete(:default_boost) if options.key?(:boost)
+              field_options[name][:index] = options.delete(:index) if options.key?(:index)
+              field_options[name][:store] = options.delete(:store) if options.key?(:store)
+              field_options[name][:term_vector] = options.delete(:term_vector) if options.key?(:term_vector)
+              field_conditions[name] = options
 
               define_method(name) do
                 _get_field(name)
               end
 
               define_method("#{name}=") do |val|
-                val = val.to_s unless val.class == String
+                val = _validate_field(name, val)
                 changed!
                 @_changed_fields[name] = val
               end
             end
           end
 
+          def validate_fields_function
+            %x{
+              if (typeof self.validate_fields_function === 'undefined') {
+                self.validate_fields_function = function(fields_object) {
+                  try { self.$_validate_fields(Opal.Hash.$new(fields_object)) }
+                  catch (e) { return e.message; }
+                }
+              }
+              return self.validate_fields_function;
+            }
+          end
+
+          def validate_field_function(field_name)
+            function_name = "validate_field_#{field_name}_function"
+            %x{
+              if (typeof self[function_name] === 'undefined') {
+                self[function_name] = function(value) {
+                  try { self.$_validate_field(field_name, value); }
+                  catch (e) { return e.message; }
+                }
+              }
+              return self[function_name];
+            }
+          end
+
           def _get_field(name)
             return @_changed_fields[name] if @_changed_fields.key?(name)
             path = @_store_path + [name]
@@ -71,14 +132,20 @@ module Isomorfeus
         else
           base.instance_exec do
             def field(name, options = {})
-              field_options[name] = options
+              field_options[name] = {}
+              field_options[name][:default_boost] = options.delete(:default_boost) if options.key?(:default_boost)
+              field_options[name][:default_boost] = options.delete(:default_boost) if options.key?(:boost)
+              field_options[name][:index] = options.delete(:index) if options.key?(:index)
+              field_options[name][:store] = options.delete(:store) if options.key?(:store)
+              field_options[name][:term_vector] = options.delete(:term_vector) if options.key?(:term_vector)
+              field_conditions[name] = options
 
               define_method(name) do
                 @_raw_fields[name]
               end
 
               define_method("#{name}=") do |val|
-                val = val.to_s unless val.class == String
+                val = _validate_field(name, val)
                 changed!
                 @_raw_fields[name] = val
               end

data/lib/isomorfeus/data/generic_class_api.rb

@@ -23,13 +23,13 @@ module Isomorfeus
         end
 
         def load(key:)
-          instance = self.new(key: key)
+          instance = self.new(key: key, _loading: true)
           promise_load(key: key, instance: instance) unless instance.loaded?
           instance
         end
 
         def promise_load(key:, instance: nil)
-          instance = self.new(key: key) unless instance
+          instance = self.new(key: key, _loading: true) unless instance
           if instance.loaded?
             Promise.new.resolve(instance)
           else
@@ -38,13 +38,13 @@ module Isomorfeus
         end
 
         def load!(key:)
-          instance = self.new(key: key)
+          instance = self.new(key: key, _loading: true)
           promise_load!(key: key, instance: instance) unless instance.loaded?
           instance
         end
 
         def promise_load!(key:, instance: nil)
-          instance = self.new(key: key) unless instance
+          instance = self.new(key: key, _loading: true) unless instance
           Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :load, key: key).then do |agent|
             if agent.processed
               agent.result
@@ -70,13 +70,9 @@ module Isomorfeus
           !!instance_exec(key: key, &@_destroy_block)
         end
 
-        def promise_load(key:)
-          instance = self.load(key: key)
-          result_promise = Promise.new
-          result_promise.resolve(instance)
-          result_promise
+        def promise_destroy(key:)
+          Promise.new.resolve(destroy(key: key))
         end
-        alias promise_load! promise_load
 
         def load(key:)
           data = instance_exec(key: key, &@_load_block)
@@ -86,6 +82,14 @@ module Isomorfeus
         end
         alias load! load
 
+        def promise_load(key:)
+          instance = self.load(key: key)
+          result_promise = Promise.new
+          result_promise.resolve(instance)
+          result_promise
+        end
+        alias promise_load! promise_load
+
         def execute_create(&block)
           @_create_block = block
         end
@@ -115,14 +119,6 @@ module Isomorfeus
         new(key: key, **things).promise_create
       end
 
-      def save(instance:)
-        instance.save
-      end
-
-      def promise_save(instance:)
-        instance.promise_save
-      end
-
       def current_user
         Isomorfeus.current_user
       end

data/lib/isomorfeus/data/generic_instance_api.rb

@@ -66,16 +66,21 @@ module Isomorfeus
         end
 
         def promise_destroy
-          self.class.promise_destroy(@key)
+          self.class.promise_destroy(key: @key)
         end
 
         def reload
-          self.class.promise_load!(@key, self)
+          self.class.promise_load!(key: @key, instance: self)
           self
         end
 
         def promise_reload
-          self.class.promise_load!(@key, self)
+          self.class.promise_load!(key: @key, instance: self)
+        end
+
+        def save
+          promise_save
+          self
         end
 
         def promise_save
@@ -122,6 +127,20 @@ module Isomorfeus
           promise.resolve(create)
         end
 
+        def destroy
+          self.class.destroy(key: @key)
+        end
+
+        def promise_destroy
+          self.class.promise_destroy(key: @key)
+        end
+
+        # reload must be implemented by mixin
+
+        def promise_reload
+          Promise.new.resolve(reload)
+        end
+
         def save
           previous_key = self.key
           instance = instance_exec(&self.class.instance_variable_get(:@_save_block))

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.0.5'
+    VERSION = '2.0.9'
   end
 end

data/lib/isomorfeus-data.rb

@@ -8,7 +8,6 @@ require 'isomorfeus/data/attribute_support'
 require 'isomorfeus/data/field_support'
 require 'isomorfeus/data/generic_class_api'
 require 'isomorfeus/data/generic_instance_api'
-require 'isomorfeus/data/element_validator'
 
 if RUBY_ENGINE == 'opal'
   require 'isomorfeus/data/reducer'

data/lib/isomorfeus_data/lucid_document/mixin.rb

@@ -5,6 +5,12 @@ module LucidDocument
       base.extend(Isomorfeus::Data::GenericClassApi)
       base.include(Isomorfeus::Data::GenericInstanceApi)
 
+      base.instance_exec do
+        def escape_string(s)
+          s.gsub(/([\\\&\:\(\)\[\]\{\}\!\"\~\^\|\<\>\=\*\?\+\-\s])/, '\\\\\1')
+        end
+      end
+
       def [](name)
         send(name)
       end
@@ -26,7 +32,7 @@ module LucidDocument
       end
 
       if RUBY_ENGINE == 'opal'
-        def initialize(key: nil, revision: nil, fields: nil)
+        def initialize(key: nil, revision: nil, fields: nil, _loading: false)
           @key = key.nil? ? SecureRandom.uuid : key.to_s
           @class_name = self.class.name
           @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
@@ -34,19 +40,25 @@ module LucidDocument
           @_revision = revision ? revision : Redux.fetch_by_path(:data_state, :revision, @class_name, @key)
           @_changed = false
           loaded = loaded?
-          if fields
-            if loaded
-              raw_fields = Redux.fetch_by_path(*@_store_path)
-              if `raw_fields === null`
-                @_changed_fields = !fields ? {} : fields
-              elsif raw_fields && !fields.nil? && ::Hash.new(raw_fields) != fields
+          if loaded
+            raw_fields = Redux.fetch_by_path(*@_store_path)
+            if `raw_fields === null`
+              if fields
+                _validate_fields(fields)
                 @_changed_fields = fields
+              else
+                @_changed_fields = {}
               end
-            else
+            elsif raw_fields && fields && ::Hash.new(raw_fields) != fields
+              _validate_fields(fields)
               @_changed_fields = fields
+            else
+              @_changed_fields = {}
             end
           else
-            @_changed_fields = {}
+            fields = {} unless fields
+            _validate_fields(fields) unless _loading
+            @_changed_fields = fields
           end
         end
 
@@ -89,15 +101,24 @@ module LucidDocument
           def search(query, options = {})
             top_docs = []
             self.ferret_accelerator.search_each(query, options) do |id|
-              doc = self.ferret_accelerator.load_doc(id)
-              top_docs << self.new(key: doc[:key], fields: doc) if doc
+              doc = self.ferret_accelerator.index.doc(id)&.load
+              if doc
+                key = doc.delete(:key)
+                top_docs << self.new(key: key, fields: doc)
+              end
             end
             top_docs
           end
 
           execute_create do
-            doc = self.fields
-            doc[:key] = self.key.nil? ? SecureRandom.uuid : self.key
+            doc = self.fields.dup
+            if self.key.nil?
+              u = SecureRandom.uuid
+              doc[:key] = u
+              self.key = u
+            else
+              doc[:key] = self.key
+            end
             self.class.ferret_accelerator.create_doc(doc)
             self
           end
@@ -115,9 +136,11 @@ module LucidDocument
           end
 
           execute_save do
-            doc = self.fields
+            doc = self.fields.dup
             if self.key.nil?
-              doc[:key] = SecureRandom.uuid
+              u = SecureRandom.uuid
+              doc[:key] = u
+              self.key = u
               self.class.ferret_accelerator.create_doc(doc)
             else
               doc[:key] = self.key
@@ -134,6 +157,7 @@ module LucidDocument
           @_revision = revision
           @_changed = false
           fields = {} unless fields
+          _validate_fields(fields)
           @_raw_fields = fields
         end
 
@@ -144,6 +168,13 @@ module LucidDocument
         def each(&block)
           @_raw_fields.each(&block)
         end
+
+        def reload
+          new_instance = self.class.load(key: @key)
+          @_raw_fields = new_instance.fields
+          _unchange!
+          self
+        end
       end # RUBY_ENGINE
     end
   end

data/lib/isomorfeus_data/lucid_file/mixin.rb

@@ -92,7 +92,7 @@ module LucidFile
           end
         end
 
-        def initialize(key: nil, content_type: nil, data: nil, data_uri: nil, revision: nil)
+        def initialize(key: nil, content_type: nil, data: nil, data_uri: nil, revision: nil, _loading: false)
           @key = key.nil? ? SecureRandom.uuid : key.to_s
           @class_name = self.class.name
           @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')

data/lib/isomorfeus_data/lucid_object/mixin.rb

@@ -5,10 +5,6 @@ module LucidObject
       base.extend(Isomorfeus::Data::GenericClassApi)
       base.include(Isomorfeus::Data::GenericInstanceApi)
 
-      def changed!
-        @_changed = true
-      end
-
       def [](name)
         send(name)
       end
@@ -17,6 +13,10 @@ module LucidObject
         send("#{name}=".to_sym, val)
       end
 
+      def changed!
+        @_changed = true
+      end
+
       def to_transport
         hash = { 'attributes' => _get_selected_attributes }
         hash['revision'] = revision if revision
@@ -26,7 +26,7 @@ module LucidObject
       end
 
       if RUBY_ENGINE == 'opal'
-        def initialize(key: nil, revision: nil, attributes: nil)
+        def initialize(key: nil, revision: nil, attributes: nil, _loading: false)
           @key = key.nil? ? SecureRandom.uuid : key.to_s
           @class_name = self.class.name
           @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
@@ -34,20 +34,25 @@ module LucidObject
           @_revision = revision ? revision : Redux.fetch_by_path(:data_state, :revision, @class_name, @key)
           @_changed = false
           loaded = loaded?
-          if attributes
-            _validate_attributes(attributes)
-            if loaded
-              raw_attributes = Redux.fetch_by_path(*@_store_path)
-              if `raw_attributes === null`
-                @_changed_attributes = !attributes ? {} : attributes
-              elsif raw_attributes && !attributes.nil? && ::Hash.new(raw_attributes) != attributes
+          if loaded
+            raw_attributes = Redux.fetch_by_path(*@_store_path)
+            if `raw_attributes === null`
+              if attributes
+                _validate_attributes(attributes)
                 @_changed_attributes = attributes
+              else
+                @_changed_attributes = {}
               end
-            else
+            elsif raw_attributes && attributes && ::Hash.new(raw_attributes) != attributes
+              _validate_attributes(attributes)
               @_changed_attributes = attributes
+            else
+              @_changed_attributes = {}
             end
           else
-            @_changed_attributes = {}
+            attributes = {} unless attributes
+            _validate_attributes(attributes) unless _loading
+            @_changed_attributes = attributes
           end
         end
 
@@ -210,6 +215,13 @@ module LucidObject
         def each(&block)
           @_raw_attributes.each(&block)
         end
+
+        def reload
+          new_instance = self.class.load(key: @key)
+          @_raw_attributes = new_instance.attributes
+          _unchange!
+          self
+        end
       end # RUBY_ENGINE
     end
   end

data/lib/isomorfeus_data/lucid_query/mixin.rb

@@ -5,20 +5,23 @@ module LucidQuery
 
       if RUBY_ENGINE == 'opal'
         base.instance_exec do
-          def execute(**props)
-            props[:query_result_instance] = LucidQueryResult.new
+          def execute(key: nil, **props)
+            props[:query_result_instance] = LucidQueryResult.new(key: key)
             promise_execute(props) unless props[:query_result_instance].loaded?
             props[:query_result_instance]
           end
 
-          def promise_execute(**props)
+          def promise_execute(key: nil, **props)
             query_result_instance = props.delete(:query_result_instance)
-            query_result_instance = LucidQueryResult.new unless query_result_instance
+            query_result_instance = LucidQueryResult.new(key: key) unless query_result_instance
+
+            return Promise.new.resolve(query_result_instance) if query_result_instance.loaded?
+
             props.each_key do |prop_name|
               Isomorfeus.raise_error(message: "#{self.to_s} No such query prop declared: '#{prop_name}'!") unless declared_props.key?(prop_name)
             end
             props = validated_props(props)
-            props[:query_result_instance_key] = query_result_instance.key
+            props[:key] = query_result_instance.key
             Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :query, props).then do |agent|
               if agent.processed
                 agent.result
@@ -50,10 +53,9 @@ module LucidQuery
           end
 
           def execute(**props)
-            query_result_instance_key = props.delete(:query_result_instance_key)
-            query_result = LucidQueryResult.new(key: query_result_instance_key)
-            query_result.result_set = self.new(**props).instance_exec(&@_query_block)
-            query_result
+            key = props.delete(:key)
+            result_set = self.new(**props).instance_exec(&@_query_block)
+            LucidQueryResult.new(key: key, result_set: result_set)
           end
 
           def execute_query(&block)

data/lib/isomorfeus_data/lucid_query_result.rb

@@ -14,7 +14,7 @@ class LucidQueryResult
   end
 
   if RUBY_ENGINE == 'opal'
-    def initialize(key: nil, result_set: {})
+    def initialize(key: nil, result_set: nil)
       @class_name = 'LucidQueryResult'
       @key = key ? key.to_s : self.object_id.to_s
       @result_set = result_set
@@ -39,17 +39,13 @@ class LucidQueryResult
     end
     alias has_key? key?
 
-    def result_set=(r)
-      @result_set = r
-    end
-
     def method_missing(accessor_name, *args, &block)
       sid_or_array = if @result_set
-              @result_set[accessor_name]
-            else
-              stored_results = Redux.fetch_by_path(:data_state, @class_name, @key)
-              stored_results.JS[accessor_name] if stored_results
-            end
+                       @result_set[accessor_name]
+                     else
+                       stored_results = Redux.fetch_by_path(:data_state, @class_name, @key)
+                       stored_results.JS[accessor_name] if stored_results
+                     end
       Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless sid_or_array
       if stored_results.JS['_is_array_']
         sid_or_array.map { |sid| Isomorfeus.instance_from_sid(sid) }
@@ -58,7 +54,7 @@ class LucidQueryResult
       end
     end
   else
-    def initialize(key: nil, result_set: {})
+    def initialize(key: nil, result_set: nil)
       @class_name = 'LucidQueryResult'
       @key = key ? key.to_s : self.object_id.to_s
       @result_set = result_set.nil? ? {} : result_set
@@ -74,10 +70,6 @@ class LucidQueryResult
     end
     alias has_key? key?
 
-    def result_set=(r)
-      @result_set = r
-    end
-
     def method_missing(accessor_name, *args, &block)
       Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless @result_set.key?(accessor_name)
       @result_set[accessor_name]

data/opal/uri/generic.rb

@@ -12,7 +12,7 @@ module URI
       :path, :opaque,
       :query,
       :fragment
-    ].freeze
+    ]
 
     def initialize(scheme,
                    userinfo, host, port, registry,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.9
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.5
+        version: 0.14.6
 - !ruby/object:Gem::Dependency
   name: isomorfeus-ferret
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.11
+        version: 10.6.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.11
+        version: 10.6.14
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,6 @@ files:
 - lib/isomorfeus-data.rb
 - lib/isomorfeus/data/attribute_support.rb
 - lib/isomorfeus/data/config.rb
-- lib/isomorfeus/data/element_validator.rb
 - lib/isomorfeus/data/ferret_accelerator.rb
 - lib/isomorfeus/data/field_support.rb
 - lib/isomorfeus/data/generic_class_api.rb

data/lib/isomorfeus/data/element_validator.rb

@@ -1,147 +0,0 @@
-module Isomorfeus
-  module Data
-    class ElementValidator
-      def initialize(source_class, element, options)
-        @c = source_class
-        @e = element
-        @o = options
-      end
-
-      def validate!
-        ensured = ensure!
-        unless ensured
-          cast!
-          type!
-        end
-        run_checks!
-        true
-      end
-
-      private
-
-      # basic tests
-
-      def cast!
-        if @o.key?(:cast)
-          begin
-            @e = case @o[:class]
-                 when Integer then @e.to_i
-                 when String then @e.to_s
-                 when Float then @e.to_f
-                 when Array then @e.to_a
-                 when Hash then @e.to_h
-                 end
-            @e = !!@e if @o[:type] == :boolean
-          rescue
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} cast failed") unless @e.class == @o[:class]
-          end
-        end
-      end
-
-      def ensure!
-        if @o.key?(:ensure)
-          @e = @o[:ensure] unless @e
-          true
-        elsif @o.key?(:ensure_block)
-          @e = @o[:ensure_block].call(@e)
-          true
-        else
-          false
-        end
-      end
-
-      def type!
-        return if @o[:allow_nil] && @e.nil?
-        if @o.key?(:class)
-          Isomorfeus.raise_error(message: "#{@c}: #{@p} class not #{@o[:class]}") unless @e.class == @o[:class]
-        elsif @o.key?(:is_a)
-          Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a #{@o[:is_a]}") unless @e.is_a?(@o[:is_a])
-        elsif @o.key?(:type)
-          case @o[:type]
-          when :boolean
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a boolean") unless @e.class == TrueClass || @e.class == FalseClass
-          else
-            c_string_sub_types
-          end
-        end
-      end
-
-      # all other checks
-
-      def run_checks!
-        if @o.key?(:validate)
-          @o[:validate].each do |m, l|
-            send('c_' + m, l)
-          end
-        end
-        @o[:validate_block].call(@e) if @o.key?(:validate_block)
-      end
-
-      # specific validations
-      def c_gt(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} not greater than #{v}!") unless @e > v
-      end
-
-      def c_lt(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} not less than #{v}!") unless @e < v
-      end
-
-      def c_keys(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} keys dont fit!") unless @e.keys.sort == v.sort
-      end
-
-      def c_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} length/size is not #{v}") unless @e.size == v
-      end
-
-      def c_matches(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} does not match #{v}") unless v.match?(@e)
-      end
-
-      def c_max(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is larger than #{v}") unless @e <= v
-      end
-
-      def c_min(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is smaller than #{v}") unless @e >= v
-      end
-
-      def c_max_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is larger than #{v}") unless @e.size <= v
-      end
-
-      def c_min_size(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is smaller than #{v}") unless @e.size >= v
-      end
-
-      def c_direction(v)
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is positive") if v == :negative && @e >= 0
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} is negative") if v == :positive && @e < 0
-      end
-
-      def c_test
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} test condition check failed") unless @o[:test].call(@e)
-      end
-
-      def c_string_sub_types
-        Isomorfeus.raise_error(message: "#{@c}: #{@p} must be a String") unless @e.class == String
-        case @o[:type]
-        when :email
-          Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid email address") unless @e.match?(/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/)
-        when :uri
-          if RUBY_ENGINE == 'opal'
-            %x{
-              try {
-                new URL(#@e);
-              } catch {
-                #{Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri")}
-              }
-            }
-          else
-            Isomorfeus.raise_error(message: "#{@c}: #{@p} is not a valid uri") unless @e.match?(/\A#{URI.regexp}\z/)
-          end
-        end
-      end
-    end
-  end
-end