notion_ruby_mapping 0.8.8 → 1.0.0

data/lib/notion_ruby_mapping/blocks/toggle_heading3_block.rb

@@ -3,16 +3,16 @@
 module NotionRubyMapping
   # Notion block
   class ToggleHeading3Block < TextSubBlockColorBaseBlock
-    # @return [String (frozen)]
+    # @return [Symbol]
     def type
-      "heading_3"
+      :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[type][:is_toggleable] = true
       ans
     end
   end

data/lib/notion_ruby_mapping/blocks/url_base_block.rb

@@ -9,7 +9,7 @@ module NotionRubyMapping
 
       super(json: json, id: id, parent: parent)
       @url = if @json
-               @json[type]["url"]
+               @json[type][:url]
              else
                url
              end
@@ -21,14 +21,14 @@ module NotionRubyMapping
     # @return [Hash{String (frozen)->Hash}]
     def block_json(not_update: true)
       ans = super
-      ans[type] = {"url" => @url}
+      ans[type] = {url: @url}
       ans
     end
 
     # @param [String] str
     def url=(str)
       @url = str
-      @payload.add_update_block_key "url"
+      @payload.add_update_block_key :url
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/url_caption_base_block.rb

@@ -12,11 +12,11 @@ module NotionRubyMapping
 
       super(json: json, id: id, parent: parent)
       if @json
-        @url = @json[type]["url"]
+        @url = @json[type][:url]
         decode_block_caption
       else
         @url = url
-        @caption = RichTextArray.rich_text_array "caption", caption
+        @caption = RichTextArray.rich_text_array :caption, caption
       end
     end
 
@@ -31,7 +31,7 @@ module NotionRubyMapping
     def block_json(not_update: true)
       ans = super
       ans[type] = @caption.update_property_schema_json not_update
-      ans[type]["url"] = @url
+      ans[type][:url] = @url
       ans
     end
 
@@ -40,7 +40,7 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/EmbedBlock-57c31e7d8e1d41669eb30f27e1c41035#25ece6bfce0749f8b4bbecc6ba7feedc
     def url=(str)
       @url = str
-      @payload.add_update_block_key "url"
+      @payload.add_update_block_key :url
     end
   end
 end

data/lib/notion_ruby_mapping/blocks/video_block.rb

@@ -3,9 +3,9 @@
 module NotionRubyMapping
   # Notion block
   class VideoBlock < FileBaseBlock
-    # @return [String (frozen)]
+    # @return [Symbol]
     def type
-      "video"
+      :video
     end
   end
 end

data/lib/notion_ruby_mapping/controllers/discussion_thread.rb

@@ -16,7 +16,7 @@ module NotionRubyMapping
     def append_comment(text_objects, dry_run: false)
       rto = RichTextArray.new "rich_text", text_objects: text_objects, will_update: true
       nc = NotionCache.instance
-      json = rto.property_schema_json.merge({"discussion_id" => @discussion_id})
+      json = rto.property_schema_json.merge({discussion_id: @discussion_id})
       if dry_run
         Base.dry_run_script :post, nc.comments_path, json
       else

data/lib/notion_ruby_mapping/controllers/mermaid_database.rb

@@ -1,6 +1,5 @@
 module NotionRubyMapping
   class MermaidDatabase
-
     def initialize(key)
       @key = key
       @name = key
@@ -17,10 +16,11 @@ module NotionRubyMapping
     attr_accessor :name
 
     def add_property(key, value)
-      if key == "title"
+      key_sym = key.to_sym
+      if key_sym == :title
         @title = value
       else
-        @properties[value] = key
+        @properties[value] = key_sym
       end
     end
 
@@ -44,7 +44,7 @@ module NotionRubyMapping
     end
 
     def blocked?(name)
-      @finish_flag[name].nil?
+      @finish_flag[name.to_sym].nil?
     end
 
     def count
@@ -66,10 +66,12 @@ module NotionRubyMapping
       ps = @real_db.properties
       @properties.each do |(value, key)|
         name, *options = value.split("|")
-        next if @finish_flag[name]
+        name_sym = name.to_sym
+        key_sym = key.to_sym
+        next if @finish_flag[name_sym]
 
-        property = ps.values_at(name).first
-        case key
+        property = ps.values_at(name_sym).first
+        case key_sym
         when /checkbox|created_by|created_time|date|email|files|last_edited_by|last_edited_time|people|phone_number|text|url|status/
           klass = {
             checkbox: CheckboxProperty, created_by: CreatedByProperty, created_time: CreatedTimeProperty,
@@ -77,9 +79,9 @@ module NotionRubyMapping
             last_edited_time: LastEditedTimeProperty, people: PeopleProperty, phone_number: PhoneNumberProperty,
             rich_text: RichTextProperty, url: UrlProperty, status: StatusProperty
           }[key.to_sym]
-          @real_db.add_property klass, name unless property
-          @working << name
-        when "formula"
+          @real_db.add_property klass, name_sym unless property
+          @working << name_sym
+        when :formula
           f_e = options.first&.gsub "@", '"'
           dependencies = f_e&.scan(/prop\("([^"]+)"\)/) || []
           blocked_key = dependencies.select { |k| blocked? k.first }
@@ -87,37 +89,37 @@ module NotionRubyMapping
             if property
               property.formula_expression = f_e unless property.formula_expression == f_e
             else
-              @real_db.add_property(FormulaProperty, name) { |dp| dp.formula_expression = f_e }
+              @real_db.add_property(FormulaProperty, name_sym) { |dp| dp.formula_expression = f_e }
             end
-            @working << name
+            @working << name_sym
           else
-            print("#{name} blocked by #{blocked_key.flatten}\n")
+            print("#{name_sym} blocked by #{blocked_key.flatten}\n")
             next
           end
 
-        when "multi_select"
+        when :multi_select
           if property
-            (options - (property.multi_select_options.map { |h| h["name"] })).each do |select_name|
+            (options - (property.multi_select_options.map { |h| h[:name] })).each do |select_name|
               property.add_multi_select_option name: select_name, color: "default"
             end
           else
-            @real_db.add_property(MultiSelectProperty, name) do |dp|
+            @real_db.add_property(MultiSelectProperty, name_sym) do |dp|
               options.each do |select_name|
                 dp.add_multi_select_option name: select_name, color: "default"
               end
             end
           end
-          @working << name
-        when "number"
+          @working << name_sym
+        when :number
           format_value = options.empty? ? "number" : options.first
           if property
             property.format = format_value unless property.format == format_value
           else
-            @real_db.add_property(NumberProperty, name) { |p| p.format = format_value }
+            @real_db.add_property(NumberProperty, name_sym) { |p| p.format = format_value }
           end
-          @working << name
-        when "rollup"
-          name, *options = value.split("|")
+          @working << name_sym
+        when :rollup
+          name, *options = value.split("|").map(&:to_sym)
           relation_name, rollup_name, function = options
           if blocked? relation_name
             print("#{name} blocked by #{relation_name}\n")
@@ -144,9 +146,9 @@ module NotionRubyMapping
               @working << name
             end
           end
-        when "select"
+        when :select
           if property
-            (options - (property.select_options.map { |h| h["name"] })).each do |select_name|
+            (options - (property.select_options.map { |h| h[:name] })).each do |select_name|
               property.add_select_option name: select_name, color: "default"
             end
           else
@@ -157,19 +159,17 @@ module NotionRubyMapping
             end
           end
           @working << name
-        else
-          nil
         end
       end
-      while (array = @relation_queue.shift) do
+      while (array = @relation_queue.shift)
         value, relation_db = array
         db_id = relation_db.real_db.id
-        forward, reverse = value.split "|"
+        forward, reverse = value.split("|").map(&:to_sym)
         property = ps.values_at(forward).first
         if property
           if reverse
             if property.database_id == db_id && property.synced_property_name == reverse
-              relation_db.add_property "relation", reverse
+              relation_db.add_property :relation, reverse
               relation_db.finish_flag[reverse] = true
             else
               unless @finish_flag[forward]
@@ -177,14 +177,14 @@ module NotionRubyMapping
                 relation_db.append_reverse_name_queue self, forward, reverse
               end
               @working << forward
-              add_property "relation", forward
+              add_property :relation, forward
             end
             relation_db.relations[reverse] = self
           else
             unless property.database_id == db_id
               property.replace_relation_database database_id: db_id, type: "single_property"
               @working << forward
-              add_property "relation", forward
+              add_property :relation, forward
             end
           end
           @relations[forward] = relation_db
@@ -200,7 +200,7 @@ module NotionRubyMapping
           end
           @relations[forward] = relation_db
           @working << forward
-          add_property "relation", forward
+          add_property :relation, forward
         end
       end
       @real_db.property_schema_json
@@ -208,7 +208,7 @@ module NotionRubyMapping
 
     def append_reverse_name_queue(other_db, forward, reverse)
       @reverse_name_queue[reverse] = [other_db, forward]
-      add_property "relation", reverse
+      add_property :relation, reverse
     end
 
     def update_database
@@ -243,4 +243,4 @@ module NotionRubyMapping
       @reverse_name_queue = {}
     end
   end
-end
+end

data/lib/notion_ruby_mapping/controllers/notion_cache.rb

@@ -2,7 +2,6 @@
 
 require "singleton"
 require "faraday"
-require "faraday_middleware"
 
 module NotionRubyMapping
   # singleton class of caching Notion objects
@@ -14,10 +13,10 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/NotionCache-65e1599864d6425686d495a5a4b3a623#dca210788f114cf59464090782c073bf
     def initialize
       @object_hash = {}
-      @client = Faraday::Connection.new "https://api.notion.com" do |builder|
-        builder.use FaradayMiddleware::EncodeJson
-        builder.use FaradayMiddleware::ParseJson
-        builder.adapter Faraday.default_adapter
+      @client = Faraday.new "https://api.notion.com" do |conn|
+        conn.request :json
+        conn.response :json, parser_options: {symbolize_names: true}
+        conn.headers["Notion-Version"] = NotionRubyMapping::NOTION_VERSION
       end
       @notion_token = nil
       @wait = 0.3333
@@ -248,7 +247,6 @@ module NotionRubyMapping
       sleep @wait
       response = @client.send(method) do |request|
         request.headers["Authorization"] = "Bearer #{@notion_token}"
-        request.headers["Notion-Version"] = NotionRubyMapping::NOTION_VERSION
         case method
         when :get, :delete
           request.url path, options
@@ -266,13 +264,13 @@ module NotionRubyMapping
     end
 
     def search(query)
-      request(:post, search_path, options = query)
+      request(:post, search_path, query)
     end
 
     def search_path
       "v1/search"
     end
-    
+
     # @param [String] token
     def token=(token)
       @notion_token = token

data/lib/notion_ruby_mapping/controllers/payload.rb

@@ -8,7 +8,7 @@ module NotionRubyMapping
       @update_block_key = []
     end
 
-    # @param [String] key
+    # @param [Symbol] key
     def add_update_block_key(key)
       @update_block_key << key
     end
@@ -20,19 +20,19 @@ module NotionRubyMapping
     end
 
     def description=(text_objects)
-      rta = RichTextArray.rich_text_array "description", text_objects
-      @json.merge!(rta.update_property_schema_json true)
+      rta = RichTextArray.rich_text_array :description, text_objects
+      @json.merge!(rta.update_property_schema_json(true))
     end
 
     # @param [Boolean] flag
     def is_inline=(flag)
-      @json["is_inline"] = flag
+      @json[:is_inline] = flag
     end
 
     # @param [Hash] json
     def merge_property(json)
-      @json["properties"] ||= {}
-      @json["properties"].merge!(json)
+      @json[:properties] ||= {}
+      @json[:properties].merge!(json)
     end
 
     # @return [Hash] created json
@@ -52,21 +52,21 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Payload] updated Payload
     def set_icon(emoji: nil, url: nil)
       payload = if emoji
-                  {"type" => "emoji", "emoji" => emoji}
+                  {type: "emoji", emoji: emoji}
                 elsif url
-                  {"type" => "external", "external" => {"url" => url}}
+                  {type: "external", external: {url: url}}
                 else
                   {}
                 end
-      @json["icon"] = payload
+      @json[:icon] = payload
       self
     end
 
     def update_block_json(type, json)
       sub_json = json[type]
       ans = {type => sub_json.slice(*@update_block_key)}
-      ans[type]["caption"] = sub_json["caption"] if sub_json["caption"]
-      ans[type]["rich_text"] = sub_json["rich_text"] if sub_json["rich_text"]
+      ans[type][:caption] = sub_json[:caption] if sub_json[:caption]
+      ans[type][:rich_text] = sub_json[:rich_text] if sub_json[:rich_text]
       ans
     end
 

data/lib/notion_ruby_mapping/controllers/property_cache.rb

@@ -17,7 +17,8 @@ module NotionRubyMapping
     # @return [Property] Property for key
     # @see https://www.notion.so/hkob/PropertyCache-2451fa64a814432db4809831cc77ba25#9709e2b2a7a0479f9951291a501f65c8
     def [](key)
-      @properties[key] ||= Property.create_from_json key, @json[key], @base_type, self
+      key_sym = key.to_sym
+      @properties[key_sym] ||= Property.create_from_json key_sym, @json[key_sym], @base_type, self
     end
 
     # @param [Property] property added Property
@@ -56,8 +57,8 @@ module NotionRubyMapping
     def property_values_json
       @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
-          ans["properties"] ||= {}
-          ans["properties"].merge! property.property_values_json
+          ans[:properties] ||= {}
+          ans[:properties].merge! property.property_values_json
         end
       end
     end
@@ -66,8 +67,8 @@ module NotionRubyMapping
     def property_schema_json
       @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
-          ans["properties"] ||= {}
-          ans["properties"].merge! property.property_schema_json
+          ans[:properties] ||= {}
+          ans[:properties].merge! property.property_schema_json
         end
       end
     end
@@ -76,8 +77,8 @@ module NotionRubyMapping
     def update_property_schema_json
       @properties.each_with_object({}) do |(_, property), ans|
         if property.will_update
-          ans["properties"] ||= {}
-          ans["properties"].merge! property.update_property_schema_json
+          ans[:properties] ||= {}
+          ans[:properties].merge! property.update_property_schema_json
         end
       end
     end

data/lib/notion_ruby_mapping/controllers/query.rb

@@ -16,10 +16,10 @@ module NotionRubyMapping
     # @param [Query] another_query other query
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def and(another_query)
-      if @filter.key? "and"
-        @filter["and"] << another_query.filter
+      if @filter.key? :and
+        @filter[:and] << another_query.filter
       else
-        @filter = {"and" => [@filter, another_query.filter]}
+        @filter = {and: [@filter, another_query.filter]}
       end
       self
     end
@@ -27,26 +27,26 @@ module NotionRubyMapping
     # @param [NotionRubyMapping::Property] property
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def ascending(property)
-      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? "timestamp" : "property"
-      @sort << {key => property.name, "direction" => "ascending"}
+      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? :timestamp : :property
+      @sort << {key => property.name, direction: "ascending"}
       self
     end
 
     # @param [NotionRubyMapping::Property] property
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def descending(property)
-      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? "timestamp" : "property"
-      @sort << {key => property.name, "direction" => "descending"}
+      key = property.is_a?(LastEditedTimeProperty) || property.is_a?(CreatedTimeProperty) ? :timestamp : :property
+      @sort << {key => property.name, direction: "descending"}
       self
     end
 
     # @param [Query] other_query other query
     # @return [NotionRubyMapping::Query] updated self (Query object)
     def or(other_query)
-      if @filter.key? "or"
-        @filter["or"] << other_query.filter
+      if @filter.key? :or
+        @filter[:or] << other_query.filter
       else
-        @filter = {"or" => [@filter, other_query.filter]}
+        @filter = {or: [@filter, other_query.filter]}
       end
       self
     end

data/lib/notion_ruby_mapping/controllers/search.rb

@@ -1,6 +1,5 @@
 module NotionRubyMapping
   class Search
-
     def initialize(ascending: false, database_only: false, page_only: false, query: nil)
       @ascending = ascending
       @database_only = database_only
@@ -19,11 +18,11 @@ module NotionRubyMapping
 
     def payload
       ans = {}
-      ans["sort"] = {"direction" => "ascending", "timestamp" => "last_edited_time"} if @ascending
-      ans["filter"] = {"value" => "database", "property" => "object" } if @database_only
-      ans["filter"] = {"value" => "page", "property" => "object" } if @page_only
-      ans["query"] = @query if @query
+      ans[:sort] = {direction: "ascending", timestamp: "last_edited_time"} if @ascending
+      ans[:filter] = {value: "database", property: "object"} if @database_only
+      ans[:filter] = {value: "page", property: "object"} if @page_only
+      ans[:query] = @query if @query
       ans
     end
   end
-end
+end

data/lib/notion_ruby_mapping/objects/comment_object.rb

@@ -10,7 +10,7 @@ module NotionRubyMapping
         @json = {}
       elsif json
         @json = json
-        @text_objects = RichTextArray.new "rich_text", json: json["rich_text"]
+        @text_objects = RichTextArray.new "rich_text", json: json[:rich_text]
       else
         raise StandardError, "Either text_objects or json is required CommentObject"
       end
@@ -19,7 +19,7 @@ module NotionRubyMapping
     attr_reader :will_update, :text_objects, :json
 
     def discussion_id
-      NotionCache.instance.hex_id @json["discussion_id"]
+      NotionCache.instance.hex_id @json[:discussion_id]
     end
 
     # @return [String] full_text

data/lib/notion_ruby_mapping/objects/emoji_object.rb

@@ -6,7 +6,7 @@ module NotionRubyMapping
     # @param [String] emoji
     # @return [TextObject]
     def initialize(emoji: nil, json: {})
-      @emoji = emoji || json && json["emoji"]
+      @emoji = emoji || json && json[:emoji]
       @will_update = false
     end
     attr_reader :will_update, :emoji
@@ -32,8 +32,8 @@ module NotionRubyMapping
     # @return [Hash]
     def property_values_json
       {
-        "type" => "emoji",
-        "emoji" => @emoji,
+        type: "emoji",
+        emoji: @emoji,
       }
     end
   end

data/lib/notion_ruby_mapping/objects/equation_object.rb

@@ -6,7 +6,7 @@ module NotionRubyMapping
     # @param [String] expression
     # @return [TextObject]
     def initialize(expression, options = {})
-      super "equation", {"plain_text" => expression}.merge(options)
+      super :equation, {plain_text: expression}.merge(options)
       @expression = expression
       @will_update = false
     end
@@ -27,7 +27,7 @@ module NotionRubyMapping
     # @see https://www.notion.so/hkob/EquationObject-cd50126fce544ad5bb76463a4269859b#155800e2c69d4676a2d74572ed8f0de8
     def expression=(expression)
       @expression = expression
-      @options["plain_text"] = expression
+      @options[:plain_text] = expression
       @will_update = true
     end
 
@@ -41,7 +41,7 @@ module NotionRubyMapping
     # @return [Hash{String (frozen)->String}]
     def partial_property_values_json
       {
-        "expression" => @expression,
+        expression: @expression,
       }
     end
   end

data/lib/notion_ruby_mapping/objects/file_object.rb

@@ -7,12 +7,12 @@ module NotionRubyMapping
     # @return [TextObject]
     def initialize(url: nil, json: {})
       if url
-        @type = "external"
+        @type = :external
         @url = url
       elsif json
-        @type = json["type"]
-        @url = json[@type]["url"]
-        @expiry_time = json[@type]["expiry_time"]
+        @type = json[:type].to_sym
+        @url = json[@type][:url]
+        @expiry_time = json[@type][:expiry_time]
       else
         raise StandardError, "FileObject requires url: or json:"
       end
@@ -33,14 +33,14 @@ module NotionRubyMapping
 
     # @return [TrueClass, FalseClass] true if "type" is "external"
     def external?
-      @type == "external"
+      @type == :external
     end
 
     # @param [String] url
     # @see https://www.notion.so/hkob/FileObject-6218c354e985423a90904f47a985be33#6b841f75d0234a1aac93fb54348abb96
     def url=(url)
       @url = url
-      @type = "external"
+      @type = :external
       @expiry_time = nil
       @will_update = true
     end
@@ -48,12 +48,12 @@ module NotionRubyMapping
     # @return [Hash]
     def property_values_json
       ans = {
-        "type" => @type,
+        type: @type.to_s,
         @type => {
-          "url" => @url,
+          url: @url,
         },
       }
-      ans[@type]["expiry_time"] = @expiry_time if @expiry_time
+      ans[@type][:expiry_time] = @expiry_time if @expiry_time
       ans
     end
   end