mass_record 0.0.4.5 → 0.0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d054cc552db3f8d9fe3ab38b89a12b619ff09b40
-  data.tar.gz: 4ccaaf474db13bffc0961fc6ad7e734bd2416966
+  metadata.gz: 81fb0c2269f13bcf50b6273f6cc47c696ff7794a
+  data.tar.gz: 68a589d4d3c8f1ed87fc1b31d4ed264123272ca2
 SHA512:
-  metadata.gz: dfa78f96994e965feb82fba8eff9fbf07305d45dcf8d568765efd4985c7a49455bf01445a0c9b42b8caf07e7de55427d38ffcd213e931e288180afcd2959569b
-  data.tar.gz: f5219ad0d9399a3912548a46a3cc7a909243ab566632d1f42220c31cd6cacd285d220b5ae8bb1b8b3f0eceeab10a4357480321fdf0cb829ec8ebd0e01e3f0b37
+  metadata.gz: 10aaa87e98054d2b488e0d15e6eac082cfc035f0974dfea70264c645c211bac34a6464c3f9899d50c17a84368a5930a4da49cbf51417c9d7e66051bbd1c6be22
+  data.tar.gz: 6ac2d9b78f5bd3b64201ffa448d10e17130633baca923c8cce045133a8b1f461241689b830653318312a3081bb02ed9ee1aa8c79545c8c52fe212c5a3bb3bfc8

data/lib/mass_record.rb

@@ -53,15 +53,29 @@ module MassRecord
 				model = object.class
 				created_at = model.attribute_alias?("created_at") ? model.attribute_alias("created_at") : "created_at"
 				updated_at = model.attribute_alias?("updated_at") ? model.attribute_alias("updated_at") : "updated_at"
+
+				# narrow the attributes to just the relevant ones
 				keepers = object.attributes.select{|k,v| object.changed.include? k} if (operation.to_s == 'update' or !object.new_record?) and keep.blank?
 				keepers = object.attributes.select{|k,v| keep.map(&:to_s).include? k} unless keep.blank?
-				keepers = keepers.merge(object.attributes.select{|k,v| [model.primary_key,created_at,updated_at].include? k}) unless keepers.blank?
+
+				# also keep important fields primary key, and created and updated datestamps
+				unless keepers.blank?
+					keepers = keepers.merge(object.attributes.select{|k,v| (model.primary_key+[created_at,updated_at]).include? k}) if model.primary_key.is_a? Array
+					keepers = keepers.merge(object.attributes.select{|k,v| [model.primary_key,created_at,updated_at].include? k}) unless model.primary_key.is_a? Array
+				end
+
 				slimmed_objects << keepers
 			end
 
 			return slimmed_objects
 		end
 
+		def specify_save on: nil
+			return 'save' if on.blank?
+			return (on.new_record? ? 'insert' : 'update') if on.is_a? ActiveRecord::Base
+			return 'save'
+		end
+
 		# TODO: add logic to append the data if the filename already exists
 		# accepts an array of objects with the option to specify what rails operation to perform
 		def queue_for_quick_query object_array, 
@@ -79,11 +93,15 @@ module MassRecord
 			class_array = object_array.collect{|x| x.class.name}
 
 			object_array = slim_data(object_array, keep:only, operation:operation) if operation.to_s == 'update' or !only.blank? or object_array.any?{|x| !x.new_record?}
-			
+
 			queue = []
 
 			object_array.each_with_index do |object,i|
-				queue << {key[:table] => class_array[i], key[:operation] =>  (operation.to_s.downcase == 'save' and object.new_record?) ? 'insert' : 'update' , key[:object] => object} unless object.blank?
+				queue << {
+					key[:table] => class_array[i], 
+					key[:operation] =>  (operation.to_s.downcase == 'save') ? specify_save(on:object) : operation , 
+					key[:object] => object
+				} unless object.blank?
 			end
 			# begin
 				File.open(folder[:queued]+"/#{operation.to_s}_#{file_tag}.json",'w'){|f| f.write queue.to_json} unless queue.blank?

data/lib/mass_record/version.rb

@@ -1,3 +1,3 @@
 module MassRecord
-  VERSION = "0.0.4.5" # added intelligent handling of updates and saves, determines save vs. update before creating queued file (without needing queries) and filters out all fields not involved in the update
+  VERSION = "0.0.4.6" # Fixed save updating trimming and save handling to account for multiple primary keys and a bug in assigning operations from save
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mass_record
 version: !ruby/object:Gem::Version
-  version: 0.0.4.5
+  version: 0.0.4.6
 platform: ruby
 authors:
 - Nathan Hanna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails