bmg 0.17.5 → 0.18.1

data/lib/bmg/support.rb

@@ -1,2 +1,5 @@
 require_relative 'support/tuple_algebra'
+require_relative 'support/tuple_transformer'
 require_relative 'support/keys'
+require_relative 'support/ordering'
+require_relative 'support/output_preferences'

data/lib/bmg/support/keys.rb

@@ -7,6 +7,10 @@ module Bmg
 
   public ## tools
 
+    def select(&bl)
+      Keys.new(@keys.select(&bl), false)
+    end
+
   public ## algebra
 
     def allbut(oldtype, newtype, butlist)

data/lib/bmg/support/ordering.rb

@@ -0,0 +1,20 @@
+module Bmg
+  class Ordering
+
+    def initialize(attrs)
+      @attrs = attrs
+    end
+    attr_reader :attrs
+
+    def comparator
+      ->(t1, t2) {
+        attrs.each do |(attr,direction)|
+          c = t1[attr] <=> t2[attr]
+          return (direction == :desc ? -c : c) unless c==0
+        end
+        0
+      }
+    end
+
+  end # class Ordering
+end # module Bmg

data/lib/bmg/support/output_preferences.rb

@@ -0,0 +1,44 @@
+module Bmg
+  class OutputPreferences
+
+    DEFAULT_PREFS = {
+      attributes_ordering: nil,
+      extra_attributes: :after
+    }
+
+    def initialize(options)
+      @options = DEFAULT_PREFS.merge(options)
+    end
+    attr_reader :options
+
+    def self.dress(arg)
+      return arg if arg.is_a?(OutputPreferences)
+      arg = {} if arg.nil?
+      new(arg)
+    end
+
+    def attributes_ordering
+      options[:attributes_ordering]
+    end
+
+    def extra_attributes
+      options[:extra_attributes]
+    end
+
+    def order_attrlist(attrlist)
+      return attrlist if attributes_ordering.nil?
+      index = Hash[attributes_ordering.each_with_index.to_a]
+      attrlist.sort{|a,b|
+        ai, bi = index[a], index[b]
+        if ai && bi
+          ai <=> bi
+        elsif ai
+          extra_attributes == :after ? -1 : 1
+        else
+          extra_attributes == :after ? 1 : -1
+        end
+      }
+    end
+
+  end # class OutputPreferences
+end # module Bmg

data/lib/bmg/support/tuple_algebra.rb

@@ -19,5 +19,11 @@ module Bmg
     end
     module_function :rename
 
+    def symbolize_keys(h)
+      return h if h.empty?
+      h.each_with_object({}){|(k,v),h| h[k.to_sym] = v }
+    end
+    module_function :symbolize_keys
+
   end # module TupleAlgebra
 end # module Bmg

data/lib/bmg/support/tuple_transformer.rb

@@ -0,0 +1,63 @@
+module Bmg
+  class TupleTransformer
+
+    def initialize(transformation)
+      @transformation = transformation
+    end
+
+    def self.new(arg)
+      return arg if arg.is_a?(TupleTransformer)
+      super
+    end
+
+    def call(tuple)
+      transform_tuple(tuple, @transformation)
+    end
+
+    def knows_attrlist?
+      @transformation.is_a?(Hash)
+    end
+
+    def to_attrlist
+      @transformation.keys
+    end
+
+    private
+
+      def transform_tuple(tuple, with)
+        case with
+        when Symbol, Proc, Regexp
+          tuple.each_with_object({}){|(k,v),dup|
+            dup[k] = transform_attr(v, with)
+          }
+        when Hash
+          with.each_with_object(tuple.dup){|(k,v),dup|
+            dup[k] = transform_attr(dup[k], v)
+          }
+        when Array
+          with.inject(tuple){|dup,on|
+            transform_tuple(dup, on)
+          }
+        else
+          raise ArgumentError, "Unexpected transformation `#{with.inspect}`"
+        end
+      end
+
+      def transform_attr(value, with)
+        case with
+        when Symbol
+          value.send(with)
+        when Regexp
+          m = with.match(value.to_s)
+          m.nil? ? m : m.to_s
+        when Proc
+          with.call(value)
+        when Hash
+          with[value]
+        else
+          raise ArgumentError, "Unexpected transformation `#{with.inspect}`"
+        end
+      end
+
+  end # module TupleTransformer
+end # module Bmg

data/lib/bmg/type.rb

@@ -241,6 +241,31 @@ module Bmg
       }
     end
 
+    def transform(transformation, options = {})
+      transformer = TupleTransformer.new(transformation)
+      if typechecked? && knows_attrlist? && transformer.knows_attrlist?
+        known_attributes!(transformer.to_attrlist)
+      end
+      keys = if options[:key_preserving]
+        self._keys
+      elsif transformer.knows_attrlist? && knows_keys?
+        touched_attrs = transformer.to_attrlist
+        keys = self._keys.select{|k| (k & touched_attrs).empty? }
+      else
+        nil
+      end
+      pred = if transformer.knows_attrlist?
+        attr_list = transformer.to_attrlist
+        predicate.and_split(attr_list).last
+      else
+        Predicate.tautology
+      end
+      dup.tap{|x|
+        x.keys = keys
+        x.predicate = pred
+      }
+    end
+
     def union(other)
       if typechecked? && knows_attrlist? && other.knows_attrlist?
         missing = self.attrlist - other.attrlist

data/lib/bmg/version.rb

@@ -1,8 +1,8 @@
 module Bmg
   module Version
     MAJOR = 0
-    MINOR = 17
-    TINY  = 5
+    MINOR = 18
+    TINY  = 1
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/lib/bmg/writer/csv.rb

@@ -6,26 +6,37 @@ module Bmg
       DEFAULT_OPTIONS = {
       }
 
-      def initialize(options)
-        @options = DEFAULT_OPTIONS.merge(options)
+      def initialize(csv_options, output_preferences = nil)
+        @csv_options = DEFAULT_OPTIONS.merge(csv_options)
+        @output_preferences = OutputPreferences.dress(output_preferences)
       end
-      attr_reader :options
+      attr_reader :csv_options, :output_preferences
 
       def call(relation, string_or_io = nil)
         require 'csv'
         string_or_io, to_s = string_or_io.nil? ? [StringIO.new, true] : [string_or_io, false]
-        headers = relation.type.to_attrlist if relation.type.knows_attrlist?
-        csv = nil
+        headers, csv = infer_headers(relation.type), nil
         relation.each do |tuple|
           if csv.nil?
-            headers = tuple.keys if headers.nil?
-            csv = CSV.new(string_or_io, options.merge(headers: headers))
+            headers = infer_headers(tuple) if headers.nil?
+            csv = CSV.new(string_or_io, csv_options.merge(headers: headers))
           end
           csv << headers.map{|h| tuple[h] }
         end
         to_s ? string_or_io.string : string_or_io
       end
 
+    private
+
+      def infer_headers(from)
+        attrlist = if from.is_a?(Type) && from.knows_attrlist?
+          from.to_attrlist
+        elsif from.is_a?(Hash)
+          from.keys
+        end
+        attrlist ? output_preferences.order_attrlist(attrlist) : nil
+      end
+
     end # class Csv
   end # module Writer
 end # module Bmg

data/tasks/test.rake

@@ -6,17 +6,24 @@ namespace :test do
   desc "Runs unit tests"
   RSpec::Core::RakeTask.new(:unit) do |t|
     t.pattern = "spec/unit/**/test_*.rb"
-    t.rspec_opts = ["-Ilib", "-Ispec/unit", "--fail-fast", "--color", "--backtrace", "--format=progress"]
+    t.rspec_opts = ["-Ilib", "-Ispec/unit", "--color", "--backtrace", "--format=progress"]
   end
   tests << :unit
 
   desc "Runs integration tests"
   RSpec::Core::RakeTask.new(:integration) do |t|
     t.pattern = "spec/integration/**/test_*.rb"
-    t.rspec_opts = ["-Ilib", "-Ispec/integration", "--fail-fast", "--color", "--backtrace", "--format=progress"]
+    t.rspec_opts = ["-Ilib", "-Ispec/integration", "--color", "--backtrace", "--format=progress"]
   end
   tests << :integration
 
+  desc "Runs github regression tests"
+  RSpec::Core::RakeTask.new(:regression) do |t|
+    t.pattern = "spec/regression/**/test_*.rb"
+    t.rspec_opts = ["-Ilib", "-Ispec/regression", "--color", "--backtrace", "--format=progress"]
+  end
+  tests << :regression
+
   task :all => tests
 end
 

metadata

@@ -1,49 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 0.18.1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -149,14 +149,17 @@ files:
 - lib/bmg/operator/shared/nary.rb
 - lib/bmg/operator/shared/unary.rb
 - lib/bmg/operator/summarize.rb
+- lib/bmg/operator/transform.rb
 - lib/bmg/operator/union.rb
 - lib/bmg/reader.rb
 - lib/bmg/reader/csv.rb
 - lib/bmg/reader/excel.rb
+- lib/bmg/reader/text_file.rb
 - lib/bmg/relation.rb
 - lib/bmg/relation/empty.rb
 - lib/bmg/relation/in_memory.rb
 - lib/bmg/relation/materialized.rb
+- lib/bmg/relation/proxy.rb
 - lib/bmg/relation/spied.rb
 - lib/bmg/sequel.rb
 - lib/bmg/sequel/ext.rb
@@ -258,7 +261,10 @@ files:
 - lib/bmg/summarizer/variance.rb
 - lib/bmg/support.rb
 - lib/bmg/support/keys.rb
+- lib/bmg/support/ordering.rb
+- lib/bmg/support/output_preferences.rb
 - lib/bmg/support/tuple_algebra.rb
+- lib/bmg/support/tuple_transformer.rb
 - lib/bmg/type.rb
 - lib/bmg/version.rb
 - lib/bmg/writer.rb
@@ -284,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Bmg is Alf's successor.