notion_ruby_mapping 0.7.7 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a125f454d083e662faf00778b9181e386846628e3d0bf6fa068e2cbd05a513
-  data.tar.gz: f536e72b18ea0b701a2f4e7bad4fbde352e59eabc8f848b72c438226b562c58a
+  metadata.gz: d5001d647004eef3101bd45070294fc461cb257e20a6f2eaf61cbc271491b9cd
+  data.tar.gz: da78628f7e1ab2c11e176cfa1ec14fa0f5fb1dcdbfdbf37d73ff960bba6b85ab
 SHA512:
-  metadata.gz: ebdf167f99b33960ffd125f59f6b5008d7cbbad548bbb044499408dbbdc81ed989c5358733ea126202e40f6142a21265cde46e511e50718caeb204af1221778c
-  data.tar.gz: cc069fabc9bdfbd92f0ac1b086ebde7742974d692616798ceed29b89f8388bbbd3bf487e3ecb58d28819e3fcc657bbdc8d3c4dce8be315c432c4fa6d00a7bd3e
+  metadata.gz: 3e9ae34abd9f5f59f4920bec6f007ae897d291391a2e8c1148af6d53e206a00cfdb035118e3dae0525bdac3b7140c8b9818312e947b857ff6750a9cad749721c
+  data.tar.gz: 43b808260694cfa5dd542901e839794309e20a39926aee9328a3976e605affec47170984a79e04bd4965c7d27c671205135ed767c2f956cbc5ff387d6218cd3f

data/README.md

@@ -127,6 +127,7 @@ NotionRubyMapping.configuration { |c| c.notion_token = ENV["NOTION_API_TOKEN"] }
 
 ## 3. ChangeLog
 
+- 2023/6/4 [v0.8.0] add unique_id properties, filter_properties
 - 2023/4/14 [v0.7.7] add token= method for Notion API book typo
 - 2023/4/1 [v0.7.6] bug fix Ignore last ? option for page_id
 - 2023/3/8 [v0.7.5] add notionTimeRecorder.rb

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -135,7 +135,7 @@ module NotionRubyMapping
     # @param [String] database_id (with or without "-")
     # @param [NotionRubyMapping::Query] query query object
     def database_query_request(database_id, query)
-      request :post, "v1/databases/#{database_id}/query", query.query_json
+      request :post, "v1/databases/#{database_id}/query#{query.database_query_string}", query.query_json
     end
 
     # @param [String] database_id

data/lib/notion_ruby_mapping/controllers/query.rb

@@ -3,14 +3,15 @@
 module NotionRubyMapping
   # Query object
   class Query
-    def initialize(filter: {}, sort: [], page_size: 100, start_cursor: nil)
+    def initialize(filter: {}, sort: [], page_size: 100, start_cursor: nil, filter_properties: [])
       @filter = filter
       @sort = sort
       @page_size = page_size
       @start_cursor = start_cursor
+      @filter_properties = Array(filter_properties)
     end
     attr_reader :filter, :sort, :page_size
-    attr_accessor :start_cursor
+    attr_accessor :start_cursor, :filter_properties
 
     # @param [Query] another_query other query
     # @return [NotionRubyMapping::Query] updated self (Query object)
@@ -67,5 +68,10 @@ module NotionRubyMapping
       ans << "start_cursor=#{@start_cursor}" if @start_cursor
       ans.empty? ? "" : "?#{ans.join("&")}"
     end
+
+    def database_query_string
+      ans = Array(@filter_properties).map { |p| "filter_properties=#{p.property_id}" }
+      ans.empty? ? "" : "?#{ans.join("&")}"
+    end
   end
 end

data/lib/notion_ruby_mapping/properties/property.rb

@@ -75,24 +75,24 @@ module NotionRubyMapping
         new name, property_id: input_json["id"], base_type: base_type, property_cache: property_cache, query: query
       elsif type == "property_item"
         tmp = new name, property_id: input_json["property_item"]["id"], base_type: base_type,
-                  property_cache: property_cache, query: query
+                        property_cache: property_cache, query: query
         objects = List.new(json: input_json, type: :property, value: tmp, query: query).to_a
         case input_json["property_item"]["type"]
         when "people"
           PeopleProperty.new name, people: objects, base_type: base_type,
-                             property_cache: property_cache, query: query
+                                   property_cache: property_cache, query: query
         when "relation"
           RelationProperty.new name, relation: objects, base_type: base_type,
-                               property_cache: property_cache, query: query
+                                     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
+                                     property_cache: property_cache, query: query
         when "rollup"
           RollupProperty.new name, json: objects, base_type: base_type,
-                             property_cache: property_cache, query: query
+                                   property_cache: property_cache, query: query
         when "title"
           TitleProperty.new name, text_objects: objects, base_type: base_type,
-                            property_cache: property_cache, query: query
+                                  property_cache: property_cache, query: query
         end
       else
         klass = {
@@ -115,12 +115,15 @@ module NotionRubyMapping
           "status" => StatusProperty,
           "title" => TitleProperty,
           "rich_text" => RichTextProperty,
+          "unique_id" => UniqueIdProperty,
           "url" => UrlProperty,
         }[type]
         raise StandardError, "Irregular property type: #{type}" unless klass
 
-        klass.new name, property_id: input_json["id"], json: input_json[type], base_type: base_type,
-                  property_cache: property_cache
+        answer = klass.new name, property_id: input_json["id"], json: input_json[type], base_type: base_type,
+                                 property_cache: property_cache
+        answer = answer.retrieve_page_property if answer.is_a?(RelationProperty) && input_json["has_more"] == true
+        answer
       end
     end
 

data/lib/notion_ruby_mapping/properties/unique_id_property.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module NotionRubyMapping
+  # Number property
+  class UniqueIdProperty < Property
+    include EqualsDoesNotEqual
+    include GreaterThanLessThan
+    include IsEmptyIsNotEmpty
+    TYPE = "unique_id"
+
+    ### Public announced methods
+
+    ## Common methods
+
+    # @return [Hash, nil]
+    def unique_id
+      @json
+    end
+
+    ## Database property only methods
+
+    ## Page property only methods
+
+    ### Not public announced methods
+
+    ## Common methods
+
+    # @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, 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
+
+    # @param [Hash] json
+    # @return [NotionRubyMapping::NumberProperty]
+    def update_from_json(json)
+      @will_update = false
+      @json = json["unique_id"]
+      self
+    end
+
+    ## Database property only methods
+
+    ## Page property only methods
+
+    # @return [Hash]
+    def property_values_json
+      assert_page_property __method__
+      {@name => {"unique_id" => @json, "type" => "unique_id"}}
+    end
+
+    ## Database property only methods
+  end
+end

data/lib/notion_ruby_mapping/version.rb

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

data/lib/notion_ruby_mapping.rb

@@ -20,7 +20,7 @@ require_relative "notion_ruby_mapping/version"
                  date_property email_property files_property formula_property last_edited_by_property
                  last_edited_time_property multi_select_property number_property people_property phone_number_property
                  relation_property text_property rich_text_property rollup_property select_property status_property
-                 title_property url_property],
+                 title_property unique_id_property url_property],
 }.each do |key, values|
   values.each do |klass|
     require_relative "notion_ruby_mapping/#{key}/#{klass}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -254,6 +254,7 @@ files:
 - lib/notion_ruby_mapping/properties/status_property.rb
 - lib/notion_ruby_mapping/properties/text_property.rb
 - lib/notion_ruby_mapping/properties/title_property.rb
+- lib/notion_ruby_mapping/properties/unique_id_property.rb
 - lib/notion_ruby_mapping/properties/url_property.rb
 - lib/notion_ruby_mapping/version.rb
 - notion_ruby_mapping.gemspec
@@ -278,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: Notion Ruby mapping tool