bmg 0.17.7 → 0.17.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41671cac00088b48c072b6e276538989ce92f3583faef903748265558ad7d1d3
-  data.tar.gz: 32003d306f1d5ea608efea4c2dd875ac935fd205ff4e016e8d8af4afbc7ee1c5
+  metadata.gz: 600739b827185e0d02252824b7b5616662a378b1c907a632ba695536e76d631e
+  data.tar.gz: f327e31860ef19e0ab8177ebd0e3d0c927c003cb25b8e48af202145cdf1ceece
 SHA512:
-  metadata.gz: 5c0fa25d89eefaaed383a8d675e046894ed8cdbc705ffc8a283a523d53d7c89b0879118d6a8163eedb5e60add7fe4dd2594238722946652c93d298c2cfd7f2e2
-  data.tar.gz: 7b0181f9d426d856f66c51ca010009c834cd4c09f3fa9563013ab06a67181576b13f469a1e4209edc82eff9d0100f3f26fdaafb4e8e21efc667cfaa4b5878371
+  metadata.gz: 2cd09c0006211c6db5d220ee2371669bd3e29bf32c71eae9fb9ba2c4698392ed172412bbd71c9eded5df34172ab469aa6d20a4117ef263955ed73e8a128cf856
+  data.tar.gz: 8777307569c78001741a597b3ecd9974aa1ee94780495d86f97af38313dcd185c9516d43b9c1635cae5e57606c7422d3e6b3f4889be0b2adcdfeb9f2c30dee24

data/lib/bmg/relation.rb

@@ -113,9 +113,10 @@ module Bmg
     # When no string_or_io is used, the method uses a string.
     #
     # The method always returns the string_or_io.
-    def to_csv(options = {}, string_or_io = nil)
+    def to_csv(options = {}, string_or_io = nil, preferences = nil)
       options, string_or_io = {}, options unless options.is_a?(Hash)
-      Writer::Csv.new(options).call(self, string_or_io)
+      string_or_io, preferences = nil, string_or_io if string_or_io.is_a?(Hash)
+      Writer::Csv.new(options, preferences).call(self, string_or_io)
     end
 
     # Converts to an sexpr expression.

data/lib/bmg/support.rb

@@ -1,3 +1,4 @@
 require_relative 'support/tuple_algebra'
 require_relative 'support/tuple_transformer'
 require_relative 'support/keys'
+require_relative 'support/output_preferences'

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

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 17
-    TINY  = 7
+    TINY  = 8
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.17.7
+  version: 0.17.8
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -260,6 +260,7 @@ files:
 - lib/bmg/summarizer/variance.rb
 - lib/bmg/support.rb
 - lib/bmg/support/keys.rb
+- lib/bmg/support/output_preferences.rb
 - lib/bmg/support/tuple_algebra.rb
 - lib/bmg/support/tuple_transformer.rb
 - lib/bmg/type.rb