notion_ruby_mapping 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378e8aecdacdabc3fd951939783195ed13f2e56665a202a8fe3cf9a2d66e0fab
-  data.tar.gz: d92c738818763b3d4d49d06e1f7c326ec2fc60e5214162a8185c4f7a8c3f501a
+  metadata.gz: 78822f6707fe646abb09c9240dce59ac8adac8c27c300baae8282e16ecd54278
+  data.tar.gz: 40aa622383799df9e197bf9eafd829d2e7699a9c66194a42812f750a2bb97b1e
 SHA512:
-  metadata.gz: 0dd2673402bbe54ccd135331c3476f4009af7c68411895f2244288eae761c8975e5bb7e9e39d14ba5d2fc58b96cb38c8dd4f401de2a422d0ebfaeff4c29277ed
-  data.tar.gz: 331fadb7063f5d72c049a7f84907174b3470be179340539796772e31a3ff61dd10222d1638d26688c67fe8470501235c3025c2ebda46ba8942e404cc256aad91
+  metadata.gz: ab8f1e29cb52504ea7c1b8877743e99d31cd1dd2b08e790a28038d966ea5319e48d733657eeae936b8c55a0af2ed87b010411568770ef57e023e0f4f3c49a9c6
+  data.tar.gz: a625b8e93d57e4ba506f67526a8f5a95bb872a0a879eaa9154bd719b2fa0c5f2374cab20a7fda448dcdaa03bf4f2f4b800725061c9f3bc0bb76ecaf5a67b3e1b

data/.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-rspec
+
 AllCops:
   TargetRubyVersion: 2.6
 

data/README.md

@@ -125,6 +125,8 @@ NotionRubyMapping.configuration { |c| c.notion_token = ENV["NOTION_API_TOKEN"] }
 
 ## 3. ChangeLog
 
+- 2023/1/25 [v0.7.2] bug fix for creating relation property / add erdToNotionRb.rb script
+- 2022/12/16 [v0.7.1] bug fix for query rollup property
 - 2022/11/28 [v0.7.0] add this_week filter and NotionRubyMapping.configure
 - 2022/11/13 [v0.6.8] remove error checking for start and end dates, add Users.all, and change Rollup and Formula query specification
 - 2022/9/2 [v0.6.7] add support for Status property, is_toggleable for headings block, and page property values

data/exe/erdToNotionDb.rb

@@ -0,0 +1,41 @@
+#! /usr/bin/env ruby
+
+require "notion_ruby_mapping"
+include NotionRubyMapping
+
+if ARGV.length < 2
+  print "Usage: erdToNotion.rb code_block_id target_page_id [--inline]"
+  exit
+end
+
+mermaid_url, target_page_url, inline_flag = ARGV
+inline = inline_flag == "--inline"
+NotionRubyMapping.configure { |c| c.notion_token = ENV["NOTION_API_KEY"] }
+nc = NotionCache.instance
+mermaid_block = Block.find mermaid_url
+unless mermaid_block.is_a? CodeBlock
+  print "#{mermaid_url} is not CodeBlock's id"
+  exit
+end
+
+# Parse mermaid ER
+mermaid = Mermaid.new mermaid_block.rich_text_array.full_text
+
+# Retrieve child databases
+target_page = Page.find target_page_url
+target_page_id = target_page.id
+db_titles = target_page.children.select { |b| b.is_a? ChildDatabaseBlock }.map(&:title)
+exist_dbs = Search.new(query: "(#{db_titles.join('|')})", database_only: true).exec.select do |db|
+  nc.hex_id(db.parent_id) == target_page_id
+end
+
+# Attach existing databases to mermaid database
+exist_dbs.each do |db|
+  mermaid.attach_database db
+end
+
+mermaid.create_notion_db target_page, inline
+mermaid.update_databases
+mermaid.rename_reverse_name
+mermaid.update_rollup
+

data/exe/notionErDiagram.rb

@@ -29,7 +29,7 @@ if ARGV.length < 2
   exit
 end
 database_id, code_block_id = ARGV
-NotionCache.instance.create_client ENV["NOTION_API_KEY"]
+NotionRubyMapping.configure { |c| c.notion_token = ENV["NOTION_API_KEY"] }
 block = Block.find code_block_id
 unless block.is_a? CodeBlock
   print "#{code_block_id} is not CodeBlock's id"

data/lib/notion_ruby_mapping/blocks/base.rb

@@ -256,6 +256,13 @@ module NotionRubyMapping
       klass.find parent_json[type], dry_run: dry_run
     end
 
+    def parent_id
+      parent_json = @json && @json["parent"]
+      raise StandardError, "Unknown parent" if parent_json.nil?
+
+      parent_json[parent_json["type"]]
+    end
+
     # @return [NotionRubyMapping::PropertyCache] get or created PropertyCache object
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#8f0b28e09dd74e2a9ff06126c48d64d4
     def properties

data/lib/notion_ruby_mapping/blocks/child_database_block.rb

@@ -7,5 +7,9 @@ module NotionRubyMapping
     def type
       "child_database"
     end
+
+    def title
+      @json[type]["title"]
+    end
   end
 end

data/lib/notion_ruby_mapping/blocks/child_page_block.rb

@@ -7,5 +7,9 @@ module NotionRubyMapping
     def type
       "child_page"
     end
+
+    def title
+      @json[type]["title"]
+    end
   end
 end

data/lib/notion_ruby_mapping/blocks/list.rb

@@ -21,6 +21,8 @@ module NotionRubyMapping
         @property = value
       when :user_object
         @user_object = true
+      when :search
+        @search = value
       end
       @query = query
       @index = 0
@@ -74,6 +76,11 @@ module NotionRubyMapping
                  query: -> { @nc.users_request @query.query_json },
                  create_object: ->(json) { UserObject.new json: json },
                  &block
+      elsif @search
+        each_sub base: @search,
+                 query: -> { @nc.search @search.payload.merge(@query.query_json) },
+                 create_object: ->(json) { Base.create_from_json json },
+                 &block
       end
       self
     end

data/lib/notion_ruby_mapping/blocks/page.rb

@@ -53,7 +53,10 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Database, String]
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#e3f1d21e0f724f589e48431468772eed
     def create_child_database(title, *assigns, dry_run: false)
-      build_child_database(title, *assigns).save dry_run: dry_run
+      db = Database.new json: {"title" => [TextObject.new(title).property_values_json]},
+                        assign: assigns, parent: {"type" => "page_id", "page_id" => @id}
+      yield db, db.properties if block_given?
+      db.save dry_run: dry_run
     end
 
     # @return [String] title

data/lib/notion_ruby_mapping/controllers/mermaid.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module NotionRubyMapping
+  class Mermaid
+    # @param [String] full_text
+    def initialize(full_text)
+      @lines = full_text.split "\n"
+      @databases = Hash.new {}
+      parse_text
+    end
+    attr_reader :lines, :databases
+
+    def parse_text
+      return unless @lines.shift =~ /^erDiagram/
+
+      until @lines.empty?
+        case @lines.shift
+        when / *(\w+) *[|}][|o]--[o|][|{] *(\w+) *: *"(.*)" */
+          db_or_create(Regexp.last_match(1)).append_relation db_or_create(Regexp.last_match(2)), Regexp.last_match(3)
+        when / *(\w+) *{ */
+          append_db_with_attributes Regexp.last_match(1)
+        else
+          nil
+        end
+      end
+    end
+
+    def db_or_create(db_name)
+      @databases[db_name] ||= MermaidDatabase.new db_name
+    end
+
+    def append_db_with_attributes(db_name)
+      db = db_or_create db_name
+      until @lines.empty?
+        case @lines.shift
+        when /^ *} *$/
+          break
+        when /^ *Database +title +"(.*)" *$/
+          db.name = Regexp.last_match(1)
+        when /^ *([^ ]+) +[^ ]+ +"(.*)" *$/
+          db.add_property Regexp.last_match(1), Regexp.last_match(2)
+        when /^ *([^ ]+) +([^ ]+) *$/
+          db.add_property Regexp.last_match(1), Regexp.last_match(2)
+        else
+          nil
+        end
+      end
+    end
+
+    def attach_database(db)
+      @databases.values.select { |mdb| mdb.name == db.database_title.full_text }.first&.attach_database(db)
+    end
+
+    def create_notion_db(target_page, inline)
+      @databases.values.each do |mdb|
+        mdb.create_notion_db(target_page, inline) unless mdb.real_db
+      end
+    end
+
+    def update_databases
+      @databases.each_value(&:update_database)
+    end
+
+    def rename_reverse_name
+      @databases.each_value(&:rename_reverse_name)
+    end
+
+    def update_rollup
+      @databases.each_value(&:update_rollup)
+    end
+  end
+end

data/lib/notion_ruby_mapping/controllers/mermaid_database.rb

@@ -0,0 +1,182 @@
+module NotionRubyMapping
+  class MermaidDatabase
+
+    def initialize(key)
+      @key = key
+      @name = key
+      @title = nil
+      @properties = {}
+      @relations = {}
+      @real_db = nil
+      @reverse_name_queue = {}
+    end
+    attr_reader :properties, :relations, :real_db, :title
+    attr_accessor :name
+
+    def add_property(key, value)
+      if key == "title"
+        @title = value
+      else
+        @properties[value] = key
+      end
+    end
+
+    def append_relation(other, relation)
+      @relations[relation] = other
+    end
+
+    def attach_database(db)
+      @real_db = db
+    end
+
+    # @param [NotionRubyMapping::Page] target_page
+    def create_notion_db(target_page, inline)
+      unless @title
+        print "Database must have a title property"
+        exit
+      end
+      @real_db = target_page.create_child_database(@name, TitleProperty, @title) do |d, _|
+        d.is_inline = inline
+      end
+    end
+
+    def update_properties
+      ps = @real_db.properties
+      title_property = ps.select { |p| p.is_a? TitleProperty }.first
+      title_property.new_name = @title unless title_property.name == @title
+      @properties.each do |(value, key)|
+        name, *options = value.split("|")
+        property = ps.values_at(name).first
+        case key
+        when /checkbox|created_by|created_time|date|email|files|last_edited_by|last_edited_time|people|phone_number|text|url|status/
+          klass = {
+            checkbox: CheckboxProperty, created_by: CreatedByProperty, created_time: CreatedTimeProperty,
+            date: DateProperty, email: EmailProperty, files: FilesProperty, last_edited_by: LastEditedByProperty,
+            last_edited_time: LastEditedTimeProperty, people: PeopleProperty, phone_number: PhoneNumberProperty,
+            rich_text: RichTextProperty, url: UrlProperty, status: StatusProperty
+          }[key.to_sym]
+          @real_db.add_property klass, name unless property
+        when "formula"
+          f_e = options.first&.gsub "@", '"'
+          if property
+            property.formula_expression = f_e unless property.formula_expression == f_e
+          else
+            @real_db.add_property(FormulaProperty, name) { |dp| dp.formula_expression = f_e }
+          end
+        when "multi_select"
+          if property
+            (options - (property.multi_select_options.map { |h| h["name"] })).each do |select_name|
+              property.add_multi_select_option name: select_name, color: "default"
+            end
+          else
+            @real_db.add_property(MultiSelectProperty, name) do |dp|
+              options.each do |select_name|
+                dp.add_multi_select_option name: select_name, color: "default"
+              end
+            end
+          end
+        when "number"
+          format_value = options.empty? ? "number" : options.first
+          if property
+            property.format = format_value unless property.format == format_value
+          else
+            @real_db.add_property(NumberProperty, name) { |p| p.format = format_value }
+          end
+        when "select"
+          if property
+            (options - (property.select_options.map { |h| h["name"] })).each do |select_name|
+              property.add_select_option name: select_name, color: "default"
+            end
+          else
+            @real_db.add_property(SelectProperty, name) do |dp|
+              options.each do |select_name|
+                dp.add_select_option name: select_name, color: "default"
+              end
+            end
+          end
+        else
+          nil
+        end
+      end
+      @relations.each do |value, relation_db|
+        db_id = relation_db.real_db.id
+        forward, reverse = value.split "|"
+        property = ps.values_at(forward).first
+        if property
+          if reverse
+            next if property.database_id == db_id && property.synced_property_name == reverse
+
+            property.replace_relation_database database_id: db_id
+            relation_db.append_reverse_name_queue self, forward, reverse
+          else
+            next if property.database_id == db_id
+
+            property.replace_relation_database database_id: db_id, type: "single_property"
+          end
+        else
+          @real_db.add_property(RelationProperty, forward) do |p|
+            if reverse
+              p.replace_relation_database database_id: relation_db.real_db.id
+              relation_db.append_reverse_name_queue self, forward, reverse
+            else
+              p.replace_relation_database database_id: relation_db.real_db.id, type: "single_property"
+            end
+          end
+        end
+      end
+      @real_db.property_schema_json
+    end
+
+    def append_reverse_name_queue(other_db, forward, reverse)
+      @reverse_name_queue[reverse] = [other_db, forward]
+    end
+
+    def update_database
+      update_properties
+      @real_db.save
+    end
+
+    def rename_reverse_name
+      save = false
+      @reverse_name_queue.each do |reverse, (other_db, forward)|
+        frp = other_db.real_db.properties[forward]
+        rp_id = frp.synced_property_id
+        rrp = @real_db.properties.filter { |pp| pp.property_id == rp_id }.first
+        if rrp && rrp.name != reverse
+          rrp.new_name = reverse
+          save = true
+        end
+      end
+      @real_db.save if save
+    end
+
+    def update_rollup_schema
+      ps = @real_db.properties
+      @properties.each do |(value, key)|
+        next unless key == "rollup"
+
+        name, *options = value.split("|")
+        property = ps.values_at(name).first
+
+        relation_name, rollup_name, function = options
+        if property
+          property.function = function unless property.function == function
+          property.relation_property_name = relation_name unless property.relation_property_name == relation_name
+          property.rollup_property_name = rollup_name unless property.rollup_property_name == rollup_name
+        else
+          @real_db.add_property(RollupProperty, name) do |dp|
+            dp.function = function
+            dp.relation_property_name = relation_name
+            dp.rollup_property_name = rollup_name
+          end
+        end
+      end
+      @real_db.property_schema_json
+    end
+
+    def update_rollup
+      update_rollup_schema
+      @real_db.save
+    end
+  end
+end

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -262,6 +262,14 @@ module NotionRubyMapping
       response.body
     end
 
+    def search(query)
+      request(:post, search_path, options = query)
+    end
+
+    def search_path
+      "v1/search"
+    end
+
     def update_block_request(block_id, payload)
       request :patch, block_path(block_id), payload
     end

data/lib/notion_ruby_mapping/controllers/search.rb

@@ -0,0 +1,29 @@
+module NotionRubyMapping
+  class Search
+
+    def initialize(ascending: false, database_only: false, page_only: false, query: nil)
+      @ascending = ascending
+      @database_only = database_only
+      @page_only = page_only
+      @query = query
+    end
+
+    def exec(dry_run: false)
+      if dry_run
+        Base.dry_run_script :post, NotionCache.instance.search_path, payload
+      else
+        response = NotionCache.instance.search payload
+        List.new json: response, type: :search, value: self, query: Query.new
+      end
+    end
+
+    def payload
+      ans = {}
+      ans["sort"] = {"direction" => "ascending", "timestamp" => "last_edited_time"} if @ascending
+      ans["filter"] = {"value" => "database", "property" => "object" } if @database_only
+      ans["filter"] = {"value" => "page", "property" => "object" } if @page_only
+      ans["query"] = @query if @query
+      ans
+    end
+  end
+end

data/lib/notion_ruby_mapping/properties/property.rb

@@ -143,12 +143,10 @@ module NotionRubyMapping
     # @param [Object] value query value
     # @return [NotionRubyMapping::Query] generated Query object
     def make_filter_query(key, value, condition: nil, another_type: nil)
-      if is_a? FormulaProperty
-        Query.new filter: {"property" => @name, "formula" => {another_type => {key => value}}}
-      elsif condition
-        Query.new filter: {"property" => @name, condition => {another_type => {key => value}}}
+      if condition
+        Query.new filter: {"property" => @name, type => {condition => {another_type => {key => value}}}}
       elsif another_type
-        Query.new filter: {"property" => @name, another_type => {key => value}}
+        Query.new filter: {"property" => @name, type => {another_type => {key => value}}}
       elsif @name == "__timestamp__"
         Query.new filter: {"timestamp" => type, type => {key => value}}
       else

data/lib/notion_ruby_mapping/properties/relation_property.rb

@@ -54,12 +54,13 @@ module NotionRubyMapping
     # @param [String] database_id
     # @param [String] synced_property_name
     # @see https://www.notion.so/hkob/RelationProperty-f608ab41a1f0476b98456620346fba03#7f5029fb7f6e4c009f22888b233e6f64
-    def replace_relation_database(database_id: nil, type: "dual_property", synced_property_name: nil)
+    def replace_relation_database(database_id: nil, type: "dual_property")
       assert_database_property __method__
       @will_update = true
       @json["database_id"] = database_id if database_id
       @json["type"] = type
-      @json["synced_property_name"] = synced_property_name if synced_property_name
+      @json[type] = {}
+      @json.delete type == "dual_property" ? "single_property" : "dual_property"
       @json
     end
 
@@ -96,6 +97,18 @@ module NotionRubyMapping
       ans
     end
 
+    def database_id
+      @json["database_id"]
+    end
+
+    def synced_property_id
+      @json["type"] == "dual_property" ? @json["dual_property"]["synced_property_id"] : nil
+    end
+
+    def synced_property_name
+      @json["type"] == "dual_property" ? @json["dual_property"]["synced_property_name"] : nil
+    end
+
     # @return [Hash] created json
     def property_values_json
       assert_page_property __method__
@@ -113,7 +126,7 @@ module NotionRubyMapping
 
     # @return [Hash]
     def property_schema_json_sub
-      {"database_id" => relation_database_id}
+      @json
     end
   end
 end

data/lib/notion_ruby_mapping/properties/text_property.rb

@@ -43,13 +43,13 @@ module NotionRubyMapping
     # @return [FalseClass]
     def clear_will_update
       super
-      @text_objects.clear_will_update
+      @text_objects.clear_will_update if page?
       false
     end
 
     # @return [TrueClass, FalseClass] will update?
     def will_update
-      @will_update || page? && @text_objects.will_update
+      @will_update || (page? && @text_objects.will_update)
     end
   end
 end

data/lib/notion_ruby_mapping/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
   NOTION_VERSION = "2022-06-28"
 end

data/lib/notion_ruby_mapping.rb

@@ -12,7 +12,8 @@ require_relative "notion_ruby_mapping/version"
              link_preview_block link_to_page_block numbered_list_item_block paragraph_block pdf_block quote_block
              synced_block table_block table_row_block table_of_contents_block template_block to_do_block
              toggle_block video_block],
-  controllers: %w[notion_cache payload property_cache query rich_text_array discussion_thread],
+  controllers: %w[notion_cache payload property_cache query rich_text_array discussion_thread search mermaid
+                  mermaid_database],
   objects: %w[rich_text_object emoji_object equation_object file_object mention_object text_object user_object
               comment_object],
   properties: %w[property checkbox_property multi_property created_by_property date_base_property created_time_property
@@ -32,4 +33,3 @@ module NotionRubyMapping
   end
   module_function :configure
 end
-

data/notion_ruby_mapping.gemspec

@@ -42,6 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "webmock"
 
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +140,7 @@ description: Mapping tool from Notion Database/Page/Block to Ruby Objects.
 email:
 - hkob@metro-cit.ac.jp
 executables:
+- erdToNotionDb.rb
 - notionErDiagram.rb
 - notionSitemap.rb
 extensions: []
@@ -146,6 +161,7 @@ files:
 - examples/change_title.md
 - examples/renumbering_pages.md
 - examples/set_icon_to_all_icon_unsettled_pages.md
+- exe/erdToNotionDb.rb
 - exe/notionErDiagram.rb
 - exe/notionSitemap.rb
 - images/post_set_icon.png
@@ -197,11 +213,14 @@ files:
 - lib/notion_ruby_mapping/blocks/url_caption_base_block.rb
 - lib/notion_ruby_mapping/blocks/video_block.rb
 - lib/notion_ruby_mapping/controllers/discussion_thread.rb
+- lib/notion_ruby_mapping/controllers/mermaid.rb
+- lib/notion_ruby_mapping/controllers/mermaid_database.rb
 - lib/notion_ruby_mapping/controllers/notion_cache.rb
 - lib/notion_ruby_mapping/controllers/payload.rb
 - lib/notion_ruby_mapping/controllers/property_cache.rb
 - lib/notion_ruby_mapping/controllers/query.rb
 - lib/notion_ruby_mapping/controllers/rich_text_array.rb
+- lib/notion_ruby_mapping/controllers/search.rb
 - lib/notion_ruby_mapping/objects/comment_object.rb
 - lib/notion_ruby_mapping/objects/emoji_object.rb
 - lib/notion_ruby_mapping/objects/equation_object.rb
@@ -257,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Notion Ruby mapping tool