dynamic-records-meritfront 2.0.17 → 2.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 122854ead22d0622151522249d115b088dc1ecd4d21fe9a794a23126ab105d65
-  data.tar.gz: 216371aab9c74e6a9a0c3638d0436cfc0f83e72f7668c7c57a3f73dc20876c19
+  metadata.gz: 0145c6915704e699ab557a6e45348a1555a774e79f4a49925be7f41d88877a6d
+  data.tar.gz: ebed51c113a9f94b9f4bc481069da98b8771c5b6aa24af2403b9a1283869fed2
 SHA512:
-  metadata.gz: d4d2ab247cf4cff13fad1f772cc437585aeb28a59686b4ff0046a7bffd2466c944749c1ab22fdc058b02150043d4e05515e0d5b5d962c78b84c02d9b8985618f
-  data.tar.gz: 6f962c2213eedc0441a38002e5ce5770ec932e6ee0c36faa2ff9c965abfa56502ad8e56accade17d94216b8c6025883e6276f65515d6886aa09681ec11f713e4
+  metadata.gz: cc6978059ea84ee5584a967bbf0c465ebd81fdaee751dd94c745811f2704216b5992d433ed4168f67187fd18e485d586ca220cc468e617b93da3798e5ed8b475
+  data.tar.gz: 6efa88c7bb6f60789301660d77d874b2252fd69fe0b4de66d223d1df863df9518dce2c89bd60d6f6a30ff167535d7adf9392ea9320979a59780a2b9e130737d7

data/Gemfile.lock

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

data/README.md

@@ -135,16 +135,12 @@ This is an example of why this method is good for dynamic prepared statements.
         SELECT id FROM votes LIMIT 1
     }).first
     v.inspect 	#   "#<Vote id: 696969>"
-    v.dynamic   #   nil
 
     #get a cool test vote. Note that is_this_vote_cool is not on the vote table.
     test =  Vote.dynamic_sql('test', %Q{
         SELECT id, 'yes' AS is_this_vote_cool FROM votes LIMIT 1
     }).first
-   test.inspect #   "#<Vote id: 696969>"	we dont have the dynamic attributes as normal ones because of some implementation issues and some real issues to do with accidently logging sensative info. Implementation issues are to do with the fact that ActiveRecord::Base doesn't expect database columns to change randomly, and doesn't allow us to append to the attributes accessor.
-   test.dynamic	# <OpenStruct is_this_vote_cool='yes'>
-   test.dynamic.is_this_vote_cool  # "yes"
-   test.dynamic[:is_this_vote_cool] #yes
+   test.inspect #   #<Vote id: 696969, is_this_vote_cool: "yes"> #getting attributes added dynamically to the models, and also showing up on inspects, was... more difficult than i anticipated.
 ```
 </details>
 
@@ -221,7 +217,7 @@ Preload :votes on some comments. :votes is an active record has_many relation.
 
 ```ruby
    # the ruby entered
-   output = ApplicationRecord.swiss_instaload_sql('test', [
+   output = ApplicationRecord.dynamic_instaload_sql('test', [
       User.instaload('SELECT id FROM users WHERE users.id = ANY (:user_ids) AND users.created_at > :time', table_name: 'limited_users', relied_on: true),
       User.instaload(%Q{
          SELECT friends.smaller_user_id AS id, friends.bigger_user_id AS friended_to
@@ -261,26 +257,32 @@ the sql:
 	
 the output:
 ```ruby
-    {
-      "limited_users"=>[#<User id: 3>, #<User id: 1>, #<User id: 4>],
-      "users_friends"=>[
-         #<User id: 21>,
-         #<User id: 5>,
-      ...],
-      "users_follows"=> [
-         {"followable_id"=>22, "follower_id"=>4},
-         {"followable_id"=>23, "follower_id"=>4}, ...]
-   }
+{"limited_users"=>
+  [#<User id: 3>,
+   #<User id: 14>,
+   #<User id: 9>,
+   ...],
+ "users_friends"=>
+  [#<User id: 9, friended_to: 14>,
+   #<User id: 21, friended_to: 14>,
+   #<User id: 14, friended_to: 9>,
+   ...],
+ "users_follows"=>
+  [{"followable_id"=>931, "follower_id"=>23},
+   {"followable_id"=>932, "follower_id"=>23},
+   {"followable_id"=>935, "follower_id"=>19},
+   ...]}
+
+
 ```
 </details>
 
 #### self.dynamic_attach(instaload_sql_output, base_name, attach_name, base_on: nil, attach_on: nil, one_to_one: false)
-taking the output of the dynamic_instaload_sql, this method attaches the models together so they have relations. Note: still undecided on using singleton attr_accessors or putting the relationship on the model.dynamic hash. Its currently using the accessors.
-- instaload_sql_output: output of above dynamic_instaload_sql
+taking the output of the dynamic_instaload_sql, this method attaches the models together so they have relations.
 - base_name: the name of the table we will be attaching to
 - attach_name: the name of the table that will be attached
-- base_on: put a proc here to override the matching behavior on the base table. Default is {|user| user.id}
-- attach_on: put a proc here to override the matching behavior on the attach table. Default is {|post| post.user_id}
+- base_on: put a proc here to override the matching key for the base table. Default is, for a user and post type, {|user| user.id}
+- attach_on: put a proc here to override the matching key for the attach table. Default is, for a user and post type, {|post| post.user_id}
 - one_to_one: switches between a one-to-one relationship or not
 
 <details> 
@@ -289,98 +291,21 @@ taking the output of the dynamic_instaload_sql, this method attaches the models
 ```ruby
 	
 ApplicationRecord.dynamic_attach(out, 'limited_users', 'users_friends', attach_on: Proc.new {|users_friend|
-	users_friend.dynamic[:friended_to]	
+	users_friend.friended_to
 })
 ApplicationRecord.dynamic_attach(out, 'limited_users', 'users_follows', attach_on: Proc.new {|follow|
 	follow['follower_id']
 })
-pp out['limited_users'].map{|o| {id: o.id, users_friends: o.dynamic.users_friends.first(4), users_follows: o.dynamic.users_follows.first(4)}}
+pp out['limited_users']
 
 ```
 
 printed output: 
 ```ruby
-[{:id=>3,
-  :users_friends=>[#<User id: 21>, #<User id: 5>, #<User id: 6>],
-  :users_follows=>
-   [{"followable_id"=>935, "follower_id"=>3},
-    {"followable_id"=>938, "follower_id"=>3},
-    {"followable_id"=>939, "follower_id"=>3},
-    {"followable_id"=>932, "follower_id"=>3}]},
- {:id=>14,
-  :users_friends=>
-   [#<User id: 18>, #<User id: 9>, #<User id: 21>, #<User id: 5>],
-  :users_follows=>
-   [{"followable_id"=>936, "follower_id"=>14},
-    {"followable_id"=>937, "follower_id"=>14},
-    {"followable_id"=>938, "follower_id"=>14},
-    {"followable_id"=>939, "follower_id"=>14}]},
- {:id=>9,
-  :users_friends=>
-   [#<User id: 19>, #<User id: 15>, #<User id: 14>, #<User id: 7>],
-  :users_follows=>
-   [{"followable_id"=>938, "follower_id"=>9},
-    {"followable_id"=>937, "follower_id"=>9},
-    {"followable_id"=>932, "follower_id"=>9},
-    {"followable_id"=>933, "follower_id"=>9}]}, ... ]
-
-```
-
-</details>
-
-#### dynamic_print(v, print: true)
-- prints models along with dynamic variables using the pretty-printer. Fails in production to prevent leaking sensative information.
-- The reason this exists is that I could not override the inspect method for ActiveRecord. In my case, devise then overrode it from me. A little annoying. Because of that, this is now the best way to view both attributes and dynamic variables in the same location.
-
-<details> 
-<summary> example using output of dynamic_attach example </summary>
-	
-```ruby	
-ApplicationRecord.dynamic_print(out['limited_users'])
-```
-
-printed output: 
-```ruby
-[#<struct DynamicRecordsMeritfront::RecordForPrint
-  class="User",
-  attributes={"id"=>3},
-  dynamic=
-   {:users_friends=>
-     [#<struct DynamicRecordsMeritfront::RecordForPrint
-       class="User",
-       attributes={"id"=>5},
-       dynamic={:friended_to=>3}>,
-      #<struct DynamicRecordsMeritfront::RecordForPrint
-       class="User",
-       attributes={"id"=>6},
-       dynamic={:friended_to=>3}>,
-      #<struct DynamicRecordsMeritfront::RecordForPrint
-       class="User",
-       attributes={"id"=>21},
-       dynamic={:friended_to=>3}>],
-    :users_follows=>
-     [{"followable_id"=>935, "follower_id"=>3},
-      {"followable_id"=>938, "follower_id"=>3},
-      {"followable_id"=>939, "follower_id"=>3},
-      {"followable_id"=>932, "follower_id"=>3},
-      {"followable_id"=>5, "follower_id"=>3},
-      {"followable_id"=>4, "follower_id"=>3},
-      {"followable_id"=>23, "follower_id"=>3},
-      {"followable_id"=>22, "follower_id"=>3},
-      {"followable_id"=>15, "follower_id"=>3},
-      {"followable_id"=>6, "follower_id"=>3},
-      {"followable_id"=>3, "follower_id"=>3},
-      {"followable_id"=>8, "follower_id"=>3},
-      {"followable_id"=>7, "follower_id"=>3},
-      {"followable_id"=>1, "follower_id"=>3},
-      {"followable_id"=>18, "follower_id"=>3},
-      {"followable_id"=>16, "follower_id"=>3},
-      {"followable_id"=>21, "follower_id"=>3},
-      {"followable_id"=>9, "follower_id"=>3},
-      {"followable_id"=>19, "follower_id"=>3}]}>,
- 
-...
-
+#<User id: 3, users_friends: [#<User id: 5, friended_to: 3>, #<User id: 6, friended_to: 3>, #<User id: 21, friended_to: 3>], users_follows: [{"followable_id"=>935, "follower_id"=>3}, {"followable_id"=>938, "follower_id"=>3}, ...]>,
+ #<User id: 14, users_friends: [#<User id: 9, friended_to: 14>, #<User id: 21, friended_to: 14>, ...], users_follows: [{"followable_id"=>936, "follower_id"=>14}, {"followable_id"=>937, "follower_id"=>14}, {"followable_id"=>938, "follower_id"=>14}, ...]>,
+ #<User id: 9, users_friends: [#<User id: 14, friended_to: 9>, #<User id: 22, friended_to: 9>, ...], users_follows: [{"followable_id"=>938, "follower_id"=>9}, {"followable_id"=>937, "follower_id"=>9}, ...]>,
+ #<User id: 19, users_friends: [#<User id: 1, friended_to: 19>, #<User id: 18, friended_to: 19>, ...], users_follows: [{"followable_id"=>935, "follower_id"=>19}, {"followable_id"=>936, "follower_id"=>19}, {"followable_id"=>938, "follower_id"=>19}, ...]>,
 ```
 
 </details>

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

@@ -1,5 +1,5 @@
 
 	module DynamicRecordsMeritfront
-	    VERSION = '2.0.17'
+	    VERSION = '2.0.21'
 	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,47 +65,33 @@ 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 questionable_attribute_set(atr, value)
+		#this is needed on initalization of a new variable after the actual thing has been made already.
 
-		def dynamic_print_arr(v)
-			v = v.dup
-			return v.map{|x|
-				dynamic_print(x, print: false)
-			}
-		end
+		#set a bunk type of the generic value type
+		@attributes.instance_variable_get(:@types)[atr] = ActiveModel::Type::Value.new
+		#Set it
+		self[atr] = value
+	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
+	def inspect
+		#basically the same as the upstream active record function (as of october 25 2022 on AR V7.0.4)
+		#except that I changed self.class.attribute_names -> self.attribute_names to pick up our
+		#dynamic insanity. Was this a good idea? Well I guess its better than not doing it
+		inspection = if defined?(@attributes) && @attributes
+			self.attribute_names.filter_map do |name|
+			if _has_attribute?(name)
+				"#{name}: #{attribute_for_inspect(name)}"
 			end
+			end.join(", ")
+		else
+			"not initialized"
 		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
+		"#<#{self.class} #{inspection}>"
+	end
+
+	module ClassMethods
 
 		def has_run_migration?(nm)
 		#put in a string name of the class and it will say if it has allready run the migration.
@@ -475,6 +460,8 @@ module DynamicRecordsMeritfront
 		end
 		alias swiss_instaload_sql dynamic_instaload_sql
 
+		
+
 		def dynamic_attach(instaload_sql_output, base_name, attach_name, base_on: nil, attach_on: nil, one_to_one: false)
 			base_arr = instaload_sql_output[base_name]
 			
@@ -486,15 +473,20 @@ module DynamicRecordsMeritfront
 			base_class = base_arr.first.class
 			base_class_is_hash = base_class <= Hash
 			
-			#	attach name information for variables
-			attach_name_sym = attach_name.to_sym
-			attach_name_with_at = "@#{attach_name}"
 			
 			#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.
+				
+				if not base_class_is_hash
+					if one_to_one
+						#attach name must be a string
+						o.questionable_attribute_set(attach_name, nil)
+					else
+						o.questionable_attribute_set(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,9 +523,7 @@ module DynamicRecordsMeritfront
 					attach_on = Proc.new{|x| x[default_attach_col]}
 				else
 					attach_on = Proc.new{|x| 
-						ret = x.attributes[default_attach_col]
-						ret ||= x.dynamic[default_attach_col]
-						ret
+						x.attributes[default_attach_col]
 					}
 				end
 			end
@@ -551,21 +541,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
 			}
 
@@ -596,12 +574,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-records-meritfront
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.21
 platform: ruby
 authors:
 - Luke Clancy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashid-rails