occams-record 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a33f839ea9d811478c883f3cf8e54ad3c67c366761db4281ad7994d54234e519
-  data.tar.gz: f3370573806301fd8b7beeb60d66fce4cd37160d147f9a626a3ba228430ba935
+  metadata.gz: 64aef087892a4022dbfe3d6cdd225a7c00a5e32c44ff34473736d464ba6d62f4
+  data.tar.gz: 7f3f8120d97ea431b41ef26e699410413cba4dc23ec6f88f0d64da497b9c6904
 SHA512:
-  metadata.gz: b28285305d8e16e497e813e1e89362b27f2d6a35f79bdb529d175dfbd07741592fd168150bfc8170eea8fcf1a538b0c22a6e1258615632240e2661c184583fc8
-  data.tar.gz: 3ed3e6cee8688afd1227d3aa736d4744e78102cc040735691f753ee32943be8a71ea24044570a64aa02739e52a5b4303b8d1c79be3359a7cd10e11e67056b7da
+  metadata.gz: 3e723f610281672d0f050feceb95d2037f21d82b799a254711c0fc756fd6c1582027a5796674a63a968155118fe7746abcbd26995311544be3ee5842c0a0b113
+  data.tar.gz: 1f9ccbf33361d7e81b79552aaf75876c02c02f9144bf1476e7bb4e71f68ab472009219d9fc86322921b0fa8489492b4a4458d2cca51be64284e6ead5178e0190

data/lib/occams-record/merge.rb

@@ -9,6 +9,25 @@ module OccamsRecord
     # @return [Array<OccamsRecord::Results::Row>] the rows into which associated rows will be merged
     attr_reader :target_rows
 
+    # Exception raised when a foreign or primary key is missing from a record
+    class MissingFieldError < StandardError
+      # @return [OccamsRecord::Result::Row]
+      attr_reader :record
+      # @return [Symbol]
+      attr_reader :field
+
+      # @param record [OccamsRecord::Result::Row]
+      # @param field [Symbol]
+      def initialize(record, field)
+        @record, @field = record, field
+      end
+
+      # @return [String]
+      def message
+        "Missing field '#{field}' on #{record.inspect}. Did you forget to select it?"
+      end
+    end
+
     #
     # Initialize a new Merge operation.
     #
@@ -30,13 +49,21 @@ module OccamsRecord
     #
     def single!(assoc_rows, target_attr, assoc_attr)
       assoc_rows_by_id = assoc_rows.reduce({}) { |a, assoc_row|
-        id = assoc_row.send assoc_attr
+        begin
+          id = assoc_row.send assoc_attr
+        rescue NoMethodError => e
+          raise MissingFieldError.new(assoc_row, e.name)
+        end
         a[id] = assoc_row
         a
       }
 
       target_rows.each do |row|
-        attr = row.send target_attr
+        begin
+          attr = row.send target_attr
+        rescue NoMethodError => e
+          raise MissingFieldError.new(row, e.name)
+        end
         row.send @assign, attr ? assoc_rows_by_id[attr] : nil
       end
     end
@@ -47,9 +74,18 @@ module OccamsRecord
     # target_attr and assoc_attr are the matching keys on target_rows and assoc_rows, respectively.
     #
     def many!(assoc_rows, target_attr, assoc_attr)
-      assoc_rows_by_attr = assoc_rows.group_by(&assoc_attr.to_sym)
+      begin
+        assoc_rows_by_attr = assoc_rows.group_by(&assoc_attr.to_sym)
+      rescue NoMethodError => e
+        raise MissingFieldError.new(assoc_rows_by_attr[0], e.name)
+      end
+
       target_rows.each do |row|
-        pkey = row.send target_attr
+        begin
+          pkey = row.send target_attr
+        rescue NoMethodError => e
+          raise MissingFieldError.new(row, e.name)
+        end
         row.send @assign, assoc_rows_by_attr[pkey] || []
       end
     end

data/lib/occams-record/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Jordan Hollinger