notion_ruby_mapping 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a2aa2a4c8880559f3a314967335cfd4f008b9884890111b6d5edfcb0f6251c
-  data.tar.gz: 52ece830f67e3373f653f60dcee81b1076c5ab095eb9d53bb4d0e3340c76bc7c
+  metadata.gz: b9297c2ca59117bacfab46da55e60bda063c3a08a1bfc0acdd5b8e9b7b029c52
+  data.tar.gz: fdcfc87ab82132cebedf50f99c174793c74e952cc35608b60935e2bd158a2df6
 SHA512:
-  metadata.gz: 7b70e9092468ef61744ec120e499402daf214e35d5c86158d4b44fc3fb9d7262e6d5b82e6763b20554f843996a9d614bd181b09baad66f2533fa1a076b15555b
-  data.tar.gz: e618b6066d6d17e4564cdfbadda3b3f0d7b598740f5b3ed1c2a9c2b640d28284cfa8ecfc1676fb0de6be0d604cd24670856ce112e049fbe5a91ac44b4404b05b
+  metadata.gz: 0f01ba2a798cd79e608b244a6c9c0157f92b1f7e2f9bd4fd4772b38e60f708d1da5a70ffda0816b8aa136282da49d118ff04ede19a363674c3277b3095a34e91
+  data.tar.gz: 6135423f52bdc33585247ef2c144a49492b54a28d18ae7429d8f4df9791f4d4189d570c2b381b89f939d0b2e2e1914276172b603f612038dbfc7c495ea250c01

data/README.md

@@ -92,6 +92,7 @@ NotionCache.instance.create_client ENV["NOTION_API_TOKEN"] # from environment
 
 ## 3. ChangeLog
 
+- 2022/9/2 [v0.6.7] add support for Status property, is_toggleable for headings block, and page property values
 - 2022/8/10 [v0.6.6] Bug fix(notionSitemap.rb): Skip if child page is empty.
 - 2022/8/10 [v0.6.5] add notionSitemap.rb, rename createErDiagram to notionErDiagram, and move them to exe directory
 - 2022/8/9 [v0.6.4] url can be entered instead of page_id, block_id and database_id

data/lib/notion_ruby_mapping/blocks/heading1_block.rb

@@ -14,5 +14,13 @@ module NotionRubyMapping
     def type
       "heading_1"
     end
+
+    # @param [Boolean] not_update false when update
+    # @return [Hash{String (frozen)->Hash}]
+    def block_json(not_update: true)
+      ans = super
+      ans[type]["is_toggleable"] = false
+      ans
+    end
   end
 end

data/lib/notion_ruby_mapping/blocks/heading2_block.rb

@@ -14,5 +14,13 @@ module NotionRubyMapping
     def type
       "heading_2"
     end
+
+    # @param [Boolean] not_update false when update
+    # @return [Hash{String (frozen)->Hash}]
+    def block_json(not_update: true)
+      ans = super
+      ans[type]["is_toggleable"] = false
+      ans
+    end
   end
 end

data/lib/notion_ruby_mapping/blocks/heading3_block.rb

@@ -14,5 +14,13 @@ module NotionRubyMapping
     def type
       "heading_3"
     end
+
+    # @param [Boolean] not_update false when update
+    # @return [Hash{String (frozen)->Hash}]
+    def block_json(not_update: true)
+      ans = super
+      ans[type]["is_toggleable"] = false
+      ans
+    end
   end
 end

data/lib/notion_ruby_mapping/blocks/page.rb

@@ -47,7 +47,7 @@ module NotionRubyMapping
 
     # @param [String] title
     # @param [Array<String, Property>] assigns
-    # @return [NotionRubyMapping::Database]
+    # @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
@@ -56,7 +56,7 @@ module NotionRubyMapping
     # @return [String] title
     # @see https://www.notion.so/hkob/Page-d359650e3ca94424af8359a24147b9a0#2ff7209055f346fbbda454cdbb40b1c8
     def title
-      tp = properties.select { |p| (p.is_a?(TitleProperty)) || (p.is_a?(Property) && p.property_id == "title") }
+      tp = properties.select { |p| p.is_a?(TitleProperty) || (p.is_a?(Property) && p.property_id == "title") }
       tp.map(&:full_text).join ""
     end
 

data/lib/notion_ruby_mapping/blocks/toggle_heading1_block.rb

@@ -7,5 +7,13 @@ module NotionRubyMapping
     def type
       "heading_1"
     end
+
+    # @param [Boolean] not_update false when update
+    # @return [Hash{String (frozen)->Hash}]
+    def block_json(not_update: true)
+      ans = super
+      ans[type]["is_toggleable"] = true
+      ans
+    end
   end
 end

data/lib/notion_ruby_mapping/blocks/toggle_heading2_block.rb

@@ -7,5 +7,13 @@ module NotionRubyMapping
     def type
       "heading_2"
     end
+
+    # @param [Boolean] not_update false when update
+    # @return [Hash{String (frozen)->Hash}]
+    def block_json(not_update: true)
+      ans = super
+      ans[type]["is_toggleable"] = true
+      ans
+    end
   end
 end

data/lib/notion_ruby_mapping/blocks/toggle_heading3_block.rb

@@ -7,5 +7,13 @@ module NotionRubyMapping
     def type
       "heading_3"
     end
+
+    # @param [Boolean] not_update false when update
+    # @return [Hash{String (frozen)->Hash}]
+    def block_json(not_update: true)
+      ans = super
+      ans[type]["is_toggleable"] = true
+      ans
+    end
   end
 end

data/lib/notion_ruby_mapping/controllers/property_cache.rb

@@ -48,6 +48,10 @@ module NotionRubyMapping
       end
     end
 
+    def inspect
+      "PropertyCache"
+    end
+
     # @return [Hash] created property values json
     def property_values_json
       @properties.each_with_object({}) do |(_, property), ans|

data/lib/notion_ruby_mapping/properties/checkbox_property.rb

@@ -33,8 +33,9 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [Boolean, Hash] json
-    def initialize(name, will_update: false, base_type: :page, property_cache: nil, json: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, property_id: nil, property_cache: nil, json: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = if database?
                 json || {}
               else

data/lib/notion_ruby_mapping/properties/created_by_property.rb

@@ -22,8 +22,10 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [String] user_id user_id (optional)
     # @param [Hash] json json (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = if database?
                 json || {}
               else

data/lib/notion_ruby_mapping/properties/created_time_property.rb

@@ -21,8 +21,9 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [String] json created_time value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json
       @json ||= {} if database?
     end

data/lib/notion_ruby_mapping/properties/date_property.rb

@@ -75,8 +75,10 @@ module NotionRubyMapping
     # @param [Date, Time, DateTime, String, nil] start_date
     # @param [Date, Time, DateTime, String, nil] end_date
     # @param [String, nil] time_zone
-    def initialize(name, will_update: false, base_type: :page, json: nil, start_date: nil, end_date: nil, time_zone: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, start_date: nil, end_date: nil,
+                   time_zone: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json || {}
       return if database?
 

data/lib/notion_ruby_mapping/properties/email_property.rb

@@ -32,8 +32,9 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json || {}
     end
 

data/lib/notion_ruby_mapping/properties/files_property.rb

@@ -33,8 +33,10 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [String] files files value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, files: [], property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, files: [], property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       if database?
         @files = json || {}
       elsif json

data/lib/notion_ruby_mapping/properties/formula_property.rb

@@ -41,8 +41,10 @@ module NotionRubyMapping
 
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, will_update: false, base_type: :page, json: nil, formula: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, formula: nil, property_id: nil, 
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json || {}
       return unless database?
 

data/lib/notion_ruby_mapping/properties/last_edited_by_property.rb

@@ -22,8 +22,10 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [String] user_id user_id (optional)
     # @param [Hash] json json (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = if database?
                 json || {}
               else

data/lib/notion_ruby_mapping/properties/last_edited_time_property.rb

@@ -21,8 +21,9 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [String] json last_edited_time value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json
       @json ||= {} if database?
     end

data/lib/notion_ruby_mapping/properties/multi_select_property.rb

@@ -61,8 +61,10 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash] json
     # @param [Array<String>, String] multi_select
-    def initialize(name, will_update: false, base_type: :page, json: nil, multi_select: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, multi_select: nil,
+                   property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       if database?
         @json = json || {"options" => []}
       else

data/lib/notion_ruby_mapping/properties/number_property.rb

@@ -53,8 +53,10 @@ module NotionRubyMapping
 
     # @param [String] name Property name
     # @param [Float, Integer, Hash] json Number value or format Hash
-    def initialize(name, will_update: false, base_type: :page, json: nil, format: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, format: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json
       @json ||= {"format" => (format || "number")} if database?
     end

data/lib/notion_ruby_mapping/properties/people_property.rb

@@ -40,14 +40,22 @@ module NotionRubyMapping
     ## Common methods
 
     def self.people_from_json(json)
-      List.new(json: json, property: self).select { true }
+      if json.is_a? Array
+        json.map { |sub_json| UserObject.new json: sub_json }
+      elsif json["object"] == "list"
+        List.new(json: json, property: self).select { true }
+      else
+        json["people"].map { |sub_json| UserObject.new json: sub_json }
+      end
     end
 
     # @param [String] name
     # @param [Hash] json
     # @param [Array] people ids for people
-    def initialize(name, will_update: false, base_type: :page, json: nil, people: nil, property_cache: nil, query: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
+    def initialize(name, will_update: false, base_type: :page, json: nil, people: nil, property_id: nil,
+                   property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache, query: query
       @json = if database?
                 {}
               elsif people

data/lib/notion_ruby_mapping/properties/phone_number_property.rb

@@ -34,8 +34,9 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+            property_cache: property_cache
       @json = database? ? {} : json
     end
 

data/lib/notion_ruby_mapping/properties/property.rb

@@ -79,15 +79,20 @@ module NotionRubyMapping
         objects = List.new(json: input_json, property: tmp, query: query).select { true }
         case input_json["property_item"]["type"]
         when "people"
-          PeopleProperty.new name, people: objects, base_type: base_type, property_cache: property_cache, query: query
+          PeopleProperty.new name, people: objects, base_type: base_type,
+                             property_cache: property_cache, query: query
         when "relation"
-          RelationProperty.new name, relation: objects, base_type: base_type, property_cache: property_cache, query: query
+          RelationProperty.new name, relation: objects, base_type: base_type,
+                               property_cache: property_cache, query: query
         when "rich_text"
-          RichTextProperty.new name, text_objects: objects, base_type: base_type, property_cache: property_cache, query: query
+          RichTextProperty.new name, text_objects: objects, base_type: base_type,
+                               property_cache: property_cache, query: query
         when "rollup"
-          RollupProperty.new name, json: objects, base_type: base_type, property_cache: property_cache, query: query
+          RollupProperty.new name, json: objects, base_type: base_type,
+                             property_cache: property_cache, query: query
         when "title"
-          TitleProperty.new name, text_objects: objects, base_type: base_type, property_cache: property_cache, query: query
+          TitleProperty.new name, text_objects: objects, base_type: base_type,
+                            property_cache: property_cache, query: query
         end
       else
         klass = {
@@ -114,7 +119,8 @@ module NotionRubyMapping
         }[type]
         raise StandardError, "Irregular property type: #{type}" unless klass
 
-        klass.new name, json: input_json[type], base_type: base_type, property_cache: property_cache
+        klass.new name, property_id: input_json["id"], json: input_json[type], base_type: base_type,
+                  property_cache: property_cache
       end
     end
 

data/lib/notion_ruby_mapping/properties/relation_property.rb

@@ -70,8 +70,10 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash, Array] json
     # @param [String, Array] relation
-    def initialize(name, will_update: false, json: nil, relation: nil, base_type: :page, property_cache: nil, query: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
+    def initialize(name, will_update: false, json: nil, relation: nil, base_type: :page, property_id: nil,
+                   property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache, query: query
       @json = if database?
                 json || {}
               elsif relation

data/lib/notion_ruby_mapping/properties/rollup_property.rb

@@ -71,8 +71,10 @@ module NotionRubyMapping
 
     # @param [String] name
     # @param [Hash] json
-    def initialize(name, will_update: false, json: nil, base_type: :page, property_cache: nil, query: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
+    def initialize(name, will_update: false, json: nil, base_type: :page, property_id: nil,
+                   property_cache: nil, query: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache, query: query
       @json = json || {}
     end
 

data/lib/notion_ruby_mapping/properties/select_property.rb

@@ -74,8 +74,10 @@ module NotionRubyMapping
     # @param [String] name Property name
     # @param [Hash] json
     # @param [String] select String value (optional)
-    def initialize(name, will_update: false, base_type: :page, json: nil, select: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, select: nil, property_id: nil,
+                   property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = if database?
                 json || {"options" => []}
               else

data/lib/notion_ruby_mapping/properties/status_property.rb

@@ -3,24 +3,47 @@
 module NotionRubyMapping
   # Status property
   class StatusProperty < Property
+    include EqualsDoesNotEqual
+    include IsEmptyIsNotEmpty
     TYPE = "status"
 
     ### Public announced methods
 
     ## Common methods
 
+    # @see https://www.notion.so/hkob/StatusProperty-c8b2c83019bc42edbc1527386c7ef453#bdb34c0aeaa74729887da087d0bd8022
     def status
       @json
     end
 
+    ## Page property only methods
+
+    # @return [String]
+    # @see https://www.notion.so/hkob/StatusProperty-c8b2c83019bc42edbc1527386c7ef453#69452ceee6c9452296e96bb2a37460ee
+    def status_name
+      assert_page_property __method__
+      @json["name"]
+    end
+
+    ## Page property only methods
+
+    # @param [String] status
+    # @see https://www.notion.so/hkob/StatusProperty-c8b2c83019bc42edbc1527386c7ef453#b3fba1b6322140f28308de3ba70a8b7b
+    def status=(status)
+      assert_page_property __method__
+      @will_update = true
+      @json = {"name" => status}
+    end
+
     ### Not public announced methods
 
     ## Common methods
 
     # @param [String] name Property name
     # @param [Boolean, Hash] json
-    def initialize(name, will_update: false, base_type: :page, property_cache: nil, json: {})
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, property_id: nil, property_cache: nil, json: {})
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json
     end
 
@@ -29,8 +52,7 @@ module NotionRubyMapping
     # @return [Hash]
     def property_values_json
       assert_page_property __method__
-      {}
-      #{@name => {"status" => @json, "type" => "status"}}
+      {@name => {"status" => @json, "type" => "status"}}
     end
   end
 end

data/lib/notion_ruby_mapping/properties/text_property.rb

@@ -27,10 +27,12 @@ module NotionRubyMapping
     # @param [String] name
     # @param [Hash, Array] json
     # @param [Array<RichTextObject>] text_objects
-    def initialize(name, will_update: false, base_type: :page, json: nil, text_objects: nil, property_cache: nil, query: nil)
+    def initialize(name, will_update: false, base_type: :page, json: nil, text_objects: nil, property_id: nil,
+                   property_cache: nil, query: nil)
       raise StandardError, "TextObject is abstract class.  Please use RichTextProperty." if instance_of? TextProperty
 
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache, query: query
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache, query: query
       @text_objects = if database?
                         json || {}
                       else

data/lib/notion_ruby_mapping/properties/title_property.rb

@@ -10,8 +10,12 @@ module NotionRubyMapping
     ## Common methods
 
     def self.rich_text_array_from_json(json)
-      rich_text_objects = List.new(json: json, property: self).select { true }
-      RichTextArray.rich_text_array "title", rich_text_objects
+      if json["object"] == "list"
+        rich_text_objects = List.new(json: json, property: self).select { true }
+        RichTextArray.rich_text_array "title", rich_text_objects
+      else
+        RichTextArray.new "title", json: json["title"]
+      end
     end
 
     # @param [Hash] json

data/lib/notion_ruby_mapping/properties/url_property.rb

@@ -34,8 +34,9 @@ module NotionRubyMapping
     ## Common methods
 
     # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_cache: nil)
-      super name, will_update: will_update, base_type: base_type, property_cache: property_cache
+    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+      super name, will_update: will_update, base_type: base_type, property_id: property_id,
+                  property_cache: property_cache
       @json = json || (database? ? {} : nil)
     end
 

data/lib/notion_ruby_mapping/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
   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.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday