notion_ruby_mapping 0.8.9 → 2.0.0

data/lib/notion_ruby_mapping/properties/people_property.rb

@@ -43,16 +43,16 @@ module NotionRubyMapping
       if json.is_a? Array
         json.map { |sub_json| UserObject.new json: sub_json }
       elsif json["object"] == "list"
-        List.new(json: json, type: :property, value: self).select { true }
+        List.new(json: json, type: "property", value: self).select { true }
       else
         json["people"].map { |sub_json| UserObject.new json: sub_json }
       end
     end
 
-    # @param [String] name
+    # @param [String, Symbol] name
     # @param [Hash] json
     # @param [Array] people ids for people
-    def initialize(name, will_update: false, base_type: :page, json: nil, people: nil, property_id: nil,
+    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

data/lib/notion_ruby_mapping/properties/phone_number_property.rb

@@ -33,10 +33,10 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+    # @param [String, Symbol] name Property name
+    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
+                  property_cache: property_cache
       @json = database? ? {} : json
     end
 

data/lib/notion_ruby_mapping/properties/property.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-#
+
 require "forwardable"
 
 module NotionRubyMapping
@@ -47,9 +47,9 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
+    # @param [String, Symbol] name Property name
     # @return [Property] generated Property object
-    def initialize(name, will_update: false, base_type: :page, property_id: nil, property_cache: nil, query: nil)
+    def initialize(name, will_update: false, base_type: "page", property_id: nil, property_cache: nil, query: nil)
       @name = name
       @will_update = will_update
       @base_type = base_type
@@ -62,12 +62,12 @@ module NotionRubyMapping
       @query = query
     end
 
-    # @param [String] name
+    # @param [String, Symbol] name
     # @param [Hash] input_json
     # @return [NotionRubyMapping::Property, nil] generated Property object
-    # @param [Symbol] base_type :page or :database
+    # @param [String] base_type "page" or "database"
     # @param [String, nil] page_id
-    def self.create_from_json(name, input_json, base_type = :page, property_cache = nil, query = nil)
+    def self.create_from_json(name, input_json, base_type = "page", property_cache = nil, query = nil)
       raise StandardError, "Property not found: #{name}:#{input_json}" if input_json.nil?
 
       type = input_json["type"]
@@ -76,7 +76,7 @@ module NotionRubyMapping
       elsif type == "property_item"
         tmp = new name, property_id: input_json["property_item"]["id"], base_type: base_type,
                         property_cache: property_cache, query: query
-        objects = List.new(json: input_json, type: :property, value: tmp, query: query).to_a
+        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,
@@ -93,33 +93,35 @@ module NotionRubyMapping
         when "title"
           TitleProperty.new name, text_objects: objects, base_type: base_type,
                                   property_cache: property_cache, query: query
+        else
+          raise StandardError, "Irregular property type: #{input_json["property_item"]["type"]}"
         end
       else
         klass = {
-          "button" => ButtonProperty,
-          "checkbox" => CheckboxProperty,
-          "created_time" => CreatedTimeProperty,
-          "date" => DateProperty,
-          "formula" => FormulaProperty,
-          "last_edited_time" => LastEditedTimeProperty,
-          "rollup" => RollupProperty,
-          "email" => EmailProperty,
-          "files" => FilesProperty,
-          "created_by" => CreatedByProperty,
-          "last_edited_by" => LastEditedByProperty,
-          "multi_select" => MultiSelectProperty,
-          "relation" => RelationProperty,
-          "number" => NumberProperty,
-          "people" => PeopleProperty,
-          "phone_number" => PhoneNumberProperty,
-          "select" => SelectProperty,
-          "status" => StatusProperty,
-          "title" => TitleProperty,
-          "rich_text" => RichTextProperty,
-          "unique_id" => UniqueIdProperty,
-          "url" => UrlProperty,
-          "verification" => VerificationProperty,
-        }[type]
+          button: ButtonProperty,
+          checkbox: CheckboxProperty,
+          created_time: CreatedTimeProperty,
+          date: DateProperty,
+          formula: FormulaProperty,
+          last_edited_time: LastEditedTimeProperty,
+          rollup: RollupProperty,
+          email: EmailProperty,
+          files: FilesProperty,
+          created_by: CreatedByProperty,
+          last_edited_by: LastEditedByProperty,
+          multi_select: MultiSelectProperty,
+          relation: RelationProperty,
+          number: NumberProperty,
+          people: PeopleProperty,
+          phone_number: PhoneNumberProperty,
+          select: SelectProperty,
+          status: StatusProperty,
+          title: TitleProperty,
+          rich_text: RichTextProperty,
+          unique_id: UniqueIdProperty,
+          url: UrlProperty,
+          verification: VerificationProperty,
+        }[type.to_sym]
         raise StandardError, "Irregular property type: #{type}" unless klass
 
         answer = klass.new name, property_id: input_json["id"], json: input_json[type], base_type: base_type,
@@ -138,7 +140,7 @@ module NotionRubyMapping
 
     # @return [TrueClass, FalseClass] true if database property
     def database?
-      @base_type == :database
+      @base_type == "database"
     end
 
     # @return [TrueClass, FalseClass] true if it has Property contents
@@ -146,7 +148,7 @@ module NotionRubyMapping
       !instance_of? Property
     end
 
-    # @param [String] key query parameter
+    # @param [Symbol] key query parameter
     # @param [Object] value query value
     # @return [NotionRubyMapping::Query] generated Query object
     def make_filter_query(key, value, condition: nil, another_type: nil)
@@ -155,7 +157,7 @@ module NotionRubyMapping
       elsif another_type
         Query.new filter: {"property" => @name, type => {another_type => {key => value}}}
       elsif @name == "__timestamp__"
-        Query.new filter: {"timestamp" => type, type => {key => value}}
+        Query.new filter: {"timestamp" => type.to_s, type => {key => value}}
       else
         Query.new filter: {"property" => @name, type => {key => value}}
       end
@@ -163,7 +165,7 @@ module NotionRubyMapping
 
     # @return [TrueClass, FalseClass] true if page property
     def page?
-      @base_type == :page
+      @base_type == "page"
     end
 
     # @param [Hash] json
@@ -208,7 +210,7 @@ module NotionRubyMapping
 
     # @param [Symbol, nil] method
     def assert_page_property(method)
-      raise StandardError, "#{method} can execute only Page property." unless @base_type == :page
+      raise StandardError, "#{method} can execute only Page property." if database?
     end
 
     # @return [NotionRubyMapping::Property, Array<UserObject>, nil]
@@ -218,7 +220,7 @@ module NotionRubyMapping
 
       json = NotionCache.instance.page_property_request @property_cache.page_id, @property_id,
                                                         (@query&.query_json || {})
-      new_property = self.class.create_from_json @name, json, :page, @property_cache, @query
+      new_property = self.class.create_from_json @name, json, "page", @property_cache, @query
       @property_cache.add_property new_property
       new_property
     end

data/lib/notion_ruby_mapping/properties/relation_property.rb

@@ -68,10 +68,10 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name
+    # @param [String, Symbol] name
     # @param [Hash, Array] json
     # @param [String, Array] relation
-    def initialize(name, will_update: false, json: nil, relation: nil, base_type: :page, property_id: nil,
+    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

data/lib/notion_ruby_mapping/properties/rollup_property.rb

@@ -69,9 +69,9 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name
+    # @param [String, Symbol] name
     # @param [Hash] json
-    def initialize(name, will_update: false, json: nil, base_type: :page, property_id: nil,
+    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

data/lib/notion_ruby_mapping/properties/select_property.rb

@@ -71,10 +71,10 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
+    # @param [String, Symbol] 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_id: nil,
+    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

data/lib/notion_ruby_mapping/properties/status_property.rb

@@ -39,9 +39,9 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
+    # @param [String, Symbol] name Property name
     # @param [Boolean, Hash] json
-    def initialize(name, will_update: false, base_type: :page, property_id: nil, property_cache: nil, json: {})
+    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

data/lib/notion_ruby_mapping/properties/text_property.rb

@@ -24,10 +24,10 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name
+    # @param [String, Symbol] 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_id: 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
 

data/lib/notion_ruby_mapping/properties/title_property.rb

@@ -11,7 +11,7 @@ module NotionRubyMapping
 
     def self.rich_text_array_from_json(json)
       if json["object"] == "list"
-        rich_text_objects = List.new(json: json, type: :property, value: self).select { true }
+        rich_text_objects = List.new(json: json, type: "property", value: self).select { true }
         RichTextArray.rich_text_array "title", rich_text_objects
       else
         RichTextArray.new "title", json: json["title"]

data/lib/notion_ruby_mapping/properties/unique_id_property.rb

@@ -27,7 +27,7 @@ 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, property_id: nil, property_cache: nil)
+    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?

data/lib/notion_ruby_mapping/properties/url_property.rb

@@ -33,8 +33,8 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
-    def initialize(name, will_update: false, base_type: :page, json: nil, property_id: nil, property_cache: nil)
+    # @param [String, Symbol] name Property name
+    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)

data/lib/notion_ruby_mapping/properties/verification_property.rb

@@ -22,9 +22,9 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
+    # @param [String, Symbol] name Property name
     # @param [Boolean, Hash] json
-    def initialize(name, will_update: false, base_type: :page, property_id: nil, property_cache: nil, json: {})
+    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
@@ -35,7 +35,7 @@ module NotionRubyMapping
     # @return [Hash]
     def property_values_json
       assert_page_property __method__
-      {@name => {"verification" => @json, "type" => "verification"}}
+      {@name => {"verification" => @json, "type" => TYPE}}
     end
   end
 end

data/lib/notion_ruby_mapping/version.rb

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

data/lib/notion_ruby_mapping.rb

@@ -15,7 +15,7 @@ require_relative "notion_ruby_mapping/version"
   controllers: %w[notion_cache payload property_cache query rich_text_array discussion_thread search mermaid
                   mermaid_database],
   objects: %w[rich_text_object emoji_object equation_object file_object mention_object text_object user_object
-              comment_object],
+              comment_object file_upload_object],
   properties: %w[property checkbox_property multi_property created_by_property date_base_property created_time_property
                  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

data/notion_ruby_mapping.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "Mapping tool from Notion Database/Page/Block to Ruby Objects."
   spec.homepage = "https://github.com/hkob/notion_ruby_mapping.git"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 3.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
@@ -35,7 +35,8 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "example-gem", "~> 1.0"
 
   spec.add_dependency "faraday"
-  spec.add_dependency "faraday_middleware"
+  spec.add_dependency "faraday-multipart"
+  spec.add_dependency "mime-types"
 
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,6 +241,7 @@ files:
 - lib/notion_ruby_mapping/objects/emoji_object.rb
 - lib/notion_ruby_mapping/objects/equation_object.rb
 - lib/notion_ruby_mapping/objects/file_object.rb
+- lib/notion_ruby_mapping/objects/file_upload_object.rb
 - lib/notion_ruby_mapping/objects/mention_object.rb
 - lib/notion_ruby_mapping/objects/rich_text_object.rb
 - lib/notion_ruby_mapping/objects/text_object.rb
@@ -260,7 +275,6 @@ files:
 - lib/notion_ruby_mapping/properties/verification_property.rb
 - lib/notion_ruby_mapping/version.rb
 - notion_ruby_mapping.gemspec
-- sig/notion_ruby_mapping.rbs
 - tools/an
 homepage: https://github.com/hkob/notion_ruby_mapping.git
 licenses:
@@ -274,14 +288,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Notion Ruby mapping tool

data/sig/notion_ruby_mapping.rbs

@@ -1,4 +0,0 @@
-module NotionRubyMapping
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
-end