marty 0.5.20 → 0.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fadde1bf5efa6fe544f3ff25c1304fe13d5d5b86
-  data.tar.gz: 5f682bdabf50f7e920e8c9c333752502da263623
+  metadata.gz: 1a03584b75e0a4352769f3c304f86291eb0b9cf5
+  data.tar.gz: 215f2fdb7b8d0dc7d3a081aea295901f02f3bc51
 SHA512:
-  metadata.gz: 196acdb333b359b87808de78b7ef4a989b006ae032d57c272ea53f9bc304dcd98421d91f3b4b6bf105632868e2c9cc627bdef65006b4e1f711ba444f46f262ce
-  data.tar.gz: e1603b431d2f8ae6d2fea170b771c09359a9d9d153786c67c855f9ecfe19dbcfa9129727b238c9c11a2467e4b46d0952001e55bca3c49c6065c64545ab34864e
+  metadata.gz: 887a19e74b5bee8fcc30421b8eb49b0ea40a4e82e53c94eaa998992d69ed353607ad3da6957b7aea0a88782ed9df92ac8d7405f463a01256374e7f1566f4d672
+  data.tar.gz: bd6eda8e03530378d34c09636da7e0af0f898ec1c55453b5a4b070c1d55ee32d1d57545bf05993d2af51401433a0fe5d9bff423715919e1b5433bc8148069463

data/lib/marty/data_change.rb

@@ -115,14 +115,15 @@ class Marty::DataChange
     classes.to_set & class_list.to_set
   end
 
-  delorean_fn :do_export, sig: [2, 3] do
-    |pt, klass, sort_field=nil|
+  delorean_fn :do_export, sig: [2, 4] do
+    |pt, klass, sort_field=nil, exclude_attrs=[]|
 
     # allow classes on class_list or any Enum to be exported
     raise "'#{klass}' not on class_list" unless
       class_list.member?(klass) || klass.constantize.is_a?(Marty::Enum)
 
-    Marty::DataExporter.do_export(pt, klass.constantize, sort_field)
+    Marty::DataExporter.
+      do_export(pt, klass.constantize, sort_field, exclude_attrs)
   end
 
   delorean_fn :export_changes, sig: 3 do

data/lib/marty/data_exporter.rb

@@ -78,15 +78,16 @@ class Marty::DataExporter
     end
   end
 
-  def self.export_attrs(klass, obj, attrs=nil)
+  def self.export_attrs(klass, obj, attrs=nil, exclude_attrs=[])
     col_types = Marty::DataConversion.col_types(klass)
 
-    (attrs || col_types.keys).map do
+    attr_list = (attrs || col_types.keys).map(&:to_s) - exclude_attrs
+
+    attr_list.map do
       |c|
 
       v = obj.send(c.to_sym)
 
-      c = c.to_s
       type = col_types[c]
 
       # return [value] if not assoc or nil
@@ -103,13 +104,14 @@ class Marty::DataExporter
     end
   end
 
-  def self.export_headers(klass, attrs=nil)
+  def self.export_headers(klass, attrs=nil, exclude_attrs=[])
     col_types = Marty::DataConversion.col_types(klass)
 
-    (attrs || col_types.keys).map do
+    attr_list = (attrs || col_types.keys).map(&:to_s) - exclude_attrs
+
+    attr_list.map do
       |c|
 
-      c = c.to_s
       type = col_types[c]
 
       next c unless type.is_a?(Hash)
@@ -130,7 +132,7 @@ class Marty::DataExporter
 
   # Given a Mcfly klass, generate an export array.  Can potentially
   # use up a lot of memory if the result set is large.
-  def self.do_export(ts, klass, sort_field=nil)
+  def self.do_export(ts, klass, sort_field=nil, exclude_attrs=[])
     query = klass
 
     if Mcfly.has_mcfly?(klass)
@@ -138,14 +140,16 @@ class Marty::DataExporter
       query = query.where("obsoleted_dt >= ? AND created_dt < ?", ts, ts)
     end
 
-    do_export_query_result(klass, query.order(sort_field || :id))
+    do_export_query_result(klass, query.order(sort_field || :id), exclude_attrs)
   end
 
-  def self.do_export_query_result(klass, qres)
+  def self.do_export_query_result(klass, qres, exclude_attrs=[])
     # strip _id from assoc fields
-    header = [ export_headers(klass).flatten ]
+    header = [ export_headers(klass, nil, exclude_attrs).flatten ]
 
-    header + qres.map {|obj| export_attrs(klass, obj).flatten(1)}
+    header + qres.map {|obj|
+      export_attrs(klass, obj, nil, exclude_attrs).flatten(1)
+    }
   end
 
   # Export a single object to hash -- FIXME: inefficient

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.20"
+  VERSION = "0.5.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.20
+  version: 0.5.21
 platform: ruby
 authors:
 - Arman Bostani
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg