bmg 0.20.2 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45a80b1a3fd00fc27f88f37b41816dd11324aa70
-  data.tar.gz: 9d600dd0619e0d814a07db94c95dc093b61584b9
+  metadata.gz: bb2c9a67394ec85b7898ecf5c3d0b0dcf9532666
+  data.tar.gz: 6a8c8ed5c60392299225c7187e2d05ac95b59798
 SHA512:
-  metadata.gz: 38fefe80ca45ddce14d3310621b82b389db5a7c11ab22bb17563c2c6f7dc769f9a54f9a3bebde6c40a2bbecbae215969857a8cf875a7363ad10261fd5b32b75f
-  data.tar.gz: 91492014f31ff3c540df388cac9e362e16555e373ca59ed178bdf32f7098d176947f7e6432df804a8bb3f34210d8a3762b92ce39d37455ff2ee2e55346bf9bce
+  metadata.gz: 633a62f541c6f2fe87d20de2809fd2dc3166d1118320623ea3c16edd54435a164ef45d11d8a8475f927203abb0e247083525d280393dc30c0ffc06ff485c70ba
+  data.tar.gz: c8b357936dc6511d3e955b80da8b48dee258adef5d2ad1cd1024fd45c3bd895ed31a382fcf27141c32afa9d0e7728c38866bd1f720830b29fdb941f98dec1411

data/lib/bmg/operator/autowrap.rb

@@ -68,6 +68,20 @@ module Bmg
 
     protected ### optimization
 
+      def _allbut(type, butlist)
+        new_roots = wrapped_roots!
+        separator = @options[:split]
+        down = operand.type.attrlist!.select { |attr|
+          root = attr.to_s.split(separator).map(&:to_sym).first
+          butlist.include?(root)
+        }
+        r = operand.allbut(down)
+        r = r.autowrap(options) unless (butlist & new_roots == new_roots)
+        r
+      rescue UnknownAttributesError
+        super
+      end
+
       def _autowrap(type, opts)
         if same_options?(opts)
           self
@@ -122,11 +136,12 @@ module Bmg
       end
 
       def _project(type, attrlist)
-        if (wrapped_roots! & attrlist).empty?
-          operand.project(attrlist).autowrap(options)
-        else
-          super
-        end
+        separator = @options[:split]
+        to_keep = operand.type.attrlist!.select { |attr|
+          root = attr.to_s.split(separator).map(&:to_sym).first
+          attrlist.include?(root)
+        }
+        operand.project(to_keep).autowrap(options)
       rescue UnknownAttributesError
         super
       end
@@ -169,6 +184,7 @@ module Bmg
 
       def wrapped_roots_of!(r, opts)
         raise UnknownAttributesError unless r.type.knows_attrlist?
+
         Support.wrapped_roots(r.type.to_attrlist, opts[:split])
       end
 

data/lib/bmg/operator/project.rb

@@ -67,6 +67,10 @@ module Bmg
         operand.restrict(predicate).project(attrlist)
       end
 
+      def _allbut(type, butlist)
+        Project.new(type, @operand, attrlist - butlist)
+      end
+
     protected ### inspect
 
       def args

data/lib/bmg/type.rb

@@ -46,6 +46,11 @@ module Bmg
     attr_accessor :attrlist
     protected :attrlist=
 
+    def attrlist!
+      knows_attrlist!
+      attrlist
+    end
+
     def with_attrlist(attrlist)
       dup.tap{|x|
         x.attrlist = attrlist

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 2
+    TINY  = 4
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.20.4
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate