activerecord-bitemporal 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 939636118c751abd0690d9956750820ffcbb970fef7e4c9b6ab29642d461bf79
-  data.tar.gz: caf2c137271a7c635318384b42c771d215849fb1ece08de062a0170f014ad0b4
+  metadata.gz: 712d3f7bf1cb73ff98bbe7f5ca15f860c62096e419b89d44e6a419ba865eec38
+  data.tar.gz: 4071219bd39db37fc51dee4d1689f722c0a8c2ee6eb16120373d21ecf234def8
 SHA512:
-  metadata.gz: '05108b579eb4585ef4835677902933167209be9a7ed13482122f088c5b5a85ea528260b74ed619f3fcbbbb0d2ae85f711a2c06803b2c60d8821b88b9528fa914'
-  data.tar.gz: e38f7f394438418cbab0a9f237ef4352cd0b2e6e07dff1fbbd4be7cda37c318ff2ce85a2c332e92e015d47980b06e49e74ce76e3c0a4b232d25bb869a092b604
+  metadata.gz: fb0f10288f109171dd11aed5221fe0297224c6d798278ba60c18cad092cf4b757d2c5aff9463c9a9fafe0f1556f1d71d47d4d89d435f96f8debdda51883c0e42
+  data.tar.gz: 588eb1741174be2031b8e326fe34da93efebda700ad37bb26a260250a3e25d6b1ecb3ffc1964a7fb99c8ea4035d4a660e59ec617d5732320f944467a3d71b202

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 2.0.0
+
+### Breaking Changed
+- [[Proposal] Changed valid_in to exclude valid_from = to and valid_to = from. by osyo-manga · Pull Request #95](https://github.com/kufu/activerecord-bitemporal/pull/95)
+
+### Added
+
+### Changed
+- [[Proposal] Add range argument to .valid_allin. by Dooor · Pull Request #98](https://github.com/kufu/activerecord-bitemporal/pull/98)
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- [Fix JOIN query does not have valid_from / valid_to when using .or. by osyo-manga · Pull Request #99](https://github.com/kufu/activerecord-bitemporal/pull/99)
+- [Fix typo in README.md by Naoya9922 · Pull Request #101](https://github.com/kufu/activerecord-bitemporal/pull/101)
+
 ## 1.1.0
 
 ### Added

data/README.md

@@ -195,7 +195,7 @@ end
 | `valid_from` | `datetime` | 有効時間の開始時刻 |
 | `valid_to` | `datetime` | 有効時間の終了時刻 |
 | `transaction_from` | `datetime` | システム時間の開始時刻 |
-| `transaction_to` | `datetime` | システム時間の終了終了 |
+| `transaction_to` | `datetime` | システム時間の終了時刻 |
 
 また、モデルクラスでは `ActiveRecord::Bitemporal` を `include` をする必要があります。
 

data/lib/activerecord-bitemporal/scope.rb

@@ -47,7 +47,7 @@ module ActiveRecord::Bitemporal
           end
         }
 
-        def each_operatable_node(nodes = predicates, &block)
+        def each_operatable_node_6_0(nodes = predicates, &block)
           if block
             each_operatable_node(nodes).each(&block)
           else
@@ -56,11 +56,6 @@ module ActiveRecord::Bitemporal
                 case node
                 when Arel::Nodes::LessThan, Arel::Nodes::LessThanOrEqual, Arel::Nodes::GreaterThan, Arel::Nodes::GreaterThanOrEqual
                   y << node if node && node.left.respond_to?(:relation)
-                when Arel::Nodes::Or, Arel::Nodes::And
-                  if Gem::Version.new("6.1.0") <= ActiveRecord.version
-                    each_operatable_node(node.left) { |node| y << node }
-                    each_operatable_node(node.right) { |node| y << node }
-                  end
                 when Arel::Nodes::Grouping
                   each_operatable_node(node.expr) { |node| y << node }
                 end
@@ -69,6 +64,36 @@ module ActiveRecord::Bitemporal
           end
         end
 
+        def each_operatable_node_6_1(nodes = predicates, &block)
+          if block
+            each_operatable_node_6_1(nodes).each(&block)
+          else
+            Enumerator.new { |y|
+              Array(nodes).each { |node|
+                case node
+                when Arel::Nodes::LessThan, Arel::Nodes::LessThanOrEqual, Arel::Nodes::GreaterThan, Arel::Nodes::GreaterThanOrEqual
+                  y << node if node && node.left.respond_to?(:relation)
+                when Arel::Nodes::And
+                  each_operatable_node_6_1(node.children) { |node| y << node }
+                when Arel::Nodes::Binary
+                  each_operatable_node_6_1(node.left) { |node| y << node }
+                  each_operatable_node_6_1(node.right) { |node| y << node }
+                when Arel::Nodes::Unary
+                  each_operatable_node_6_1(node.expr) { |node| y << node }
+                end
+              }
+            }
+          end
+        end
+
+        def each_operatable_node(nodes = predicates, &block)
+          if Gem::Version.new("6.1.0") <= ActiveRecord.version
+            each_operatable_node_6_1(nodes, &block)
+          else
+            each_operatable_node_6_0(nodes, &block)
+          end
+        end
+
         def bitemporal_query_hash(*names)
           each_operatable_node
             .select { |node| names.include? node.left.name.to_s }
@@ -466,15 +491,53 @@ module ActiveRecord::Bitemporal
         where(bitemporal_id: id)
       }
 
-      scope :valid_in, -> (from: nil, to: nil) {
-        ignore_valid_datetime
-          .tap { |relation| break relation.bitemporal_where_bind("valid_to", :gteq, from.in_time_zone.to_datetime) if from }
-          .tap { |relation| break relation.bitemporal_where_bind("valid_from", :lteq, to.in_time_zone.to_datetime) if to }
+      # from < valid_to AND valid_from < to
+      scope :valid_in, -> (range = nil, from: nil, to: nil) {
+        return valid_in(from...to) if range.nil?
+
+        relation = ignore_valid_datetime
+        begin_, end_ = range.begin, range.end
+
+        # beginless range
+        if begin_
+          # from < valid_to
+          relation = relation.bitemporal_where_bind("valid_to", :gt, begin_.in_time_zone.to_datetime)
+        end
+
+        # endless range
+        if end_
+          if range.exclude_end?
+            # valid_from < to
+            relation = relation.bitemporal_where_bind("valid_from", :lt, end_.in_time_zone.to_datetime)
+          else
+            # valid_from <= to
+            relation = relation.bitemporal_where_bind("valid_from", :lteq, end_.in_time_zone.to_datetime)
+          end
+        end
+
+        relation
       }
-      scope :valid_allin, -> (from: nil, to: nil) {
-        ignore_valid_datetime
-          .tap { |relation| break relation.bitemporal_where_bind("valid_from", :gteq, from.in_time_zone.to_datetime) if from }
-          .tap { |relation| break relation.bitemporal_where_bind("valid_to", :lteq, to.in_time_zone.to_datetime) if to }
+
+      # from <= valid_from AND valid_to <= to
+      scope :valid_allin, -> (range = nil, from: nil, to: nil) {
+        return valid_allin(from..to) if range.nil?
+
+        relation = ignore_valid_datetime
+        begin_, end_ = range.begin, range.end
+
+        if begin_
+          relation = relation.bitemporal_where_bind("valid_from", :gteq, begin_.in_time_zone.to_datetime)
+        end
+
+        if end_
+          if range.exclude_end?
+            raise 'Range with excluding end is not supported'
+          else
+            relation = relation.bitemporal_where_bind("valid_to", :lteq, end_.in_time_zone.to_datetime)
+          end
+        end
+
+        relation
       }
     end
 

data/lib/activerecord-bitemporal/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Bitemporal
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bitemporal
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - SmartHR
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: BiTemporal Data Model for ActiveRecord