storyblok 3.0.0 → 3.0.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5b52ba5dae9347e6869eff8ae51d53d3b569eef875132b569bcfd8c88c648650
4
- data.tar.gz: b15b55e78b254420e70016a9258e4c31f9fcd855a97050ae64972b9ce16aeeeb
3
+ metadata.gz: a0a390c17a7c90bad28b7a799a7f151486d55d38977a98257cf67a1cd539e9dd
4
+ data.tar.gz: 54f9aaad47ad4d435cd40292fc969e9250c5f934c278475880f83a077e49b7cc
5
5
  SHA512:
6
- metadata.gz: 5265d40c02b920d73d783306810c0dffd1498574b607dd2af7ac658895efbf428f2812b04abdf56ca0e5107a050483f55f98e6c48a371da037bfcfa1fba9c01d
7
- data.tar.gz: c7df3f398a7cffe56773d1c286b68ab9be0edcc3791fff45abdc504249b2ba70a0096aa43e6798e38b4b56f374008fc8007fdf9157835ba5a756c9e28a9d7c87
6
+ metadata.gz: 179c3cc2405a6370ab2cc924fa925df5df0a2737b18cd76ac6c6183e3c980889dd1782a4b3cb6f3f0e963124e138639864b6ed04fd293286c647fcf03a092424
7
+ data.tar.gz: aff00d8502c0816aac6078e68d4060db5a8041249c695f5e55c2c2ea8825ebf63efd788fd408acb9f9408ad57ce9f375eb098a5cb05253f8c820b1b3cd8c25aa
@@ -316,13 +316,14 @@ module Storyblok
316
316
  data = result['data']
317
317
  rels = data['rels']
318
318
  links = data['links']
319
+ resolve_relations = params[:resolve_relations] || params["resolve_relations"]
319
320
 
320
321
  if data['stories'].nil?
321
- find_and_fill_relations(data.dig('story', 'content'), params[:resolve_relations], rels)
322
+ find_and_fill_relations(data.dig('story', 'content'), resolve_relations, rels)
322
323
  find_and_fill_links(data.dig('story', 'content'), links)
323
324
  else
324
325
  data['stories'].each do |story|
325
- find_and_fill_relations(story['content'], params[:resolve_relations], rels)
326
+ find_and_fill_relations(story['content'], resolve_relations, rels)
326
327
  find_and_fill_links(story['content'], links)
327
328
  end
328
329
  end
@@ -1,4 +1,4 @@
1
1
  module Storyblok
2
2
  # Gem Version
3
- VERSION = '3.0.0'
3
+ VERSION = '3.0.1'
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: storyblok
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Storyblok (Alexander Feiglstorfer)
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-01 00:00:00.000000000 Z
11
+ date: 2021-12-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rest-client
@@ -69,9 +69,6 @@ dependencies:
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
71
  - - "~>"
72
- - !ruby/object:Gem::Version
73
- version: '1.0'
74
- - - ">="
75
72
  - !ruby/object:Gem::Version
76
73
  version: 1.0.1
77
74
  type: :development
@@ -79,9 +76,6 @@ dependencies:
79
76
  version_requirements: !ruby/object:Gem::Requirement
80
77
  requirements:
81
78
  - - "~>"
82
- - !ruby/object:Gem::Version
83
- version: '1.0'
84
- - - ">="
85
79
  - !ruby/object:Gem::Version
86
80
  version: 1.0.1
87
81
  - !ruby/object:Gem::Dependency
@@ -102,30 +96,30 @@ dependencies:
102
96
  name: webmock
103
97
  requirement: !ruby/object:Gem::Requirement
104
98
  requirements:
105
- - - "~>"
99
+ - - '='
106
100
  - !ruby/object:Gem::Version
107
- version: '0'
101
+ version: 3.14.0
108
102
  type: :development
109
103
  prerelease: false
110
104
  version_requirements: !ruby/object:Gem::Requirement
111
105
  requirements:
112
- - - "~>"
106
+ - - '='
113
107
  - !ruby/object:Gem::Version
114
- version: '0'
108
+ version: 3.14.0
115
109
  - !ruby/object:Gem::Dependency
116
110
  name: vcr
117
111
  requirement: !ruby/object:Gem::Requirement
118
112
  requirements:
119
- - - "~>"
113
+ - - '='
120
114
  - !ruby/object:Gem::Version
121
- version: '0'
115
+ version: 6.0.0
122
116
  type: :development
123
117
  prerelease: false
124
118
  version_requirements: !ruby/object:Gem::Requirement
125
119
  requirements:
126
- - - "~>"
120
+ - - '='
127
121
  - !ruby/object:Gem::Version
128
- version: '0'
122
+ version: 6.0.0
129
123
  - !ruby/object:Gem::Dependency
130
124
  name: simplecov
131
125
  requirement: !ruby/object:Gem::Requirement
@@ -150,7 +144,6 @@ files:
150
144
  - ".DS_Store"
151
145
  - ".editorconfig"
152
146
  - ".gitignore"
153
- - ".rspec"
154
147
  - ".ruby-version"
155
148
  - Gemfile
156
149
  - Gemfile.lock
@@ -168,12 +161,6 @@ files:
168
161
  - lib/storyblok/links.rb
169
162
  - lib/storyblok/request.rb
170
163
  - lib/storyblok/version.rb
171
- - spec/lib/storyblok_cache_redis_spec.rb
172
- - spec/lib/storyblok_client_spec.rb
173
- - spec/lib/storyblok_request_spec.rb
174
- - spec/spec_helper.rb
175
- - spec/v2/storyblok_client_spec.rb
176
- - storyblok.gemspec
177
164
  homepage: https://github.com/storyblok/storyblok-ruby
178
165
  licenses:
179
166
  - MIT
@@ -198,9 +185,4 @@ rubygems_version: 2.7.6
198
185
  signing_key:
199
186
  specification_version: 4
200
187
  summary: storyblok
201
- test_files:
202
- - spec/lib/storyblok_cache_redis_spec.rb
203
- - spec/lib/storyblok_client_spec.rb
204
- - spec/lib/storyblok_request_spec.rb
205
- - spec/spec_helper.rb
206
- - spec/v2/storyblok_client_spec.rb
188
+ test_files: []
data/.rspec DELETED
@@ -1 +0,0 @@
1
- --require spec_helper
@@ -1,91 +0,0 @@
1
- require 'redis'
2
- require_relative '../../lib/storyblok/cache/redis'
3
- require 'spec_helper'
4
-
5
- describe Storyblok::Cache::Redis, redis_cache: true do
6
- let(:redis_client) {
7
- raise StandardError, "Environment variable 'REDIS_URL' is not defined" if ENV['REDIS_URL'].nil?
8
- Redis.new(url: ENV['REDIS_URL'])
9
- }
10
-
11
- context "When '::Redis' from redis-rb gem is not available" do
12
- let!(:redis_constant_copy) { ::Redis }
13
- before { Object.send(:remove_const, :Redis) }
14
- after { ::Redis = redis_constant_copy }
15
- it "raises Redis.current could not be found" do
16
- expect{ subject }.to raise_error(RuntimeError, 'Redis.current could not be found. Supply :redis option or make sure Redis.current is available.')
17
- end
18
- end
19
-
20
- context "When Storyblok::Cache::Redis is initialized without 'redis' arg" do
21
- it "asks the redis to '::Redis.current'" do
22
- redis_current = nil
23
- expect{ redis_current = subject.redis }.not_to raise_error
24
- expect(redis_current.object_id).to eq(::Redis.current.object_id)
25
- end
26
- end
27
-
28
- describe "#cache" do
29
- before { redis_client.keys("storyblok:*").each { |e| redis_client.del(e) } }
30
-
31
- let(:key) { "storyblok:my_cache_key" }
32
- context "When is passed an block" do
33
- context "When the result it's not cached" do
34
- it "caches the block result and returns the block call result" do
35
- expect{
36
- subject.cache(key){ "my_value" }
37
- }.to change { redis_client.keys("#{key}*").size }.from(0).to(1)
38
-
39
- expect(redis_client.get(key)).to eq("my_value")
40
- end
41
- end
42
-
43
- context "When the arg expire as '0' is passed" do
44
- let(:expire) { 0 }
45
- it "returns the result of the block" do
46
- expect(subject.cache(key, expire){ "my_value" } ).to eq("my_value")
47
- end
48
-
49
- it "doesn't cache anything" do
50
- expect{ subject.cache(key, expire){ "my_value" } }.not_to change { redis_client.keys.size }
51
- end
52
- end
53
-
54
- context "When the key has value on cache" do
55
- before { subject.cache(key){ "my_value_cached" } }
56
- it "the block it's no called and the cache stays untouched and the cached value is returned" do
57
- expect{
58
- subject.cache(key){ "my_new_value" }
59
- }.not_to change { redis_client.keys("#{key}*").size }
60
-
61
- expect(redis_client.get(key)).to eq("my_value_cached")
62
- end
63
- end
64
- end
65
- end
66
-
67
- describe "#set" do
68
- subject { super().set(key, value, expire) }
69
- before { redis_client.keys("storyblok:*").each { |e| redis_client.del(e) } }
70
- let(:key) {'storyblok:my_key'}
71
- let(:value) {'my_value'}
72
-
73
- context "When arg 'expire' is false" do
74
- let(:expire) { false }
75
- it "store the key value at Redis database WITHOUT expiration" do
76
- expect{ subject }.to change { redis_client.keys("#{key}*").size }.from(0).to(1)
77
- expect(redis_client.get(key)).to eq(value)
78
- expect(redis_client.ttl(key)).to eq(-1) # -1 means no expiration for redis key
79
- end
80
- end
81
-
82
- context "When args 'expire' is valid integer" do
83
- let(:expire) { 60 * 60 }
84
- it "store the key value at Redis database WITH expiration" do
85
- expect{ subject }.to change { redis_client.keys("#{key}*").size }.from(0).to(1)
86
- expect(redis_client.get(key)).to eq(value)
87
- expect(redis_client.ttl(key)).to be > 1
88
- end
89
- end
90
- end
91
- end