notion_rails 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b73231a083c06cfc250557a99ad2fb590f704368e301d7c9a59053b03835fcd
-  data.tar.gz: 7e2c59c2aa19e4977daa97ae3eef11c829e2322264bd940f0248221e551952d7
+  metadata.gz: 7d8520fa8311a89b08c67281c8b2facb0083c983924064f8a73fd99845d45888
+  data.tar.gz: 51463269664f950db99b64211544d851d442e966160d96f36cc01d158fe7e457
 SHA512:
-  metadata.gz: f5643d4e2204fe42e2691c99d9db2ab980fee60e6f21428e75f937a144870b599a64af429fa7488bde0e8ba83db330645330b1eff271eb6f767f8866a64ab573
-  data.tar.gz: 88863038b9711c56a55e96e94bb39e681742e7540ab1a62c4535743eca0c6f8bc751366190c459e8aabdc4923dcf5da34775167b8fb777d66d0524ccd7e2c12e
+  metadata.gz: '09ab69fb89468ff1713d2433cac98c1777f0c4ab1dde081fc56f79352813c74b987e475408ffacc2379f3a4055681641babf0abb3f847e9550b27da3e7182049'
+  data.tar.gz: 72ed0bce7de6e8b055c588f155504a16e1a27925fe06b851c70971dcdd3dbadaee93a9ed56a6ec4be584283ef9b26493b89f48150da6d2a85d6ff387e2a5ff81

data/lib/notion_rails/base_block.rb

@@ -66,9 +66,9 @@ module NotionRails
         render_numbered_list_item(rich_text, @siblings, @children, class: options[:numbered_list_item])
       when 'quote' then render_quote(rich_text, class: options[:quote])
       when 'callout' then render_callout(rich_text, icon, class: options[:callout])
-      when 'code' then render_code(rich_text, class: "#{options[:code]} language-#{@properties["language"]}")
-      when 'image' then render_image(*multi_media)
-      when 'video' then render_video(*multi_media)
+      when 'code' then render_code(rich_text, class: options[:code], language: @properties['language'])
+      when 'image' then render_image(*multi_media, class: options[:image])
+      when 'video' then render_video(*multi_media, class: options[:video])
       else
         'Error'
       end

data/lib/notion_rails/renderers.rb

@@ -80,21 +80,18 @@ module NotionRails
 
     def render_code(rich_text_array, options = {})
       # TODO: render captions
-      pre_options = options
-      pre_options[:class] = "border-2 p-6 rounded #{pre_options[:class]}"
       content_tag(:div, class: 'mt-4', data: { controller: 'highlight' }) do
         content_tag(:div, data: { highlight_target: 'source' }) do
-          content_tag(:pre, pre_options) do
+          content_tag(:pre, class: "border-2 p-6 rounded w-full overflow-x-auto language-#{options[:language]}",
+**options) do
             text_renderer(rich_text_array, options)
           end
         end
       end
     end
 
-    def render_bulleted_list_item(rich_text_array, siblings, children, options = {})
-      pre_options = options
-      pre_options[:class] = "list-disc break-words #{pre_options[:class]}"
-      content_tag(:ul, pre_options) do
+    def render_bulleted_list_item(rich_text_array, _siblings, children, options = {})
+      content_tag(:ul, class: 'list-disc break-words', **options.except(:class)) do
         content = content_tag(:li, options) do
           text_renderer(rich_text_array)
         end
@@ -109,9 +106,7 @@ module NotionRails
     end
 
     def render_numbered_list_item(rich_text_array, siblings, children, options = {})
-      pre_options = options
-      pre_options[:class] = "list-decimal #{pre_options[:class]}"
-      content_tag(:ol, pre_options) do
+      content_tag(:ol, class: 'list-decimal', **options.except(:class)) do
         render_list_items(:numbered_list_item, rich_text_array, siblings, children, options)
       end
     end
@@ -135,13 +130,9 @@ module NotionRails
     end
 
     def render_quote(rich_text_array, options = {})
-      div_options = options.dup
-      pre_options = options.dup
-      div_options[:class] = "mt-4 #{options[:class]}"
-      content_tag(:div, div_options) do
-        pre_options[:class] = "border-l-4 border-black px-5 py-1 #{options[:class]}"
+      content_tag(:div, class: 'mt-4', **options) do
         content_tag(:cite) do
-          content_tag(:p, pre_options) do
+          content_tag(:p, class: 'border-l-4 border-black px-5 py-1', **options) do
             text_renderer(rich_text_array)
           end
         end
@@ -149,16 +140,14 @@ module NotionRails
     end
 
     def render_callout(rich_text_array, icon, options = {})
-      pre_options = options
-      pre_options[:class] = "p-4 rounded bg-neutral-200 mt-4 #{pre_options[:class]}"
-      content_tag(:div, pre_options) do
+      content_tag(:div, class: 'p-4 rounded bg-neutral-200 mt-4', **options) do
         content = tag.span(icon, class: 'pr-2')
         content += text_renderer(rich_text_array)
         content
       end
     end
 
-    def render_image(src, expiry_time, caption, type, options = {})
+    def render_image(src, _expiry_time, caption, _type, options = {})
       content_tag(:figure, options) do
         content = tag.img(src: src, alt: '')
         content += tag.figcaption(text_renderer(caption))
@@ -166,7 +155,7 @@ module NotionRails
       end
     end
 
-    def render_video(src, expiry_time, caption, type, options = {})
+    def render_video(src, _expiry_time, caption, type, options = {})
       content_tag(:figure, options) do
         content = if type == 'file'
                     video_tag(src, controls: true)

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.3'
 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.3
 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