bmg 0.18.2 → 0.18.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9b490328160c9816102f7dd34b3ee46207ab4362cd2af6d8623c9fc5d4b87a
-  data.tar.gz: d113dc14ae1811f2b5565af9e84a0ffbc82b7842c46284af7fcad3bc9f3b7470
+  metadata.gz: b7b4d39e83f04ee58369bef32ce396893d5ac98d357fd8c497d309fa17cc93b2
+  data.tar.gz: b36344887bb1142c4ddd3de0eb4419c0ba1821490a9c8c336668c37008e59156
 SHA512:
-  metadata.gz: fd42b8787cc093c6452386760744d7480c64c8be186ab73b87a548a1b853643b46a6ad48cf019da9d77fddbb38c824eb0e0bef3ef5fa2f333f1d1240f5a0bd84
-  data.tar.gz: 7bd0cd32a28963123b03b59152fa03d6470bbdf1a3c6cfe0b17a6667a80d97e65d5309def4e31ec9cbb47353d409ad9ad2a6d1fbc9c2ec10797460852836ce35
+  metadata.gz: c21cc2eb5c0e0e93cb8c4afc823855140051112f6ac5bd896181634edb67f87fca9b88f4a16c0ec70da36c8ce937e3265ade2506e7077f103e4fb46409b8dded
+  data.tar.gz: b40c206ad43a6ec36e4951c8ff8d531872154e0e855f055f62059ff3af9f0d35e7d96f2443e8046bd107741c4df481aa4ebc2b680ccf1fc88181b988add1d2d6

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/error.rb

@@ -16,4 +16,7 @@ module Bmg
   # while unknown
   class UnknownAttributesError < Error; end
 
+  # Raised when an operator is badly used
+  class MisuseError < Error; end
+
 end

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/allbut.rb

@@ -30,6 +30,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         seen = {}
         @operand.each do |tuple|
           allbuted = tuple_allbut(tuple)

data/lib/bmg/operator/autosummarize.rb

@@ -41,6 +41,7 @@ module Bmg
       end
 
       def each(&bl)
+        return to_enum unless block_given?
         h = {}
         @operand.each do |tuple|
           key = key(tuple)

data/lib/bmg/operator/autowrap.rb

@@ -43,6 +43,7 @@ module Bmg
       end
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           yield autowrap_tuple(tuple)
         end

data/lib/bmg/operator/constants.rb

@@ -23,6 +23,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           yield extend_it(tuple)
         end

data/lib/bmg/operator/extend.rb

@@ -26,6 +26,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           yield extend_it(tuple)
         end

data/lib/bmg/operator/group.rb

@@ -32,6 +32,7 @@ module Bmg
     public
 
       def each(&bl)
+        return to_enum unless block_given?
         index = Hash.new{|h,k| h[k] = k.merge(as => empty_group) }
         operand.each do |tuple|
           key = TupleAlgebra.allbut(tuple, attrs)

data/lib/bmg/operator/image.rb

@@ -26,7 +26,11 @@ module Bmg
         #   resulting operabds. This option only applies when (optimized) `on`
         #   contains one attribute only. ; it fallbacks on :index_right
         #   otherwise.
-        strategy: :refilter_right
+        strategy: :refilter_right,
+
+        # Whether the attributes on which the join is made should be kept
+        # in the result or not
+        preserve: false
 
       }
 
@@ -46,6 +50,7 @@ module Bmg
     public
 
       def each(*args, &bl)
+        return to_enum unless block_given?
         (options[:jit_optimized] ? self : jit_optimize)._each(*args, &bl)
       end
 
@@ -95,9 +100,10 @@ module Bmg
 
       def build_right_index(right)
         index = Hash.new{|h,k| h[k] = empty_image }
+        butlist = options[:preserve] ? [] : on
         right.each_with_object(index) do |t, index|
           key = tuple_project(t, on)
-          index[key].operand << tuple_image(t, on)
+          index[key].operand << tuple_allbut(t, butlist)
         end
         if opt = options[:array]
           sorter = to_sorter(opt)
@@ -248,8 +254,8 @@ module Bmg
         TupleAlgebra.project(tuple, on)
       end
 
-      def tuple_image(tuple, on)
-        TupleAlgebra.allbut(tuple, on)
+      def tuple_allbut(tuple, butlist)
+        TupleAlgebra.allbut(tuple, butlist)
       end
 
       def image_type

data/lib/bmg/operator/join.rb

@@ -25,6 +25,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         index = Hash.new
         right.each_with_object(index) do |t, index|
           key = tuple_project(t, on)

data/lib/bmg/operator/matching.rb

@@ -23,6 +23,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         index = Hash.new
         right.each_with_object(index) do |t, index|
           key = tuple_project(t, on)

data/lib/bmg/operator/not_matching.rb

@@ -23,6 +23,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         index = Hash.new
         right.each_with_object(index) do |t, index|
           key = tuple_project(t, on)

data/lib/bmg/operator/page.rb

@@ -30,6 +30,7 @@ module Bmg
     public
 
       def each(&bl)
+        return to_enum unless block_given?
         page_size = options[:page_size]
         @operand.to_a
           .sort(&comparator)

data/lib/bmg/operator/project.rb

@@ -29,6 +29,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         seen = {}
         @operand.each do |tuple|
           projected = tuple_project(tuple)

data/lib/bmg/operator/rename.rb

@@ -29,16 +29,17 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
-          yield rename(tuple, renaming)
+          yield rename_tuple(tuple, renaming)
         end
       end
 
       def insert(arg)
         case arg
-        when Hash       then operand.insert(rename(arg, reverse_renaming))
+        when Hash       then operand.insert(rename_tuple(arg, reverse_renaming))
         when Relation   then operand.insert(arg.rename(reverse_renaming))
-        when Enumerable then operand.insert(arg.map{|t| rename(t, reverse_renaming) })
+        when Enumerable then operand.insert(arg.map{|t| rename_tuple(t, reverse_renaming) })
         else
           super
         end
@@ -46,7 +47,7 @@ module Bmg
 
       def update(arg)
         case arg
-        when Hash then operand.update(rename(arg, reverse_renaming))
+        when Hash then operand.update(rename_tuple(arg, reverse_renaming))
         else
           super
         end
@@ -88,7 +89,7 @@ module Bmg
 
     private
 
-      def rename(tuple, renaming)
+      def rename_tuple(tuple, renaming)
         tuple.each_with_object({}){|(k,v),h|
           h[renaming[k] || k] = v
           h

data/lib/bmg/operator/restrict.rb

@@ -26,6 +26,7 @@ module Bmg
       end
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           yield(tuple) if @predicate.evaluate(tuple)
         end

data/lib/bmg/operator/rxmatch.rb

@@ -32,6 +32,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         @operand.each do |tuple|
           against = attrs.map{|a| tuple[a] }.join(" ")
           matcher = self.matcher

data/lib/bmg/operator/summarize.rb

@@ -13,7 +13,7 @@ module Bmg
         @type = type
         @operand = operand
         @by = by
-        @summarization = Summarize.compile(summarization)
+        @summarization = Summarizer.summarization(summarization)
       end
 
     protected
@@ -23,6 +23,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         # summary key => summarization memo, starting with least
         result = Hash.new{|h,k|
           h[k] = Hash[@summarization.map{|k,v|
@@ -56,22 +57,6 @@ module Bmg
         [ by, summarization ]
       end
 
-    private
-
-      # Compile a summarization hash so that every value is a Summarizer
-      # instance
-      def self.compile(summarization)
-        Hash[summarization.map{|k,v|
-          summarizer = case v
-          when Summarizer then v
-          when Symbol     then Summarizer.send(v, k)
-          else
-            raise ArgumentError, "Unexpected summarizer #{k} => #{v}"
-          end
-          [ k, summarizer ]
-        }]
-      end
-
     end # class Summarize
   end # module Operator
 end # module Bmg

data/lib/bmg/operator/transform.rb

@@ -28,6 +28,7 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         t = transformer
         @operand.each do |tuple|
           yield t.call(tuple)

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/union.rb

@@ -37,6 +37,7 @@ module Bmg
       end
 
       def each(&bl)
+        return to_enum unless block_given?
         if all?
           operands.each do |op|
             op.each(&bl)

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