notion_ruby_mapping 0.8.8 → 1.0.0

data/lib/notion_ruby_mapping/objects/mention_object.rb

@@ -5,16 +5,16 @@ module NotionRubyMapping
   class MentionObject < RichTextObject
     # @return [MentionObject]
     def initialize(options = {})
-      super "mention", options
-      return unless (url = options["link_preview"])
+      super :mention, options
+      return unless (url = options[:link_preview])
 
-      @options["href"] = url
-      @options["plain_text"] = url
+      @options[:href] = url
+      @options[:plain_text] = url
     end
 
     # @return [String, NilClass]
     def page_id
-      @options["page_id"]
+      @options[:page_id]
     end
 
     # @return [String (frozen)]
@@ -23,69 +23,69 @@ module NotionRubyMapping
     end
 
     def partial_property_values_json
-      if @options.key? "user_id"
+      if @options.key? :user_id
         {
-          "type" => "user",
-          "user" => {
-            "object" => "user",
-            "id" => @options["user_id"],
+          type: "user",
+          user: {
+            object: "user",
+            id: @options[:user_id],
           },
         }
-      elsif @options.key? "page_id"
+      elsif @options.key? :page_id
         {
-          "type" => "page",
-          "page" => {
-            "id" => @options["page_id"],
+          type: "page",
+          page: {
+            id: @options[:page_id],
           },
         }
-      elsif @options.key? "database_id"
+      elsif @options.key? :database_id
         {
-          "type" => "database",
-          "database" => {
-            "id" => @options["database_id"],
+          type: "database",
+          database: {
+            id: @options[:database_id],
           },
         }
-      elsif @options.key? "start"
+      elsif @options.key? :start
         {
-          "type" => "date",
-          "date" => @options.slice("start", "end", "time_zone"),
+          type: "date",
+          date: @options.slice(:start, :end, :time_zone),
         }
-      elsif @options.key? "template_mention"
-        sub = case @options["template_mention"]
-              when "today"
-                @options["plain_text"] = "@Today"
+      elsif @options.key? :template_mention
+        sub = case @options[:template_mention]&.to_sym
+              when :today
+                @options[:plain_text] = "@Today"
                 {
-                  "type" => "template_mention_date",
-                  "template_mention_date" => "today",
+                  type: :template_mention_date,
+                  template_mention_date: "today",
                 }
-              when "now"
-                @options["plain_text"] = "@Now"
+              when :now
+                @options[:plain_text] = "@Now"
                 {
-                  "type" => "template_mention_date",
-                  "template_mention_date" => "now",
+                  type: :template_mention_date,
+                  template_mention_date: "now",
                 }
               else
-                @options["plain_text"] = "@Me"
+                @options[:plain_text] = "@Me"
                 {
-                  "type" => "template_mention_user",
-                  "template_mention_user" => "me",
+                  type: :template_mention_user,
+                  template_mention_user: "me",
                 }
               end
         {
-          "type" => "template_mention",
-          "template_mention" => sub,
+          type: :template_mention,
+          template_mention: sub,
         }
-      elsif @options.key? "link_preview"
+      elsif @options.key? :link_preview
         {
-          "type" => "link_preview",
-          "link_preview" => {
-            "url" => @options["link_preview"],
+          type: :link_preview,
+          link_preview: {
+            url: @options[:link_preview],
           },
         }
-      elsif @options.key? "href"
+      elsif @options.key? :href
         {
-          "type" => "link_mention",
-          "link_mention" => @options.slice("href", "icon_url", "link_provider", "thumbnail_url", "title"),
+          type: :link_mention,
+          link_mention: @options.slice(:href, :icon_url, :link_provider, :thumbnail_url, :title),
         }
       else
         raise StandardError, "Irregular mention type: #{@options.keys}"

data/lib/notion_ruby_mapping/objects/rich_text_object.rb

@@ -3,7 +3,7 @@
 module NotionRubyMapping
   # RichTextObject
   class RichTextObject
-    # @param [String] type
+    # @param [Symbol] type
     # @return [TextObject]
     def initialize(type, options = {})
       if instance_of?(RichTextObject)
@@ -11,45 +11,45 @@ module NotionRubyMapping
               "RichTextObject is abstract class.  Please use TextObject."
       end
 
-      @type = type
+      @type = type.to_sym
       @options = options
     end
     attr_reader :will_update, :options
 
     def self.create_from_json(json)
-      type = json["type"]
-      options = (json["annotations"] || {}).merge(json.slice("plain_text", "href"))
+      type = json[:type]&.to_sym
+      options = (json[:annotations] || {}).merge(json.slice(:plain_text, :href))
       case type
-      when "text"
-        TextObject.new json["plain_text"], options
-      when "equation"
-        EquationObject.new json["equation"]["expression"], options
-      when "mention"
-        mention = json["mention"]
-        case mention["type"]
-        when "user"
-          MentionObject.new options.merge({"user_id" => mention["user"]["id"]})
-        when "page"
-          MentionObject.new options.merge({"page_id" => mention["page"]["id"]})
-        when "database"
-          MentionObject.new options.merge({"database_id" => mention["database"]["id"]})
-        when "date"
-          MentionObject.new options.merge(mention["date"].slice("start", "end", "time_zone"))
-        when "template_mention"
-          template_mention = mention["template_mention"]
-          case template_mention["type"]
-          when "template_mention_date"
-            MentionObject.new options.merge({"template_mention" => template_mention["template_mention_date"]})
+      when :text
+        TextObject.new json[:plain_text], options
+      when :equation
+        EquationObject.new json[:equation][:expression], options
+      when :mention
+        mention = json[:mention]
+        case mention[:type]&.to_sym
+        when :user
+          MentionObject.new options.merge({user_id: mention[:user][:id]})
+        when :page
+          MentionObject.new options.merge({page_id: mention[:page][:id]})
+        when :database
+          MentionObject.new options.merge({database_id: mention[:database][:id]})
+        when :date
+          MentionObject.new options.merge(mention[:date].slice(:start, :end, :time_zone))
+        when :template_mention
+          template_mention = mention[:template_mention]
+          case template_mention[:type].to_sym
+          when :template_mention_date
+            MentionObject.new options.merge({template_mention: template_mention[:template_mention_date]})
           else
-            MentionObject.new options.merge({"template_mention" => template_mention["template_mention_user"]})
+            MentionObject.new options.merge({template_mention: template_mention[:template_mention_user]})
           end
-        when "link_preview"
-          MentionObject.new options.merge({"link_preview" => mention["link_preview"]["url"]})
-        when "link_mention"
-          lm_keys = %w[href icon_url link_provider thumbnail_url title]
-          MentionObject.new options.merge(mention["link_mention"].slice(*lm_keys))
+        when :link_preview
+          MentionObject.new options.merge({link_preview: mention[:link_preview][:url]})
+        when :link_mention
+          lm_keys = %i[href icon_url link_provider thumbnail_url title]
+          MentionObject.new options.merge(mention[:link_mention].slice(*lm_keys))
         else
-          raise StandardError, "Unknown mention type: #{mention["type"]}"
+          raise StandardError, "Unknown mention type: #{mention[:type]}"
         end
       else
         raise StandardError, json
@@ -69,10 +69,10 @@ module NotionRubyMapping
     # @return [Hash{String (frozen)->Object}]
     def property_values_json
       {
-        "type" => @type,
+        type: @type.to_s,
         @type => partial_property_values_json,
-        "plain_text" => @options["plain_text"],
-        "href" => @options["href"],
+        plain_text: @options[:plain_text],
+        href: @options[:href],
       }.merge annotations_json
     end
 
@@ -85,7 +85,7 @@ module NotionRubyMapping
     # @return [String] input text
     def href=(url)
       @will_update = true
-      @options["href"] = url
+      @options[:href] = url
     end
 
     # @param [String, RichTextObject] value
@@ -98,50 +98,50 @@ module NotionRubyMapping
     # @return [Boolean] input flag
     def bold=(flag)
       @will_update = true
-      @options["bold"] = flag
+      @options[:bold] = flag
     end
 
     # @param [Boolean] flag
     # @return [Boolean] input flag
     def italic=(flag)
       @will_update = true
-      @options["italic"] = flag
+      @options[:italic] = flag
     end
 
     # @param [Boolean] flag
     # @return [Boolean] input flag
     def strikethrough=(flag)
       @will_update = true
-      @options["strikethrough"] = flag
+      @options[:strikethrough] = flag
     end
 
     # @param [Boolean] flag
     # @return [Boolean] input flag
     def underline=(flag)
       @will_update = true
-      @options["underline"] = flag
+      @options[:underline] = flag
     end
 
     # @param [Boolean] flag
     # @return [Boolean] input flag
     def code=(flag)
       @will_update = true
-      @options["code"] = flag
+      @options[:code] = flag
     end
 
     # @param [String] color
     # @return [String] input color
     def color=(color)
       @will_update = true
-      @options["color"] = color
+      @options[:color] = color
     end
 
     protected
 
     # @return [Hash, Hash{String (frozen)->Hash}]
     def annotations_json
-      annotations = @options.slice(*%w[bold italic strikethrough underline code color])
-      annotations.empty? ? {} : {"annotations" => annotations}
+      annotations = @options.slice(*%i[bold italic strikethrough underline code color])
+      annotations.empty? ? {} : {annotations: annotations}
     end
   end
 end

data/lib/notion_ruby_mapping/objects/text_object.rb

@@ -6,7 +6,7 @@ module NotionRubyMapping
     # @param [String] text
     # @return [TextObject]
     def initialize(text, options = {})
-      super "text", {"plain_text" => text}.merge(options)
+      super :text, {plain_text: text}.merge(options)
       @text = text
       @will_update = false
     end
@@ -20,17 +20,17 @@ module NotionRubyMapping
         @text = value.text
       else
         @text = value
-        @options["plain_text"] = value
+        @options[:plain_text] = value
       end
     end
 
     protected
 
     def partial_property_values_json
-      url = @options["href"]
+      url = @options[:href]
       {
-        "content" => @text,
-        "link" => url ? {"url" => url} : nil,
+        content: @text,
+        link: url ? {url: url} : nil,
       }
     end
   end

data/lib/notion_ruby_mapping/objects/user_object.rb

@@ -6,7 +6,7 @@ module NotionRubyMapping
     # @param [String] user_id
     # @return [TextObject]
     def initialize(user_id: nil, json: {})
-      @user_id = NotionCache.instance.hex_id(user_id || json && json["id"])
+      @user_id = NotionCache.instance.hex_id(user_id || json && json[:id])
       @json = json
       @will_update = false
     end
@@ -56,14 +56,14 @@ module NotionRubyMapping
 
     # @return [String]
     def name
-      @json["name"]
+      @json[:name]
     end
 
     # @return [Hash]
     def property_values_json
       {
-        "object" => "user",
-        "id" => @user_id,
+        object: "user",
+        id: @user_id,
       }
     end
 

data/lib/notion_ruby_mapping/properties/button_property.rb

@@ -3,7 +3,7 @@
 module NotionRubyMapping
   # Button property
   class ButtonProperty < Property
-    TYPE = "button"
+    TYPE = :button
 
     ### Public announced methods
 
@@ -14,11 +14,11 @@ module NotionRubyMapping
       @json
     end
 
-    # @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: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
-            property_cache: property_cache
+                  property_cache: property_cache
       @json = json
     end
 
@@ -27,7 +27,7 @@ module NotionRubyMapping
     # @return [Hash]
     def property_values_json
       assert_page_property __method__
-      {@name => {"button" => @json, "type" => "button"}}
+      {@name => {button: @json, type: "button"}}
     end
   end
 end

data/lib/notion_ruby_mapping/properties/checkbox_property.rb

@@ -4,7 +4,7 @@ module NotionRubyMapping
   # Checkbox property
   class CheckboxProperty < Property
     include EqualsDoesNotEqual
-    TYPE = "checkbox"
+    TYPE = :checkbox
 
     ### Public announced methods
 
@@ -31,7 +31,7 @@ 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: nil)
       super name, will_update: will_update, base_type: base_type, property_id: property_id,
@@ -48,7 +48,7 @@ module NotionRubyMapping
     # @return [Hash]
     def property_values_json
       assert_page_property __method__
-      {@name => {"checkbox" => @json, "type" => "checkbox"}}
+      {@name => {checkbox: @json, type: "checkbox"}}
     end
   end
 end

data/lib/notion_ruby_mapping/properties/created_by_property.rb

@@ -3,7 +3,7 @@
 module NotionRubyMapping
   # CreatedByProperty
   class CreatedByProperty < MultiProperty
-    TYPE = "created_by"
+    TYPE = :created_by
 
     ### Public announced methods
 
@@ -19,7 +19,7 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
+    # @param [String, Symbol] name Property name
     # @param [String] user_id user_id (optional)
     # @param [Hash] json json (optional)
     def initialize(name, will_update: false, base_type: :page, json: nil, user_id: nil, property_id: nil,
@@ -36,7 +36,7 @@ module NotionRubyMapping
     # @param [Hash] json
     def update_from_json(json)
       @will_update = false
-      cb = json["created_by"]
+      cb = json[:created_by]
       @json = database? ? cb : UserObject.new(json: cb)
     end
 

data/lib/notion_ruby_mapping/properties/created_time_property.rb

@@ -3,7 +3,7 @@
 module NotionRubyMapping
   # CreatedTimeProperty
   class CreatedTimeProperty < DateBaseProperty
-    TYPE = "created_time"
+    TYPE = :created_time
 
     ### Public announced methods
 
@@ -19,7 +19,7 @@ module NotionRubyMapping
 
     ## Common methods
 
-    # @param [String] name Property name
+    # @param [String, Symbol] name Property name
     # @param [String] json created_time value (optional)
     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,

data/lib/notion_ruby_mapping/properties/date_base_property.rb

@@ -59,7 +59,7 @@ module NotionRubyMapping
             .and(filter_before(end_date, another_type: another_type))
         end
       else
-        make_filter_query "equals", value_str(date), condition: condition, another_type: another_type
+        make_filter_query :equals, value_str(date), condition: condition, another_type: another_type
       end
     end
 
@@ -77,7 +77,7 @@ module NotionRubyMapping
             .or(filter_after(end_date, another_type: another_type))
         end
       else
-        make_filter_query "does_not_equal", value_str(date), condition: condition, another_type: another_type
+        make_filter_query :does_not_equal, value_str(date), condition: condition, another_type: another_type
       end
     end
 
@@ -86,7 +86,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#841815bfaf684964bebf3fa6712ae26c
     def filter_before(date, condition: nil, another_type: nil)
-      make_filter_query "before", value_str(date, start_time: true), condition: condition, another_type: another_type
+      make_filter_query :before, value_str(date, start_time: true), condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -94,7 +94,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#c0ea140866ea46f9a746b24773dc821c
     def filter_after(date, condition: nil, another_type: nil)
-      make_filter_query "after", value_str(date, end_time: true), condition: condition, another_type: another_type
+      make_filter_query :after, value_str(date, end_time: true), condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -102,7 +102,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#6a20ade0ee964aad81aae4c08ea29d6b
     def filter_on_or_before(date, condition: nil, another_type: nil)
-      make_filter_query "on_or_before", value_str(date, end_time: true), condition: condition, another_type: another_type
+      make_filter_query :on_or_before, value_str(date, end_time: true), condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -110,7 +110,8 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#1469e3fb3068426a8ea8492d191d1563
     def filter_on_or_after(date, condition: nil, another_type: nil)
-      make_filter_query "on_or_after", value_str(date, start_time: true), condition: condition, another_type: another_type
+      make_filter_query :on_or_after, value_str(date, start_time: true), condition: condition,
+                                                                         another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -118,7 +119,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#707e7e848dc9417998420b65024542db
     def filter_past_week(condition: nil, another_type: nil)
-      make_filter_query "past_week", {}, condition: condition, another_type: another_type
+      make_filter_query :past_week, {}, condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -126,7 +127,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#7b2d05c549204c2eb68d95020d7b97c5
     def filter_past_month(condition: nil, another_type: nil)
-      make_filter_query "past_month", {}, condition: condition, another_type: another_type
+      make_filter_query :past_month, {}, condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -134,7 +135,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#9c8bf0a2398a41c8a0714a62afca3aa8
     def filter_past_year(condition: nil, another_type: nil)
-      make_filter_query "past_year", {}, condition: condition, another_type: another_type
+      make_filter_query :past_year, {}, condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -142,7 +143,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see
     def filter_this_week(condition: nil, another_type: nil)
-      make_filter_query "this_week", {}, condition: condition, another_type: another_type
+      make_filter_query :this_week, {}, condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -150,7 +151,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#d9dc189ee8244ba8a6c863259eaa9984
     def filter_next_week(condition: nil, another_type: nil)
-      make_filter_query "next_week", {}, condition: condition, another_type: another_type
+      make_filter_query :next_week, {}, condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -158,7 +159,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#0edb4dffbe6b403882255e870cc71066
     def filter_next_month(condition: nil, another_type: nil)
-      make_filter_query "next_month", {}, condition: condition, another_type: another_type
+      make_filter_query :next_month, {}, condition: condition, another_type: another_type
     end
 
     # @param [String] condition Rollup name
@@ -166,7 +167,7 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CreatedTimeProperty-bb979ff02dc04efa9733da1003efa871#b59c73dd4b1a488f95d3e8cd19853709
     def filter_next_year(condition: nil, another_type: nil)
-      make_filter_query "next_year", {}, condition: condition, another_type: another_type
+      make_filter_query :next_year, {}, condition: condition, another_type: another_type
     end
 
     # @param [Date, Time, DateTime, String, nil] obj