occams-record 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e8255756485b83318f48137489d45b0dffe2a35
-  data.tar.gz: 4b6587880995459b90027367dcb2ed7afb2c6010
+  metadata.gz: 011e5e6f67a6eeb9ad95fe8e314c443099e9d06c
+  data.tar.gz: 595a4ed16e94f1abf7fc33e32f1d067308f814fd
 SHA512:
-  metadata.gz: 19078d98919da18c5aefc53031707c194e7a4e4de3f1804643ecd3b9df13d8bee3748e7f4e867f8d824048afda783ef1fbf0488456aa50bdcd4b9092f0c37121
-  data.tar.gz: 98b93cb73bda0873486b20daec39e41b6088e5661201be53c08325982a65704577d8df4207d4ce99b5b3298fb11f113063f8183fd28258672fb52fc327ee46b4
+  metadata.gz: ca932af1da71d11622e5cdf077ae48b9a5114c144ed01ef4b3cd590ba06f4916ab539df201fd01fa14477239ebd78598bdd031380d87aaa73b9d5b626a2ed5ca
+  data.tar.gz: d8755fb3d2c0520531aaea1f7266e5420f755277a394a35138a8a7be6fe3a35c0f061bfbf479ece0900518cb50448d1847a5166eb00c98594bff07f7ada5657a

data/lib/occams-record/eager_loaders.rb

@@ -24,11 +24,11 @@ module OccamsRecord
       # @param eval_block [Proc] 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, &eval_block)
+      def eager_load(assoc, scope = nil, select: nil, use: nil, as: nil, &eval_block)
         ref = @model ? @model.reflections[assoc.to_s] : nil
         raise "OccamsRecord: No assocation `:#{assoc}` on `#{@model&.name || '<model missing>'}`" if ref.nil?
         scope ||= -> { self.select select } if select
-        @eager_loaders << eager_loader_for_association(ref).new(ref, scope, use, &eval_block)
+        @eager_loaders << eager_loader_for_association(ref).new(ref, scope, use: use, as: as, &eval_block)
         self
       end
 

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

@@ -15,11 +15,13 @@ module OccamsRecord
       # @param ref [ActiveRecord::Association] the ActiveRecord association
       # @param scope [Proc] a scope to apply to the query (optional)
       # @param use [Array(Module)] optional Module to include in the result class (single or array)
+      # @param as [Symbol] Load the association into this attr instead
       # @param eval_block [Proc] a block where you may perform eager loading on *this* association (optional)
       #
-      def initialize(ref, scope = nil, use = nil, &eval_block)
-        @ref, @scope, @use, @eval_block = ref, scope, use, eval_block
-        @name, @model = ref.name.to_s, ref.klass
+      def initialize(ref, scope = nil, use: nil, as: nil, &eval_block)
+        @ref, @scope, @use, @as, @eval_block = ref, scope, use, as, eval_block
+        @model = ref.klass
+        @name = (as || ref.name).to_s
       end
 
       #

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

@@ -13,11 +13,12 @@ module OccamsRecord
       # @param ref [ActiveRecord::Association] the ActiveRecord association
       # @param scope [Proc] a scope to apply to the query (optional)
       # @param use [Array<Module>] optional Module to include in the result class (single or array)
+      # @param as [Symbol] Load the association into this attr instead
       # @param eval_block [Proc] a block where you may perform eager loading on *this* association (optional)
       #
-      def initialize(ref, scope = nil, use = nil, &eval_block)
+      def initialize(ref, scope = nil, use: nil, as: nil, &eval_block)
         @ref, @scope, @use, @eval_block = ref, scope, use, eval_block
-        @name = ref.name.to_s
+        @name = (as || ref.name).to_s
         @foreign_type = @ref.foreign_type.to_sym
         @foreign_key = @ref.foreign_key.to_sym
       end

data/lib/occams-record/merge.rb

@@ -13,11 +13,11 @@ module OccamsRecord
     # Initialize a new Merge operation.
     #
     # @param target_rows [Array<OccamsRecord::Results::Row] the rows into which associated rows should be merged
-    # @param assoc_name [String|Symbol] name of the attribute where associated rows will be put
+    # @param assoc_attr [String|Symbol] name of the attribute where associated rows will be put
     #
-    def initialize(target_rows, assoc_name)
+    def initialize(target_rows, assoc_attr)
       @target_rows = target_rows
-      @assign = "#{assoc_name}="
+      @assign = "#{assoc_attr}="
     end
 
     #

data/lib/occams-record/query.rb

@@ -74,6 +74,16 @@ module OccamsRecord
 
     alias_method :to_a, :run
 
+    #
+    # Run the query and return the first result (which could be nil). This WILL append a LIMIT 1 to the query.
+    #
+    # @return [OccamsRecord::Results::Row]
+    #
+    def first
+      scope.limit! 1
+      run[0]
+    end
+
     #
     # If you pass a block, each result row will be yielded to it. If you don't,
     # an Enumerable will be returned.

data/lib/occams-record/raw_query.rb

@@ -97,6 +97,15 @@ module OccamsRecord
 
     alias_method :to_a, :run
 
+    #
+    # Run the query and return the first result (which could be nil). IMPORTANT you MUST add LIMIT 1 yourself!
+    #
+    # @return [OccamsRecord::Results::Row]
+    #
+    def first
+      run[0]
+    end
+
     #
     # If you pass a block, each result row will be yielded to it. If you don't,
     # an Enumerable will be returned.

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # Library version
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.9.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord