dynamic-records-meritfront 3.1.3 → 3.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd63ab9cfaf15d4472c125505260f76db354e11856a8e17aefdb2aac197fd675
-  data.tar.gz: f15916d4f9301319c8fbbcd2355cc04406dcaebe4855bfad8395629d652d182d
+  metadata.gz: 5dfcf5de90cdcac42af2c68794fd94b2d97976edabebc30c7af030b03a4cc26f
+  data.tar.gz: 62d372644b0997607dc8cb73e4c95e0c29b4942b7519bea26cdfc3e960007899
 SHA512:
-  metadata.gz: e5af425ecff409a85dd1bdc04b3fd3bc7e7a0ecbb974e51912d66013ad57351099d6004ecd014ee08edb74830948c0ffa0cfc6e71b9b3020151c10ea3195d9ac
-  data.tar.gz: d3ac6b00f58cdd803714742eb37653a57bea2523851058a174273f15329d0da3b8577d439f7f7e878246681c60fe6e979166401a954ee400ce0b678831d490c6
+  metadata.gz: 2eb9f39a73f585d769ac0e65f123f995a19d0129659e18b2d3978eb85668a32754ef859b3bef162d063c2cd720b4684e85247979ab3422485a179314566a2128
+  data.tar.gz: d70133876b5a852d6e3e6d73d9a4d76818e078ef5b46b0dc530a36801a48caa73764f9cc275794c75d6409a96dc4a5a67ad201d72f0741111dbc0f895b93463c

data/Gemfile.lock

@@ -1,31 +1,45 @@
 PATH
   remote: .
   specs:
-    dynamic-records-meritfront (3.1.3)
+    dynamic-records-meritfront (3.1.33)
       hashid-rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-    concurrent-ruby (1.2.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    drb (2.2.1)
     hashid-rails (1.4.1)
       activerecord (>= 4.0)
       hashids (~> 1.0)
     hashids (1.0.6)
-    i18n (1.12.0)
+    i18n (1.14.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.18.0)
+      racc (~> 1.7)
+    minitest (5.22.2)
+    mutex_m (0.2.0)
+    racc (1.7.3)
     rake (12.3.3)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 

data/README.md

@@ -532,6 +532,14 @@ v3.0.6
 ....
 - took out undocumented quick_safe_increment and safe_increment as they were not relevant to the gem - and fairly basic.
 
+3.1.28
+- warning messages for dynamic_attach. to_s'd any provided table_names for ease-of-use.
+- logging info for dynamic_attach outside of instaload.
+- fixed an error where instaload only worked with ApplicationRecord abstract_class. Now works on anything thats a subclass of ActiveRecord::Base
+
+3.2
+- Updates so the latest version of the pg gem and rails works with the latest version of postgresql
+
 
 ## Questions
 - Q: does the name of a sql operation have anything to do with prepared statements?
@@ -539,7 +547,7 @@ v3.0.6
 - Q: The default name of my sql statements looks like a stack trace? Whats going on?
 - A: We set the location of where you called the function as the default name for easy debugging. Its not an error, we just take some info from the stacktrace. It also includes the method name which can provide some insite into what the query is doing. Makes logs alot nicer to look at.
 - Q: Whats MeritFront?
-- A: I am making a social media platform. See meritfront.com, Its soft launched.
+- A: I am making a social media platform. Its called midflip now. See midflip.io
 - Q: Inspect on user records doesn't seem to work properly
 - A: inspect is overwritten by many diffrent libraries, in terms of devise for example, they override our override of active record's inspect. The best way to deal with this is to look at the source location of these methods and bring them together (user.method(:inspect).source_location). In my case with devise, i ended up with this in the user record:
 ```ruby

data/bin/update

@@ -51,5 +51,8 @@ puts `git commit -m 'minor changes to version #{version_new}'`
 puts "_______________________________________________"
 puts "INSTALL GEM LOCALLY"
 puts `bundle exec rake install`
+puts "note if you cant install in your project u prob have different ruby versions for the project and this folder."
+puts "if in that case and using rbenv, change your global ruby version under ~/.rbenv/version or your local by adding"
+puts "somthing similar in a .ruby_version file. Not using .rbenv? Add ur instructions here"
 puts "_______________________________________________"
 puts "info: write 'bundle exec rake release' to release the current version to the interwebz"

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

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

data/lib/dynamic-records-meritfront.rb

@@ -105,7 +105,7 @@ module DynamicRecordsMeritfront
 
             type = DB_TYPE_MAPS[v.class]
             if type.nil?
-                raise StandardError.new("#{name} (of value: #{v}, class: #{v.class}) unsupported class for ApplicationRecord#headache_sql")
+                raise StandardError.new("#{name} (of value: #{v}, class: #{v.class}) unsupported class for DynamicRecordsMeritfront#headache_sql")
             elsif type.class == Proc
                 a = v[0]
                 # if a.nil?
@@ -400,9 +400,14 @@ module DynamicRecordsMeritfront
                 if returns_nil
                     return nil
                 else
-                    raise StandardError.new("non-string class passed to ApplicationRecord#locate_hgid as the hgid_string variable")
+                    raise StandardError.new("non-string class passed to DynamicRecordsMeritfront#locate_hgid as the hgid_string variable")
                 end
             end
+            if PROJECT_NAME == 'midflip'
+                #should be fine to take out in a month or so, just got lazy and pretty sure I am the only one using this gem.
+                #dont want to kill me jobs.
+                hgid_string = hgid_string.gsub('ApplicationRecord', 'Record')
+            end
             if hgid_string.include?('@')
                 hgid_string = hgid_string.split('@')
                 hgid_string.pop
@@ -438,7 +443,7 @@ module DynamicRecordsMeritfront
                 nil
             else
                 #stops execution as default
-                raise StandardError.new 'Not the expected class, or a subclass of ApplicationRecord if called on that.'
+                raise StandardError.new 'Not the expected class or subclass.'
             end
         end
         def get_hgid_tag(hgid_string)
@@ -472,7 +477,6 @@ module DynamicRecordsMeritfront
         # - multi_query allows more than one query (you can seperate an insert and an update with ';' I dont know how else to say it.)
         #		this disables other options (except name_modifiers). Not sure how it effects prepared statements. Its a fairly useless
         #		command as you can do multiple queries anyway with 'WITH' statements and also gain the other options.
-        # - async does what it says but I haven't used it yet so. Probabably doesn't work
         # - raw switches between using a Hash or a ActiveRecord::Response object when used on a abstract class
             args << {} unless args[-1].kind_of? Hash
             if args.length == 3
@@ -496,7 +500,6 @@ module DynamicRecordsMeritfront
             name_modifiers ||= []
             prepare = opts.delete(:prepare) != false
             multi_query = opts.delete(:multi_query) == true
-            async = opts.delete(:async) == true
             params = opts
 
                 #unique value hash cuts down on the number of repeated arguments like in an update or insert statement
@@ -552,7 +555,7 @@ module DynamicRecordsMeritfront
                         end
                     end
                     sql_vals = var_track.get_array_for_exec_query
-                    ret = ActiveRecord::Base.connection.exec_query sql, name, sql_vals, prepare: prepare, async: async
+                    ret = ActiveRecord::Base.connection.exec_query sql, name, sql_vals, prepare: prepare
                 else
                     ret = ActiveRecord::Base.connection.execute sql, name
                 end
@@ -562,14 +565,12 @@ module DynamicRecordsMeritfront
                 sql ||= ''
                 sql_vals ||= ''
                 prepare ||= ''
-                async ||= ''
                 Rails.logger.error(%Q{
     DynamicRecords#dynamic_sql debug info.
     name: #{name.to_s}
     sql: #{sql.to_s}
     sql_vals: #{sql_vals.to_s}
     prepare: #{prepare.to_s}
-    async: #{async.to_s}
     })
                 raise e
             end
@@ -654,37 +655,31 @@ module DynamicRecordsMeritfront
             insta_array = insta_array.select{|ar| not ar[:dont_return]}
             ret_hash = insta_array.map{|ar| [ar[:table_name].to_s, []]}.to_h
             opts[:raw] = true
-            ApplicationRecord.headache_sql(name, sql, opts).rows.each{|row|
+
+            #annoying bug
+            s = self
+            unless s.abstract_class?
+                s = s.superclass
+            end
+            
+            s.dynamic_sql(name, sql, opts).rows.each{|row|
                 #need to pre-parsed as it has a non-normal output.
                 table_name = row[2]
                 klass = row[1].constantize
                 json = row[0]
                 parsed = JSON.parse(json)
-
                 ret_hash[table_name].push dynamic_init(klass, parsed)
             }
 
-            insta_array = insta_array.map{|a|a.delete(:sql); next a} #better for debuggin and we dont need it anymore
+            insta_array.each{|a| a.delete(:sql)}
             
             #formatting options
             for insta in insta_array
                 if insta[:base_name]
                     #in this case, 'as' is meant as to what pseudonym to dynamicly attach it as
-                    n_attached = dynamic_attach(ret_hash, insta[:base_name], insta[:table_name], base_on: insta[:base_on], attach_on: insta[:attach_on],
+                    #we are attaching to the base table. Variable could of been less confusing. My bad.
+                    dynamic_attach(ret_hash, insta[:base_name], insta[:table_name], base_on: insta[:base_on], attach_on: insta[:attach_on],
                         one_to_one: insta[:one_to_one], as: insta[:as])
-
-                    if Rails.logger.level <= 1
-                        tn = insta[:table_name]
-                        bn = insta[:base_name]
-                        tc = ret_hash[tn].count
-                        btc = ret_hash[bn].count
-
-                        if insta[:as]
-                            Rails.logger.debug "#{n_attached} attached from #{tn}(#{tc}) as #{insta[:as]} -> #{bn}(#{btc})"
-                        else
-                            Rails.logger.debug "#{n_attached} attached from #{tn}(#{tc}) -> #{bn}(#{btc})"
-                        end
-                    end
                 elsif insta[:as]
                     Rails.logger.debug "#{insta[:table_name]} as #{insta[:as]}"
                     #in this case, the idea is more polymorphic in nature. unless they are confused and just want to rename the table (this can be done with
@@ -708,7 +703,7 @@ module DynamicRecordsMeritfront
             m = model_with_an_id_column_and_timestamps
             ar = m.superclass
             mtname = m.table_name
-            ApplicationRecord.transaction do
+            transaction do
                 puts 'test recieving columns not normally in the record.'
                 rec = m.dynamic_sql(%Q{
                     SELECT id, 5 AS random_column from #{mtname} LIMIT 10
@@ -800,12 +795,23 @@ module DynamicRecordsMeritfront
         def dynamic_attach(instaload_sql_output, base_name, attach_name, base_on: nil, attach_on: nil, one_to_one: false, as: nil)
             #as just lets it attach us anywhere on the base class, and not just as the attach_name.
             #Can be useful in polymorphic situations, otherwise may lead to confusion.
+            
+            #oh the errors
+            base_name = base_name.to_s
+            attach_name = attach_name.to_s
+
             as ||= attach_name
 
             base_arr = instaload_sql_output[base_name]
             
             #return if there is nothing for us to attach to.
-            return 0 if base_arr.nil? or not base_arr.any?
+            if base_arr.nil?
+                Rails.logger.error("base table " + base_name + " was not set")
+                return 0
+            elsif not base_arr.any?
+                Rails.logger.debug("no items in base table " + base_name)
+                return 0
+            end
 
             #set variables for neatness and so we dont compute each time
             #	base class information
@@ -830,7 +836,14 @@ module DynamicRecordsMeritfront
 
             #make sure the attach class has something going on. We do this after the default stage
             attach_arr = instaload_sql_output[attach_name]
-            return 0 if attach_arr.nil? or not attach_arr.any?
+            
+            if attach_arr.nil?
+                Rails.logger.error("attaching table " + attach_name + " was not set")
+                return 0
+            elsif not attach_arr.any?
+                Rails.logger.debug("no items in attach table " + attach_name)
+                return 0
+            end
             
             #   attach class information
             attach_class = attach_arr.first.class
@@ -934,6 +947,14 @@ module DynamicRecordsMeritfront
                 end
             }
 
+            if Rails.logger.level <= 1
+                if as
+                    Rails.logger.debug "#{x}/#{attach_arr.count} attached from #{attach_name} as #{as} -> #{base_name}(#{x}/#{base_arr.count})"
+                else
+                    Rails.logger.debug "#{x}/#{attach_arr.count} attached from #{attach_name} -> #{base_name}(#{x}/#{base_arr.count})"
+                end
+            end
+
             return x
         end
         alias swiss_attach dynamic_attach

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-records-meritfront
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.33
 platform: ruby
 authors:
 - Luke Clancy
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashid-rails
@@ -54,7 +54,7 @@ metadata:
   homepage_uri: https://github.com/LukeClancy/dynamic-records-meritfront
   source_code_uri: https://github.com/LukeClancy/dynamic-records-meritfront
   changelog_uri: https://github.com/LukeClancy/dynamic-records-meritfront/blob/main/README.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -69,8 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Helpers for active record that allow for more abstract and fine-grained code.
 test_files: []