isomorfeus-i18n 1.0.0.zeta23 → 1.0.0.zeta24

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isomorfeus/i18n/init.rb +0 -1
  3. data/lib/isomorfeus/i18n/reducer.rb +9 -2
  4. data/lib/isomorfeus/i18n/version.rb +1 -1
  5. data/lib/lucid_translation/mixin.rb +6 -12
  6. metadata +12 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4e69010c5deaf30f403d170dc57dba3020da4236ba40df78950cdb16e5b89b1a
4
- data.tar.gz: 71ccc91befe2d5d699f9bac50ee3ce172c5499422697920f064907488d30b9c1
3
+ metadata.gz: 033c047c253ffa1e3f2b77126a449a9ec94b735af0ec04910564724751d5caaf
4
+ data.tar.gz: 69cbc25fa2bd25ef502e094fd275f6956fa68822fb2e86ad9623a9b101fa3531
5
5
  SHA512:
6
- metadata.gz: 5b0b0aecd626e4c435db28edfd5931d4181fe0054add4ee076af200401265ba8385334149aefb35f7ae4eccb98b64575a648b6e9939fa434d4b6eaa863099dd3
7
- data.tar.gz: '083e94aaa20be606d271c293cd124036c9ecae596e8bf1c18d4b4b91f96148b2c81da87d36c258b71d575fb673e9c139670b0ee66b8e091f537b6cf8c3626399'
6
+ metadata.gz: d3b53a62459ca6ceb39aaa3cd032615563fc55214fa4d74006b8a964f26e946f1e99a482431b4752c1e0ddc1786e6638fd6753dcb250afab4ff77e9f36f8a6c3
7
+ data.tar.gz: 9aa997a8bcc5f0e7d07560a19ec2ae452901fd160adcd46cbdfce5322af7924ef5e82d3d8af16d8e1894f5e15921ff7fba4943bf63b9102f6f2f849ecb60d1dd
data/lib/isomorfeus/i18n/init.rb CHANGED
@@ -21,7 +21,6 @@ module Isomorfeus
21
21
  else
22
22
  agent.processed = true
23
23
  if agent.response.key?(:error)
24
- `console.error(#{agent.response[:error].to_n})`
25
24
  Isomorfeus.raise_error(message: agent.response[:error])
26
25
  end
27
26
  @initializing = false
data/lib/isomorfeus/i18n/reducer.rb CHANGED
@@ -13,8 +13,15 @@ module Isomorfeus
13
13
  prev_state
14
14
  end
15
15
  when 'I18N_LOAD'
16
- result = prev_state.deep_merge(action[:data])
17
- result == prev_state ? prev_state : result
16
+ new_state = {}.merge!(prev_state)
17
+ if action.key?(:collected)
18
+ action[:collected].each do |act|
19
+ new_state.deep_merge!(act[:data])
20
+ end
21
+ else
22
+ new_state.deep_merge!(action[:data])
23
+ end
24
+ new_state
18
25
  else
19
26
  prev_state
20
27
  end
data/lib/isomorfeus/i18n/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Isomorfeus
2
2
  module I18n
3
- VERSION = '1.0.0.zeta23'
3
+ VERSION = '1.0.0.zeta24'
4
4
  end
5
5
  end
data/lib/lucid_translation/mixin.rb CHANGED
@@ -26,10 +26,9 @@ module LucidTranslation
26
26
  else
27
27
  agent.processed = true
28
28
  if agent.response.key?(:error)
29
- `console.error(#{agent.response[:error].to_n})`
30
29
  Isomorfeus.raise_error(message: agent.response[:error])
31
30
  end
32
- Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
31
+ Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
33
32
  end
34
33
  end
35
34
  end
@@ -49,10 +48,9 @@ module LucidTranslation
49
48
  else
50
49
  agent.processed = true
51
50
  if agent.response.key?(:error)
52
- `console.error(#{agent.response[:error].to_n})`
53
51
  Isomorfeus.raise_error(message: agent.response[:error])
54
52
  end
55
- Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
53
+ Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
56
54
  end
57
55
  end
58
56
  end
@@ -80,10 +78,9 @@ module LucidTranslation
80
78
  else
81
79
  agent.processed = true
82
80
  if agent.response.key?(:error)
83
- `console.error(#{agent.response[:error].to_n})`
84
81
  Isomorfeus.raise_error(message: agent.response[:error])
85
82
  end
86
- Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
83
+ Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
87
84
  end
88
85
  end
89
86
  end
@@ -103,10 +100,9 @@ module LucidTranslation
103
100
  else
104
101
  agent.processed = true
105
102
  if agent.response.key?(:error)
106
- `console.error(#{agent.response[:error].to_n})`
107
103
  Isomorfeus.raise_error(message: agent.response[:error])
108
104
  end
109
- Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
105
+ Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
110
106
  end
111
107
  end
112
108
  end
@@ -126,10 +122,9 @@ module LucidTranslation
126
122
  else
127
123
  agent.processed = true
128
124
  if agent.response.key?(:error)
129
- `console.error(#{agent.response[:error].to_n})`
130
125
  Isomorfeus.raise_error(message: agent.response[:error])
131
126
  end
132
- Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
127
+ Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
133
128
  end
134
129
  end
135
130
  end
@@ -168,10 +163,9 @@ module LucidTranslation
168
163
  else
169
164
  agent.processed = true
170
165
  if agent.response.key?(:error)
171
- `console.error(#{agent.response[:error].to_n})`
172
166
  Isomorfeus.raise_error(message: agent.response[:error])
173
167
  end
174
- Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
168
+ Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
175
169
  end
176
170
  end
177
171
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: isomorfeus-i18n
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.zeta23
4
+ version: 1.0.0.zeta24
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jan Biedermann
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-02-22 00:00:00.000000000 Z
11
+ date: 2020-02-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -100,70 +100,70 @@ dependencies:
100
100
  requirements:
101
101
  - - ">="
102
102
  - !ruby/object:Gem::Version
103
- version: 16.12.23
103
+ version: 16.13.0
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: 16.12.23
110
+ version: 16.13.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: isomorfeus-redux
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 4.0.21
117
+ version: 4.0.22
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: 4.0.21
124
+ version: 4.0.22
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: isomorfeus-transport
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - '='
130
130
  - !ruby/object:Gem::Version
131
- version: 1.0.0.zeta23
131
+ version: 1.0.0.zeta24
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - '='
137
137
  - !ruby/object:Gem::Version
138
- version: 1.0.0.zeta23
138
+ version: 1.0.0.zeta24
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: isomorfeus-data
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - '='
144
144
  - !ruby/object:Gem::Version
145
- version: 1.0.0.zeta23
145
+ version: 1.0.0.zeta24
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: 1.0.0.zeta23
152
+ version: 1.0.0.zeta24
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: 1.0.0.zeta23
159
+ version: 1.0.0.zeta24
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: 1.0.0.zeta23
166
+ version: 1.0.0.zeta24
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: opal-webpack-loader
169
169
  requirement: !ruby/object:Gem::Requirement