notion_rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b73231a083c06cfc250557a99ad2fb590f704368e301d7c9a59053b03835fcd
-  data.tar.gz: 7e2c59c2aa19e4977daa97ae3eef11c829e2322264bd940f0248221e551952d7
+  metadata.gz: 3eca01ee926a98e214454e4329988d1e383fafbd21a9b77fc3bbcbcb907e66c5
+  data.tar.gz: c900f19f3f6c0e8eac48b1890347a8b7305b688a7e77e754c3a7e5a603e45117
 SHA512:
-  metadata.gz: f5643d4e2204fe42e2691c99d9db2ab980fee60e6f21428e75f937a144870b599a64af429fa7488bde0e8ba83db330645330b1eff271eb6f767f8866a64ab573
-  data.tar.gz: 88863038b9711c56a55e96e94bb39e681742e7540ab1a62c4535743eca0c6f8bc751366190c459e8aabdc4923dcf5da34775167b8fb777d66d0524ccd7e2c12e
+  metadata.gz: 93b528ac174dbf02dc3ff4ae6ac8a56aaa2ab4b58e38657ff4832bd47700c4e59ca3da0b98a0c33dd1e01f05c674d018d50b77489831bef9c4c9882df334f665
+  data.tar.gz: 0d7f23fe9ebaecaed6bb83381d899332459123a3ae07f10ffc6cd2c4dab98b00dde236a330617ce8f23203e54bf81822faa48a2bc7d1c5ced987ac456923238a

data/lib/notion_rails/service.rb

@@ -52,7 +52,7 @@ module NotionRails
 
     def get_article(id)
       base_page = NotionRails::BasePage.new(__get_page(id))
-      base_blocks = NotionRails.config.cache_store.fetch(id) { get_blocks(id) }
+      base_blocks = get_blocks(id)
       NotionRails::Page.new(base_page, base_blocks)
     end
 
@@ -61,6 +61,7 @@ module NotionRails
       parent_list_block_index = nil
       results = []
       blocks['results'].each_with_index do |block, index|
+        block = refresh_block(block['id']) if refresh_image?(block)
         base_block = NotionRails::BaseBlock.new(block)
         base_block.children = get_blocks(base_block.id) if base_block.has_children
         # Notion returns same list items as different blocks so we have to do some processing to have them be related
@@ -86,6 +87,14 @@ module NotionRails
       results
     end
 
+    def refresh_image?(data)
+      return false unless data['type'] == 'image'
+      return false unless data.dig('image', 'type') == 'file'
+
+      expiry_time = data.dig('image', 'file', 'expiry_time')
+      expiry_time.to_datetime.past?
+    end
+
     private
 
     def __get_articles(tag: nil, slug: nil, page_size: 10)
@@ -106,7 +115,15 @@ module NotionRails
     end
 
     def __get_blocks(id)
-      @client.block_children(block_id: id)
+      NotionRails.config.cache_store.fetch(id) { @client.block_children(block_id: id) }
+    end
+
+    def __get_block(id)
+      @client.block(block_id: id)
+    end
+
+    def refresh_block(id)
+      __get_block(id)
     end
   end
 end

data/lib/notion_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NotionRails
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/notion_rails.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'active_support/all'
 require 'notion_rails/renderers'
 require 'notion_rails/base_block'
 require 'notion_rails/base_page'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Guillermo Aguirre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview