notion_ruby_mapping 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78822f6707fe646abb09c9240dce59ac8adac8c27c300baae8282e16ecd54278
-  data.tar.gz: 40aa622383799df9e197bf9eafd829d2e7699a9c66194a42812f750a2bb97b1e
+  metadata.gz: fc53f7256d1ce820695e6f2dc28149ef945dd0ddf765fd933b90882212335d0c
+  data.tar.gz: 625c42250124c4e66d8016812c8a8bd53d02cef88c0061320fdd2ea8c996cd28
 SHA512:
-  metadata.gz: ab8f1e29cb52504ea7c1b8877743e99d31cd1dd2b08e790a28038d966ea5319e48d733657eeae936b8c55a0af2ed87b010411568770ef57e023e0f4f3c49a9c6
-  data.tar.gz: a625b8e93d57e4ba506f67526a8f5a95bb872a0a879eaa9154bd719b2fa0c5f2374cab20a7fda448dcdaa03bf4f2f4b800725061c9f3bc0bb76ecaf5a67b3e1b
+  metadata.gz: 573470cad7c6c10bb683417cb0ae62ed33819cb3471db31f3eb9b10d5718204c801fd7e42a063a69c1753dd7739f80777fa265fee073d5bd1abd1f17b29320ff
+  data.tar.gz: 2b76551f53c23564645aff1c027fe8521d13f0451e6cb43bbd7f66551e784a35bbcc0b1aa0ca4d12df5f35aa5d277570ae12415963a8c51de098574d67c66804

data/README.md

@@ -116,8 +116,9 @@ NotionRubyMapping.configuration { |c| c.notion_token = ENV["NOTION_API_TOKEN"] }
 1. [Set icon to all icon unsettled pages / 全てのページのアイコンを同一に設定](examples/set_icon_to_all_icon_unsettled_pages.md)
 2. [Renumbering pages / ページのナンバリング](examples/renumbering_pages.md)
 3. [Change title / タイトルの変更](examples/change_title.md)
-4. [Create ER Diagram from Notion database / Notion データベースの ER 図を作成](https://www.notion.so/hkob/notionErDiagram-Sample-1720c2199c534ca08138cde38f31f710)
-5. [Create Sitemap from Notion pages / Notion page からサイトマップを作成](https://www.notion.so/hkob/NotionSitemap-sample-14e195c83d024c5382aab09210916c87)
+4. [Create ER Diagram from Notion database / Notion データベースの ER 図を作成](https://hkob.notion.site/notionErDiagram-Sample-1720c2199c534ca08138cde38f31f710)
+5. [Create Sitemap from Notion pages / Notion page からサイトマップを作成](https://hkob.notion.site/notionSitemap-sample-14e195c83d024c5382aab09210916c87)
+6. [Create Notion databases from ER Diagram / ER 図から Notion データベースを作成](https://hkob.notion.site/erdToNotionDb-sample-87e5e52a6b9f46abbdeebcb3c902a516)
 
 ### 2.5 API reference / API リファレンス
 
@@ -125,6 +126,8 @@ NotionRubyMapping.configuration { |c| c.notion_token = ENV["NOTION_API_TOKEN"] }
 
 ## 3. ChangeLog
 
+- 2023/2/9 [v0.7.4] bug fix for rollup property of erdToNotionRb.rb script
+- 2023/1/26 [v0.7.3] release beta version of erdToNotionRb.rb script
 - 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

data/exe/erdToNotionDb.rb

@@ -35,7 +35,22 @@ exist_dbs.each do |db|
 end
 
 mermaid.create_notion_db target_page, inline
-mermaid.update_databases
-mermaid.rename_reverse_name
-mermaid.update_rollup
-
+mermaid.update_title
+pass = 1
+pre_remain = nil
+loop do
+  print "=== Pass #{pass} ===\n"
+  mermaid.update_databases
+  mermaid.rename_reverse_name
+  count = mermaid.count
+  remain = mermaid.remain
+  print "Pass #{pass} Remain #{remain} in #{count}\n"
+  if pre_remain == remain
+    print "Dependency loop detected.\n"
+    exit
+  end
+  pre_remain = remain
+  break if remain.zero?
+  pass += 1
+end
+print "Finish!!!"

data/lib/notion_ruby_mapping/blocks/database.rb

@@ -155,7 +155,12 @@ module NotionRubyMapping
       if dry_run
         dry_run_script :patch, @nc.database_path(@id), :update_property_schema_json
       else
-        update_json @nc.update_database_request(@id, update_property_schema_json)
+        payload = update_property_schema_json
+        begin
+          update_json @nc.update_database_request(@id, payload)
+        rescue StandardError => e
+          raise StandardError, "#{e.message} by #{payload}"
+        end
       end
     end
   end

data/lib/notion_ruby_mapping/controllers/mermaid.rb

@@ -16,7 +16,7 @@ module NotionRubyMapping
       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)
+          db_or_create(Regexp.last_match(1)).append_relation_queue db_or_create(Regexp.last_match(2)), Regexp.last_match(3)
         when / *(\w+) *{ */
           append_db_with_attributes Regexp.last_match(1)
         else
@@ -52,11 +52,17 @@ module NotionRubyMapping
     end
 
     def create_notion_db(target_page, inline)
-      @databases.values.each do |mdb|
+      @databases.each_value do |mdb|
         mdb.create_notion_db(target_page, inline) unless mdb.real_db
       end
     end
 
+    def update_title
+      @databases.each_value do |mdb|
+        mdb.update_title
+      end
+    end
+
     def update_databases
       @databases.each_value(&:update_database)
     end
@@ -65,8 +71,12 @@ module NotionRubyMapping
       @databases.each_value(&:rename_reverse_name)
     end
 
-    def update_rollup
-      @databases.each_value(&:update_rollup)
+    def count
+      @databases.values.map(&:count).sum
+    end
+
+    def remain
+      @databases.values.map(&:remain).sum
     end
   end
-end
+end

data/lib/notion_ruby_mapping/controllers/mermaid_database.rb

@@ -6,11 +6,14 @@ module NotionRubyMapping
       @name = key
       @title = nil
       @properties = {}
+      @finish_flag = {}
+      @working = []
       @relations = {}
+      @relation_queue = []
       @real_db = nil
       @reverse_name_queue = {}
     end
-    attr_reader :properties, :relations, :real_db, :title
+    attr_reader :properties, :relation_queue, :relations, :real_db, :title, :finish_flag
     attr_accessor :name
 
     def add_property(key, value)
@@ -21,8 +24,8 @@ module NotionRubyMapping
       end
     end
 
-    def append_relation(other, relation)
-      @relations[relation] = other
+    def append_relation_queue(other, relation)
+      @relation_queue << [relation, other]
     end
 
     def attach_database(db)
@@ -40,12 +43,31 @@ module NotionRubyMapping
       end
     end
 
-    def update_properties
+    def blocked?(name)
+      @finish_flag[name].nil?
+    end
+
+    def count
+      @properties.count + @relation_queue.count + 1
+    end
+
+    def remain
+      count - @finish_flag.count
+    end
+
+    def update_title
       ps = @real_db.properties
       title_property = ps.select { |p| p.is_a? TitleProperty }.first
       title_property.new_name = @title unless title_property.name == @title
+      @finish_flag[@title] = true
+    end
+
+    def update_properties
+      ps = @real_db.properties
       @properties.each do |(value, key)|
         name, *options = value.split("|")
+        next if @finish_flag[name]
+
         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/
@@ -56,13 +78,23 @@ module NotionRubyMapping
             rich_text: RichTextProperty, url: UrlProperty, status: StatusProperty
           }[key.to_sym]
           @real_db.add_property klass, name unless property
+          @working << name
         when "formula"
           f_e = options.first&.gsub "@", '"'
-          if property
-            property.formula_expression = f_e unless property.formula_expression == f_e
+          dependencies = f_e&.scan(/prop\("([^"]+)"\)/) || []
+          blocked_key = dependencies.select { |k| blocked? k.first }
+          if blocked_key.empty?
+            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
+            @working << name
           else
-            @real_db.add_property(FormulaProperty, name) { |dp| dp.formula_expression = f_e }
+            print("#{name} blocked by #{blocked_key.flatten}\n")
+            next
           end
+
         when "multi_select"
           if property
             (options - (property.multi_select_options.map { |h| h["name"] })).each do |select_name|
@@ -75,6 +107,7 @@ module NotionRubyMapping
               end
             end
           end
+          @working << name
         when "number"
           format_value = options.empty? ? "number" : options.first
           if property
@@ -82,6 +115,35 @@ module NotionRubyMapping
           else
             @real_db.add_property(NumberProperty, name) { |p| p.format = format_value }
           end
+          @working << name
+        when "rollup"
+          name, *options = value.split("|")
+          relation_name, rollup_name, function = options
+          if blocked? relation_name
+            print("#{name} blocked by #{relation_name}\n")
+            next
+          else
+            relation_db = @relations[relation_name]
+            if relation_db.nil? || relation_db.blocked?(rollup_name)
+              print "#{name} blocked by #{relation_name}-#{rollup_name}\n"
+              next
+            else
+              property = ps.values_at(name).first
+
+              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
+              @working << name
+            end
+          end
         when "select"
           if property
             (options - (property.select_options.map { |h| h["name"] })).each do |select_name|
@@ -94,34 +156,51 @@ module NotionRubyMapping
               end
             end
           end
+          @working << name
         else
           nil
         end
       end
-      @relations.each do |value, relation_db|
+      while (array = @relation_queue.shift) do
+        value, relation_db = array
         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
+            if property.database_id == db_id && property.synced_property_name == reverse
+              relation_db.add_property "relation", reverse
+              relation_db.finish_flag[reverse] = true
+            else
+              unless @finish_flag[forward]
+                property.replace_relation_database database_id: db_id
+                relation_db.append_reverse_name_queue self, forward, reverse
+              end
+              @working << forward
+              add_property "relation", forward
+            end
+            relation_db.relations[reverse] = self
           else
-            next if property.database_id == db_id
-
-            property.replace_relation_database database_id: db_id, type: "single_property"
+            unless property.database_id == db_id
+              property.replace_relation_database database_id: db_id, type: "single_property"
+              @working << forward
+              add_property "relation", forward
+            end
           end
+          @relations[forward] = relation_db
         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
+              relation_db.relations[reverse] = self
             else
               p.replace_relation_database database_id: relation_db.real_db.id, type: "single_property"
             end
           end
+          @relations[forward] = relation_db
+          @working << forward
+          add_property "relation", forward
         end
       end
       @real_db.property_schema_json
@@ -129,54 +208,39 @@ module NotionRubyMapping
 
     def append_reverse_name_queue(other_db, forward, reverse)
       @reverse_name_queue[reverse] = [other_db, forward]
+      add_property "relation", reverse
     end
 
     def update_database
       update_properties
       @real_db.save
+      while (name = @working.shift)
+        @finish_flag[name] = true
+      end
     end
 
     def rename_reverse_name
       save = false
+      reverses = []
+      clears = []
       @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
+          reverses << other_db.real_db
+          clears << rrp
           save = true
         end
+        @finish_flag[reverse] = true
       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
+      if save
+        @real_db.save
+        clears.map(&:clear_will_update)
+        reverses.map(&:reload)
       end
-      @real_db.property_schema_json
-    end
-
-    def update_rollup
-      update_rollup_schema
-      @real_db.save
+      @reverse_name_queue = {}
     end
   end
 end

data/lib/notion_ruby_mapping/properties/property.rb

@@ -126,6 +126,8 @@ module NotionRubyMapping
 
     # @return [FalseClass]
     def clear_will_update
+      @new_name = nil
+      @remove = nil
       @will_update = false
     end
 

data/lib/notion_ruby_mapping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Notion Ruby mapping tool