global_uid 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5cd65221c9309e5bc370d275e9a5c1c0b69c6031db5e18720e4444124e5ef57
-  data.tar.gz: a4439cd889d012a9dba8a7b142052d2bf1e2402db4b61dae426cdc3c150d5b48
+  metadata.gz: ad55c024882af32e3742e90494c7ce51f31c23691dac422e005c80f88a22516f
+  data.tar.gz: 2ef4857f162be4c8bab458ef5b978b4f7071f953ab6078cd6ed4ba25a14bbdef
 SHA512:
-  metadata.gz: 91e8f5d532fc022897e406a9035d49b460cf75d7719533d7782ce2e91cd11bd49aac4890174fe92fb9479448fd7832a10f8669987cc2962bd9bd93856b526b59
-  data.tar.gz: 8da0eaaa562fa0bf39733eb00db2f672f40e5b7575f8a2e474f1c18147ea2c20c6ddb4aaa89af00221d14493e051db1512305c5ca20cd321c2f59c445fbdccb1
+  metadata.gz: c3f1ae8cfaf3a5bac014b6bb9df8c05ca352d5295d27c13c80aeb75ce7047ef06ace8f471c58e140930541df78b3dd6c2de4ec62611710d6cb9023b0dccbe4b8
+  data.tar.gz: e92d225b0745f454daaa444d1851e960c04c717960aea6993d3af0ab504a68afcea55f6d8756d890aa0dc7ce0bf10f32c68dfed79631d0a0321917a269dcbb59

data/lib/global_uid/active_record_extension.rb

@@ -35,7 +35,7 @@ module GlobalUid
 
       def generate_many_uids(count)
         GlobalUid::Base.with_servers do |server|
-          return server.allocate(self, count: count)
+          return Array(server.allocate(self, count: count))
         end
       end
 

data/lib/global_uid/migration_extension.rb

@@ -10,7 +10,7 @@ module GlobalUid
 
       options.merge!(:id => false) if remove_auto_increment
 
-      super(name, options) { |t|
+      super(name, **options) { |t|
         t.column :id, "int(10) NOT NULL PRIMARY KEY" if remove_auto_increment
         blk.call(t) if blk
       }
@@ -35,7 +35,7 @@ module GlobalUid
           server.drop_uid_table!(name: id_table_name)
         end
       end
-      super(name, options)
+      super(name, **options)
     end
   end
 end

data/lib/global_uid/server.rb

@@ -93,11 +93,7 @@ module GlobalUid
     end
 
     def mysql2_connection(name)
-      raise "No id server '#{name}' configured in database.yml" unless ActiveRecord::Base.configurations.to_h.has_key?(name)
-      config = ActiveRecord::Base.configurations.to_h[name]
-      c = config.symbolize_keys
-
-      raise "No global_uid support for adapter #{c[:adapter]}" if c[:adapter] != 'mysql2'
+      config = mysql2_config(name)
 
       Timeout.timeout(connection_timeout, ConnectionTimeoutException) do
         ActiveRecord::Base.mysql2_connection(config)
@@ -110,6 +106,27 @@ module GlobalUid
       nil
     end
 
+    if ActiveRecord.version < Gem::Version.new('6.1.0')
+      def mysql2_config(name)
+        raise "No id server '#{name}' configured in database.yml" unless ActiveRecord::Base.configurations.to_h.has_key?(name)
+        config = ActiveRecord::Base.configurations.to_h[name]
+
+        c = config.symbolize_keys
+        raise "No global_uid support for adapter #{c[:adapter]}" if c[:adapter] != 'mysql2'
+
+        config
+      end
+    else
+      def mysql2_config(name)
+        config = ActiveRecord::Base.configurations.configs_for(env_name: name, name: 'primary')
+
+        raise "No id server '#{name}' configured in database.yml" if config.nil?
+        raise "No global_uid support for adapter #{config.adapter}" if config.adapter != 'mysql2'
+
+        config.configuration_hash
+      end
+    end
+
     def validate_connection_increment
       db_increment = connection.select_value("SELECT @@auto_increment_increment")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,7 +22,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.1
 signing_key:
 specification_version: 4
 summary: GUID