storyblok 2.1.1 → 3.1.0

data/examples/cache.rb

@@ -1,16 +1,16 @@
 # bundle exec ruby examples/cache.rb
 
-require 'storyblok'
-require 'redis'
+require "storyblok"
+require "redis"
 
 logger = Logger.new(STDOUT)
 
-redis_url = 'redis://localhost:6379'
+redis_url = "redis://localhost:6379"
 Storyblok::Cache.client = Redis.new(:url => redis_url)
 
 client = Storyblok::Client.new(
-  token: 't618GfLe1YHICBioAHnMrwtt',
-  api_url: 'localhost:3001',
+  token: "t618GfLe1YHICBioAHnMrwtt",
+  api_url: "localhost:3001",
   secure: false,
   logger: logger
 )
@@ -19,4 +19,3 @@ links = client.links
 links = client.links
 links = client.flush
 links = client.links
-

data/examples/example_queries.rb

@@ -1,18 +1,18 @@
 # bundle exec ruby examples/example_queries.rb
 
-require 'storyblok'
+require "storyblok"
 
 logger = Logger.new(STDOUT)
 
 client = Storyblok::Client.new(
-  token: 't618GfLe1YHICBioAHnMrwtt',
-  api_url: 'localhost:3001',
+  token: "t618GfLe1YHICBioAHnMrwtt",
+  api_url: "localhost:3001",
   secure: false,
   logger: logger
 )
 
-p client.stories(starts_with: 'en/news')
-p client.story('demo1')
-p client.datasource_entries(datasource: 'labels', per_page: 10)
+p client.stories(starts_with: "en/news")
+p client.story("demo1")
+p client.datasource_entries(datasource: "labels", per_page: 10)
 p client.links
 p client.datasources

data/examples/management_api.rb

@@ -14,14 +14,14 @@ spaces = client.get('spaces')['data']['spaces']
 space = spaces.first
 
 p client.get("spaces/#{space['id']}")['data']['space']
-story_res = client.post("spaces/#{space['id']}/stories", {story: {name: 'new', slug: "new"}})['data']
+story_res = client.post("spaces/#{space['id']}/stories", { story: { name: 'new', slug: "new" } })['data']
 
 10.times do |index|
   client.get("spaces/#{space['id']}/stories/#{story_res['story']['id']}")
   puts index
 end
 
-p client.put("spaces/#{space['id']}/stories/#{story_res['story']['id']}", {story: {name: 'new123'}})['data']
+p client.put("spaces/#{space['id']}/stories/#{story_res['story']['id']}", { story: { name: 'new123' } })['data']
 
 10.times do |index|
   client.story('new')
@@ -29,5 +29,3 @@ p client.put("spaces/#{space['id']}/stories/#{story_res['story']['id']}", {story
 end
 
 p client.delete("spaces/#{space['id']}/stories/#{story_res['story']['id']}")
-
-

data/examples/renderer.rb

@@ -1,31 +1,30 @@
 # bundle exec ruby examples/renderer.rb
 
-require_relative '../lib/storyblok'
-require 'redis'
+require_relative "../lib/storyblok"
+require "redis"
 
 logger = Logger.new(STDOUT)
 
-redis = Redis.new(url: 'redis://localhost:6379')
+redis = Redis.new(url: "redis://localhost:6379")
 cache = Storyblok::Cache::Redis.new(redis: redis)
 
 client = Storyblok::Client.new(
-  token: '6HMYdAjBoONyuS6GIf5PdAtt',
+  token: "6HMYdAjBoONyuS6GIf5PdAtt",
   logger: logger,
   component_resolver: ->(component, data) {
     "Placeholder for #{component}: #{data['text']}"
   },
-  api_url: 'api-testing.storyblok.com',
+  api_url: "api-testing.storyblok.com",
   api_version: 2,
   cache: cache
 )
 
-
 res = client.flush
-res = client.story('authors/page', {version: 'published'})
+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'})
+res = client.story("authors/page", { version: "published" })
+res = client.story("authors/page", { version: "published" })
+res = client.story("authors/page", { version: "published" })
 
-puts res['data']
-#puts client.render(res['data']['story']['content']['intro'])
+puts res["data"]
+# puts client.render(res['data']['story']['content']['intro'])

data/examples/tree.rb

@@ -1,30 +1,30 @@
 # bundle exec ruby examples/tree.rb
 
-require 'storyblok'
+require "storyblok"
 
 logger = Logger.new(STDOUT)
 
 client = Storyblok::Client.new(
-  token: 't618GfLe1YHICBioAHnMrwtt',
-  api_url: 'localhost:3001',
+  token: "t618GfLe1YHICBioAHnMrwtt",
+  api_url: "localhost:3001",
   secure: false,
   logger: logger
 )
 
 tree = client.tree
 
-puts '<ul>'
+puts "<ul>"
 tree.each do |key, item|
-  puts '<li>' + item['item']['name']
+  puts "<li>" + item["item"]["name"]
 
-  if !item['children'].empty?
-    puts '<ul>'
-    item['children'].each do |key, inner_item|
-      puts '<li>' + inner_item['item']['name'] + '</li>'
+  if !item["children"].empty?
+    puts "<ul>"
+    item["children"].each do |key, inner_item|
+      puts "<li>" + inner_item["item"]["name"] + "</li>"
     end
-    puts '</ul>'
+    puts "</ul>"
   end
 
-  puts '</li>'
+  puts "</li>"
 end
-puts '</ul>'
+puts "</ul>"

data/lib/storyblok/cache/redis.rb

@@ -3,7 +3,9 @@ module Storyblok
     class Redis
       DEFAULT_CONFIGURATION = {
         ttl: 60 * 60 * 24
-      }
+      }.freeze
+
+      attr_reader :redis
 
       def initialize(*args)
         options = args.last.is_a?(::Hash) ? args.pop : {}
@@ -45,7 +47,6 @@ module Storyblok
           @redis.set(key, value)
         end
       end
-
     end
   end
 end

data/lib/storyblok/client.rb

@@ -11,12 +11,14 @@ module Storyblok
   class Client
     DEFAULT_CONFIGURATION = {
       secure: true,
-      api_url: 'api.storyblok.com',
-      api_version: 1,
+      api_version: 2,
       logger: false,
       log_level: Logger::INFO,
       version: 'draft',
+      # :nocov:
       component_resolver: ->(component, data) { '' },
+      # :nocov:
+      cache_version: Time.now.to_i,
       cache: nil
     }
 
@@ -29,6 +31,7 @@ module Storyblok
     # @option given_configuration [String] :api_url
     # @option given_configuration [Proc] :component_resolver
     # @option given_configuration [Number] :api_version
+    # @option given_configuration [String] :api_region
     # @option given_configuration [false, ::Logger] :logger
     # @option given_configuration [::Logger::DEBUG, ::Logger::INFO, ::Logger::WARN, ::Logger::ERROR] :log_level
     def initialize(given_configuration = {})
@@ -38,8 +41,8 @@ module Storyblok
 
       if configuration[:oauth_token]
         @rest_client = RestClient::Resource.new(base_url, :headers => {
-          :authorization => configuration[:oauth_token]
-        })
+                                                  :authorization => configuration[:oauth_token]
+                                                })
       end
 
       @renderer = Richtext::HtmlRenderer.new
@@ -185,7 +188,13 @@ module Storyblok
         end
       end
 
-      JSON.parse(result)
+      result = JSON.parse(result)
+
+      if !result.dig('data', 'story').nil? || !result.dig('data', 'stories').nil?
+        result = resolve_stories(result, query)
+      end
+
+      result
     end
 
     def flush
@@ -213,93 +222,180 @@ module Storyblok
     end
 
     private
+      def parse_result(res)
+        { 'headers' => res.headers, 'data' => JSON.parse(res.body) }
+      end
 
-    def parse_result(res)
-      {'headers' => res.headers, 'data' => JSON.parse(res.body)}
-    end
+      def run_request(endpoint, query_string)
+        logger.info(request: { endpoint: endpoint, query: query_string }) if logger
 
-    def run_request(endpoint, query_string)
-      logger.info(request: { endpoint: endpoint, query: query_string }) if logger
+        retries_left = 3
 
-      retries_left = 3
+        begin
+          res = RestClient.get "#{endpoint}?#{query_string}"
+        rescue RestClient::TooManyRequests
+          if retries_left != 0
+            retries_left -= 1
+            logger.info("Too many requests. Retry nr. #{(3 - retries_left).to_s} of max. 3 times.") if logger
+            sleep(0.5)
+            retry
+          end
 
-      begin
-        res = RestClient.get "#{endpoint}?#{query_string}"
-      rescue RestClient::TooManyRequests
-        if retries_left != 0
-          retries_left -= 1
-          logger.info("Too many requests. Retry nr. #{(3 - retries_left).to_s} of max. 3 times.") if logger
-          sleep(0.5)
-          retry
+          raise
         end
 
-        raise
+        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
 
-      body = JSON.parse(res.body)
-      self.cache_version = body['cv'] if body['cv']
+      # 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?
 
-      unless cache.nil?
-        cache.set('storyblok:' + configuration[:token] + ':version', cache_version)
+        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
 
-      {'headers' => res.headers, 'data' => body}.to_json
-    end
+      # Returns the base url for all of the client's requests
+      def base_url
+        if !configuration[:api_url]
+          region = configuration[:api_region] ? "-#{configuration[:api_region]}" : ""
+          "http#{configuration[:secure] ? 's' : ''}://api#{region}.storyblok.com/v#{configuration[:api_version]}"
+        else
+          "http#{configuration[:secure] ? 's' : ''}://#{configuration[:api_url]}/v#{configuration[:api_version]}"
+        end
+      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?
+      def default_configuration
+        DEFAULT_CONFIGURATION.dup
+      end
 
-      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?
+      def cache
+        configuration[:cache]
       end
 
-      query
-    end
+      def setup_logger
+        @logger = configuration[:logger]
+        logger.level = configuration[:log_level] if logger
+      end
 
-    # Returns the base url for all of the client's requests
-    def base_url
-      "http#{configuration[:secure] ? 's' : ''}://#{configuration[:api_url]}/v#{configuration[:api_version]}"
-    end
+      def validate_configuration!
+        fail ArgumentError, 'You will need to initialize a client with an :token or :oauth_token' if !configuration[:token] and !configuration[:oauth_token]
+        fail ArgumentError, 'The :api_version must be a positive number' unless configuration[:api_version].to_i >= 0
+      end
 
-    def default_configuration
-      DEFAULT_CONFIGURATION.dup
-    end
+      def build_nested_query(value, prefix = nil)
+        case value
+        when Array
+          value.map { |v|
+            build_nested_query(v, "#{prefix}[]")
+          }.join("&")
+        when Hash
+          value.map { |k, v|
+            build_nested_query(v,
+                               prefix ? "#{prefix}[#{URI.encode_www_form_component(k)}]" : URI.encode_www_form_component(k))
+          }.reject(&:empty?).join('&')
+        when nil
+          prefix
+        else
+          raise ArgumentError, "value must be a Hash" if prefix.nil?
 
-    def cache
-      configuration[:cache]
-    end
+          "#{prefix}=#{URI.encode_www_form_component(value)}"
+        end
+      end
 
-    def setup_logger
-      @logger = configuration[:logger]
-      logger.level = configuration[:log_level] if logger
-    end
+      def resolve_stories(result, params)
+        data = result['data']
+        rels = data['rels']
+        links = data['links']
+        resolve_relations = params[:resolve_relations] || params["resolve_relations"]
 
-    def validate_configuration!
-      fail ArgumentError, 'You will need to initialize a client with an :token or :oauth_token' if !configuration[:token] and !configuration[:oauth_token]
-      fail ArgumentError, 'The client configuration needs to contain an :api_url' if configuration[:api_url].empty?
-      fail ArgumentError, 'The :api_version must be a positive number' unless configuration[:api_version].to_i >= 0
-    end
+        if data['stories'].nil?
+          find_and_fill_relations(data.dig('story', 'content'), resolve_relations, rels)
+          find_and_fill_links(data.dig('story', 'content'), links)
+        else
+          data['stories'].each do |story|
+            find_and_fill_relations(story['content'], resolve_relations, rels)
+            find_and_fill_links(story['content'], links)
+          end
+        end
 
-    def build_nested_query(value, prefix = nil)
-      case value
-      when Array
-        value.map { |v|
-          build_nested_query(v, "#{prefix}[]")
-        }.join("&")
-      when Hash
-        value.map { |k, v|
-          build_nested_query(v, prefix ? "#{prefix}[#{URI.encode_www_form_component(k)}]" : URI.encode_www_form_component(k))
-        }.reject(&:empty?).join('&')
-      when nil
-        prefix
-      else
-        raise ArgumentError, "value must be a Hash" if prefix.nil?
-        "#{prefix}=#{URI.encode_www_form_component(value)}"
+        result
+      end
+
+      def find_and_fill_links(content, links)
+        return if content.nil? || links.nil? || links.size.zero?
+
+        if content.is_a? Array
+          content.each do |item|
+            find_and_fill_links(item, links)
+          end
+        elsif content.is_a? Hash
+          content['story'] = nil
+          content.each do |_k, value|
+            if !content['fieldtype'].nil?
+              if content['fieldtype'] == 'multilink' && content['linktype'] == 'story'
+                id =
+                  if content['id'].is_a? String
+                    content['id']
+                  elsif content['uuid'].is_a? String
+                    content['uuid']
+                  end
+
+                links.each do |link|
+                  if link['uuid'] == id
+                    content['story'] = link
+                    break
+                  end
+                end
+              end
+            end
+
+            find_and_fill_links(value, links)
+          end
+          content.delete('story') if content['story'].nil?
+        end
+      end
+
+      def find_and_fill_relations(content, relation_params, rels)
+        return if content.nil? || rels.nil? || rels.size.zero?
+
+        if content.is_a? Array
+          content.each do |item|
+            find_and_fill_relations(item, relation_params, rels)
+          end
+        elsif content.is_a? Hash
+          content.each do |_k, value|
+            if !content['component'].nil? && !content['_uid'].nil?
+              relation_params.split(',').each do |relation|
+                component, field_name = relation.split('.')
+
+                if (content['component'] == component) && !content[field_name].nil?
+                  rels.each do |rel|
+                    index = content[field_name].index(rel['uuid'])
+                    if !index.nil?
+                      content[field_name][index] = rel
+                    end
+                  end
+                end
+              end
+            end
+
+            find_and_fill_relations(value, relation_params, rels)
+          end
+        end
       end
-    end
   end
 end

data/lib/storyblok/links.rb

@@ -1,42 +1,41 @@
 module Storyblok
   class Links
     def initialize(response_obj)
-      @links = response_obj['data']['links']
+      @links = response_obj["data"]["links"]
     end
 
     def as_tree
       tree = {}
 
       @links.each do |key, item|
-        if tree[item['parent_id']].nil?
-          tree[item['parent_id']] = []
+        if tree[item["parent_id"]].nil?
+          tree[item["parent_id"]] = []
         end
 
-        tree[item['parent_id']] << item
+        tree[item["parent_id"]] << item
       end
 
       generate_tree(0, tree)
     end
 
     private
+      def generate_tree(parent_id = 0, items)
+        tree = {}
 
-    def generate_tree(parent_id = 0, items)
-      tree = {}
+        if !items[parent_id].nil?
+          result = items[parent_id]
 
-      if !items[parent_id].nil?
-        result = items[parent_id]
+          result.each do |item|
+            if tree[item["id"]].nil?
+              tree[item["id"]] = {}
+            end
 
-        result.each do |item|
-          if tree[item['id']].nil?
-            tree[item['id']] = {}
+            tree[item["id"]]["item"] = item
+            tree[item["id"]]["children"] = generate_tree(item["id"], items)
           end
-
-          tree[item['id']]['item'] = item
-          tree[item['id']]['children'] = generate_tree(item['id'], items)
         end
-      end
 
-      tree
-    end
+        tree
+      end
   end
 end

data/lib/storyblok/version.rb

@@ -1,4 +1,4 @@
 module Storyblok
   # Gem Version
-  VERSION = '2.1.1'
+  VERSION = "3.1.0"
 end

data/lib/storyblok.rb

@@ -1,3 +1,3 @@
-require 'storyblok/version'
-require 'storyblok/cache/redis'
-require 'storyblok/client'
+require "storyblok/version"
+require "storyblok/cache/redis"
+require "storyblok/client"