dynamic-records-meritfront 2.0.16 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa19593097842159f3b5f7b387a3ae2771ac0ce89edfa94ca83a3ca4065418b7
-  data.tar.gz: e3294816f249639df5bbdc64346cc625c2eeda98c8c12baa9a0c75a451acfd34
+  metadata.gz: c23065ffa740c578b38c7311ada210295ad2b876240480109913eff333a7c7b6
+  data.tar.gz: e38654aeb1f6e5f3d8a91a334b0489847674bde43451a7bb7f641770f5f061fb
 SHA512:
-  metadata.gz: 20307306744813447e04c58df7ed54fce62de160acbda99e0fbe0a7b208572fadf8ef8195600eac292d0cc7684da14a2072ef00a728d1f9d706b8d209aa44382
-  data.tar.gz: 4de4c710212960930835a7a1cf2a699a8fdbc7931ac57895557affce1b34ac49d505d7cbc7fefc6d82f08e2961e11357c9b00d0afbc57f8101fadf46e4c4e8ce
+  metadata.gz: 63eb8b2cf1342d742e77140091583201dea03dccad9edb8aa78201d663eec39a352e9741978e967ba5fe8b0bfc461478328fe1e0dde46bba434b36495e3842fc
+  data.tar.gz: 35cd5e867cd6853b7614ce0d67c2253794f31b03af59c0e7189a66bca30c4e8f7eaa984858a2bb659607c60b8dc8b4a29ed9ba9bc5d944435ab38a425283db01

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dynamic-records-meritfront (2.0.16)
+    dynamic-records-meritfront (2.0.19)
       hashid-rails
 
 GEM

data/lib/dynamic-records-meritfront/version.rb

@@ -1,5 +1,5 @@
 
 	module DynamicRecordsMeritfront
-	    VERSION = '2.0.16'
+	    VERSION = '2.0.19'
 	end
 	#this file gets overwritten automatically on minor updates, major ones need to be manually changed

data/lib/dynamic-records-meritfront.rb

@@ -19,7 +19,6 @@ module DynamicRecordsMeritfront
 		#Note we defined here as it breaks early on as Rails.application returns nil
 		PROJECT_NAME = Rails.application.class.to_s.split("::").first.to_s.downcase
 		DYNAMIC_SQL_RAW = true
-		attr_accessor :dynamic
 	end
 
 	class MultiRowExpression
@@ -66,48 +65,8 @@ module DynamicRecordsMeritfront
 		end
 	end
 
-	RecordForPrint = Struct.new(:class, :attributes, :dynamic)
 	module ClassMethods
 
-		def dynamic_print_h(v)
-			v = v.dup
-			return v.to_h.transform_values{|x|
-				dynamic_print(x, print: false)
-			}
-		end
-
-		def dynamic_print_arr(v)
-			v = v.dup
-			return v.map{|x|
-				dynamic_print(x, print: false)
-			}
-		end
-
-		def dynamic_print_obj(v)
-			if v.class < ActiveRecord::Base
-				#return v.dynamic
-				return RecordForPrint.new(v.class.to_s, v.attributes, dynamic_print(v.dynamic, print: false))
-			else
-				v
-			end
-		end
-
-		def dynamic_print(v, print: true)
-			return if Rails.env.production?
-			if v.class == Hash || v.class == OpenStruct
-				ret = dynamic_print_h v
-			elsif v.class == Array
-				ret = dynamic_print_arr v
-			else
-				ret = dynamic_print_obj v
-			end
-			if print
-				pp ret
-			else
-				return ret
-			end
-		end
-
 		def has_run_migration?(nm)
 		#put in a string name of the class and it will say if it has allready run the migration.
 		#good during enum migrations as the code to migrate wont run if enumerate is there 
@@ -492,9 +451,17 @@ module DynamicRecordsMeritfront
 			
 			#variable accessors and defaults.
 			base_arr.each{ |o|
-				unless one_to_one or base_class_is_hash
-					o.dynamic ||= OpenStruct.new
-					o.dynamic[attach_name_sym] = []
+				#
+				#   there is no way to set an attribute after instantiation I tried I looked
+				#   I dealt with silent breaks on symbol keys, I have wasted time, its fine.
+				cancer = o.instance_variable_get(:@attributes).instance_variable_get(:@values)
+				if not base_class_is_hash
+					if one_to_one
+						#attach name must be a string
+						cancer[attach_name] = nil
+					else
+						cancer[attach_name] = []
+					end
 				end
 				# o.dynamic o.singleton_class.public_send(:attr_accessor, attach_name_sym) unless base_class_is_hash
 				# o.instance_variable_set(attach_name_with_at, []) unless one_to_one
@@ -531,7 +498,7 @@ module DynamicRecordsMeritfront
 					attach_on = Proc.new{|x| x[default_attach_col]}
 				else
 					attach_on = Proc.new{|x| 
-							x.method(default_attach_col).call
+						x.attributes[default_attach_col]
 					}
 				end
 			end
@@ -549,21 +516,9 @@ module DynamicRecordsMeritfront
 			#(b=base, a=attach)
 			add_to_base = Proc.new{|b, a|
 				if one_to_one
-					if base_class_is_hash
-						b[attach_name] = a
-					else
-						b.dynamic ||= OpenStruct.new
-						b.dynamic[attach_name] = a
-						#b.instance_variable_set(attach_name_with_at, a)
-					end
+					b[attach_name] = a
 				else
-					if base_class_is_hash
-						b[attach_name].push a
-					else
-						# o.dynamic o.single
-						b.dynamic[attach_name].push a
-						#b.instance_variable_get(attach_name_with_at).push a
-					end
+					b[attach_name].push a
 				end
 			}
 
@@ -594,12 +549,13 @@ module DynamicRecordsMeritfront
 			if klass.abstract_class
 				return input
 			else
-				#handle attributes through ar if allowed. Throws an error on unkown variables, except apparently for devise classes? 😡
-				active_record_handled = input.slice(*(klass.attribute_names & input.keys))
-				record = klass.instantiate(active_record_handled)
-				#set those that were not necessarily expected
-				not_expected = input.slice(*(input.keys - klass.attribute_names))
-				record.dynamic = OpenStruct.new(not_expected.transform_keys{|k|k.to_sym}) if not_expected.keys.any?
+				record = klass.instantiate(input.stringify_keys ) #trust me they need to be stringified
+				# #handle attributes through ar if allowed. Throws an error on unkown variables, except apparently for devise classes? 😡
+				# active_record_handled = input.slice(*(klass.attribute_names & input.keys))
+				# record = klass.instantiate(active_record_handled)
+				# #set those that were not necessarily expected
+				# not_expected = input.slice(*(input.keys - klass.attribute_names))
+				# record.dynamic = OpenStruct.new(not_expected.transform_keys{|k|k.to_sym}) if not_expected.keys.any?
 				return record
 			end
 		end
@@ -646,4 +602,4 @@ module DynamicRecordsMeritfront
 		self.class.where(id: self.id).update_all("#{col} = #{col} + #{val}")
 	end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-records-meritfront
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.19
 platform: ruby
 authors:
 - Luke Clancy