notion_ruby_mapping 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d4b404cfe0798695934594f05049482f5436f15e0f2eb7c82125031ce3f340
-  data.tar.gz: b179b7d3530ec7f323023f5ec3ada9057f7e402f87a87c65579482c015184c62
+  metadata.gz: 6958b79feeac5556e9eec4fcfac214099d81319f85249db07ad7e7d5ef326359
+  data.tar.gz: 8fb970d28b42a5c0354ad6caf3aee0165362c76b1c3b0786548eafd654019255
 SHA512:
-  metadata.gz: 35b3b4ec135b729ba8f93e5d583f0e717e75cb6f0bd75779433948ef671b4bfa9cf22346e1a222d473f506b90a1a24efaa4fca856cd533448d773a710160f421
-  data.tar.gz: 92ef1a7218a0551195dae18a9bbbb3f82f440ba6fd2b8af49bcb578c5f21bf9417644750bc5297133d0ddd789987123f5e6dbd024bb7cb8b5b19a3a4c0764758
+  metadata.gz: 755b7031ff208823d9434bbe5850845f2b4bfe0b8bf4585418fe8ef42b5095df080d7461ff0788c3ddb0a500a9c4017fa5e287d63721c6a34e9c7baea4a55884
+  data.tar.gz: 4227d5ac411aa5dc48f46a6d9bab1f4b097f17ba6fb9a1f9eb47b4b34167a5dc36a2e44d8f5df359a1f0ab1afeb256423ec7fe37603685df010f3891c4feaf2d

data/lib/notion_ruby_mapping/blocks/base.rb

@@ -25,7 +25,7 @@ module NotionRubyMapping
       assign.each_slice(2) { |(klass, key)| assign_property(klass, key) }
       @json ||= {}
     end
-    attr_reader :json, :id
+    attr_reader :json, :id, :archived
 
     # @param [Hash, Notion::Messages] json
     # @return [NotionRubyMapping::Base]

data/lib/notion_ruby_mapping/properties/date_base_property.rb

@@ -22,6 +22,13 @@ module NotionRubyMapping
       end
     end
 
+    # @param [Date] date
+    def self.start_end_time(date)
+      ds = date.iso8601
+      tz = Time.now.strftime "%:z"
+      %w[00:00:00 23:59:59].map {|t| [ds, "T", t, tz].join("") }
+    end
+
     # @param [Date, Time, DateTime, String, nil] obj
     # @return [Date, nil] iso8601 format string
     def self.date_from_obj(obj)
@@ -34,14 +41,34 @@ module NotionRubyMapping
     # @return [NotionRubyMapping::Query] generated Query object
     # @see https://www.notion.so/hkob/CheckboxProperty-ac1edbdb8e264af5ad1432b522b429fd#5f07c4ebc4744986bfc99a43827349fc
     def filter_equals(date, rollup = nil, rollup_type = nil)
-      make_filter_query "equals", value_str(date), rollup, rollup_type
+      if date.is_a? Date
+        start_date, end_date = self.class.start_end_time date
+        if rollup
+          filter_after(start_date, rollup, rollup_type)
+            .and(filter_before(end_date, rollup, rollup_type))
+        else
+          filter_after(start_date).and(filter_before end_date)
+        end
+      else
+        make_filter_query "equals", value_str(date), rollup, rollup_type
+      end
     end
 
     # @param [String] rollup Rollup name
     # @param [String] rollup_type Rollup type
     # @return [NotionRubyMapping::Query] generated Query object
     def filter_does_not_equal(date, rollup = nil, rollup_type = nil)
-      make_filter_query "does_not_equal", value_str(date), rollup, rollup_type
+      if date.is_a? Date
+        start_date, end_date = self.class.start_end_time date
+        if rollup
+          filter_before(start_date, rollup, rollup_type)
+            .or(filter_after(end_date, rollup, rollup_type))
+        else
+          filter_before(start_date).or(filter_after(end_date))
+        end
+      else
+        make_filter_query "does_not_equal", value_str(date), rollup, rollup_type
+      end
     end
 
     # @param [String] rollup Rollup name

data/lib/notion_ruby_mapping/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NotionRubyMapping
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
   NOTION_VERSION = "2022-02-22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notion_ruby_mapping
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Hiroyuki KOBAYASHI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday