notion_ruby_mapping 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c557600e1d6f89386696ffeadd7b3169fc0f3bfd19cc9aab29ce4e401d5b8969
-  data.tar.gz: 3dc90d601a14e96bc6c65b44a75231095cc52a7efc89067b5e37653133e546cf
+  metadata.gz: 53bd845c6d0535c221a3485dde1a005f31d86dfe668a3a61e64a9170cad88e77
+  data.tar.gz: 4523b7623a9bafaceac4264bdbc5a635cdd190558cf2079747922cf9644aa664
 SHA512:
-  metadata.gz: 3177e1c978dfda8968986afc96c4456a3842112d5de4d8b661074be3aaf3eb3a75b87297ac3b5701874091ac3444e8d88782747efa4ffbab02f3299875363d47
-  data.tar.gz: 3ad09dca8a9f818e35b8f8b1c611f89273efc4c9b34a78daf5fb34232372f5827afe5e307011380fa47263bc2de694461339d4b27793e4b2cb1af0fecdf75f6f
+  metadata.gz: a9a372c98e531807eb7a954375ada24adaa3e1fbef57d6058483a7774517fb1bdbbe840bba72a301007750fcba6000d81d0504861513aafbac58b1c445d23518
+  data.tar.gz: fb95291c350bfe39d730360d1aa2ad38d1be92736e2f5f393423c3aabf3e6432552f6c4327c4a0f88d4ecd97129f0e78879d5e562f73d0d625c9836c5c52f9ce

data/README.md

@@ -58,6 +58,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,12 +69,10 @@ Database.query(database_id, tp.filter_is_not_empty.ascending(tp)).each.with_inde
   page.properties["NumberTitle"].number = index
   page.update
 end
-
 ```
-
-|Before execution|After execution|
-|---|---|
-|![Before execution](images/pre_set_icon.png)|![After execution](images/post_set_icon.png)|
+| After execution                               |
+|-----------------------------------------------|
+| ![After exuecution](images/serial_number.png) |
 
 ## Usage
 
@@ -427,7 +429,7 @@ 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"}]
@@ -487,8 +489,65 @@ end
 
 Not implemented
 
+#### NumberProperty class
+
+- constructor
+```Ruby
+np = NumberProperty.new "np", number: 123
+```
+
+- set value
+```Ruby
+np.number = 456 # number <- 456 and will_update <- true
+```
+
+- create json
+```Ruby
+np.create_json # {"number" => 456}
+```
+
+#### SelectProperty class
+
+- constructor
+```Ruby
+sp = SelectProperty.new "sp", select: "Select 1"
+```
+
+- set value
+```Ruby
+sp.select = "Select 2" # select <- "Select 2" and will_update <- true
+```
+
+- create json
+```Ruby
+sp.create_json # {"select" => {"name" => "Select 2"}}
+```
+
+#### MultiSelectProperty class
+
+- constructor
+```Ruby
+msp1 = MultiSelectProperty.new "msp1", multi_select: "MS1" # Single value
+msp2 = MultiSelectProperty.new "msp2", multi_select: %w[MS1 MS2] # Multi values
+```
+
+- set value
+```Ruby
+msp1.multi_select = %w[MS2 MS1] # multi_select <- ["MS1", "MS2"] and will_update <- true
+msp2.select = "MS2" # multi_select <- "MS2" and will_update <- true
+```
+
+- create json
+```Ruby
+msp1.create_json # {"multi_select" => [{"name" => "MS2"}, {"name" => "MS1"}]}
+msp2.create_json # {"multi_select" => [{"name" => "MS2"}]}
+```
+
 ## ChangeLog
 
+- 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

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

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/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,16 @@ 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"]
       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.2"
 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.2
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-20 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