marty 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62e4573c0a62c67a00f1496bb2a994392e5362d9
-  data.tar.gz: 7f62a9c6a5a130e171a9e1959c1af0e08d9ad74d
+  metadata.gz: 9c0900603f68de4a2d16347f8cd75cad55f92761
+  data.tar.gz: 0f927363e84dbdb332939f907f2396c766b3ecf2
 SHA512:
-  metadata.gz: 96a9afe241c9b14a31588bf7c695c274b6ded6f873d98b7e8d68d1f0c2de6b6a15ebdca15eaadd87b4ad5139c83a7ba3e5959d30390732cc5b5724f555495da2
-  data.tar.gz: ad6da4446e1f074da66997fb00b8efa9e9bcd36d425bdc130b68fdf51199a0ef4fadacfdb9db44cdc9a126099bcb5ea39c844177d1d4cecb04a8ff31af661eb0
+  metadata.gz: 620c234afb693a0aea7480e7c299c854f39210256dedf43f6d1e1e0823c9cea7f36b0010dd0b4bffa7d3395375cdc02de3730c9692fda4db5ffc3100bb7d1860
+  data.tar.gz: 632298cbb98def0ddb8698fcb05eb77c37827169a9483d8a0e57a576b31a75c4f6c4359f7e7fb35d9b480314f8533dd820dd7ba02eb68bc8ecc983d5d8d35cda

data/README.md

@@ -82,4 +82,4 @@ PennyMac.  We have split Marty from its original home with the goal of
 making it generally available as a platform for working with versioned
 data and scripts. However, some rspec and cucumber tests are still in
 the parent and have yet to be ported. Also, documentation is sorely
-lacking. Hopefully, this will be rectified sometime in 2015.
+lacking. Hopefully, this will be rectified soon.

data/app/controllers/marty/rpc_controller.rb

@@ -24,41 +24,60 @@ class Marty::RpcController < ActionController::Base
   private
 
   def do_eval(sname, tag, node, attrs, params, api_key)
-    return {error: "Bad attrs"} unless attrs.is_a?(String)
+    unless attrs.is_a?(String)
+      logger.info "Marty::RpcController#do_eval, Bad attrs (must be a string): <#{attrs.inspect}>"
+      return {error: "Bad attrs"}
+    end
 
     begin
       attrs = ActiveSupport::JSON.decode(attrs)
-    rescue MultiJson::DecodeError
+    rescue JSON::ParserError => e
+      logger.info "Marty::RpcController#do_eval, Malformed attrs (json parse error): #{attrs.inspect}, #{e.message}"
       return {error: "Malformed attrs"}
     end
 
-    return {error: "Malformed attrs"} unless
-      attrs.is_a?(Array) && attrs.all? {|x| x.is_a? String}
+    unless attrs.is_a?(Array) && attrs.all? {|x| x.is_a? String}
+      logger.info "Marty::RpcController#do_eval, Malformed attrs (must be array of strings): <#{attrs.inspect}>"
+      return {error: "Malformed attrs"}
+    end
 
-    return {error: "Bad params"} unless params.is_a?(String)
+    unless params.is_a?(String)
+      logger.info "Marty::RpcController#do_eval, Bad params (must be a string): <#{params.inspect}>"
+      return {error: "Bad params"}
+    end
 
     begin
       params = ActiveSupport::JSON.decode(params)
-    rescue MultiJson::DecodeError
+    rescue JSON::ParserError => e
+      logger.info "Marty::RpcController#do_eval, Malformed params (json parse error): <#{params.inspect}>, #{e.message}"
       return {error: "Malformed params"}
     end
 
-    return {error: "Malformed params"} unless params.is_a?(Hash)
+    unless params.is_a?(Hash)
+      logger.info "Marty::RpcController#do_eval, Malformed params (must be a hash): <#{params.inspect}>"
+      return {error: "Malformed params"}
+    end
 
-    return {error: "Permission denied" } unless
-      Marty::ApiAuth.authorized?(sname, api_key)
+    unless Marty::ApiAuth.authorized?(sname, api_key)
+      logger.info "Marty::RpcController#do_eval, permission denied"
+      return {error: "Permission denied" }
+    end
 
     begin
       engine = Marty::ScriptSet.new(tag).get_engine(sname)
     rescue => e
-      return {error: "Can't get engine: #{sname || 'nil'} with tag: " +
-              "#{tag || 'nil'}; message: #{e.message}"}
+      err_msg = "Can't get engine: #{sname || 'nil'} with tag: " +
+              "#{tag || 'nil'}; message: #{e.message}"
+      logger.info "Marty::RpcController#do_eval, #{err_msg}"
+      return {error: err_msg}
     end
 
     begin
       engine.evaluate_attrs(node, attrs, params)
     rescue => exc
-      Delorean::Engine.grok_runtime_exception(exc)
+      err_msg = Delorean::Engine.grok_runtime_exception(exc)
+      logger.info "Marty::RpcController#do_eval, Evaluation error: #{err_msg}"
+      err_msg
     end
   end
 end

data/lib/marty/data_change.rb

@@ -199,14 +199,22 @@ class Marty::DataChange
       |h, res|
 
       fk = h[:foreign_key]
-      attr = fk.to_s.sub(/_id$/, '').to_sym
-      ref_table = h[:assoc_class].table_name
-
-      arr = klass.joins(attr).
-            where("#{klass.table_name}.obsoleted_dt >= ?", ts).
-            where("#{klass.table_name}.created_dt < ?", ts).
-            where("#{ref_table}.obsoleted_dt < ? OR #{ref_table}.created_dt >= ?", ts, ts).
-            all
+      rtable = h[:assoc_class].table_name
+      ktable = klass.table_name
+
+      # find references to the latest version in rtable (i.e. id =
+      # group_id). The latest referenced version should not be
+      # obsoleted before the row which refers to it.  FIXME: this is
+      # not exhaustive.  There are other possibities for dead
+      # references. e.g. referenced id != group_id.
+      arr =
+        klass.
+        joins("INNER JOIN #{rtable} ON #{ktable}.#{fk} = #{rtable}.group_id").
+        where("#{ktable}.obsoleted_dt >= ?", ts).
+        where("#{ktable}.created_dt < ?", ts).
+        where("#{rtable}.obsoleted_dt < #{ktable}.obsoleted_dt").
+        where("#{rtable}.group_id = #{rtable}.id").
+        all
 
       arr = arr.map {|obj| Marty::DataExporter.export_attrs(klass, obj, [fk])}
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.14"
+  VERSION = "0.5.15"
 end

metadata

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