global_uid 3.4.4 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a371e3dbfed6e0435a626259cf64906018d70e86
-  data.tar.gz: d09a5bb556f731c8e78cef898967a9a5c3db1608
+  metadata.gz: a75efa773de9a27edd860de29b6c79d133b5f605
+  data.tar.gz: 7ddf18d558f580e5adf934a9d6b6dc2b5c49adda
 SHA512:
-  metadata.gz: 51d65569244dfcd3b135a3e4845efc4f1325b9641dde0d437c13b54d0ce0272d15db92199047edb37806ef24019abbf9ce2a9be323e9f5350fcfc19880ebaea0
-  data.tar.gz: 03aaad26dbef7941d438a8d0d6742fa75045e9c6e39bc367dd2b3458db3a0f0f75eec395d6f1c41840f397ba40f6b25453a24e5a635b768625681a2d16149dde
+  metadata.gz: 0c2752c562b662ded70c5feb9e038fcfe89ec66b30181ee1f788a66e97e47c8cc85d827819a6d70a20ad48e71a0a50aa241551d133eea2428ebc7fd1d495acd3
+  data.tar.gz: d7e5fb1924ab616148f33f1ac7f10f7906a6d6d8fc0b50035fe7c46dcb0b368b37adfdabf47094a7a39e2ba0d41b5d7752e2700e5a155bff8cdf5816141aab96

data/lib/global_uid/base.rb

@@ -1,15 +1,9 @@
 # frozen_string_literal: true
 require "active_record"
 require "active_support/all"
-
+require "mysql2"
 require "timeout"
 
-begin
-  require 'mysql2'
-rescue LoadError
-end
-
-
 module GlobalUid
   class Base
     GLOBAL_UID_DEFAULTS = {
@@ -38,7 +32,6 @@ module GlobalUid
 
       engine_stmt = "ENGINE=#{global_uid_options[:storage_engine] || "MyISAM"}"
 
-      # TODO it would be nice to be able to set the engine or something to not be MySQL specific
       with_connections do |connection|
         connection.execute("CREATE TABLE IF NOT EXISTS `#{id_table_name}` (
         `id` #{type} NOT NULL AUTO_INCREMENT,
@@ -58,17 +51,6 @@ module GlobalUid
       end
     end
 
-    begin
-      require 'system_timer'
-    rescue LoadError
-    end
-
-    if const_defined?("SystemTimer")
-      GlobalUidTimer = SystemTimer
-    else
-      GlobalUidTimer = Timeout
-    end
-
     def self.new_connection(name, connection_timeout, offset, increment_by)
       raise "No id server '#{name}' configured in database.yml" unless ActiveRecord::Base.configurations.has_key?(name)
       config = ActiveRecord::Base.configurations[name]
@@ -76,20 +58,17 @@ module GlobalUid
 
       raise "No global_uid support for adapter #{c[:adapter]}" if c[:adapter] != 'mysql2'
 
-      con = nil
       begin
-        GlobalUidTimer.timeout(connection_timeout, ConnectionTimeoutException) do
-          con = ActiveRecord::Base.send("#{c[:adapter]}_connection", config)
+        Timeout.timeout(connection_timeout, ConnectionTimeoutException) do
+          ActiveRecord::Base.mysql2_connection(config)
         end
       rescue ConnectionTimeoutException => e
         notify e, "Timed out establishing a connection to #{name}"
-        return nil
+        nil
       rescue Exception => e
         notify e, "establishing a connection to #{name}: #{e.message}"
-        return nil
+        nil
       end
-
-      con
     end
 
     def self.init_server_info(options)
@@ -187,7 +166,7 @@ module GlobalUid
 
     def self.get_uid_for_class(klass, options = {})
       with_connections do |connection|
-        GlobalUidTimer.timeout(self.global_uid_options[:query_timeout], TimeoutException) do
+        Timeout.timeout(self.global_uid_options[:query_timeout], TimeoutException) do
           id = connection.insert("REPLACE INTO #{klass.global_uid_table} (stub) VALUES ('a')")
           return id
         end
@@ -198,7 +177,7 @@ module GlobalUid
     def self.get_many_uids_for_class(klass, count, options = {})
       return [] unless count > 0
       with_connections do |connection|
-        GlobalUidTimer.timeout(self.global_uid_options[:query_timeout], TimeoutException) do
+        Timeout.timeout(self.global_uid_options[:query_timeout], TimeoutException) do
           increment_by = connection.select_value("SELECT @@auto_increment_increment")
           start_id = connection.insert("REPLACE INTO #{klass.global_uid_table} (stub) VALUES " + (["('a')"] * count).join(','))
           return start_id.step(start_id + (count-1) * increment_by, increment_by).to_a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.5.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -195,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: GUID