storyblok 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b954d3cf0dc7ca6346d490dfe34ed0b676cbd3eef222d7091860d31c7103b4
-  data.tar.gz: f5aaa23eac80dba3e1129c729c96aa3f57a4fcda746a6bdd14a6e914a25523fb
+  metadata.gz: a7788a31d2120b18b1048f242d05f5d9f2c984344bf36e44bc9519e244dd15a3
+  data.tar.gz: b1858aa45ffad79e7088da5ff78cbc0fd7523f8b30e7525e91da72f6e8609e41
 SHA512:
-  metadata.gz: 69cdd57edaab0f030cd3018a0e27caa4d28dde70ca6e4b75d00bd773d71838d3e8de9346e05b53c1b8885f273037787c09a08937de6564193bde954831e91941
-  data.tar.gz: 4680ba3b6697ad2e25bd50cb0039dc3b3a4c3652df680045e862a80a8d9625d057a388d3d0b448bf5c17c042c2cea158672f2144fde359311b8ece9eb68dc58e
+  metadata.gz: 2d91bbcdc949b788375f0409560c843050c8166606d73b9ed6e59d6422d33c01c5dfbde90143268cc4fe5b6605cefba1a8f1ba494c0b06e68a493c07d5d0ab39
+  data.tar.gz: 0164c14e04e352a1f51f598592a25e6c9266a4a3eeb646cfaafdb51c1ea7ae4244c7774e4ae349f49ea7afac261dee007871cb788fa36978be2b9f2a5c27aec0

data/examples/renderer.rb

@@ -1,23 +1,31 @@
 # bundle exec ruby examples/renderer.rb
 
 require_relative '../lib/storyblok'
+require 'redis'
 
 logger = Logger.new(STDOUT)
 
+redis = Redis.new(url: 'redis://localhost:6379')
+cache = Storyblok::Cache::Redis.new(redis: redis)
+
 client = Storyblok::Client.new(
   token: '6HMYdAjBoONyuS6GIf5PdAtt',
   logger: logger,
   component_resolver: ->(component, data) {
     "Placeholder for #{component}: #{data['text']}"
-  }
+  },
+  api_url: 'api-testing.storyblok.com',
+  api_version: 2,
+  cache: cache
 )
 
-puts client.render({'type' => 'doc', 'content' => [
-  {'type' => 'paragraph', 'content' => [{'text' => 'Good', 'type' => 'text'}]},
-  {'type' => 'blok', 'attrs' => {'body' => [{'component' => 'button', 'text' => 'Click me'}]}}
-]})
 
-res = client.story('article/article-1')
+res = client.flush
+res = client.story('authors/page', {version: 'published'})
+puts client.cache_version
+res = client.story('authors/page', {version: 'published'})
+res = client.story('authors/page', {version: 'published'})
+res = client.story('authors/page', {version: 'published'})
 
-puts res['data']['story']['content']['intro']
-puts client.render(res['data']['story']['content']['intro'])
+puts res['data']
+#puts client.render(res['data']['story']['content']['intro'])

data/lib/storyblok/client.rb

@@ -17,11 +17,11 @@ module Storyblok
       log_level: Logger::INFO,
       version: 'draft',
       component_resolver: ->(component, data) { '' },
-      cache_version: Time.now.to_i,
       cache: nil
     }
 
     attr_reader :configuration, :logger
+    attr_accessor :cache_version
 
     # @param [Hash] given_configuration
     # @option given_configuration [String] :token Required if oauth_token is not set
@@ -33,6 +33,7 @@ module Storyblok
     # @option given_configuration [::Logger::DEBUG, ::Logger::INFO, ::Logger::WARN, ::Logger::ERROR] :log_level
     def initialize(given_configuration = {})
       @configuration = default_configuration.merge(given_configuration)
+      @cache_version = '0'
       validate_configuration!
 
       if configuration[:oauth_token]
@@ -62,7 +63,7 @@ module Storyblok
     #
     # @return [Hash]
     def space(query = {})
-      Request.new(self, '/cdn/spaces/me', query).get
+      Request.new(self, '/cdn/spaces/me', query, nil, true).get
     end
 
     # Gets a collection of stories
@@ -169,20 +170,15 @@ module Storyblok
       parse_result(res)
     end
 
-    def cached_get(request)
+    def cached_get(request, bypass_cache = false)
       endpoint = base_url + request.url
+      query = request_query(request.query)
+      query_string = build_nested_query(query)
 
-      if cache.nil?
-        query = request_query(request.query)
-        query_string = build_nested_query(query)
+      if cache.nil? || bypass_cache || query[:version] == 'draft'
         result = run_request(endpoint, query_string)
       else
-        version = cache.get('storyblok:' + configuration[:token] + ':version') || '0'
-
-        query = query = request_query({ cache_version: version }.merge(request.query))
-        query_string = build_nested_query(query)
-
-        cache_key = 'storyblok:' + configuration[:token] + ':v:' + version + ':' + request.url + ':' + Base64.encode64(query_string)
+        cache_key = 'storyblok:' + configuration[:token] + ':v:' + query[:cv] + ':' + request.url + ':' + Base64.encode64(query_string)
 
         result = cache.cache(cache_key) do
           run_request(endpoint, query_string)
@@ -194,7 +190,7 @@ module Storyblok
 
     def flush
       unless cache.nil?
-        cache.set('storyblok:' + configuration[:token] + ':version', Time.now.to_i.to_s)
+        cache.set('storyblok:' + configuration[:token] + ':version', space['data']['space']['version'])
       end
     end
 
@@ -240,14 +236,27 @@ module Storyblok
         raise
       end
 
-      {'headers' => res.headers, 'data' => JSON.parse(res.body)}.to_json
+      body = JSON.parse(res.body)
+      self.cache_version = body['cv'] if body['cv']
+
+      unless cache.nil?
+        cache.set('storyblok:' + configuration[:token] + ':version', cache_version)
+      end
+
+      {'headers' => res.headers, 'data' => body}.to_json
     end
 
     # Patches a query hash with the client configurations for queries
     def request_query(query)
       query[:token] = configuration[:token] if query[:token].nil?
       query[:version] = configuration[:version] if query[:version].nil?
-      query[:cv] = configuration[:cache_version] if query[:cache_version].nil?
+
+      unless cache.nil?
+        query[:cv] = (cache.get('storyblok:' + configuration[:token] + ':version') or cache_version) if query[:cv].nil?
+      else
+        query[:cv] = cache_version if query[:cv].nil?
+      end
+
       query
     end
 

data/lib/storyblok/request.rb

@@ -5,14 +5,15 @@ module Storyblok
   class Request
     attr_reader :client, :type, :query, :id, :endpoint
 
-    def initialize(client, endpoint, query = {}, id = nil)
+    def initialize(client, endpoint, query = {}, id = nil, bypass_cache = false)
       @client = client
       @endpoint = endpoint
       @query = query
+      @bypass_cache = bypass_cache
 
       if id
         @type = :single
-        @id = URI.escape(id)
+        @id = URI.encode_www_form_component(id)
       else
         @type = :multi
         @id = nil
@@ -26,7 +27,7 @@ module Storyblok
 
     # Delegates the actual HTTP work to the client
     def get
-      client.cached_get(self)
+      client.cached_get(self, @bypass_cache)
     end
 
     # Returns a new Request object with the same data

data/lib/storyblok/version.rb

@@ -1,4 +1,4 @@
 module Storyblok
   # Gem Version
-  VERSION = '2.0.8'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storyblok
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Storyblok (Alexander Feiglstorfer)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client