bmg 0.18.5 → 0.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6569e9038c83dda887da734d97ef58f9ff6e94984c78e8eae993561cde3bbfcc
-  data.tar.gz: 85d65ca717992a132e94ae17dbdf2cc671a161c495eb5be240c3d4e342e90c3f
+  metadata.gz: 482e0bb06c06e4afc620696491cf75f788902240c75f9c82d71ce9b0db4deee1
+  data.tar.gz: f49609c7cf929149d91bb1c29703fd4e5fb7d861073b38ad916a851214ec20b9
 SHA512:
-  metadata.gz: fbeb5215e5942626dd5115d95c091602daa57128014bc0833c38c3460697ef9dbc59b4ccd7566d4d3604e8d7a8c5e7e4812159a5bb89d3dad477e6a7b75545d8
-  data.tar.gz: 9e8a9eaaf3699d28890cb15faef5b12360f9bf26c5bb0e9bf42ccedba0b7b5a3c8c2eb627f8b1a4e154c8d992426f47ed82153e9f110634f0ba6aa7ceddd1353
+  metadata.gz: a4068309c373faa50bfc4549648ee26e3220187192a529ee8c6c890424c52b4d05103c2ebf7b137354c1c8a82a756eafbdb5c6b266f489c3c6e0a0b9923a4d15
+  data.tar.gz: ba7a0046919e2d796c58cae326f3d4cf7b86f6d577e34f79395c04286c4bf463cb4c349cb2a5ce4611fbd6e310ebf521736fb190bcc1d1c2c42c51ccc175fb2e

data/README.md

@@ -234,7 +234,11 @@ t.transform(:to_s)                           # all-attrs transformation
 t.transform(&:to_s)                          # similar, but Proc-driven
 t.transform(:foo => :upcase, ...)            # specific-attrs tranformation
 t.transform([:to_s, :upcase])                # chain-transformation
+r.ungroup([:a, :b, ...])                     # ungroup relation-valued attributes within parent tuple
+r.ungroup(:a)                                # shortcut over ungroup([:a])
 r.union(right)                               # relational union
+r.unwrap([:a, :b, ...])                      # merge tuple-valued attributes within parent tuple
+r.unwrap(:a)                                 # shortcut over unwrap([:a])
 r.where(predicate)                           # alias for restrict(predicate)
 ```
 

data/lib/bmg/algebra.rb

@@ -183,6 +183,15 @@ module Bmg
     end
     protected :_transform
 
+    def ungroup(attrs)
+      _ungroup self.type.ungroup(attrs), attrs
+    end
+
+    def _ungroup(type, attrs)
+      Operator::Ungroup.new(type, self, attrs)
+    end
+    protected :_ungroup
+
     def union(other, options = {})
       return self if other.is_a?(Relation::Empty)
       _union self.type.union(other.type), other, options
@@ -193,6 +202,15 @@ module Bmg
     end
     protected :_union
 
+    def unwrap(attrs)
+      _unwrap self.type.unwrap(attrs), attrs
+    end
+
+    def _unwrap(type, attrs)
+      Operator::Unwrap.new(type, self, attrs)
+    end
+    protected :_unwrap
+
     def spied(spy)
       return self if spy.nil?
       Relation::Spied.new(self, spy)

data/lib/bmg/algebra/shortcuts.rb

@@ -69,6 +69,14 @@ module Bmg
         self.not_matching(right.rename(renaming), on.keys)
       end
 
+      def ungroup(attr)
+        super(attr.is_a?(Symbol) ? [attr] : attr)
+      end
+
+      def unwrap(attr)
+        super(attr.is_a?(Symbol) ? [attr] : attr)
+      end
+
     end # module Shortcuts
   end # module Algebra
 end # module Bmg

data/lib/bmg/operator.rb

@@ -47,4 +47,6 @@ require_relative 'operator/restrict'
 require_relative 'operator/rxmatch'
 require_relative 'operator/summarize'
 require_relative 'operator/transform'
+require_relative 'operator/ungroup'
 require_relative 'operator/union'
+require_relative 'operator/unwrap'

data/lib/bmg/operator/ungroup.rb

@@ -0,0 +1,61 @@
+module Bmg
+  module Operator
+    class Ungroup
+      include Operator::Unary
+
+      def initialize(type, operand, attrs)
+        @type = type
+        @operand = operand
+        @attrs = attrs
+      end
+
+    protected
+
+      attr_reader :attrs
+
+    public
+
+      def each(&bl)
+        return to_enum unless block_given?
+        if type.knows_keys? && type.keys.any?{|k| (k & attrs).empty? }
+          operand.each do |tuple|
+            _each(tuple, attrs[0], attrs[1..-1], &bl)
+          end
+        else
+          with_dups = []
+          operand.each do |tuple|
+            _each(tuple, attrs[0], attrs[1..-1]){|t|
+              with_dups << t
+            }
+          end
+          with_dups.uniq.each(&bl)
+        end
+      end
+
+      def _each(tuple, attr, attrs, &bl)
+        rva = tuple[attr] || []
+        rva.each do |rvt|
+          t = tuple.merge(rvt).tap{|t| t.delete(attr) }
+          if attrs.empty?
+            yield(t)
+          else
+            _each(t, attrs[0], attrs[1..-1], &bl)
+          end
+        end
+      end
+
+      def to_ast
+        [ :ungroup, operand.to_ast, attrs ]
+      end
+
+    protected
+
+    protected ### inspect
+
+      def args
+        [ attrs ]
+      end
+
+    end # class Ungroup
+  end # module Operator
+end # module Bmg

data/lib/bmg/operator/unwrap.rb

@@ -0,0 +1,47 @@
+module Bmg
+  module Operator
+    class Unwrap
+      include Operator::Unary
+
+      def initialize(type, operand, attrs)
+        @type = type
+        @operand = operand
+        @attrs = attrs
+      end
+
+    protected
+
+      attr_reader :attrs
+
+    public
+
+      def each(&bl)
+        return to_enum unless block_given?
+        operand.each do |tuple|
+          yield tuple_unwrap(tuple)
+        end
+      end
+
+      def to_ast
+        [ :unwrap, operand.to_ast, attrs ]
+      end
+
+    protected
+
+      def tuple_unwrap(tuple)
+        attrs.inject(tuple.dup){|t,attr|
+          t.merge(tuple[attr]).tap{|t2|
+            t2.delete(attr)
+          }
+        }
+      end
+
+    protected ### inspect
+
+      def args
+        [ attrs ]
+      end
+
+    end # class Unwrap
+  end # module Operator
+end # module Bmg

data/lib/bmg/summarizer/value_by.rb

@@ -39,7 +39,7 @@ module Bmg
       def default_tuple
         (options[:series] || []).each_with_object({}){|s,ss|
           s_def = options[:default]
-          s_def = s_def.to_sym if s_def && options[:symbolize]
+          s = s.to_sym if s && options[:symbolize]
           ss[s] = s_def
         }
       end

data/lib/bmg/support/keys.rb

@@ -69,6 +69,11 @@ module Bmg
       Keys.new(shared, false)
     end
 
+    def unwrap(oldtype, newtype, attrs)
+      untouched = @keys.select{|k| (attrs & k).empty? }
+      Keys.new(untouched, false)
+    end
+
   public ## usuals
 
     def to_a

data/lib/bmg/type.rb

@@ -82,7 +82,7 @@ module Bmg
 
     def with_keys(keys)
       dup.tap{|x|
-        x.keys = Keys.new(keys)
+        x.keys = keys ? Keys.new(keys) : nil
       }
     end
 
@@ -266,6 +266,15 @@ module Bmg
       }
     end
 
+    def ungroup(attrlist)
+      known_attributes!(attrlist) if typechecked? && knows_attrlist?
+      dup.tap{|x|
+        x.attrlist  = nil
+        x.predicate = Predicate.tautology
+        x.keys      = nil
+      }
+    end
+
     def union(other)
       if typechecked? && knows_attrlist? && other.knows_attrlist?
         missing = self.attrlist - other.attrlist
@@ -280,6 +289,15 @@ module Bmg
       }
     end
 
+    def unwrap(attrlist)
+      known_attributes!(attrlist) if typechecked? && knows_attrlist?
+      dup.tap{|x|
+        x.attrlist  = nil
+        x.predicate = predicate.and_split(attrlist).last
+        x.keys      = self._keys.unwrap(self, x, attrlist) if knows_keys?
+      }
+    end
+
   private
 
     def known_attributes!(attrs)

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 18
-    TINY  = 5
+    TINY  = 6
   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.18.5
+  version: 0.18.6
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
@@ -164,7 +164,9 @@ files:
 - lib/bmg/operator/shared/unary.rb
 - lib/bmg/operator/summarize.rb
 - lib/bmg/operator/transform.rb
+- lib/bmg/operator/ungroup.rb
 - lib/bmg/operator/union.rb
+- lib/bmg/operator/unwrap.rb
 - lib/bmg/reader.rb
 - lib/bmg/reader/csv.rb
 - lib/bmg/reader/excel.rb