prismic.io 1.0.0.rc8 → 1.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e8407198320a76fe68735f7adbab9c99caf2540
-  data.tar.gz: ea27a831a0d80593f279ae187f0530a5094c6f3b
+  metadata.gz: efe6723ef7f29deff32c702fed5695aba28e93f6
+  data.tar.gz: a2a470960e7065d31ea4f416d07a738bdf3d467f
 SHA512:
-  metadata.gz: 4dbc3131e382071d913859b15005f039c17323862c7da63d19ebabbfa766c0337c11aa462665985ed5714bbec4ad74820d6460640ff688bcf2ccbdc0d7b84fb9
-  data.tar.gz: 322c49ea82af8afe85a487c6a4643be5ad68671b73deec72e0a802bb9505161b843c53c7f139c385f73a77b3a22be379dbfb030fcc6af1d9efc048267db6a9e2
+  metadata.gz: 05c234357c7f80ee100af6471632a5b8defa792ab7dd3def6db15442a0b3a115b0a8c38864f87e37ce755c7516f99e114db0fccb91ed2d1e592b70a7ea8ef655
+  data.tar.gz: 0b4d361e0a79ea6d86795133b16499e6e8c8a844e40be2f681be66269b2ee4c5518971e054bb7c820d029d5bfc0613211ca5db40538f7ebe350ab381398db9a4

data/lib/prismic/api.rb

@@ -92,7 +92,7 @@ module Prismic
       data = {}
       data["access_token"] = access_token if access_token
       cache_key = url + (access_token ? ("#" + access_token) : "")
-      api_cache.get_or_set(cache_key, expired_in:5) {
+      api_cache.get_or_set(cache_key, nil, 5) {
         res = http_client.get(url, data, 'Accept' => 'application/json')
         case res.code
         when '200'

data/lib/prismic/cache/basic.rb

@@ -39,7 +39,7 @@ module Prismic
     end
 
     def get_or_set(key, value = nil, expired_in = 0)
-      return get(key) if include?(key)
+      return get(key) if include?(key) && !expired?(key)
       set(key, block_given? ? yield : value, expired_in)
     end
 

data/lib/prismic/json_parsers.rb

@@ -202,7 +202,7 @@ module Prismic
         linked_documents = json['linked_documents']
         if linked_documents
           linked_documents.map! do |linked_doc|
-            LinkedDocument.new(linked_doc['id'], linked_doc['type'], linked_doc['tags'])
+            LinkedDocument.new(linked_doc['id'], linked_doc['slug'], linked_doc['type'], linked_doc['tags'])
           end
         else
           linked_documents = []

data/lib/prismic/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Prismic
 
-  VERSION = "1.0.0.rc8"
+  VERSION = "1.0.0.rc9"
 
 end

data/lib/prismic.rb

@@ -352,10 +352,11 @@ module Prismic
   end
 
   class LinkedDocument
-    attr_accessor :id, :type, :tags
+    attr_accessor :id, :slug, :type, :tags
 
-    def initialize(id, type, tags)
+    def initialize(id, slug, type, tags)
       @id = id
+      @slug = slug
       @type = type
       @tags = tags
     end

data/spec/cache_spec.rb

@@ -100,6 +100,14 @@ describe "Basic Cache's" do
 	cache.get('key').should == nil
   end
 
+  it 'set with expiration and a block' do
+    cache = Prismic::BasicCache.new
+    cache.get_or_set('key', nil, 2){ 'value' }
+    cache.get_or_set('key', nil, 2){ 'othervalue' }.should == 'value'
+    sleep(3)
+    cache.get_or_set('key', nil, 2){ 'othervalue' }.should == 'othervalue'
+  end
+
   it 'set & test value' do
 	cache = Prismic::BasicCache.new
 	cache.set('key', 'value')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prismic.io
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc8
+  version: 1.0.0.rc9
 platform: ruby
 authors:
 - "Étienne Vallette d'Osia"
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler