marty 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd09d3bb234821197b1ae5dd78b70e8d07db080f
-  data.tar.gz: 4a2b19ce73da8012c2cd8157661e56fef22d2fd6
+  metadata.gz: 2b427adbbbc21ea8c9e260999376f86e048cbe2e
+  data.tar.gz: a776a0c78d3280491a4cca50017df92e5d872386
 SHA512:
-  metadata.gz: 5862a5cc24a94a11a71ba2d649440d6636768b8b18872ae1f1653cfeef588d34d81069486cdb45bf9a2793a22bf9aef172df3bbf9f9e4fad243138b2be04f9b9
-  data.tar.gz: fc3048d404e60b186f3ab9bc49063369f98fd05f30a161ee5736ed116224ec544a3059218e60cf8eacccf1685f7a1f4bfaf15793569fc09d804b731a32e8ac27
+  metadata.gz: 0f5002a7ccbbd7011768d3c96bbddb2550924d84c21feac1f4920acace47ab293aaf7f087e67317d638f1a3777236654a5ce660b7c465c7b772c3e3ece813438
+  data.tar.gz: 68206fcb4fdc3de3d65dcc0a824ae62a32ecf8fcc0b90efaf7d9e01a5b6d68990244e84f3eb2254be3099fe55576bd3a336994772ccb4aedd1a8ed80c92e8203

data/Gemfile.lock

@@ -5,7 +5,7 @@ PATH
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
-      delorean_lang (~> 0.4.2)
+      delorean_lang (~> 0.4.8)
       json-schema
       mcfly (= 0.0.20)
       net-ldap (= 0.12.1)
@@ -83,7 +83,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     connection_pool (2.2.1)
     crass (1.0.3)
     daemons (1.1.9)
@@ -93,7 +93,7 @@ GEM
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.4.2)
+    delorean_lang (0.4.8)
       activerecord (>= 3.2)
       treetop (~> 1.5)
     diff-lcs (1.3)
@@ -120,7 +120,7 @@ GEM
       pg (~> 0.17)
     method_source (0.9.0)
     mime-types (2.99.3)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)

data/lib/marty.rb

@@ -11,6 +11,7 @@
 require 'marty/engine'
 require 'marty/railtie'
 require 'marty/mcfly_model'
+require 'marty/cache_adapters'
 require 'marty/monkey'
 require 'marty/promise_job'
 require 'marty/json_schema'

data/lib/marty/cache_adapters.rb

@@ -0,0 +1,6 @@
+require 'marty/cache_adapters/mcfly_ruby_cache'
+
+module Marty
+  module CacheAdapters
+  end
+end

data/lib/marty/cache_adapters/mcfly_ruby_cache.rb

@@ -0,0 +1,12 @@
+module Marty
+  module CacheAdapters
+    class McflyRubyCache < ::Delorean::Cache::Adapters::RubyCache
+      def cache_item?(klass:, method_name:, args:)
+        ts = args && args.first
+
+        return false if Mcfly.is_infinity(ts)
+        true
+      end
+    end
+  end
+end

data/lib/marty/mcfly_model.rb

@@ -6,52 +6,6 @@ module Mcfly::Model
   end
 
   module ClassMethods
-    def clear_lookup_cache!
-      @LOOKUP_CACHE.clear if @LOOKUP_CACHE
-    end
-
-    # FIXME IDEA: we just make :cache an argument to delorean_fn.
-    # That way, we don't need the cached_ flavors.  It'll make all
-    # this code a lot simpler.  We should also just add the :private
-    # mechanism here.
-
-    # Implements a VERY HACKY class-based (per process) caching
-    # mechanism for database lookup results.  Issues include: cached
-    # values are ActiveRecord objects.  Query results can be very
-    # large lists which we count as one item in the cache.  Caching
-    # mechanism will result in large processes.
-    def cached_delorean_fn(name, options = {}, &block)
-      @LOOKUP_CACHE ||= {}
-
-      delorean_fn(name, options) do |ts, *args|
-        cache_key = [name, ts] + args.map{ |a|
-          a.is_a?(ActiveRecord::Base) ? a.id : a
-        } unless Mcfly.is_infinity(ts)
-        next @LOOKUP_CACHE[cache_key] if
-          cache_key && @LOOKUP_CACHE.has_key?(cache_key)
-
-        res = block.call(ts, *args)
-
-        if cache_key
-          # Cache has >1000 items, clear out the oldest 200.  FIXME:
-          # hard-coded, should be configurable.  Cache
-          # size/invalidation should be per lookup and not class.
-          # We're invalidating cache items simply based on age and
-          # not usage.  This is faster but not as fair.
-          if @LOOKUP_CACHE.count > 1000
-            @LOOKUP_CACHE.keys[0..200].each{|k| @LOOKUP_CACHE.delete(k)}
-          end
-          @LOOKUP_CACHE[cache_key] = res
-
-          # Since we're caching this object and don't want anyone
-          # changing it.  FIXME: ideally should freeze this object
-          # recursively.
-          res.freeze unless res.is_a?(ActiveRecord::Relation)
-        end
-        res
-      end
-    end
-
     def hash_if_necessary(q, private)
       !private && q.is_a?(ActiveRecord::Base) ? make_openstruct(q) : q
     end

data/lib/marty/monkey.rb

@@ -189,6 +189,8 @@ end
 
 ######################################################################
 
+require 'marty/cache_adapters'
+
 class ActiveRecord::Base
   MCFLY_PT_SIG = [1, 1]
 
@@ -224,28 +226,44 @@ end
 
 ar_instances = [ActiveRecord::Relation, ActiveRecord::QueryMethods::WhereChain]
 
-args_hack = [ar_instances] + [[Object, nil]]*10
-
-Delorean::RUBY_WHITELIST.merge!(
-  count:    [ar_instances],
-  distinct: args_hack,
-  find_by:  args_hack,
-  group:    args_hack,
-  joins:    args_hack,
-  limit:    [ar_instances, Integer],
-  not:      args_hack,
-  order:    args_hack,
-  pluck:    args_hack,
-  select:   args_hack,
-  where:    args_hack,
-  mcfly_pt: [ar_instances,
-             [Date, Time, ActiveSupport::TimeWithZone, String],
-             [nil, Class]],
-  lookup_grid_distinct_entry: [OpenStruct,
-                               [Date, Time, ActiveSupport::TimeWithZone, String],
-                               Hash],
+args_hack = [[Object, nil]]*10
+
+[[:distinct, args_hack],
+ [:find_by,  args_hack],
+ [:group,    args_hack],
+ [:joins,    args_hack],
+ [:limit,    [Integer]],
+ [:not,      args_hack],
+ [:order,     args_hack],
+ [:pluck,     args_hack],
+ [:select,    args_hack],
+ [:where,     args_hack],
+ [:mcfly_pt, [[Date, Time, ActiveSupport::TimeWithZone, String], [nil, Class]]]
+].each do |meth, args|
+  ::Delorean::Ruby.whitelist.add_method meth do |method|
+    ar_instances.each do |ar|
+      method.called_on ar, with: args
+    end
+  end
+end
+::Delorean::Ruby.whitelist.add_method :count do |method|
+    ar_instances.each do |ar|
+      method.called_on ar
+    end
+end
+::Delorean::Ruby.whitelist.add_method :lookup_grid_distinct_entry do |method|
+  method.called_on OpenStruct, with: [[Date, Time,
+                                       ActiveSupport::TimeWithZone, String],
+                                        Hash]
+end
+
+
+mcfly_cache_adapter = ::Marty::CacheAdapters::McflyRubyCache.new(
+  size_per_class: 1000
 )
 
+::Delorean::Cache.adapter = mcfly_cache_adapter
+
 ######################################################################
 
 module Mcfly::Controller

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.4.6"
+  VERSION = "2.4.7"
 end

data/marty.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'axlsx', '3.0.0pre'
 
-  s.add_dependency 'delorean_lang', '~> 0.4.2'
+  s.add_dependency 'delorean_lang', '~> 0.4.8'
   s.add_dependency 'mcfly', '0.0.20'
 
   s.add_dependency 'coderay'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: mcfly
   requirement: !ruby/object:Gem::Requirement
@@ -496,6 +496,8 @@ files:
 - lib/marty.rb
 - lib/marty/aws/base.rb
 - lib/marty/aws/request.rb
+- lib/marty/cache_adapters.rb
+- lib/marty/cache_adapters/mcfly_ruby_cache.rb
 - lib/marty/content_handler.rb
 - lib/marty/data_change.rb
 - lib/marty/data_conversion.rb