occams-record 1.0.0.rc8 → 1.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e8b9c5da26d6d76932bfca57a9470648e97bb07ca33ee3fbdfe7fa5e67aed7
-  data.tar.gz: 694e75291ee550813f0732cd8d4d2361e5c6e44f324637789af0afa4637e7865
+  metadata.gz: dffcac805f1cbe701d082c2b965aeaa98c89c289fbb1d5bf3e164e5ce5ad8af1
+  data.tar.gz: a94cda603a6c408c77f751e2d9358a1f52decb34464bbd8967af9f16fd978712
 SHA512:
-  metadata.gz: 5831bafffa9f1da1677d2dff25d59d9a1480be2db886a0e275fa9a7e0d7f874dd22314bd18632df383e7213cb5e0fd50b046a526e44d5cae553c7d807af6bb0a
-  data.tar.gz: 40ab48b4680d2cf5aabbd48fa90e5564111fc77239bbfa6a0ec7ecdd7f3cc05bb4a906fd28134706a9a216c0eb8c2c9b9cf449791ec1a6dc225334d9fe356233
+  metadata.gz: afeb27a07b31d12257161618ea4d9a17088963014d354691de035b3e0e423d7f8d5d1c62991f4c9256282ec7ab4afecf32806ba4f56182cdb9d36a91e4436bf0
+  data.tar.gz: aecefa1ddbcb7179b5b24805d1ffcadbd71a25a1f4888c8bb89a433f7900f39dd576885a4e85e33502f568cef82b9da04eccdcaa3f4d9c44964ac59631595442

data/lib/occams-record.rb

@@ -2,7 +2,8 @@ require 'active_record'
 require 'occams-record/version'
 require 'occams-record/merge'
 require 'occams-record/eager_loaders'
-require 'occams-record/results'
+require 'occams-record/results/results'
+require 'occams-record/results/row'
 require 'occams-record/query'
 require 'occams-record/raw_query'
 require 'occams-record/errors'

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

@@ -56,13 +56,14 @@ module OccamsRecord
           node.send(link.name).reduce(Set.new) { |a, child|
             result = reduce(child, depth + 1)
             case result
+            when nil then a
             when Array then a + result
             else a << result
             end
           }.to_a
         when :has_one, :belongs_to
           child = node.send(link.name)
-          reduce(child, depth + 1)
+          child ? reduce(child, depth + 1) : nil
         else
           raise "Unsupported through chain link type '#{link.macro}'"
         end

data/lib/occams-record/results/results.rb

@@ -0,0 +1,69 @@
+module OccamsRecord
+  # Classes and methods for handing query results.
+  module Results
+    # ActiveRecord's internal type casting API changes from version to version.
+    CASTER = case ActiveRecord::VERSION::MAJOR
+             when 4 then :type_cast_from_database
+             when 5 then :deserialize
+             end
+
+    #
+    # Dynamically build a class for a specific set of result rows. It inherits from OccamsRecord::Results::Row, and optionall includes
+    # a user-defined module.
+    #
+    # @param column_names [Array<String>] the column names in the result set. The order MUST match the order returned by the query.
+    # @param column_types [Hash] Column name => type from an ActiveRecord::Result
+    # @param association_names [Array<String>] names of associations that will be eager loaded into the results.
+    # @param model [ActiveRecord::Base] the AR model representing the table (it holds column & type info).
+    # @param modules [Array<Module>] (optional)
+    # @return [OccamsRecord::Results::Row] a class customized for this result set
+    #
+    def self.klass(column_names, column_types, association_names = [], model: nil, modules: nil)
+      Class.new(Results::Row) do
+        Array(modules).each { |mod| prepend mod } if modules
+
+        self.columns = column_names.map(&:to_s)
+        self.associations = association_names.map(&:to_s)
+        self.model_name = model ? model.name : nil
+        self.table_name = model ? model.table_name : nil
+        self.primary_key = model&.primary_key&.to_s
+
+        # Build getters & setters for associations. (We need setters b/c they're set AFTER the row is initialized
+        attr_accessor(*association_names)
+
+        # Build id getters for associations, e.g. "widget_ids" for "widgets"
+        self.associations.each do |assoc|
+          if (ref = model.reflections[assoc]) and !ref.polymorphic? and (ref.macro == :has_many or ref.macro == :has_and_belongs_to_many)
+            pkey = ref.association_primary_key.to_sym
+            define_method "#{assoc.singularize}_ids" do
+              begin
+                self.send(assoc).map(&pkey).uniq
+              rescue NoMethodError => e
+                raise MissingColumnError.new(self, e.name)
+              end
+            end
+          end
+        end if model
+
+        # Build a getter for each attribute returned by the query. The values will be type converted on demand.
+        model_column_types = model ? model.attributes_builder.types : {}
+        self.columns.each_with_index do |col, idx|
+          type =
+            column_types[col] ||
+            model_column_types[col] ||
+            raise("OccamsRecord: Column `#{col}` does not exist on model `#{self.model_name}`")
+
+          case type.type
+          when :datetime
+            define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx])&.in_time_zone }
+          when :boolean
+            define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx]) }
+            define_method("#{col}?") { !!send(col) }
+          else
+            define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx]) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/occams-record/{results.rb → results/row.rb}

@@ -1,71 +1,5 @@
 module OccamsRecord
-  # Classes and methods for handing query results.
   module Results
-    # ActiveRecord's internal type casting API changes from version to version.
-    CASTER = case ActiveRecord::VERSION::MAJOR
-             when 4 then :type_cast_from_database
-             when 5 then :deserialize
-             end
-
-    #
-    # Dynamically build a class for a specific set of result rows. It inherits from OccamsRecord::Results::Row, and optionall includes
-    # a user-defined module.
-    #
-    # @param column_names [Array<String>] the column names in the result set. The order MUST match the order returned by the query.
-    # @param column_types [Hash] Column name => type from an ActiveRecord::Result
-    # @param association_names [Array<String>] names of associations that will be eager loaded into the results.
-    # @param model [ActiveRecord::Base] the AR model representing the table (it holds column & type info).
-    # @param modules [Array<Module>] (optional)
-    # @return [OccamsRecord::Results::Row] a class customized for this result set
-    #
-    def self.klass(column_names, column_types, association_names = [], model: nil, modules: nil)
-      Class.new(Results::Row) do
-        Array(modules).each { |mod| prepend mod } if modules
-
-        self.columns = column_names.map(&:to_s)
-        self.associations = association_names.map(&:to_s)
-        self.model_name = model ? model.name : nil
-        self.table_name = model ? model.table_name : nil
-        self.primary_key = model&.primary_key&.to_s
-
-        # Build getters & setters for associations. (We need setters b/c they're set AFTER the row is initialized
-        attr_accessor(*association_names)
-
-        # Build id getters for associations, e.g. "widget_ids" for "widgets"
-        self.associations.each do |assoc|
-          if (ref = model.reflections[assoc]) and !ref.polymorphic? and (ref.macro == :has_many or ref.macro == :has_and_belongs_to_many)
-            pkey = ref.association_primary_key.to_sym
-            define_method "#{assoc.singularize}_ids" do
-              begin
-                self.send(assoc).map(&pkey).uniq
-              rescue NoMethodError => e
-                raise MissingColumnError.new(self, e.name)
-              end
-            end
-          end
-        end if model
-
-        # Build a getter for each attribute returned by the query. The values will be type converted on demand.
-        model_column_types = model ? model.attributes_builder.types : {}
-        self.columns.each_with_index do |col, idx|
-          type =
-            column_types[col] ||
-            model_column_types[col] ||
-            raise("OccamsRecord: Column `#{col}` does not exist on model `#{self.model_name}`")
-
-          case type.type
-          when :datetime
-            define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx])&.in_time_zone }
-          when :boolean
-            define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx]) }
-            define_method("#{col}?") { !!send(col) }
-          else
-            define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx]) }
-          end
-        end
-      end
-    end
-
     #
     # Abstract class for result rows.
     #

data/lib/occams-record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc8
+  version: 1.0.0.rc9
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -57,7 +57,8 @@ files:
 - lib/occams-record/merge.rb
 - lib/occams-record/query.rb
 - lib/occams-record/raw_query.rb
-- lib/occams-record/results.rb
+- lib/occams-record/results/results.rb
+- lib/occams-record/results/row.rb
 - lib/occams-record/ugly.rb
 - lib/occams-record/version.rb
 homepage: https://jhollinger.github.io/occams-record/