storyblok 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddf62135995f7382d7859652b2d02b1b0a147a41
-  data.tar.gz: 7e3f2229f06904fe05410352ddfa9fbeb74671a1
+  metadata.gz: 9876a3898f429335e6252d7d52962dbf2ff6af96
+  data.tar.gz: 1795aeb2880895aa2f05d244513af07ad41f16bf
 SHA512:
-  metadata.gz: db9fabb6d63a3dfea95e7ddc1a468b9f05a57d233b6ea1d19360005934df038c0803b4e41ec372de68632b249a89f73a24397a972cf6c96f7a2d5cf787711e17
-  data.tar.gz: 1416e31040d1a7549a12ec212e282eadd8c8f15e018b8c0add2ae1e92509ae9fc2100f1ef0e38398d2614032d54463b759d54b66a3c613b1974ae0789b8ee333
+  metadata.gz: 2191647a2248d3e851dbc9157a521b2223a9ba5d40123e4682f5d90b7b93c9e1a7057b81ebf8d28afc16534f6faa10f1221005fb7db6b818817d919f577d70b4
+  data.tar.gz: e4a111074b5ae3019c1ff9df0a7de5f97cc2ec3d27ea105b1a7cef9a4fce8bc3b36518439511035e79e9f38904f13738bfcd7639542728e4da5618459fb82c29

data/README.md

@@ -12,7 +12,7 @@ gem 'storyblok'
 ### Load a Story
 
 ```ruby
-client = new Storyblok::Client(token: 'YOUR_TOKEN')
+client = Storyblok::Client.new(token: 'YOUR_TOKEN')
 
 # Optionally set a cache client
 Storyblok::Cache.client = Redis.new(:url => 'redis://localhost:6379')

data/lib/storyblok.rb

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

data/lib/storyblok/cache/redis.rb

@@ -0,0 +1,51 @@
+module Storyblok
+  module Cache
+    class Redis
+      DEFAULT_CONFIGURATION = {
+        ttl: 60 * 60 * 24
+      }
+
+      def initialize(*args)
+        options = args.extract_options!
+
+        @redis = options.delete(:redis) || begin
+          if defined?(::Redis)
+            ::Redis.current
+          else
+            raise "Redis.current could not be found. Supply :redis option or make sure Redis.current is available."
+          end
+        end
+
+        @options = DEFAULT_CONFIGURATION.merge(options)
+      end
+
+      def cache(key, expire = nil)
+        if expire == 0
+          return yield(self)
+        end
+
+        expire ||= @options[:ttl]
+
+        if (value = get(key)).nil?
+          value = yield(self)
+          set(key, value, expire)
+        end
+
+        value
+      end
+
+      def get(key)
+        @redis.get(key)
+      end
+
+      def set(key, value, expire = false)
+        if expire
+          @redis.setex(key, expire, value)
+        else
+          @redis.set(key, value)
+        end
+      end
+
+    end
+  end
+end

data/lib/storyblok/client.rb

@@ -15,7 +15,8 @@ module Storyblok
       logger: false,
       log_level: Logger::INFO,
       version: 'draft',
-      cache_version: Time.now.to_i
+      cache_version: Time.now.to_i,
+      cache: nil,
     }
 
     attr_reader :configuration, :logger
@@ -92,14 +93,13 @@ module Storyblok
       query = request_query(request.query)
       query_string = build_nested_query(query)
 
-      if Cache.client.nil?
+      if cache.nil?
         result = run_request(endpoint, query_string)
       else
-        version = Cache.client.get('storyblok:' + configuration[:token] + ':version') || '0'
+        version = cache.get('storyblok:' + configuration[:token] + ':version') || '0'
         cache_key = 'storyblok:' + configuration[:token] + ':v:' + version + ':' + request.url + ':' + Base64.encode64(query_string)
-        cache_time = 60 * 60 * 2
 
-        result = Cache.cache(cache_key, cache_time) do
+        result = cache.cache(cache_key) do
           run_request(endpoint, query_string)
         end
       end
@@ -108,8 +108,8 @@ module Storyblok
     end
 
     def flush
-      if !Cache.client.nil?
-        Cache.client.set('storyblok:' + configuration[:token] + ':version', Time.now.to_i.to_s)
+      unless cache.nil?
+        cache.set('storyblok:' + configuration[:token] + ':version', Time.now.to_i.to_s)
       end
     end
 
@@ -139,6 +139,10 @@ module Storyblok
       DEFAULT_CONFIGURATION.dup
     end
 
+    def cache
+      configuration[:cache]
+    end
+
     def setup_logger
       @logger = configuration[:logger]
       logger.level = configuration[:log_level] if logger

data/lib/storyblok/version.rb

@@ -1,4 +1,4 @@
 module Storyblok
   # Gem Version
-  VERSION = '1.0.4'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storyblok
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Storyblok (Alexander Feiglstorfer)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -66,19 +66,18 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
-- ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - README.md
 - examples/cache.rb
 - examples/example_queries.rb
 - examples/tree.rb
 - lib/storyblok.rb
-- lib/storyblok/cache.rb
+- lib/storyblok/cache/redis.rb
 - lib/storyblok/client.rb
 - lib/storyblok/links.rb
 - lib/storyblok/request.rb
 - lib/storyblok/version.rb
+- storyblok-1.0.4.gem
 - storyblok.gemspec
 homepage: https://github.com/storyblok/storyblok-ruby
 licenses:
@@ -100,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: storyblok

data/lib/storyblok/cache.rb

@@ -1,26 +0,0 @@
-module Storyblok
-  class Cache
-    def self.client=(client)
-      @client = client
-    end
-
-    def self.client
-      @client
-    end
-
-    def self.cache(key, expire = nil)
-      if expire == 0
-        return yield(self)
-      end
-
-      if (value = @client.get(key)).nil?
-        value = yield(self)
-        @client.set(key, value)
-        @client.expire(key, expire) if expire
-        value
-      else
-        value
-      end
-    end
-  end
-end