marty 0.5.30 → 0.5.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f6ae3f8de45632f30c956f678af08c47b405b1
-  data.tar.gz: e2ba5a92b204f703bb8c9ef805a89c13b0ddecfd
+  metadata.gz: 809fc288adf7ea9d369bca2de4f9f8f3df715c94
+  data.tar.gz: cfb16d53db4fec2a753ad86c27f0f8f0830626b7
 SHA512:
-  metadata.gz: 5a748aaab77334c1b2ec3fd11deb42158c4ff517372047d397fc7093d85cea40f282a7046ae6549298ec997b9cef50a6a2be5be60c0c19fe0f4d59b761e812a9
-  data.tar.gz: 07246a3ec714c4ead02182ef21603c3b672c774b4d8fc16b5b77156aa6b98c845488608301f9c10dfa6cfbb51680fd47898d46f64841bf9746b1b4f6453cfcbf
+  metadata.gz: f40763bca3159b187edc5566ddb499545f0be35e50ba613c525f1bb287dab1e5ccd823eddeab1bbd696d71d1313e51de71656575030dce5692f0cc241e2709c9
+  data.tar.gz: 1b4760cd572d56dc4541654c254a58ce77b2d8a73ef1341f1e03ba61d653bce5cd4d2fbe36b2b0958cb2b9c75205e545bede3ba955328010bf6f735fc64ceb95

data/lib/marty/data_change.rb

@@ -4,16 +4,20 @@ class Marty::DataChange
   # Some arbitrary limit so we don't allow enormous queries
   MAX_COUNT = 64000
 
-  delorean_fn :changes, sig: 3 do
-    |t0, t1, class_name|
+  # will break if DataExporter::export_attrs recurses more than 1 level
+  # and a level 2+ child table has a compound mcfly_uniqueness key
+  delorean_fn :changes, sig: [3, 4] do
+    |t0, t1, class_name, ids = nil|
 
     klass = class_name.constantize
 
     t0 = Mcfly.normalize_infinity t0
     t1 = Mcfly.normalize_infinity t1
 
-    cols = Marty::DataConversion.columns(klass)
-    changes = get_changed_data(t0, t1, klass)
+    cols_model = Marty::DataConversion.columns(klass)
+    cols_header = Marty::DataExporter.export_headers(class_name.constantize,
+                                                     nil, [])
+    changes = get_changed_data(t0, t1, klass, ids)
 
     changes.each_with_object({}) do |(group_id, ol), h|
       h[group_id] = ol.each_with_index.map do |o, i|
@@ -38,18 +42,19 @@ class Marty::DataChange
         exp_attrs = Marty::DataExporter.export_attrs(klass, o).flatten(1)
 
         # assumes cols order is same as that returned by export_attrs
-        profile["attrs"] = cols.each_with_index.map do
-          |c, i|
-
-          {
-            # FIXME: this will not work if the attr is an association
-            # which will requires multiple keys to identify
-            # (e.g. Rule: name & version)
-            "value"     => exp_attrs[i],
-            "changed"   => prev && (o.send(c.to_sym) != prev.send(c.to_sym)),
-          }
-        end
 
+        profile["attrs"] = cols_model.each_with_index.with_object([]) do
+          |(col, i), a|
+          header_current = cols_header[i]
+          valcount = Array === header_current ? header_current.count : 1
+          changed = o.send(col.to_sym) != prev.send(col.to_sym) if prev
+          valcount.times do
+            a.push({
+              "value"     => exp_attrs.shift,
+              "changed"   => changed
+            })
+          end
+        end
         profile
       end
     end
@@ -90,14 +95,8 @@ class Marty::DataChange
 
   delorean_fn :class_headers, sig: 1 do
     |class_name|
-
-    klass = class_name.constantize
-    assoc = Marty::DataConversion.associations klass
-    Marty::DataConversion.columns(klass).map { |c|
-      # strip _id if it's an assoc
-      c = c[0..-4] if assoc[c]
-      I18n.t(c, scope: 'attributes', default: c)
-    }
+    Marty::DataExporter.export_headers(class_name.constantize, nil, []).flatten.
+      map { |f| I18n.t(f, scope: 'attributes', default: f) }
   end
 
   delorean_fn :user_name, sig: 1 do
@@ -161,19 +160,25 @@ class Marty::DataChange
     }
   end
 
-  def self.get_changed_data(t0, t1, klass)
+  def self.get_changed_data(t0, t1, klass, ids)
     # The following test fails when t0/t1 are infinity.  ActiveSupport
     # doesn't know about infinity.
     # return unless t0 < t1
 
     change_q = '(obsoleted_dt >= ? AND obsoleted_dt < ?)' +
-      ' OR (created_dt >= ? AND created_dt < ?)'
+               ' OR (created_dt >= ? AND created_dt < ?)'
+
+    countq = klass.unscoped.where(change_q, t0, t1, t0, t1)
+    dataq = klass.where(change_q, t0, t1, t0, t1)
+
+    if ids
+      countq = countq.where(group_id: ids)
+      dataq = dataq.where(group_id: ids)
+    end
 
-    raise "Change count exceeds limit #{MAX_COUNT}" if
-      klass.unscoped.where(change_q, t0, t1, t0, t1).count > MAX_COUNT
+    raise "Change count exceeds limit #{MAX_COUNT}" if countq.count > MAX_COUNT
 
-    klass.where(change_q, t0, t1, t0, t1).
-      order("group_id, created_dt").group_by(&:group_id)
+    dataq.order("group_id, created_dt").group_by(&:group_id)
   end
 
   ######################################################################

data/lib/marty/data_exporter.rb

@@ -89,11 +89,13 @@ class Marty::DataExporter
       |c|
 
       v = obj.send(c.to_sym)
-
       type = col_types[c]
 
       # return [value] if not assoc or nil
-      next [v] if v.nil? || !type.is_a?(Hash)
+      next [v] if !type.is_a?(Hash)
+
+      # no child row, return nils for each field
+      next [nil]*type[:assoc_keys].count if v.nil?
 
       assoc_keys  = type[:assoc_keys]
       assoc_class = type[:assoc_class]

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.30"
+  VERSION = "0.5.31"
 end

data/spec/dummy/public/images/icons

@@ -0,0 +1 @@
+../extjs/icons/

data/spec/dummy/spec/features/javascripts

@@ -0,0 +1 @@
+../../../features/javascripts/

data/spec/lib/data_importer_spec.rb

@@ -420,7 +420,6 @@ EOF
 
     context 'when exporting' do
       it "exports the column_name" do
-
         expect(@res[0][1][0][1].length).to eq(12)
         expect(@res[0][1][0][1][7]).to eq("note_rate")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.31
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -523,8 +523,10 @@ files:
 - spec/dummy/public/icons/user_delete.png
 - spec/dummy/public/icons/user_edit.png
 - spec/dummy/public/icons/wrench.png
+- spec/dummy/public/images/icons
 - spec/dummy/script/delayed_job
 - spec/dummy/script/rails
+- spec/dummy/spec/features/javascripts
 - spec/dummy/tmp/.gitkeep
 - spec/features/javascripts/job_dashboard_live_search.js.coffee
 - spec/features/javascripts/login.js.coffee
@@ -571,9 +573,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data
 test_files: []
-has_rdoc: