notion_rails 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a025ff228890fafa2fd982d108512fa0980fbae091232c6fbfac6ae85667b8
-  data.tar.gz: 8bc99ae3b897b5116ed5e4fe91847a8160db7436490f76360d637c10128df487
+  metadata.gz: 3eca01ee926a98e214454e4329988d1e383fafbd21a9b77fc3bbcbcb907e66c5
+  data.tar.gz: c900f19f3f6c0e8eac48b1890347a8b7305b688a7e77e754c3a7e5a603e45117
 SHA512:
-  metadata.gz: bdd4412954a606cccf29b805a4db0c9f4ffcec32b9d1baf64feb7a7724fe48a2a72974e1e5650254bc86d0b5eb467961492c5e49284d1d3f9f7a62f31d072b0a
-  data.tar.gz: 426dee990473e7a39722e81e32f282cd3f3909156884e2a9dd46f64fff0ef4893a235ab8eff6921621603c445a6117932116961d370c423cb393fc88a145c171
+  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.0'
+  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,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: notion_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
 - !ruby/object:Gem::Dependency