notion_ruby_mapping 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c557600e1d6f89386696ffeadd7b3169fc0f3bfd19cc9aab29ce4e401d5b8969
-  data.tar.gz: 3dc90d601a14e96bc6c65b44a75231095cc52a7efc89067b5e37653133e546cf
+  metadata.gz: 5aef3ce3be5f734faf9803496c1196e715ad8513fbabc143abe43b4d4780a274
+  data.tar.gz: 1384fc70512cc6a396693fb7a37f8a80311bac85e26616a22ea8a5b3c491e28e
 SHA512:
-  metadata.gz: 3177e1c978dfda8968986afc96c4456a3842112d5de4d8b661074be3aaf3eb3a75b87297ac3b5701874091ac3444e8d88782747efa4ffbab02f3299875363d47
-  data.tar.gz: 3ad09dca8a9f818e35b8f8b1c611f89273efc4c9b34a78daf5fb34232372f5827afe5e307011380fa47263bc2de694461339d4b27793e4b2cb1af0fecdf75f6f
+  metadata.gz: cf783b7b53434fefb0f556a9f0fd17ca4dc4bac220e90bb609abf454a1e05ec0de37f4937998cd04fc34c037e87bea9ca3c454593a53a1a0de7998fea7009c9f
+  data.tar.gz: ea70aa30d1f9d082cab295320d79b4a975a67255fc61ce4956379e98ca4b4996093ac9e0b1c19e80815b233792be5ff5d29b50a49115d0d1e68461237dfefdfd

data/README.md

@@ -6,25 +6,41 @@ Development note is here. → [Idea note of "notion_ruby_mapping"](https://www.n
 
 ## Table of Contents
 - [NotionRubyMapping](#notionrubymapping)
-  - [Installation](#installation)
-  - [Example code](#example-code)
-  - [Usage](#usage)
-    - [Create a New Integration](#create-a-new-integration)
-    - [Create client](#create-client)
-    - [Classes](#classes)
-      - [Base class](#base-class)
-      - [Database class](#database-class)
-      - [Query class](#query-class)
-      - [Page class](#page-class)
-      - [List class](#list-class)
-      - [Block class](#block-class)
-  - [ChangeLog](#changelog)
-  - [Contributing](#contributing)
-  - [License](#license)
-  - [Code of Conduct](#code-of-conduct)
-  - [Acknowledgements](#acknowledgements)
-
-## Installation
+  - [Table of Contents](#table-of-contents)
+  - [1. Installation](#1-installation)
+  - [2. Example code](#2-example-code)
+  - [3. Usage](#3-usage)
+    - [3.1 Create a New Integration](#31-create-a-new-integration)
+    - [3.2 Create client](#32-create-client)
+    - [3.3 Retrieve a database](#33-retrieve-a-database)
+    - [3.4 Retrieve a page](#34-retrieve-a-page)
+    - [3.5 Query a database](#35-query-a-database)
+      - [3.5.1 A simple example](#351-a-simple-example)
+      - [3.5.2 Property classes](#352-property-classes)
+      - [3.5.3 Query object generator of property objects](#353-query-object-generator-of-property-objects)
+      - [3.5.4 Complex conditions](#354-complex-conditions)
+      - [3.5.5 Sort criteria](#355-sort-criteria)
+    - [3.6 Access the database or page values and properties](#36-access-the-database-or-page-values-and-properties)
+  - [3.7 Set icon (Database / Page)](#37-set-icon-database--page)
+  - [3.8 Update page property values](#38-update-page-property-values)
+    - [3.8.1 Assign property and update it (fastest: one API call only)](#381-assign-property-and-update-it-fastest-one-api-call-only)
+    - [3.8.2 Update the loaded page (easy but slow: two API calls)](#382-update-the-loaded-page-easy-but-slow-two-api-calls)
+    - [3.8.3 Update the unloaded page with auto-load (easy but slow: two API calls)](#383-update-the-unloaded-page-with-auto-load-easy-but-slow-two-api-calls)
+    - [3.8.4 Explanation of how to update each property](#384-explanation-of-how-to-update-each-property)
+      - [3.8.4.1 NumberProperty](#3841-numberproperty)
+      - [3.8.4.2 SelectProperty](#3842-selectproperty)
+      - [3.8.4.3 MultiSelectProperty](#3843-multiselectproperty)
+      - [3.8.4.4 DateProperty](#3844-dateproperty)
+    - [3.9 Iteration of list object](#39-iteration-of-list-object)
+  - [4. ChangeLog](#4-changelog)
+  - [5. Contributing](#5-contributing)
+  - [6. License](#6-license)
+  - [7. Code of Conduct](#7-code-of-conduct)
+  - [8. Acknowledgements](#8-acknowledgements)
+
+<!-- @import "[TOC]" {cmd="toc" depthFrom=2 depthTo=4 orderedList=false} -->
+
+## 1. Installation
 
 Add this line to your application's Gemfile:
 
@@ -40,7 +56,7 @@ Or install it yourself as:
 
     $ gem install notion_ruby_mapping
 
-## Example code
+## 2. Example code
 
 The following code sets a "💿" icon on all unset pages in the database.
 ```Ruby
@@ -58,6 +74,10 @@ Database.query(database_id).each do |page|
 end
 ```
 
+|Before execution|After execution|
+|---|---|
+|![Before execution](images/pre_set_icon.png)|![After execution](images/post_set_icon.png)|
+
 The following code sets serial numbers to the pages whose title is not empty in ascending order of titles.
 ```Ruby
 tp = RichTextProperty.new("TextTitle")
@@ -65,52 +85,59 @@ Database.query(database_id, tp.filter_is_not_empty.ascending(tp)).each.with_inde
   page.properties["NumberTitle"].number = index
   page.update
 end
-
 ```
+| After execution                               |
+|-----------------------------------------------|
+| ![After exuecution](images/serial_number.png) |
 
-|Before execution|After execution|
-|---|---|
-|![Before execution](images/pre_set_icon.png)|![After execution](images/post_set_icon.png)|
+## 3. Usage
 
-## Usage
-
-### Create a New Integration
+### 3.1 Create a New Integration
 
 Please check [Notion documentation](https://developers.notion.com/docs#getting-started).
 
-### Create client
+### 3.2 Create client
 
+Please create a client (notion-ruby-client) before you use the following class.
 ```Ruby
 NotionCache.instance.create_client ENV["NOTION_API_TOKEN"]
 ```
-Please create a client (notion-ruby-client) before you use the following class.
 
-### Classes
+### 3.3 Retrieve a database
+
+Database.find(id) creates a Database object from the results of Notion API.
 
-#### Base class (Abstract class for Database / Page / Block / List)
+```Ruby
+db = Database.find("c37a2c66-e3aa-4a0d-a447-73de3b80c253")
+```
 
-- Set icon (only Database / Page)
+Database.new(id) creates a Database object without accessing to Notion.
+If you want to retrieve the contents after creation, please use a `reload` method.
 
 ```Ruby
-obj.set_icon emoji: "💿" # set emoji
-obj.set_icon url: "https://cdn.profile-image.st-hatena.com/users/hkob/profile.png" # set external url
+db = Database.new("c37a2c66-e3aa-4a0d-a447-73de3b80c253")
+db.reload
 ```
 
-- Get values and properties
+### 3.4 Retrieve a page
+
+Page.find(id) creates a Page object from the results of Notion API.
 
 ```Ruby
-obj.icon # obtain icon json
-obj["icon"] # same as obj.icon
-obj.properties["NumberTitle"]
+page = Page.find("c01166c6-13ae-45cb-b968-18b4ef2f5a77")
 ```
 
-#### Database class
+Page.new(id) creates a Page object without accessing to Notion.
+If you want to retrieve the contents after creation, please use a `reload` method.
 
-- Retrieve a database
 ```Ruby
-db = Database.find("c37a2c66-e3aa-4a0d-a447-73de3b80c253")
+page = Page.new("c01166c6-13ae-45cb-b968-18b4ef2f5a77")
+page.reload
 ```
-- Query a database
+
+### 3.5 Query a database
+
+#### 3.5.1 A simple example
 
 Gets a List object of Page objects contained in the database.
 You can obtain filtered and ordered pages using Query object.
@@ -119,8 +146,6 @@ Database.query("c37a2c66-e3aa-4a0d-a447-73de3b80c253") # retrieves all pages
 Database.query("c37a2c66-e3aa-4a0d-a447-73de3b80c253", query) # retrieves using query
 ```
 
-#### Query class and related *Property class
-
 Query object can be generated from the following Property objects.
 For example, in order to obtain the pages whose title starts with "A" and ordered by ascending,
 the following code can be used.
@@ -130,6 +155,35 @@ query = tp.filter_starts_with("A").ascending(tp)
 pages = Database.query database_id, query
 ```
 
+#### 3.5.2 Property classes
+
+There are the following 17 XXXProperty classes corresponding to Notion databases.
+They are child classes of a `Property` class
+and these constructor method has a common form where the first argument is the property name.
+```Ruby
+xp = XXXProperty.new "property name"
+```
+
+1. TitleProperty
+2. RichTextProperty
+3. UrlProperty
+4. EmailProperty
+5. PhoneNumberProperty
+6. NumberProperty
+7. CheckboxProperty
+8. SelectProperty
+9. MultiSelectProperty
+10. PeopleProperty
+11. CreatedByProperty
+12. LastEditedByProperty
+13. DateProperty
+14. CreatedTimeProperty
+15. LastEditedTimeProperty
+16. FilesProperty
+17. FormulaProperty
+
+#### 3.5.3 Query object generator of property objects
+
 The following methods for the Property objects generate a query object.
 - TitleProperty, RichTextProperty, UrlProperty, EmailProperty, PhoneNumberProperty
   - filter_equals(value)
@@ -202,16 +256,19 @@ The following methods for the Property objects generate a query object.
   - filter_is_empty
   - filter_is_not_empty
 
+#### 3.5.4 Complex conditions
 Complex filters can be generated `and` / `or` methods.
+Here are some sample scripts and the json parameters created from them.
+
 ```Ruby
-# Prepare sample properties
+# Prepare some sample properties
 tp = TitleProperty.new "tp"
 np = NumberProperty.new "np"
 cp = CheckboxProperty.new "cp"
 letp = LastEditedTimeProperty.new "letp"
 ```
 
-- (A and B) filter
+- query1: (A and B) filter
 ```Ruby
 query1 = tp.filter_starts_with("start")
            .and(np.filter_greater_than(100))
@@ -231,7 +288,7 @@ query1 = tp.filter_starts_with("start")
 }
 ```
 
-- (A and B and C) filter
+- query2: (A and B and C) filter
 ```Ruby
 query2 = tp.filter_starts_with("start")
   .and(np.filter_greater_than(100))
@@ -256,7 +313,7 @@ query2 = tp.filter_starts_with("start")
 }
 ```
 
-- (A or B) filter
+- query3: (A or B) filter
 ```Ruby
 query3 = tp.filter_starts_with("start")
   .or(np.filter_greater_than(100))
@@ -276,7 +333,7 @@ query3 = tp.filter_starts_with("start")
 }
 ```
 
-- (A or B or C) filter
+- query4: (A or B or C) filter
 ```Ruby
 query4 = tp.filter_starts_with("start")
       .or(np.filter_greater_than(100))
@@ -301,7 +358,7 @@ query4 = tp.filter_starts_with("start")
 }
 ```
 
-- ((A and B) or C) filter
+- query5: ((A and B) or C) filter
 ```Ruby
 query5 = tp.filter_starts_with("start")
   .and(np.filter_greater_than(100))
@@ -330,7 +387,7 @@ query5 = tp.filter_starts_with("start")
 }
 ```
 
-- ((A or B) and C) filter
+- query6: ((A or B) and C) filter
 ```Ruby
 query6 = tp.filter_starts_with("start")
   .or(np.filter_greater_than(100))
@@ -359,7 +416,7 @@ query6 = tp.filter_starts_with("start")
 }
 ```
 
-- ((A and B) or (C and D)) filter
+- query7: ((A and B) or (C and D)) filter
 ```Ruby
 query7 = np.filter_greater_than(100).and(np.filter_less_than(200))
       .or(np.filter_greater_than(300).and(np.filter_less_than(400)))
@@ -395,7 +452,11 @@ query7 = np.filter_greater_than(100).and(np.filter_less_than(200))
 }
 ```
 
-- sort criteria
+#### 3.5.5 Sort criteria
+Sort criteria can be appended to an existing query object.
+If you don't use the previous filters, you can generate by `Query.new`.
+
+- sort criteria only
 ```Ruby
 query8 = Query.new.ascending tp
 query9 = Query.new.ascending letp
@@ -427,86 +488,211 @@ query12 = Query.new.ascending(tp).descending letp
 query13 = tp.filter_starts_with("A").ascending(tp)
 
 # Result of query13.filter
-{"property" => "tp", "title" => {"starts_with" => "start"}},
+{"property" => "tp", "title" => {"starts_with" => "start"}}
 
 # Result of query13.sort
 [{"property" => "tp", "direction" => "ascending"}]
 ```
 
-#### Page class
+### 3.6 Access the database or page values and properties
+
+Database or Page values can be accessed by [] access with keywords.
 
-- Retrieve a page
 ```Ruby
-page = Page.find("c01166c6-13ae-45cb-b968-18b4ef2f5a77")
+obj["icon"]
 ```
 
-- Update values and properties
+Almost values returns a hash or an array object except "properties".
+`obj["properties"]` or `obj.properties` returns a PropertyCache object.
+The PropertyCache object is created from json information on the first access and is cached to the Page or Database object.
+If page or database object is generated by `.new` method, the object don't have json information.
+In this case, the `.properties` method calls `reload` method automatically, then it creates the PropertyCache object from the loaded json information (called auto-load function).
+
+```Ruby
+obj["properties"]
+# or
+obj.properties
+```
+
+Each Property object is obtained by [] access with the property name.
+The Property object is also created on the first access and is cached to the PropertyCache object.
+
+```Ruby
+np = obj.properties["NumberTitle"]
+```
+
+## 3.7 Set icon (Database / Page)
+
+Database or Page icon can update by `obj.set_icon` method.
+You can set icon as emoji or external url.
+
+```Ruby
+obj.set_icon emoji: "💿" # set emoji
+obj.set_icon url: "https://cdn.profile-image.st-hatena.com/users/hkob/profile.png" # set external url
+```
+
+## 3.8 Update page property values
 
 Page properties can update in the following three ways.
 
-  1. update the property directory (fastest: one API call only)
+### 3.8.1 Assign property and update it (fastest: one API call only)
+
+This is the fastest way using an empty Page object.
+`page.assign_property` generates an empty PropertyCache and an empty XXXProperty.
+After updating the property value, please call `page.update`.
+Notion API will be called using a JSON payload generated from the PropertyCache object.
+
 ```Ruby
 page = Page.new id: page_id
-np = NumberProperty.new "NumberTitle", number: 3.14
-page.add_property_for_update np
+property = page.assign_property NumberProperty, "NumberTitle"
+property.number = 2022
 page.update # update page API call
 print page
 ```
 
-  2. update the loaded page (easy but slow: two API call)
+### 3.8.2 Update the loaded page (easy but slow: two API calls)
+
+This is an easiest way using a loaded Page object.
+A PropertyCache object is automatically generated by `page.properties`.
+After updating the property value, please call `page.update`.
+Notion API will be called using a JSON payload generated from the PropertyCache object.
+There are two API calls (find and update).
+
 ```Ruby
 page = Page.find first_page_id # retrieve page API call
-page.properties["NumberTitle"].number = 2022
+property = page.properties["NumberTitle"]
+property.number = 2022
 page.update # update page API call
 print page
 ```
 
-  3. update the unloaded page using autoload (easy but slow: two API call)
+### 3.8.3 Update the unloaded page with auto-load (easy but slow: two API calls)
+
+This is also an easiest way using an auto-load function of the Page object.
+A PropertyCache object is automatically generated by `page.properties` using the auto-load function of page objects.
+After updating the property value, please call `page.update`.
+Notion API will be called using a JSON payload generated from the PropertyCache object.
+There are also two API calls (find and update).
+
 ```Ruby
 page = Page.new id: first_page_id
-page.properties["NumberTitle"].number = 12345 # retrieve page API call (autoload)
+property = page.properties["NumberTitle"] # retrieve page API call (auto-load)
+property.number = 12345
 page.update # update page API call
 print page
 ```
 
-- Retrieve block children (List object)
+### 3.8.4 Explanation of how to update each property
+
+#### 3.8.4.1 NumberProperty
+
+NumberProperty can set a number by `.number=`.
+
+```Ruby
+np = page.properties["NumberTitle"]
+np.number = 456
+p np.create_json
+# Result => {"number" => 456}
+```
+
+#### 3.8.4.2 SelectProperty
+
+NumberProperty can set a select name by `.select=`.
+
 ```Ruby
-children = page.children
+sp = page.properties["SelectTitle"]
+sp.select = "Select 2"
+p sp.create_json
+# Result => {"select" => {"name" => "Select 2"}}
 ```
 
-#### List class
+#### 3.8.4.3 MultiSelectProperty
+
+MultiSelectProperty can set a select value or Array of select values by `.multi_select=`.
 
-- access for each components
 ```Ruby
-list.each do |obj| # obj's class is Page or Block
-  # do something
-end
+msp = page.properties["MultiSelectTitle"]
+msp.select = "MS2"
+p msp.create_json
+# Result => {"multi_select" => [{"name" => "MS2"}]}
+
+msp.multi_select = %w[MS2 MS1]
+p msp.create_json
+# Result => {"multi_select" => [{"name" => "MS2"}, {"name" => "MS1"}]}
+```
+
+#### 3.8.4.4 DateProperty
+
+DateProperty can set a start_date or end_date by `.start_date=` or `end_date=`.
+Date, Time, DateTime or String object can be used to the argument.
+
+```Ruby
+dp = page.properties["DateTitle"]
+dp.start_date = Date.new(2022, 2, 22)
+p dp.create_json
+# Result => {"start" => "2022-02-22"}
+
+dp.start_date = Time.new(2022, 2, 22, 1, 23, 45, "+09:00")
+p dp.create_json
+# Result => {"start" => "2022-02-22T01:23:45+09:00"}
+
+dp.start_date = DateTime.new(2022, 2, 23, 1, 23, 45, "+09:00")
+p dp.create_json
+# Result => {"start" => "2022-02-23T01:23:45+09:00"}
+
+dp.start_date = Date.new(2022, 2, 20)
+dp.end_date = Date.new(2022, 2, 22)
+p dp.create_json
+# Result => {"start" => "2022-02-20", "end" => "2022-02-22"}
+
+dp.start_date = Time.new(2022, 2, 21, 1, 23, 45, "+09:00")
+dp.end_date = Time.new(2022, 2, 22, 1, 23, 45, "+09:00")
+p dp.create_json
+# Result => {"start" => "2022-02-21T01:23:45+09:00", "end" => "2022-02-22T01:23:45+09:00"}
+
+dp.start_date = DateTime.new(2022, 2, 21, 1, 23, 45, "+09:00")
+dp.end_date = DateTime.new(2022, 2, 22, 1, 23, 45, "+09:00")
+p dp.create_json
+# result => {"start" => "2022-02-21T01:23:45+09:00", "end" => "2022-02-22T01:23:45+09:00"}
 ```
 
-#### Block class
+### 3.9 Iteration of list object
 
-Not implemented
+Some methods like as `Database.query` return a list object.
+Since the list object also has a json array object, `Enumerable` module is implemented.
+Each iteration creates a Page or Block object and calls the block with it as an argument.
 
-## ChangeLog
+```Ruby
+pages = Database.query("c37a2c66-e3aa-4a0d-a447-73de3b80c253") # retrieves all pages
+pages.each do |page| # obj's class is Page or Block
+  page.set_icon(emoji: "💿") unless page["icon"]
+end
+```
 
+## 4. ChangeLog
+
+- 2022/2/25 add_property_for_update -> assign_property, update README.md
+- 2022/2/20 add support for MultiSelectProperty
+- 2022/2/19 add support for SelectProperty
+- 2022/2/17 added Page#properties, Page#add_property_for_update, Page#update
 - 2022/2/17 added Page#properties, Page#add_property_for_update, Page#update
 - 2022/2/16 added PropertyCache and Payload class
 - 2022/2/14 added Database#set_icon
 - 2022/2/13 added Page#set_icon
 - 2022/2/13 First commit
 
-## Contributing
+## 5. Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/hkob/notion_ruby_mapping. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/notion_ruby_mapping/blob/main/CODE_OF_CONDUCT.md).
 
-## License
+## 6. License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-## Code of Conduct
+## 7. Code of Conduct
 
 Everyone interacting in the NotionRubyMapping project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/notion_ruby_mapping/blob/main/CODE_OF_CONDUCT.md).
 
-## Acknowledgements
+## 8. Acknowledgements
 
-The code depends on [notion-ruby-client](https://github.com/orbit-love/notion-ruby-client).
+The code depends on [notion-ruby-client](https://github.com/orbit-love/notion-ruby-client).

data/lib/notion_ruby_mapping/base.rb

@@ -40,12 +40,18 @@ module NotionRubyMapping
         unless @json
           return nil if @id.nil?
 
-          update_json reload
+          reload
         end
         @property_cache = PropertyCache.new json_properties
       end
       @property_cache
-   end
+    end
+
+    # @return [NotionRubyMapping::Base] reloaded self
+    def reload
+      update_json reload_json
+      self
+    end
 
     # @return [Hash] json properties
     def json_properties
@@ -85,7 +91,7 @@ module NotionRubyMapping
       end
       self
     end
-    
+
     # @param [String] key
     # @return [NotionRubyMapping::PropertyCache, Hash] obtained Page value or PropertyCache
     def [](key)
@@ -110,10 +116,23 @@ module NotionRubyMapping
     # @param [Property] property Property object for udpate or create
     # @return [NotionRubyMapping::Base]
     def add_property_for_update(property)
-      properties.add_property property, will_update: true
+      @property_cache ||= PropertyCache.new {}
+      @property_cache.add_property property, will_update: true
       self
     end
 
+    # @param [Class] klass
+    # @param [String] title
+    # @return [Property] generated property
+    def assign_property(klass, title)
+      @property_cache ||= PropertyCache.new {}
+
+      property = klass.new(title)
+      property.will_update = true
+      @property_cache.add_property property
+      property
+    end
+
     # @return [Hash] created json
     def create_json
       payload.create_json @property_cache&.create_json

data/lib/notion_ruby_mapping/database.rb

@@ -17,8 +17,12 @@ module NotionRubyMapping
     # @param [String] id database_id (with or without "-")
     # @param [Payload] payload
     def update
-      update_json @nc.update_database @id, @payload.create_json
+      update_json @nc.update_database(@id, create_json)
+    end
+
+    # @return [Hash]
+    def reload_json
+      @nc.database_json @id
     end
   end
 end
-

data/lib/notion_ruby_mapping/date_base_property.rb

@@ -7,7 +7,7 @@ module NotionRubyMapping
   class DateBaseProperty < Property
     include IsEmptyIsNotEmpty
 
-    # @param [Date, Time, DateTime, String] obj
+    # @param [Date, Time, DateTime, String, nil] obj
     # @return [String] iso8601 format string
     def value_str(obj)
       case obj

data/lib/notion_ruby_mapping/date_property.rb

@@ -3,5 +3,42 @@
 module NotionRubyMapping
   class DateProperty < DateBaseProperty
     TYPE = "date"
+
+    # @param [String] name
+    # @param [Hash] json
+    # @param [Array] multi_select
+    def initialize(name, json: nil, start_date: nil, end_date: nil, time_zone: nil)
+      super(name, json: json)
+      @end_date = end_date
+      @start_date = start_date || end_date
+      @time_zone = time_zone
+    end
+
+    # @return [Hash] created json
+    def create_json
+      if @end_date
+        {"date" => {"start" => value_str(@start_date || @end_date), "end" => value_str(@end_date)}}
+      elsif @start_date
+        {"date" => {"start" => value_str(@start_date)}}
+      else
+        {"date" => @json || {}}
+      end
+    end
+
+    # @param [Hash] multi_select
+    # @return [Array, nil] settled array
+    def start_date=(start_date)
+      @will_update = true
+      @start_date = start_date
+      @end_date = nil if @start_date.class != @end_date.class || @start_date > @end_date
+    end
+
+    # @param [Hash] multi_select
+    # @return [Array, nil] settled array
+    def end_date=(end_date)
+      @will_update = true
+      @end_date = end_date
+      @end_date = nil if @start_date.class != @end_date.class || @start_date > @end_date
+    end
   end
 end

data/lib/notion_ruby_mapping/multi_select_property.rb

@@ -4,5 +4,25 @@ module NotionRubyMapping
   # MultiSelect property
   class MultiSelectProperty < MultiProperty
     TYPE = "multi_select"
+
+    # @param [String] name
+    # @param [Hash] json
+    # @param [Array] multi_select
+    def initialize(name, json: nil, multi_select: nil)
+      super(name, json: json)
+      @multi_select = multi_select ? Array(multi_select) : nil
+    end
+
+    # @return [Hash] created json
+    def create_json
+      {"multi_select" => @multi_select ? (@multi_select.map { |v| {"name" => v} }) : @json} || {}
+    end
+
+    # @param [Hash] multi_select
+    # @return [Array, nil] settled array
+    def multi_select=(multi_select)
+      @will_update = true
+      @multi_select = multi_select ? Array(multi_select) : nil
+    end
   end
 end

data/lib/notion_ruby_mapping/notion_cache.rb

@@ -14,7 +14,6 @@ module NotionRubyMapping
       @wait = 0
     end
     attr_reader :object_hash, :client
-    attr_accessor :use_cache
 
     # @param [String] notion_token
     # @return [NotionRubyMapping::NotionCache] self (NotionCache.instance)

data/lib/notion_ruby_mapping/number_property.rb

@@ -9,15 +9,17 @@ module NotionRubyMapping
     TYPE = "number"
 
     # @param [String] name Property name
-    # @param [Number, Fixnum] number Number value (optional)
-    # @param [String] format Format string (optional, default: "number")
-    def initialize(name, number: nil)
-      super(name)
+    # @param [Hash] json
+    # @param [Float] number Number value (optional)
+    def initialize(name, json: nil, number: nil)
+      super(name, json: json)
       @number = number
     end
+    attr_reader :number
 
+    # @return [Hash]
     def create_json
-      {"type" => "number", "number" => @number}
+      {"number" => @number || @json}
     end
 
     def number=(n)

data/lib/notion_ruby_mapping/page.rb

@@ -3,18 +3,16 @@
 module NotionRubyMapping
   # Notion page object
   class Page < Base
-    def self.find(key)
-      NotionCache.instance.page key
+    def self.find(id)
+      NotionCache.instance.page id
     end
 
-    # @param [String] id page_id (with or without "-")
-    # @param [Payload] payload
     def update
       update_json @nc.update_page(@id, create_json)
     end
-    
+
     # @return [Hash]
-    def reload
+    def reload_json
       @nc.page_json @id
     end
   end

data/lib/notion_ruby_mapping/property.rb

@@ -4,10 +4,12 @@ module NotionRubyMapping
   # abstract class for property
   class Property
     # @param [String] name Property name
+    # @param [Hash] json
     # @return [Property] generated Property object
-    def initialize(name)
+    def initialize(name, json: nil)
       @name = name
       @will_update = false
+      @json = json
     end
     attr_reader :name
     attr_accessor :will_update
@@ -25,12 +27,18 @@ module NotionRubyMapping
     end
 
     # @param [String] key
-    # @param [Hash] json
-    # @return [NotionRubyMapping::NumberProperty, nil] generated Property object
-    def self.create_from_json(key, json)
-      case json["type"]
-      when "number"
-        NumberProperty.new key, number: json["number"]
+    # @param [Hash] input_json
+    # @return [NotionRubyMapping::Property, nil] generated Property object
+    def self.create_from_json(key, input_json)
+      keys = input_json.keys
+      if keys.include? "number"
+        NumberProperty.new key, json: input_json["number"]
+      elsif keys.include? "select"
+        SelectProperty.new key, json: input_json["select"]
+      elsif keys.include? "multi_select"
+        MultiSelectProperty.new key, json: input_json["multi_select"]
+      elsif keys.include? "date"
+        DateProperty.new key, json: input_json["date"]
       else
         nil
       end

data/lib/notion_ruby_mapping/select_property.rb

@@ -6,5 +6,25 @@ module NotionRubyMapping
     include EqualsDoesNotEqual
     include IsEmptyIsNotEmpty
     TYPE = "select"
+
+    # @param [String] name Property name
+    # @param [Hash] json
+    # @param [String] select String value (optional)
+    def initialize(name, json: nil, select: nil)
+      super(name, json: json)
+      @select = select
+    end
+
+    # @return [Hash]
+    def create_json
+      {"select" => @select ? {"name" => @select} : @json} || {}
+    end
+
+    # @param [String] select
+    # @return [String] settled value
+    def select=(select)
+      @will_update = true
+      @select = select
+    end
   end
-end
+end

data/lib/notion_ruby_mapping/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notion-ruby-client
@@ -115,6 +115,7 @@ files:
 - env.yml.sample
 - images/post_set_icon.png
 - images/pre_set_icon.png
+- images/serial_number.png
 - lib/notion_ruby_mapping.rb
 - lib/notion_ruby_mapping/base.rb
 - lib/notion_ruby_mapping/block.rb