marty 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31ab53bcb7bcc26bfa4bd1d400c5e0c7861558d3
-  data.tar.gz: c12dae6177787b1cd2eefb4416c11b15155a4395
+  metadata.gz: '08f9abbd9c473713331bb0ade7453ac85f1c4842'
+  data.tar.gz: d0251f02426640781822b048f6203f0597f73227
 SHA512:
-  metadata.gz: 6c435cd40922422b864e5dc5ed4d20536ca8a50317b917a4b53b299a9d949ef67594ceb8707c38c822efd3024264e7a1832f3707ed8d2ae039957848681cf627
-  data.tar.gz: 17a9348a816387d216a59739eac52b9cca47790ec8dd5cb469eaee93c660c83a29d40f8b9afac1ccc422d4ea6245386948732c5a87632fc612793b5a0677d4c0
+  metadata.gz: 2cab552bb2a885d177007686a476e57a28a72ab02af0ce904b0e81c0dde0dd63ed0ce773399000ea3283ee618023909259618e5e1e95e6547372ca31cefb2077
+  data.tar.gz: f39020a718bcb428a4c3171c6e21c0973b6b5bb3f8efb02bbc7237f4f386606e5c321cadaaea77ed375f39f2b07dfc239f8b55ad849d6be08591a2408c1626ac

data/lib/marty/mcfly_model.rb

@@ -54,17 +54,22 @@ module Mcfly::Model
 
     def base_mcfly_lookup(meth, name, options = {}, &block)
 
-      sig = options[:sig]
+      priv = options[:private]
+      sig = priv ? -1 : options[:sig]
+
+      # add an extra argument to the sig to receive the openstruct conversion
+      # options hash (unless private)
       newsig = sig.is_a?(Array) ? [sig[0], sig[1]+1] :
                  sig == -1 ? sig : [sig, sig+1]
       options[:sig] = newsig
-      asig = options[:asig] || newsig[1]-1
 
       send(meth, name, options) do |ts, *pargs|
         raise "time cannot be nil" if ts.nil?
 
-        args, opts = pargs.last.is_a?(Hash) && pargs.length == asig ?
-                       [pargs[0..-2], pargs.last] :
+        # get the options hash if method is not private and last arg is a hash
+        # and pargs len = max sig (-1 because ts is separated in the arg list)
+        args, opts = !priv && pargs.last.is_a?(Hash) &&
+                     pargs.length == newsig[1]-1 ? [pargs[0..-2], pargs.last] :
                        [pargs, {}]
 
         ts = Mcfly.normalize_infinity(ts)
@@ -73,18 +78,19 @@ module Mcfly::Model
                    "#{table_name}.created_dt < ?", ts, ts).scoping do
           block.call(ts, *args)
         end
+        next q if priv
+
         fa = get_final_attrs(opts)
         opts += {"fa"=>fa}
-
-        q = q.select(*fa) if fa.present? &&
-                             q.respond_to?(:select) && !q.is_a?(Array) &&
-                             !q.is_a?(Hash)
+        q = q.select(*fa) if fa.present? && q.is_a?(ActiveRecord::Relation)
 
         case
         when opts["no_convert"] == true
           q
         when q.is_a?(ActiveRecord::Relation)
-          q.map{|ar| make_openstruct(ar, opts)}
+          # shouldn't happen - lookups that are mode nil should be private
+          # raise "#{self}.#{name} can't convert ActiveRecord::Relation to OpenStruct"
+          q
         when q.is_a?(ActiveRecord::Base)
           make_openstruct(q, opts)
         else
@@ -133,11 +139,8 @@ module Mcfly::Model
         raise "bad attrs" unless Array === attrs
       end
 
-      actual_sig = attrs.length + 1
       fn = cache ? :cached_delorean_fn : :delorean_fn
-      sig = options[:private] ? -1 : actual_sig
-
-      base_mcfly_lookup(fn, name, {sig: sig, asig: actual_sig}) do
+      base_mcfly_lookup(fn, name, options + {sig: attrs.length+1}) do
         |t, *attr_list|
 
         attr_list_ids = attr_list.each_with_index.map {|x, i|

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/dummy/app/models/gemini/fannie_bup.rb

@@ -25,5 +25,72 @@ module Gemini
         rec
       }
     end
+
+    gen_mcfly_lookup :lookup, {
+                       entity: true,
+                       note_rate: false
+                     }
+    gen_mcfly_lookup :lookup_p, {
+                       entity: true,
+                       note_rate: false
+                     }, private: true
+    gen_mcfly_lookup :clookup, {
+                       entity: true,
+                       note_rate: false
+                     }, cache: true
+    gen_mcfly_lookup :clookup_p, {
+                       entity: true,
+                       note_rate: false
+                     }, cache: true, private: true
+    gen_mcfly_lookup :lookupn, {
+                       entity: true,
+                       note_rate: false
+                     }, mode: nil
+    gen_mcfly_lookup :lookupn_p, {
+                       entity: true,
+                       note_rate: false
+                     }, private: true, mode: nil
+    gen_mcfly_lookup :clookupn, {
+                       entity: true,
+                       note_rate: false
+                     }, cache: true, mode: nil
+    gen_mcfly_lookup :clookupn_p, {
+                       entity: true,
+                       note_rate: false
+                     }, cache: true, private: true, mode: nil
+
+    mcfly_lookup :a_func, sig: 3 do
+      |pt, e_id, bc_id|
+      where(entity_id: e_id, bud_category_id: bc_id).
+        order(:settlement_mm)
+    end
+
+    mcfly_lookup :b_func, sig: [3, 4] do
+      |pt, e_id, bc_id, mm = nil|
+      q = where(entity_id: e_id, bud_category_id: bc_id)
+      q = q.where(settlement_mm: mm) if mm
+      q.order(:settlement_mm).first
+    end
+
+    mcfly_lookup :a_func_p, sig: 3, private: true do
+      |pt, e_id, bc_id|
+      where(entity_id: e_id, bud_category_id: bc_id).
+        order(:settlement_mm)
+    end
+
+    mcfly_lookup :b_func_p, sig: [3, 4], private: true do
+      |pt, e_id, bc_id, mm = nil|
+      q = where(entity_id: e_id, bud_category_id: bc_id)
+      q = q.where(settlement_mm: mm) if mm
+      q.order(:settlement_mm)
+    end
+
+    cached_mcfly_lookup :ca_func, sig: 3 do
+      |pt, e_id, bc_id|
+      where(entity_id: e_id, bud_category_id: bc_id).
+        order(:settlement_mm)
+    end
+
+
   end
 end

data/spec/lib/delorean_query_spec.rb

@@ -74,6 +74,10 @@ A:
 EOF
 
   describe 'DeloreanQuery' do
+    before(:all) do
+      @clean_file = "/tmp/clean_#{Process.pid}.psql"
+      save_clean_db(@clean_file)
+    end
     before(:each) do
       marty_whodunnit
       Marty::DataImporter.do_import_summary(Gemini::BudCategory, bud_cats)
@@ -86,7 +90,10 @@ EOF
 
       @engine = Marty::ScriptSet.new.get_engine("A")
     end
-
+    after(:all) do
+      restore_clean_db(@clean_file)
+      Marty::ScriptSet.clear_cache
+    end
     it "perfroms join+count" do
       res = @engine.evaluate("A", "c", {})
 

data/spec/lib/mcfly_model_spec.rb

@@ -0,0 +1,255 @@
+require "spec_helper"
+
+module Marty
+
+entities =<<EOF
+name
+PLS
+EOF
+bud_cats =<<EOF
+name
+Conv Fixed 30
+Conv Fixed 20
+EOF
+
+fannie_bup =<<EOF
+entity	bud_category	note_rate	buy_up	buy_down	settlement_mm	settlement_yy
+	Conv Fixed 30	2.250	4.42000	7.24000	12	2012
+	Conv Fixed 30	2.375	4.42000	7.24000	12	2012
+	Conv Fixed 30	2.500	4.41300	7.22800	12	2012
+	Conv Fixed 30	2.625	4.37500	7.16200	12	2012
+	Conv Fixed 30	2.750	4.32900	7.09300	12	2012
+	Conv Fixed 20	2.875	4.24800	6.95900	12	2012
+	Conv Fixed 20	2.875	4.24800	6.95900	11	2012
+PLS	Conv Fixed 30	2.250	5.42000	8.24000	12	2012
+PLS	Conv Fixed 30	2.375	5.42000	8.24000	12	2012
+PLS	Conv Fixed 30	2.500	5.41300	8.22800	12	2012
+PLS	Conv Fixed 30	2.625	5.37500	8.16200	12	2012
+PLS	Conv Fixed 30	2.750	5.32900	8.09300	12	2012
+PLS	Conv Fixed 20	2.875	5.24800	7.95900	12	2012
+PLS	Conv Fixed 20	2.875	5.24800	7.95900	11	2012
+EOF
+
+script =<<EOF
+A:
+    pt        =?
+    entity    =?
+    note_rate =?
+
+    extra = {"include_attrs": ["settlement_mm", "settlement_yy"],
+             "link_attrs": {"entity": "name",
+                            "bud_category": "name"}}
+    ex2 = {"include_attrs": ["settlement_mm", "settlement_yy", "entity_id",
+                             "bud_category_id"]}
+
+    lookup            = Gemini::FannieBup.lookup(  pt, entity, note_rate)
+    lookup_extra      = Gemini::FannieBup.lookup(  pt, entity, note_rate, extra)
+
+    clookup     = Gemini::FannieBup.clookup( pt, entity, note_rate)
+
+    lookupn            = Gemini::FannieBup.lookupn( pt, entity, note_rate)
+    lookupn_extra      = Gemini::FannieBup.lookupn(  pt, entity, note_rate, ex2)
+
+    clookupn    = Gemini::FannieBup.clookupn(pt, entity, note_rate)
+
+    a_func = Gemini::FannieBup.a_func('infinity', 1, 2)
+    a_func_extra = Gemini::FannieBup.a_func('infinity', 1, 2, ex2)
+    b_func = Gemini::FannieBup.b_func('infinity',1, 2, 12)
+    b_func_extra = Gemini::FannieBup.b_func('infinity',1, 2, 12, extra)
+    ca_func = Gemini::FannieBup.ca_func('infinity',1, 2, ex2)
+
+EOF
+errscript =<<EOF
+Err:
+    pt        =?
+    entity    =?
+    note_rate =?
+    result = Gemini::FannieBup.%s(pt, entity, note_rate)
+EOF
+errscript2 =<<EOF
+Err:
+    pt    =?
+    e_id  =?
+    bc_id =?
+    result = Gemini::FannieBup.%s(pt, e_id, bc_id)
+EOF
+errscript3 =<<EOF
+Err:
+    pt    =?
+    e_id  =?
+    bc_id =?
+    mm    =?
+    result = Gemini::FannieBup.%s(pt, e_id, bc_id, mm)
+EOF
+
+  describe 'McflyModel' do
+    before(:all) do
+      @clean_file = "/tmp/clean_#{Process.pid}.psql"
+      save_clean_db(@clean_file)
+      marty_whodunnit
+      dt = Date.today
+      Marty::DataImporter.do_import_summary(Gemini::Entity, entities)
+      Marty::DataImporter.do_import_summary(Gemini::BudCategory, bud_cats)
+      Marty::DataImporter.do_import_summary(Gemini::FannieBup, fannie_bup)
+      Marty::Script.load_script_bodies(
+        {
+          "AA" => script,
+        }, dt)
+      @errs = ['E1', 'lookup_p',
+               'E2', 'clookup_p',
+               'E3', 'lookupn_p',
+               'E4', 'clookupn_p']
+
+      @errs.in_groups_of(2) do |name, fn|
+        Marty::Script.load_script_bodies(
+        {
+          name => (errscript % fn),
+        }, Date.today)
+      end
+
+      Marty::Script.load_script_bodies({'E5'=>(errscript2 % 'a_func_p')}, dt)
+      Marty::Script.load_script_bodies({'E6'=>(errscript3 % 'b_func_p')}, dt)
+
+      @engine = Marty::ScriptSet.new.get_engine("AA")
+    end
+    after(:all) do
+      restore_clean_db(@clean_file)
+      Marty::ScriptSet.clear_cache
+    end
+    let(:params) {{"pt"        =>'infinity',
+                   "entity"    => Gemini::Entity.all.first,
+                   "note_rate" => 2.875}}
+    it "lookup mode default" do
+      a1 = @engine.evaluate("A", "lookup", params)
+      a2 = @engine.evaluate("A", "clookup", params)
+      expect(a1).to eq(a2)                            # cache/non return same
+      expect(a1.class).to eq(OpenStruct)              # mode default so return OS
+      expect(a2.class).to eq(OpenStruct)
+
+      # check that keys are non mcfly non uniqueness
+      expect(a1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
+    end
+
+    it "lookup non generated" do
+      # a1-a3 will be AR Relations
+      # b1-b2 will be OpenStructs because the b fns return #first
+      a1 = @engine.evaluate("A", "a_func", {})
+      a2 = @engine.evaluate("A", "ca_func", {})
+      a3 = @engine.evaluate("A", "a_func_extra", {})
+      b1 = @engine.evaluate("A", "b_func", {})
+      b2 = @engine.evaluate("A", "b_func_extra", {})
+
+      # all return relations
+      expect(ActiveRecord::Relation === a1).to be_truthy
+      expect(ActiveRecord::Relation === a2).to be_truthy
+      expect(ActiveRecord::Relation === a3).to be_truthy
+      expect(ActiveRecord::Base === a1.first).to be_truthy
+      expect(ActiveRecord::Base === a2.first).to be_truthy
+      expect(ActiveRecord::Base === a3.first).to be_truthy
+
+      expect(a1.to_a.count).to eq(2)
+      expect(a2.to_a.count).to eq(2)
+      expect(a3.to_a.count).to eq(2)
+
+      # a1 lookup did not include extra attrs
+      expect(a1.first.attributes.keys.to_set).to eq(Set["id", "buy_up", "buy_down"])
+
+      # a2 and a3 did
+      s = Set["id", "entity_id", "bud_category_id",  "buy_up", "buy_down",
+              "settlement_mm", "settlement_yy"]
+      expect(a2.first.attributes.keys.to_set).to eq(s)
+      expect(a3.first.attributes.keys.to_set).to eq(s)
+
+      # a1 is AR but still missing the FK entity_id so will raise
+      expect{a1.first.entity}.to raise_error(/missing attribute: entity_id/)
+
+      # a3 included those so can access them
+      expect(a3.first.entity.name).to eq('PLS')
+      expect(a3.first.bud_category.name).to eq('Conv Fixed 20')
+
+      expect(b1.class).to eq(OpenStruct)
+      expect(b2.class).to eq(OpenStruct)
+
+      # make sure b1-b2 have correct keys and extra stuff
+      expect(b1.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down])
+      expect(b2.to_h.keys.to_set).to eq(
+               Set[:buy_up, :buy_down, :settlement_mm, :settlement_yy,
+                :entity, :bud_category])
+      expect(b2.entity.name).to eq('PLS')
+      expect(b2.bud_category.name).to eq('Conv Fixed 20')
+    end
+    it "lookup extra values" do
+      a2 = @engine.evaluate("A", "lookup_extra", params)
+      expect(a2.class).to eq(OpenStruct)
+
+      # check that extra values are there
+      expect(a2.to_h.keys.to_set).to eq(Set[:buy_up, :buy_down, :settlement_mm,
+                                            :settlement_yy, :entity,
+                                            :bud_category])
+      # check that linked values are there
+      expect(a2.entity.name).to eq("PLS")
+      expect(a2.bud_category.name).to eq("Conv Fixed 20")
+    end
+    it "lookup mode nil extra values" do
+      all = @engine.evaluate("A", "lookupn_extra", params)
+
+      # mode nil always returns AR
+      expect(ActiveRecord::Relation === all).to be_truthy
+
+      # check keys returned
+      all.each do |a2|
+        expect(a2.attributes.keys.to_set).to eq(
+                       Set["id", "buy_up", "buy_down", "settlement_mm",
+                           "settlement_yy", "entity_id", "bud_category_id"])
+        if a2.entity_id
+          expect(a2.entity.name).to eq("PLS")
+          expect(ActiveRecord::Base === a2.entity).to be_truthy
+          expect(a2.bud_category.name).to eq("Conv Fixed 20")
+          expect(ActiveRecord::Base === a2.bud_category).to be_truthy
+        end
+      end
+    end
+    it "lookup mode nil" do
+      # make sure ARs are returned
+      a1 = @engine.evaluate("A", "lookupn", params)
+      a2 = @engine.evaluate("A", "clookupn", params)
+      expect(a1).to eq(a2)
+      expect(ActiveRecord::Relation === a1).to be_truthy
+      expect(a1.to_a.count).to eq(4)
+    end
+    it "private methods can't be called by delorean" do
+      # generated methods
+      aggregate_failures "errors" do
+        @errs.in_groups_of(2) do |name, fn|
+          err = /Too many args to #{fn}/
+          expect{Marty::ScriptSet.new.get_engine(name)}.to raise_error(
+                                                   Delorean::BadCallError, err)
+        end
+      end
+
+      # non-generated
+      aggregate_failures "errors" do
+        ['E5', 'a_func_p', 'E6', 'b_func_p'].in_groups_of(2) do |scr, fn|
+          err = /Too many args to #{fn}/
+          expect{Marty::ScriptSet.new.get_engine(scr)}.to raise_error(
+                                             Delorean::BadCallError, err)
+        end
+      end
+    end
+    it "caching times" do
+      ts = DateTime.now
+      x=Benchmark.measure { 10000.times {
+                            Gemini::FannieBup.a_func(ts,
+                                                     1, 2)
+                          }
+      }
+      y=Benchmark.measure { 10000.times {
+                            Gemini::FannieBup.ca_func(ts, 
+                                                     1, 2)
+                          }
+      }
+      # x time should be 30x or more than y time
+      expect(x.real / y.real).to be > 30
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -1631,6 +1631,7 @@ files:
 - spec/lib/delorean_query_spec.rb
 - spec/lib/json_schema_spec.rb
 - spec/lib/logger_spec.rb
+- spec/lib/mcfly_model_spec.rb
 - spec/lib/migrations/vw_marty_postings.sql.expected
 - spec/lib/migrations_spec.rb
 - spec/lib/xl_spec.rb