marty 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb8e6c31b7c3d069f58ef86fa901ac18df05c7a0
-  data.tar.gz: 9208a3fcbab2e2e42a01c9a4c84ce59c05391aab
+  metadata.gz: 9d4b9ec78b400c21d7508aea327a6ca0938e0d58
+  data.tar.gz: 30e58cfb52553a81c175c50083fe33f784ab9d76
 SHA512:
-  metadata.gz: 72de58e1116dd97de068be07a05a91f8c7e08cf9ae80be8edb2e2043b0ebb8b8f88de09a93b957e16bc8377ec1b207cdb6e37c21074cf904cf9548b90b8c844e
-  data.tar.gz: 202dd1ea697678aa730e02801b76fb4ffe68a93a75f343b77402317e6dc238ed7d7e14dfd3019c8813b36729bae05c793f1fd63d4ce017be503bb36fda36e65e
+  metadata.gz: 9347545575665dc478f1b704f659724a957a92780d955ced1ba3ef3244ba370080df8205f8943eb33b83b421e415411875a82def6eb2e3d4dd97c8de172096ba
+  data.tar.gz: 7e153da3ce81774de494b87ced870ad5153180e2c90ed08c68d70fe0615378de71e4403fd5d928c0e810022f28b69579fed669d586de685853db2cf1948db21a

data/Gemfile

@@ -17,6 +17,7 @@ gem 'aws-sigv4', '~> 1.0', '>= 1.0.2'
 group :development, :test do
   gem 'pry-rails'
   gem 'rspec-rails'
+  gem 'rspec-instafail', require: false
   gem 'capybara'
   gem 'selenium-webdriver'
   gem 'chromedriver-helper'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.0.7)
+    marty (2.0.8)
       axlsx (= 3.0.0pre)
       coderay
       delorean_lang (~> 0.3.37)
@@ -177,6 +177,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
     rspec-by (0.0.7)
       rspec-core (>= 3)
     rspec-core (3.7.1)
@@ -184,6 +188,8 @@ GEM
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
+    rspec-instafail (1.0.0)
+      rspec
     rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
@@ -242,6 +248,7 @@ DEPENDENCIES
   pry-rails
   rails (~> 5.1.4)
   rails-controller-testing
+  rspec-instafail
   rspec-rails
   selenium-webdriver
   sqlite3

data/lib/marty/mcfly_model.rb

@@ -60,16 +60,18 @@ module Mcfly::Model
         raise "time cannot be nil" if ts.nil?
 
         ts = Mcfly.normalize_infinity(ts)
-
         q = self.where("#{table_name}.obsoleted_dt >= ? AND " +
                    "#{table_name}.created_dt < ?", ts, ts).scoping do
           block.call(ts, *args)
         end
-        next q if priv
 
         fa = get_final_attrs
         q = q.select(*fa) if fa.present? && q.is_a?(ActiveRecord::Relation)
 
+        q = q.first if q.respond_to?(:first) && options[:mode] == :first
+
+        next q if priv
+
         case
         when q.is_a?(ActiveRecord::Relation)
           # shouldn't happen - lookups that are mode nil should be
@@ -124,7 +126,8 @@ module Mcfly::Model
       end
 
       fn = cache ? :cached_delorean_fn : :delorean_fn
-      base_mcfly_lookup(fn, name, options + {sig: attrs.length+1}) do
+      base_mcfly_lookup(fn, name, options + {sig:  attrs.length+1,
+                                             mode: mode}) do
         |t, *attr_list|
 
         attr_list_ids = attr_list.each_with_index.map {|x, i|
@@ -134,7 +137,7 @@ module Mcfly::Model
 
         q = self.where(qstr, *attr_list_ids)
         q = q.order(order) if order
-        mode ? q.send(mode) : q
+        q
       end
     end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg