isomorfeus-data 2.0.8 → 2.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isomorfeus/data/config.rb +10 -5
- data/lib/isomorfeus/data/hamster_storage_expander.rb +6 -0
- data/lib/isomorfeus/data/version.rb +1 -1
- data/lib/isomorfeus_data/lucid_object/mixin.rb +12 -6
- data/lib/isomorfeus_data/lucid_query/mixin.rb +11 -9
- data/lib/isomorfeus_data/lucid_query_result.rb +7 -15
- metadata +12 -12
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 627f9bbd4631a09f7c9a0c676893c89d958967e543d0476f2292793be7826da9
|
4
|
+
data.tar.gz: d91708a7491235b4cc2ba82c3c46b12cdc79b1cda604956c3998dd1e1caf0aa7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a03aa57958ad41dbec1376a805c4546cb6fae7a2a01c8d89e42f835dfbb6e073a37471082f9e5327653e243a27689ed5821de6df161f939949f59a9d300674d5
|
7
|
+
data.tar.gz: 253455c09d2e576652421ee756a50e1d650a78f4a3e60a85829edb5ac7839775dfb4b68f5d424b15878859a4d16a94b8b3de7d5e61ad9ac8683a77771002ef2b
|
@@ -1,12 +1,12 @@
|
|
1
1
|
module Isomorfeus
|
2
2
|
# available settings
|
3
3
|
class << self
|
4
|
-
def instance_from_sid(sid)
|
5
|
-
data_class = cached_data_class(sid[0])
|
6
|
-
data_class.new(key: sid[1])
|
7
|
-
end
|
8
|
-
|
9
4
|
if RUBY_ENGINE == 'opal'
|
5
|
+
def instance_from_sid(sid)
|
6
|
+
data_class = cached_data_class(sid[0])
|
7
|
+
data_class.new(key: sid[1], _loading: true)
|
8
|
+
end
|
9
|
+
|
10
10
|
def cached_data_classes
|
11
11
|
@cached_data_classes ||= `{}`
|
12
12
|
end
|
@@ -17,6 +17,11 @@ module Isomorfeus
|
|
17
17
|
cached_data_classes.JS[class_name] = "::#{class_name}".constantize
|
18
18
|
end
|
19
19
|
else
|
20
|
+
def instance_from_sid(sid)
|
21
|
+
data_class = cached_data_class(sid[0])
|
22
|
+
data_class.new(key: sid[1])
|
23
|
+
end
|
24
|
+
|
20
25
|
def cached_data_classes
|
21
26
|
@cached_data_classes ||= {}
|
22
27
|
end
|
@@ -77,6 +77,12 @@ module Isomorfeus
|
|
77
77
|
@index_db.put(key, val)
|
78
78
|
end
|
79
79
|
|
80
|
+
def each(&block)
|
81
|
+
@db.each do |key, obj|
|
82
|
+
block.call(Isomorfeus::Hamster::Marshal.unserialize(obj))
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
80
86
|
def search(val_key, &block)
|
81
87
|
@index_db.each_value(val_key, &block)
|
82
88
|
end
|
@@ -121,14 +121,20 @@ module LucidObject
|
|
121
121
|
end
|
122
122
|
end
|
123
123
|
else
|
124
|
-
|
125
|
-
|
126
|
-
self.hamster_storage_expander.search(":[:#{val}:]:") do |sid_s_attr|
|
127
|
-
if accept_all_attr || sid_s_attr.end_with?(attr_s)
|
128
|
-
sid_s = sid_s_attr.split(':|:[')[0]
|
129
|
-
obj = self.load(key: sid_s)
|
124
|
+
if val == '*'
|
125
|
+
self.hamster_storage_expander.each do |obj|
|
130
126
|
objs << obj if obj
|
131
127
|
end
|
128
|
+
else
|
129
|
+
attr_s = ":[#{attr}]"
|
130
|
+
accept_all_attr = attr_s == ":[*]" ? true : false
|
131
|
+
self.hamster_storage_expander.search(":[:#{val}:]:") do |sid_s_attr|
|
132
|
+
if accept_all_attr || sid_s_attr.end_with?(attr_s)
|
133
|
+
sid_s = sid_s_attr.split(':|:[')[0]
|
134
|
+
obj = self.load(key: sid_s)
|
135
|
+
objs << obj if obj
|
136
|
+
end
|
137
|
+
end
|
132
138
|
end
|
133
139
|
end
|
134
140
|
objs
|
@@ -5,20 +5,23 @@ module LucidQuery
|
|
5
5
|
|
6
6
|
if RUBY_ENGINE == 'opal'
|
7
7
|
base.instance_exec do
|
8
|
-
def execute(**props)
|
9
|
-
props[:query_result_instance] = LucidQueryResult.new
|
8
|
+
def execute(key: nil, **props)
|
9
|
+
props[:query_result_instance] = LucidQueryResult.new(key: key)
|
10
10
|
promise_execute(props) unless props[:query_result_instance].loaded?
|
11
11
|
props[:query_result_instance]
|
12
12
|
end
|
13
13
|
|
14
|
-
def promise_execute(**props)
|
14
|
+
def promise_execute(key: nil, **props)
|
15
15
|
query_result_instance = props.delete(:query_result_instance)
|
16
|
-
query_result_instance = LucidQueryResult.new unless query_result_instance
|
16
|
+
query_result_instance = LucidQueryResult.new(key: key) unless query_result_instance
|
17
|
+
|
18
|
+
return Promise.new.resolve(query_result_instance) if query_result_instance.loaded?
|
19
|
+
|
17
20
|
props.each_key do |prop_name|
|
18
21
|
Isomorfeus.raise_error(message: "#{self.to_s} No such query prop declared: '#{prop_name}'!") unless declared_props.key?(prop_name)
|
19
22
|
end
|
20
23
|
props = validated_props(props)
|
21
|
-
props[:
|
24
|
+
props[:key] = query_result_instance.key
|
22
25
|
Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :query, props).then do |agent|
|
23
26
|
if agent.processed
|
24
27
|
agent.result
|
@@ -50,10 +53,9 @@ module LucidQuery
|
|
50
53
|
end
|
51
54
|
|
52
55
|
def execute(**props)
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
query_result
|
56
|
+
key = props.delete(:key)
|
57
|
+
result_set = self.new(**props).instance_exec(&@_query_block)
|
58
|
+
LucidQueryResult.new(key: key, result_set: result_set)
|
57
59
|
end
|
58
60
|
|
59
61
|
def execute_query(&block)
|
@@ -14,7 +14,7 @@ class LucidQueryResult
|
|
14
14
|
end
|
15
15
|
|
16
16
|
if RUBY_ENGINE == 'opal'
|
17
|
-
def initialize(key: nil, result_set:
|
17
|
+
def initialize(key: nil, result_set: nil, _loading: false)
|
18
18
|
@class_name = 'LucidQueryResult'
|
19
19
|
@key = key ? key.to_s : self.object_id.to_s
|
20
20
|
@result_set = result_set
|
@@ -39,17 +39,13 @@ class LucidQueryResult
|
|
39
39
|
end
|
40
40
|
alias has_key? key?
|
41
41
|
|
42
|
-
def result_set=(r)
|
43
|
-
@result_set = r
|
44
|
-
end
|
45
|
-
|
46
42
|
def method_missing(accessor_name, *args, &block)
|
47
43
|
sid_or_array = if @result_set
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
44
|
+
@result_set[accessor_name]
|
45
|
+
else
|
46
|
+
stored_results = Redux.fetch_by_path(:data_state, @class_name, @key)
|
47
|
+
stored_results.JS[accessor_name] if stored_results
|
48
|
+
end
|
53
49
|
Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless sid_or_array
|
54
50
|
if stored_results.JS['_is_array_']
|
55
51
|
sid_or_array.map { |sid| Isomorfeus.instance_from_sid(sid) }
|
@@ -58,7 +54,7 @@ class LucidQueryResult
|
|
58
54
|
end
|
59
55
|
end
|
60
56
|
else
|
61
|
-
def initialize(key: nil, result_set:
|
57
|
+
def initialize(key: nil, result_set: nil)
|
62
58
|
@class_name = 'LucidQueryResult'
|
63
59
|
@key = key ? key.to_s : self.object_id.to_s
|
64
60
|
@result_set = result_set.nil? ? {} : result_set
|
@@ -74,10 +70,6 @@ class LucidQueryResult
|
|
74
70
|
end
|
75
71
|
alias has_key? key?
|
76
72
|
|
77
|
-
def result_set=(r)
|
78
|
-
@result_set = r
|
79
|
-
end
|
80
|
-
|
81
73
|
def method_missing(accessor_name, *args, &block)
|
82
74
|
Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless @result_set.key?(accessor_name)
|
83
75
|
@result_set[accessor_name]
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: isomorfeus-data
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jan Biedermann
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-01
|
11
|
+
date: 2022-02-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -72,14 +72,14 @@ dependencies:
|
|
72
72
|
requirements:
|
73
73
|
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: 0.14.
|
75
|
+
version: 0.14.7
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: 0.14.
|
82
|
+
version: 0.14.7
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: isomorfeus-ferret
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
@@ -100,28 +100,28 @@ dependencies:
|
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
102
|
- !ruby/object:Gem::Version
|
103
|
-
version: 0.6.
|
103
|
+
version: 0.6.2
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
108
|
- - "~>"
|
109
109
|
- !ruby/object:Gem::Version
|
110
|
-
version: 0.6.
|
110
|
+
version: 0.6.2
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: isomorfeus-preact
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
115
|
- - "~>"
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version: 10.6.
|
117
|
+
version: 10.6.23
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
122
|
- - "~>"
|
123
123
|
- !ruby/object:Gem::Version
|
124
|
-
version: 10.6.
|
124
|
+
version: 10.6.23
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: isomorfeus-redux
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
@@ -142,28 +142,28 @@ dependencies:
|
|
142
142
|
requirements:
|
143
143
|
- - '='
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version: 2.0.
|
145
|
+
version: 2.0.12
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - '='
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: 2.0.
|
152
|
+
version: 2.0.12
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: isomorfeus
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - '='
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: 2.0.
|
159
|
+
version: 2.0.12
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
164
|
- - '='
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: 2.0.
|
166
|
+
version: 2.0.12
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: rake
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|