notion_to_html 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caed92b00e1abcaa3a71a1d66bd92d0573780216f736ad7cdaf69db6f458c883
-  data.tar.gz: c9cf38980c56659538130f2abc3d544136c68836464a3e2e25cf5b8be68b3f1b
+  metadata.gz: 1ae21e019724a4f1e4524140a11365eaa8abbb7564fcca823a17bb618054b037
+  data.tar.gz: e860e17724407d000232d933b9cf244611d97f17bcb9323c71750d09fb67b98b
 SHA512:
-  metadata.gz: aa4e67f8d8c66cbbfb30945e418fd836f76c560ca1906456c541ea46cf544582f85f850205ad901064a8d23d544983e6b7f14f935b68af83d4cab7b012e3608b
-  data.tar.gz: c60adf08fea36a8f0b4a940a203dbd954173a34ddcd8a344aeb4d2305ea54a6430a6bdce94b9020bc409f79d7d5419f27e486f00680a92672f453f62fea9ff71
+  metadata.gz: e013321283c02d19986e9e80779bf1127ead9445b1932f818f78e9f4324a0ee34f129d8cad09e9b5896b520ed900245aa1900d1d0aa384b3ac8cea3b2a57541b
+  data.tar.gz: 0e2e63856a1c706c37cf61f9b774f00e93fd9e1ab3492cb01560d3b6f2520b3cf2018c76bbd4222301b99336950bb3084eef6559e4e0f12e7b86822c3fb9d6d7

data/lib/notion_to_html/base_block.rb

@@ -68,46 +68,83 @@ module NotionToHtml
       @properties = data[@type]
     end
 
+    RENDERERS = {}.with_indifferent_access
+
     BLOCK_TYPES.each do |block|
       define_method("class_for_#{block}") { |options| options.dig(block, :class) }
       define_method("data_for_#{block}") { |options| options.dig(block, :data) }
+      RENDERERS[block] = "render_#{block}_block".to_sym
     end
 
+    RENDERERS.freeze
+
     # Renders the block based on its type.
     # @param options [Hash] Additional options for rendering the block.
     # @return [String] The rendered block as HTML.
     def render(options = {})
-      case @type
-      when 'paragraph'
-        render_paragraph(rich_text, class: class_for_paragraph(options), data: data_for_paragraph(options))
-      when 'heading_1'
-        render_heading_1(rich_text, class: class_for_heading_1(options), data: data_for_heading_1(options))
-      when 'heading_2'
-        render_heading_2(rich_text, class: class_for_heading_2(options), data: data_for_heading_2(options))
-      when 'heading_3'
-        render_heading_3(rich_text, class: class_for_heading_3(options), data: data_for_heading_3(options))
-      when 'table_of_contents'
-        render_table_of_contents
-      when 'bulleted_list_item'
-        render_bulleted_list_item(rich_text, @siblings, @children, 0, class: class_for_bulleted_list_item(options),
-          data: data_for_bulleted_list_item(options))
-      when 'numbered_list_item'
-        render_numbered_list_item(rich_text, @siblings, @children, 0, class: class_for_numbered_list_item(options),
-          data: data_for_numbered_list_item(options))
-      when 'quote'
-        render_quote(rich_text, class: class_for_quote(options), data: data_for_quote(options))
-      when 'callout'
-        render_callout(rich_text, icon, class: class_for_callout(options), data: data_for_callout(options))
-      when 'code'
-        render_code(rich_text, class: class_for_code(options), data: data_for_code(options),
-          language: @properties['language'])
-      when 'image', 'embed'
-        render_image(*multi_media, class: class_for_image(options), data: data_for_image(options))
-      when 'video'
-        render_video(*multi_media, class: class_for_video(options), data: data_for_video(options))
-      else
-        'Unsupported block'
-      end
+      render_method = RENDERERS[@type]
+      return 'Unsupported block' unless render_method
+
+      send(render_method, build_render_options(options))
+    end
+
+    # Builds render options for a block type
+    # @param options [Hash] The original options hash
+    # @return [Hash] Processed options for rendering
+    def build_render_options(options)
+      {
+        class: send("class_for_#{@type}", options),
+        data: send("data_for_#{@type}", options),
+        **options.with_indifferent_access.dig(@type)&.except(:class, :data).to_h
+      }.deep_symbolize_keys
+    end
+
+    def render_paragraph_block(options)
+      render_paragraph(rich_text, **options)
+    end
+
+    def render_heading_1_block(options)
+      render_heading_1(rich_text, **options)
+    end
+
+    def render_heading_2_block(options)
+      render_heading_2(rich_text, **options)
+    end
+
+    def render_heading_3_block(options)
+      render_heading_3(rich_text, **options)
+    end
+
+    def render_table_of_contents_block(_options)
+      render_table_of_contents
+    end
+
+    def render_bulleted_list_item_block(options)
+      render_bulleted_list_item(rich_text, @siblings, @children, 0, **options)
+    end
+
+    def render_numbered_list_item_block(options)
+      render_numbered_list_item(rich_text, @siblings, @children, 0, **options)
+    end
+
+    def render_quote_block(options)
+      render_quote(rich_text, **options)
+    end
+
+    def render_callout_block(options)
+      render_callout(rich_text, icon, **options)
+    end
+
+    def render_code_block(options)
+      render_code(rich_text, **options.merge(language: @properties['language']))
+    end
+
+    def render_image_block(options)
+      render_image(*multi_media, **options)
+    end
+
+    def render_video_block(options)
+      render_video(*multi_media, **options)
     end
 
     # Retrieves the rich text content of the block.

data/lib/notion_to_html/service.rb

@@ -111,7 +111,7 @@ module NotionToHtml
         parent_list_block_index = nil
         results = []
         blocks['results'].each_with_index do |block, index|
-          block = refresh_block(block['id']) if refresh_image?(block)
+          block = refresh_block(block['id']) if refresh_block?(block)
           base_block = NotionToHtml::BaseBlock.new(block)
           base_block.children = get_blocks(base_block.id) if base_block.has_children
           if %w[numbered_list_item].include? base_block.type
@@ -133,6 +133,13 @@ module NotionToHtml
         results
       end
 
+      # Determines if a block needs to be refreshed based on its type and expiry time
+      # @param block [Hash] The block data to check
+      # @return [Boolean] True if the block needs to be refreshed, false otherwise
+      def refresh_block?(block)
+        refresh_image?(block) || refresh_video?(block)
+      end
+
       # Determines if an image block needs to be refreshed based on its expiry time
       # @param data [Hash] The data of the image block
       # @return [Boolean] True if the image needs to be refreshed, false otherwise
@@ -144,6 +151,17 @@ module NotionToHtml
         expiry_time.to_datetime.past?
       end
 
+      # Determines if a video block needs to be refreshed based on its expiry time
+      # @param data [Hash] The data of the video block
+      # @return [Boolean] True if the video needs to be refreshed, false otherwise
+      def refresh_video?(data)
+        return false unless data['type'] == 'video'
+        return false unless data.dig('video', 'type') == 'file'
+
+        expiry_time = data.dig('video', 'file', 'expiry_time')
+        expiry_time.to_datetime.past?
+      end
+
       private
 
       # Accessor for the client

data/lib/notion_to_html/version.rb

@@ -2,5 +2,5 @@
 
 module NotionToHtml
   # The current version of the NotionToHtml gem.
-  VERSION = '1.2.1'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: notion_to_html
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Guillermo Aguirre
 bindir: bin
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview