isomorfeus-data 2.0.7 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d991a34b0743cc8723b790c57b0f97f1eabce527a2c61a189a8b05a5ab1c01d
-  data.tar.gz: 6c163cb1c1de3f0b8f40c7a4c8feda23a16f99a91cba0167be55c1f1d181546a
+  metadata.gz: e20dfbc0fffcb6a9dae5dde4a51dc15efe3cee6853e7c06ec0a44832479c3f3b
+  data.tar.gz: 82f45e897f6afc83cbec00bbd0531ce9ebf86ae2bf54d4c1ebf4ededb857358e
 SHA512:
-  metadata.gz: d68c4467cf2cfdccd6676b03d7f1fd60c850900fb4f44cb926cb69e7151ad30a444b914a903e42bceca0501a805ea8275a2656f36bb4fe3fffdd84e618d90bc4
-  data.tar.gz: 4003de4bd7f69841d1ab9b93c17a6472df9d72698bae42c1aca5ff2b219f2360d22a96f388d97e29749f378e75ac550a226ddb472e9fec19e653418d1cbf5edf
+  metadata.gz: 72462528f224761d6d4a54f8d1bb54e5943819b5d70469a50abb494d887834292af15408bd9c0f69ce207434f546c585c1ab53031f6b378ec4344170b2798cab
+  data.tar.gz: 5374484bc35170c9e15c73cbfa9af3c13cda1be7803390ae9763b85ce2e6c6f901f71b165345c36076ee27e0f792e9d9dfb798432f0f396a1fda02a9178be97a

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/isomorfeus/data/config.rb

@@ -1,12 +1,12 @@
 module Isomorfeus
   # available settings
   class << self
-    def instance_from_sid(sid)
-      data_class = cached_data_class(sid[0])
-      data_class.new(key: sid[1])
-    end
-
     if RUBY_ENGINE == 'opal'
+      def instance_from_sid(sid)
+        data_class = cached_data_class(sid[0])
+        data_class.new(key: sid[1], _loading: true)
+      end
+
       def cached_data_classes
         @cached_data_classes ||= `{}`
       end
@@ -17,6 +17,11 @@ module Isomorfeus
         cached_data_classes.JS[class_name] = "::#{class_name}".constantize
       end
     else
+      def instance_from_sid(sid)
+        data_class = cached_data_class(sid[0])
+        data_class.new(key: sid[1])
+      end
+
       def cached_data_classes
         @cached_data_classes ||= {}
       end

data/lib/isomorfeus/data/generic_class_api.rb

@@ -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.7'
+    VERSION = '2.0.11'
   end
 end

data/lib/isomorfeus_data/lucid_document/mixin.rb

@@ -168,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_object/mixin.rb

@@ -215,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, _loading: false)
       @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.7
+  version: 2.0.11
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-01-31 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.6
+        version: 0.14.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.14.7
 - !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.13
+        version: 10.6.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.13
+        version: 10.6.23
 - !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.7
+        version: 2.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement