occams-record 1.0.0.rc5 → 1.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a370b14fabfecd12e219d2bdf5c0719e95c71518e283a5aa5601e9de69c5b3d4
-  data.tar.gz: dbfab334da683c11342efeece655780c59272f2ac51c1ddf6c5382fea926571a
+  metadata.gz: 851fb48e34ce23fa35958cb72bae9ea977f21fa96694bf9ba20a1c98e706a518
+  data.tar.gz: ac548521b2303bce203a0d18ff73a4542ec68ea6cbdd9842a1b9115fd373b1b6
 SHA512:
-  metadata.gz: 35e38ad43a0cbe41adfcbffa72badd4cf3b6f1f716a74fe1e752e419fb4697903156445360f5b159d951983faa716c71ad157edce704dbfa7155f8d51921b44d
-  data.tar.gz: bf2e41947e4366243b3a45ce9a4f4a8bf3fd2dea1f7314f85a61cc3268be3c514fb08e6a5a6fcf6c0a83de35e7a0905ffea3d2d9f64c4511433ec56fc3088174
+  metadata.gz: 6575024104f85f9c3565834e5cf4c012df74aa11dbe9ae9b71b6638035c4d048729cf6e543bce46cd79556ba0dbbb817509a8ffc9fc091c1ce3890ffde8579db
+  data.tar.gz: 8d6100ac2cd92fa4d36fecca233f8684cb96984a56d0322179101130f4cb9c53ba9a2d599bf868f6b69cfb4a2caa108e770d21eba6ec1e2facd3177dab5dc142

data/README.md

@@ -230,9 +230,9 @@ The following ActiveRecord features are not supported, and likely never will be.
 
 # Benchmarking
 
-`bundle exec rake bench` will run a suite of performance benchmarks comparing Occams Record with Active Record. These are primarily used during development to prevent performance regressions. An in-memory Sqlite database is used.
+`bundle exec rake bench` will run a suite of speed and memory benchmarks comparing Occams Record to Active Record. [You can find an example of a typical run here.](https://github.com/jhollinger/occams-record/wiki/Measurements). These are primarily used during development to prevent performance regressions. An in-memory Sqlite database is used.
 
-If you run your own benchmarks, keep in mind exactly what you're measuring. For example if you're benchmarking a report written in AR vs OR, there are many constants in that measurement: the time spent in the database, the time spent transfering the database results back to your Ruby process, any calculations you're doing on your results, and the time spent building your html/json/csv/etc. So if OR is 3x fastr than AR, the total runtime of said report *won't* improve by 3x.
+If you run your own benchmarks, keep in mind exactly what you're measuring. For example if you're benchmarking a report written in AR vs OR, there are many constants in that measurement: the time spent in the database, the time spent sending the database results over the network, any calculations you're doing in Ruby, and the time spent building your html/json/csv/etc. So if OR is 3x fastr than AR, the total runtime of said report *won't* improve by 3x.
 
 On the other hand, Active Record makes it *very* easy to forget to eager load associations (the N+1 query problem). Occams Record fixes that. So if your report was missing some associations you could see easily see performance improvements well over 3x.
 

data/lib/occams-record/eager_loaders/builder.rb

@@ -16,12 +16,13 @@ module OccamsRecord
       # @param select [String] a custom SELECT statement, minus the SELECT (optional)
       # @param use [Array<Module>] optional Module to include in the result class (single or array)
       # @param as [Symbol] Load the association usign a different attribute name
+      # @param from [Symbol] Opposite of `as`. `assoc` is the custom name and `from` is the name of association on the ActiveRecord model.
       # @param optimizer [Symbol] Only used for `through` associations. Options are :none (load all intermediate records) | :select (load all intermediate records but only SELECT the necessary columns)
       # @yield a block where you may perform eager loading on *this* association (optional)
       # @return [OccamsRecord::Query] returns self
       #
-      def eager_load(assoc, scope = nil, select: nil, use: nil, as: nil, optimizer: :select, &builder)
-        @eager_loaders.add(assoc, scope, select: select, use: use, as: as, optimizer: optimizer, &builder)
+      def eager_load(assoc, scope = nil, select: nil, use: nil, as: nil, from: nil, optimizer: :select, &builder)
+        @eager_loaders.add(assoc, scope, select: select, use: use, as: as, from: from, optimizer: optimizer, &builder)
         self
       end
 
@@ -36,13 +37,14 @@ module OccamsRecord
       # @param select [String] a custom SELECT statement, minus the SELECT (optional)
       # @param use [Array<Module>] optional Module to include in the result class (single or array)
       # @param as [Symbol] Load the association usign a different attribute name
+      # @param from [Symbol] Opposite of `as`. `assoc` is the custom name and `from` is the name of association on the ActiveRecord model.
       # @param optimizer [Symbol] Only used for `through` associations. Options are :none (load all intermediate records) | :select (load all intermediate records but only SELECT the necessary columns)
       # @return [OccamsRecord::EagerLoaders::Base]
       #
       #
-      def nest(assoc, scope = nil, select: nil, use: nil, as: nil, optimizer: :select)
+      def nest(assoc, scope = nil, select: nil, use: nil, as: nil, from: nil, optimizer: :select)
         raise ArgumentError, "OccamsRecord::EagerLoaders::Builder#nest does not accept a block!" if block_given?
-        @eager_loaders.add(assoc, scope, select: select, use: use, as: as, optimizer: optimizer) ||
+        @eager_loaders.add(assoc, scope, select: select, use: use, as: as, from: from, optimizer: optimizer) ||
           raise("OccamsRecord::EagerLoaders::Builder#nest may not be called under a polymorphic association")
       end
 

data/lib/occams-record/eager_loaders/context.rb

@@ -71,17 +71,29 @@ module OccamsRecord
       # @param select [String] a custom SELECT statement, minus the SELECT (optional)
       # @param use [Array<Module>] optional Module to include in the result class (single or array)
       # @param as [Symbol] Load the association usign a different attribute name
+      # @param from [Symbol] Opposite of `as`. `assoc` is the custom name and `from` is the name of association on the ActiveRecord model.
       # @param optimizer [Symbol] Only used for `through` associations. Options are :none (load all intermediate records) | :select (load all intermediate records but only SELECT the necessary columns)
       # @yield a block where you may perform eager loading on *this* association (optional)
       # @return [OccamsRecord::EagerLoaders::Base] the new loader. if @model is nil, nil will be returned.
       #
-      def add(assoc, scope = nil, select: nil, use: nil, as: nil, optimizer: :select, &builder)
+      def add(assoc, scope = nil, select: nil, use: nil, as: nil, from: nil, optimizer: :select, &builder)
+        if from
+          real_assoc = from
+          custom_name = assoc
+        elsif as
+          real_assoc = assoc
+          custom_name = as
+        else
+          real_assoc = assoc
+          custom_name = nil
+        end
+
         if @model
-          loader = build_loader!(assoc, scope, select, use, as, optimizer, builder)
+          loader = build_loader!(real_assoc, custom_name, scope, select, use, optimizer, builder)
           @loaders << loader
           loader
         else
-          @dynamic_loaders << [assoc, scope, select, use, as, optimizer, builder]
+          @dynamic_loaders << [real_assoc, custom_name, scope, select, use, optimizer, builder]
           nil
         end
       end
@@ -102,19 +114,19 @@ module OccamsRecord
 
       private
 
-      def build_loader!(assoc, scope, select, use, as, optimizer, builder)
-        build_loader(assoc, scope, select, use, as, optimizer, builder) ||
+      def build_loader!(assoc, custom_name, scope, select, use, optimizer, builder)
+        build_loader(assoc, custom_name, scope, select, use, optimizer, builder) ||
           raise("OccamsRecord: No assocation `:#{assoc}` on `#{@model.name}` or subclasses")
       end
 
-      def build_loader(assoc, scope, select, use, as, optimizer, builder)
+      def build_loader(assoc, custom_name, scope, select, use, optimizer, builder)
         ref = @model.reflections[assoc.to_s] ||
           @model.subclasses.map(&:reflections).detect { |x| x.has_key? assoc.to_s }&.[](assoc.to_s)
         return nil if ref.nil?
 
         scope ||= ->(q) { q.select select } if select
         loader_class = !!ref.through_reflection ? EagerLoaders::Through : EagerLoaders.fetch!(ref)
-        loader_class.new(ref, scope, use: use, as: as, optimizer: optimizer, &builder)
+        loader_class.new(ref, scope, use: use, as: custom_name, optimizer: optimizer, &builder)
       end
     end
   end

data/lib/occams-record/results.rb

@@ -173,7 +173,7 @@ module OccamsRecord
       end
 
       def method_missing(name, *args, &block)
-        return super if args.any? or !block.nil?
+        return super if args.any? or !block.nil? or self.class.model_name.nil?
         model = self.class.model_name.constantize
 
         if model.reflections.has_key? name.to_s

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # Library version
-  VERSION = '1.0.0.rc5'.freeze
+  VERSION = '1.0.0.rc6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord