bmg 0.18.1 → 0.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e47d2972990cc85ae0a3b99fa6a79caf97176e46c7d70cdbbbb35ffdb3df21a
-  data.tar.gz: dd7ddf0c123a9347f517da44cc923ec9664c8a1fd12b9e8f0ed08677be2dcdd4
+  metadata.gz: 482e0bb06c06e4afc620696491cf75f788902240c75f9c82d71ce9b0db4deee1
+  data.tar.gz: f49609c7cf929149d91bb1c29703fd4e5fb7d861073b38ad916a851214ec20b9
 SHA512:
-  metadata.gz: 929f4c67a01d756b484e9ae27e5465173a4a1850686a173a8ab293dbe1e1ba01899c1ab21a8e2f29251378d0354287e379e7573ae551d3aef0583a0690640375
-  data.tar.gz: 3a92ab6c7708badf0464a94c496000eb55d233fb979bfd7128b71f3229347fa56c38be381815dbbc7eb0f741b58138f89551080e7670b3b044dfbba6571ac892
+  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/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)
@@ -74,15 +75,19 @@ module Bmg
         operand.matching(right, on).allbut(butlist)
       end
 
-      def _restrict(type, predicate)
-        operand.restrict(predicate).allbut(butlist)
-      end
-
       def _page(type, ordering, page_index, options)
         return super unless self.preserving_key?
         operand.page(ordering, page_index, options).allbut(butlist)
       end
 
+      def _project(type, attrlist)
+        operand.project(attrlist)
+      end
+
+      def _restrict(type, predicate)
+        operand.restrict(predicate).allbut(butlist)
+      end
+
     protected ### inspect
 
       def preserving_key?

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)
@@ -57,6 +58,12 @@ module Bmg
         [:autosummarize, operand.to_ast, by.dup, sums.dup]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected
 
       def _restrict(type, predicate)

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
@@ -52,6 +53,12 @@ module Bmg
         [ :autowrap, operand.to_ast, @original_options.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _autowrap(type, opts)
@@ -92,6 +99,8 @@ module Bmg
         else
           super
         end
+      rescue UnknownAttributesError
+        super
       end
 
       def _page(type, ordering, page_index, opts)
@@ -105,6 +114,16 @@ module Bmg
         super
       end
 
+      def _project(type, attrlist)
+        if (wrapped_roots! & attrlist).empty?
+          operand.project(attrlist).autowrap(options)
+        else
+          super
+        end
+      rescue UnknownAttributesError
+        super
+      end
+
       def _rename(type, renaming)
         # 1. Can't optimize if renaming applies to a wrapped one
         return super unless (wrapped_roots! & renaming.keys).empty?

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
@@ -54,6 +55,12 @@ module Bmg
         [ :constants, operand.to_ast, constants.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _page(type, ordering, page_index, options)

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
@@ -53,6 +54,12 @@ module Bmg
         [ :extend, operand.to_ast, extension.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _allbut(type, butlist)

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

@@ -46,6 +46,7 @@ module Bmg
     public
 
       def each(*args, &bl)
+        return to_enum unless block_given?
         (options[:jit_optimized] ? self : jit_optimize)._each(*args, &bl)
       end
 
@@ -155,6 +156,12 @@ module Bmg
         end
       end
 
+    public ### for internal reasons
+
+      def _count
+        left._count
+      end
+
     protected ### optimization
 
       def _allbut(type, butlist)
@@ -185,6 +192,14 @@ module Bmg
         end
       end
 
+      def _project(type, attrlist)
+        if attrlist.include?(as)
+          super
+        else
+          left.project(attrlist)
+        end
+      end
+
       def _restrict(type, predicate)
         on_as, rest = predicate.and_split([as])
         if rest.tautology?

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,9 +29,10 @@ module Bmg
     public
 
       def each
+        return to_enum unless block_given?
         seen = {}
         @operand.each do |tuple|
-          projected = project(tuple)
+          projected = tuple_project(tuple)
           unless seen.has_key?(projected)
             yield(projected)
             seen[projected] = true
@@ -74,7 +75,7 @@ module Bmg
 
     private
 
-      def project(tuple)
+      def tuple_project(tuple)
         tuple.dup.delete_if{|k,_| !@attrlist.include?(k) }
       end
 

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
@@ -60,6 +61,12 @@ module Bmg
         [ :rename, operand.to_ast, renaming.dup ]
       end
 
+    public ### for internal reasons
+
+      def _count
+        operand._count
+      end
+
     protected ### optimization
 
       def _page(type, ordering, page_index, options)
@@ -82,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