global_uid 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f17fa1ca013a3522b17564a1a5221f6808fe5a13
-  data.tar.gz: 2768edccf2ce2c846149b346533ef1723e0f4cea
+  metadata.gz: 3680d975cbe2d05025cbc770b25a6418e09d04ee
+  data.tar.gz: 5002baf9f29f436701bf087d26916e0e74d1e946
 SHA512:
-  metadata.gz: 2ad21dd9b622a6c67314474d14b8150293a9b8c54350090e91ed58abd17cbe847280c0b6992b28db3c496ba9373e2dcd90ac791e2eca69cc4672d42d986f93fa
-  data.tar.gz: 9b5e0e4f6a14f99c120cf5d1cd8cdab218bb886e260123fb3537c1dd8c47987a1287e1319c840f990d271e719fc302fa5a7b2c6ad83b683a6ef03d16d55bda8b
+  metadata.gz: 7ddcb75af62154ae5b815653fabe3ee66d8f95810d5ef7fe315738db7e105ddc5145984fa04f8eae848795d1e78a0a5247b1e7f11d8345c84b0ebfb872d295e8
+  data.tar.gz: 80055cb8046cda7b95fab72e7105d913749bd4bc80d893a0c957607a8dc6be0d72d8ce1e95ceca5c1ac41eb588a01ede9a92f7e8215bef935f5fc7b0a728e452

data/lib/global_uid/active_record_extension.rb

@@ -10,11 +10,9 @@ module GlobalUid
       return if GlobalUid::Base.global_uid_options[:disabled]
       return if self.class.global_uid_disabled
 
-      global_uid = self.class.get_reserved_global_uid
-      if !global_uid
-        realtime = Benchmark::realtime do
-          global_uid = self.class.generate_uid
-        end
+      global_uid = nil
+      realtime = Benchmark::realtime do
+        global_uid = self.class.generate_uid
       end
 
       if GlobalUid::Base.global_uid_options[:dry_run]
@@ -63,28 +61,6 @@ module GlobalUid
         end
         @global_uid_table_exists = true
       end
-
-      def with_reserved_global_uids(n_to_reserve)
-        old_should_reserve = @should_reserve_global_uids
-        @should_reserve_global_uids = n_to_reserve
-        yield
-      ensure
-        @should_reserve_global_uids = old_should_reserve
-      end
-
-      def get_reserved_global_uid
-        @reserved_global_uids ||= []
-        id = @reserved_global_uids.shift
-        return id if id
-
-        if @should_reserve_global_uids
-          @reserved_global_uids += GlobalUid::Base.get_many_uids_for_class(self, @should_reserve_global_uids)
-          @reserved_global_uids.shift
-        else
-          nil
-        end
-      end
-
     end
   end
 end

data/lib/global_uid/base.rb

@@ -195,26 +195,6 @@ module GlobalUid
       raise NoServersAvailableException, "All global UID servers are gone!"
     end
 
-    def self.get_many_uids_for_class(klass, n, options = {})
-      with_connections do |connection|
-        GlobalUidTimer.timeout(self.global_uid_options[:query_timeout], TimeoutException) do
-          connection.transaction do
-            start_id = connection.select_value("SELECT id from #{klass.global_uid_table} where stub='a' FOR UPDATE").to_i
-            connection.execute("update #{klass.global_uid_table} set id = id + #{n} * @@auto_increment_increment where stub='a'")
-            if self.global_uid_options[:storage_engine] =~ /InnoDB/i
-              # This is needed to reset the auto_increment counter on an InnoDB table.
-              connection.execute("ALTER TABLE #{klass.global_uid_table} AUTO_INCREMENT = 1")
-            end
-            end_res = connection.select_one("SELECT id, @@auto_increment_increment as inc from #{klass.global_uid_table} where stub='a'")
-            increment_by = end_res['inc'].to_i
-            end_id = end_res['id'].to_i
-            return (start_id + increment_by).step(end_id, increment_by).to_a
-          end
-        end
-      end
-      raise NoServersAvailableException, "All global UID servers are gone!"
-    end
-
     def self.global_uid_options=(options)
       @global_uid_options = GLOBAL_UID_DEFAULTS.merge(options.symbolize_keys)
     end

data/lib/global_uid/migration_extension.rb

@@ -1,11 +1,7 @@
 module GlobalUid
   module MigrationExtension
-    def self.included(base)
-      base.alias_method_chain :create_table, :global_uid
-      base.alias_method_chain :drop_table, :global_uid
-    end
 
-    def create_table_with_global_uid(name, options = {}, &blk)
+    def create_table(name, options = {}, &blk)
       uid_enabled = !(GlobalUid::Base.global_uid_options[:disabled] || options[:use_global_uid] == false)
 
       # rules for stripping out auto_increment -- enabled, not dry-run, and not a "PK-less" table
@@ -16,7 +12,7 @@ module GlobalUid
         options.merge!(:id => false)
       end
 
-      create_table_without_global_uid(name, options) { |t|
+      super(name, options) { |t|
         if remove_auto_increment
           # need to honor specifically named tables
           id_column_name = (old_id_option || :id)
@@ -32,12 +28,12 @@ module GlobalUid
 
     end
 
-    def drop_table_with_global_uid(name, options = {})
+    def drop_table(name, options = {})
       if !GlobalUid::Base.global_uid_options[:disabled] && options[:use_global_uid] == true
         id_table_name = options[:global_uid_table] || GlobalUid::Base.id_table_from_name(name)
         GlobalUid::Base.drop_uid_tables(id_table_name,options)
       end
-      drop_table_without_global_uid(name)
+      super(name, options)
     end
   end
 end

data/lib/global_uid.rb

@@ -4,8 +4,6 @@ require "global_uid/migration_extension"
 require "global_uid/schema_dumper_extension"
 
 module GlobalUid
-  VERSION = "1.4.1"
-
   class NoServersAvailableException < Exception ; end
   class ConnectionTimeoutException < Exception ; end
   class TimeoutException < Exception ; end
@@ -14,7 +12,7 @@ module GlobalUid
 end
 
 ActiveRecord::Base.send(:include, GlobalUid::ActiveRecordExtension)
-ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, GlobalUid::MigrationExtension)
+ActiveRecord::Migration.send(:prepend, GlobalUid::MigrationExtension)
 if ActiveRecord::VERSION::MAJOR == 4 && RUBY_VERSION >= '2'
   ActiveRecord::SchemaDumper.send(:prepend, GlobalUid::SchemaDumperExtension)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -87,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="