global_uid 1.4.0 → 1.4.1

data/lib/global_uid/active_record_extension.rb

@@ -48,6 +48,10 @@ module GlobalUid
         @global_uid_disabled = true
       end
 
+      def enable_global_uid
+        @global_uid_disabled = false
+      end
+
       def global_uid_table
         GlobalUid::Base.id_table_from_name(self.table_name)
       end

data/lib/global_uid/base.rb

@@ -61,7 +61,7 @@ module GlobalUid
       GlobalUidTimer = Timeout
     end
 
-    def self.new_connection(name, connection_timeout, offset, increment_by, use_server_variables)
+    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]
       c = config.symbolize_keys
@@ -81,14 +81,6 @@ module GlobalUid
         return nil
       end
 
-      # Please note that this is unreliable -- if you lose your CX to the server
-      # and auto-reconnect, you will be utterly hosed.  Much better to dedicate a server
-      # or two to the cause, and set their auto_increment_increment globally.
-      if use_server_variables
-        con.execute("set @@auto_increment_increment = #{increment_by}")
-        con.execute("set @@auto_increment_offset = #{offset}")
-      end
-
       con
     end
 
@@ -133,7 +125,7 @@ module GlobalUid
         if info[:new?] || ( info[:retry_at] && Time.now > info[:retry_at] )
           info[:new?] = false
 
-          connection = new_connection(info[:name], connection_timeout, info[:offset], increment_by, options[:use_server_variables])
+          connection = new_connection(info[:name], connection_timeout, info[:offset], increment_by)
           info[:cx]  = connection
           info[:retry_at] = Time.now + options[:connection_retry] if connection.nil?
         end

data/lib/global_uid/server_variables.rb

@@ -0,0 +1,29 @@
+# This module is good for testing and development, not so much for production.
+# Please note that this is unreliable -- if you lose your CX to the server
+# and auto-reconnect, you will be utterly hosed.  Much better to dedicate a server
+# or two to the cause, and set their auto_increment_increment globally.
+#
+# You can include this module in tests like this:
+#   GlobalUid::Base.extend(GlobalUid::ServerVariables)
+#
+module GlobalUid
+  module ServerVariables
+
+    def self.extended(base)
+      base.singleton_class.send(:alias_method, :new_connection_without_server_variables, :new_connection)
+      base.singleton_class.send(:alias_method, :new_connection, :new_connection_with_server_variables)
+    end
+
+    def new_connection_with_server_variables(name, connection_timeout, offset, increment_by)
+      con = new_connection_without_server_variables(name, connection_timeout, offset, increment_by)
+
+      if con
+        con.execute("set @@auto_increment_increment = #{increment_by}")
+        con.execute("set @@auto_increment_offset = #{offset}")
+      end
+
+      con
+    end
+
+  end
+end

data/lib/global_uid.rb

@@ -3,11 +3,13 @@ require "global_uid/active_record_extension"
 require "global_uid/migration_extension"
 
 module GlobalUid
-  VERSION = "1.3.1"
+  VERSION = "1.4.1"
 
   class NoServersAvailableException < Exception ; end
   class ConnectionTimeoutException < Exception ; end
   class TimeoutException < Exception ; end
+
+  autoload :ServerVariables, "global_uid/server_variables"
 end
 
 ActiveRecord::Base.send(:include, GlobalUid::ActiveRecordExtension)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: global_uid
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -139,35 +139,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: GUIDs for sharded models
 email: ben@zendesk.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
-- Appraisals
-- Gemfile
-- README.md
-- Rakefile
-- gemfiles/rails2.gemfile
-- gemfiles/rails2.gemfile.lock
-- gemfiles/rails2mysql2.gemfile.lock
-- gemfiles/rails3.gemfile
-- gemfiles/rails3.gemfile.lock
-- global_uid.gemspec
 - lib/global_uid.rb
 - lib/global_uid/active_record_extension.rb
 - lib/global_uid/base.rb
 - lib/global_uid/migration_extension.rb
-- test/config/database.yml.example
-- test/global_uid_test.rb
-- test/test_helper.rb
-homepage: http://github.com/zendesk/global_uid
-licenses: []
+- lib/global_uid/server_variables.rb
+homepage: https://github.com/zendesk/global_uid
+licenses:
+- MIT
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -181,13 +184,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: global_uid
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: GUID
-test_files:
-- test/global_uid_test.rb
-- test/test_helper.rb
+test_files: []

data/Appraisals

@@ -1,12 +0,0 @@
-appraise "rails2" do
-  gem "activerecord", "2.3.14"
-end
-
-appraise "rails2mysql2" do 
-  gem "activerecord", "2.3.14"
-  gem "mysql2", :git => "git://github.com/osheroff/mysql2.git", :ref => "a1ab7ba"
-end
-
-appraise "rails3" do
-  gem "activerecord", "3.2.2"
-end

data/Gemfile

@@ -1,6 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-gem "ruby-debug", :platform => "mri_18", :group => "test"
-gem "debugger", :platform => "mri_19", :require => "ruby-debug", :group => "test"

data/README.md

@@ -1,130 +0,0 @@
-# Global UID Plugin
-
-## Summary
-
-This plugin does a lot of the heavy lifting needed to have an external MySQL based global id generator as described in this article from Flickr
-
-(http://code.flickr.com/blog/2010/02/08/ticket-servers-distributed-unique-primary-keys-on-the-cheap/)
-
-There are three parts to it: configuration, migration and object creation
-
-### Interactions with other databases
-
-This plugin shouldn't fail with Databases other than MySQL but neither will it do anything either. There's theoretically nothing that should stop it from being *ported* to other DBs, we just don't need to.
-
-## Installation
-
-Shove this in your Gemfile and smoke it
-
-    gem "global_uid", :git => "git://github.com/zendesk/global_uid.git"
-
-### Configuration
-
-First configure some databases in database.yml in the normal way.
-
-    id_server_1:
-      adapter: mysql
-      host: id_server_db1.prod
-      port: 3306
-
-    id_server_2:
-        adapter: mysql
-        host: id_server_db2.prod
-        port: 3306
-
-Then setup these servers, and other defaults in your environment.rb:
-
-    GlobalUid.default_options = {
-      :id_servers => [ 'id_server_1', 'id_server_2' ],
-      :increment_by => 3
-    }
-
-Here's a complete list of the options you can use:
-
-    Name                  Default
-    :disabled             false                         
-            Disable GlobalUid entirely
-
-    :dry_run              false                         
-            Setting this parameter causes the REPLACE INTO statements to run, but the id picked up will not be used.
-
-    :connection_timeout   3 seconds                    
-            Timeout for connecting to a global UID server
-
-    :query_timeout        10 seconds                    
-            Timeout for retrieving a global UID from a server before we move on to the next server
-
-    :connection_retry     10.minutes
-            After failing to connect or query a UID server, how long before we retry
-
-    :use_server_variables false
-            If set, this gem will call "set @@auto_increment_offset" in order to setup the global uid servers.
-            good for test/development, not so much for production.
-    :notifier             A proc calling ActiveRecord::Base.logger
-            This proc is called with two parameters upon UID server failure -- an exception and a message
-
-    :increment_by         5
-            Chooses the step size for the increment.  This will define the maximum number of UID servers you can have.
-
-### Testing
-
-    mysqladmin -uroot create global_uid_test
-    mysqladmin -uroot create global_uid_test_id_server_1
-    mysqladmin -uroot create global_uid_test_id_server_2
-
-Copy test/config/database.yml.example to test/config/database.yml and make the modifications you need to point it to 2 local MySQL databases. Then +rake test+
-
-### Migration
-
-Migrations will now add global_uid tables for you by default.  They will also change
-your primary keys from signature "PRIMARY KEY AUTO_INCREMENT NOT NULL" to "PRIMARY KEY NOT NULL".
-
-If you'd like to disable this behavior, you can write:
-
-    class CreateFoos < ActiveRecord::Migration
-      def self.up
-        create_table :foos, :use_global_uid => false do |t|
-
-
-## Model-level stuff
-
-If you want GlobalUIDs created, you don't have to do anything except set up the GlobalUID tables
-with your migration.  Everything will be taken care you.  It's calm, and soothing like aloe.
-It's the Rails way.
-
-
-### Disabling global uid per table
-
-    class Foo < ActiveRecord::Base
-      disable_global_uid
-    end
-
-
-## Taking matters into your own hands:
-
-
-	class Foo < ActiveRecord::Base
-		disable_global_uid
-
-		def before_create
-		  self.id = generate_uid()
-		  # other stuff
-		  ....
-		end
-
-	end
-
-If you're using a non standard uid table then pass that in.
-
-    generate_uid(:uid_table => '<name>')
-
-## Submitting Bug reports, patches or improvements
-
-I welcome your feedback, bug reports, patches and improvements. Please e-mail these
-to
-    simon at zendesk.com
-    
-
-with [mysqlbigint global uid] in the subject line. I'll get back to you as soon as I can.
-
-Copyright (c) 2010 Zendesk, released under the MIT license

data/Rakefile

@@ -1,151 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'date'
-require 'appraisal'
-
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
-def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def date
-  Date.today.to_s
-end
-
-def rubyforge_project
-  name
-end
-
-def gemspec_file
-  "#{name}.gemspec"
-end
-
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
-task :default => :test
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
-end
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/#{name}.rb"
-end
-
-#############################################################################
-#
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
-desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
-task :release => :build do
-  unless `git branch` =~ /^\* master$/
-    puts "You must be on the master branch to release!"
-    exit!
-  end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
-  sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
-end
-
-desc "Build #{gem_file} into the pkg directory"
-task :build => :gemspec do
-  sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-desc "Generate #{gemspec_file}"
-task :gemspec => :validate do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
-end
-
-desc "Validate #{gemspec_file}"
-task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts "A `VERSION` file at root level violates Gem best practices."
-    exit!
-  end
-end

data/gemfiles/rails2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "ruby-debug", :platform=>"mri_18", :group=>"test"
-gem "debugger", :platform=>"mri_19", :require=>"ruby-debug", :group=>"test"
-gem "activerecord", "2.3.14"
-
-gemspec :path=>"../"

data/gemfiles/rails2.gemfile.lock

@@ -1,53 +0,0 @@
-PATH
-  remote: /Users/ben/src/global_uid
-  specs:
-    global_uid (1.2.6)
-      activerecord
-      activesupport
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    appraisal (0.4.0)
-      bundler
-      rake
-    columnize (0.3.5)
-    debugger (1.1.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1)
-      debugger-ruby_core_source (~> 1.1)
-    debugger-linecache (1.1.1)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    metaclass (0.0.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    mysql (2.8.1)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (2.11.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 2.3.14)
-  appraisal
-  bundler
-  debugger
-  global_uid!
-  mocha
-  mysql (= 2.8.1)
-  rake
-  ruby-debug
-  shoulda

data/gemfiles/rails2mysql2.gemfile.lock

@@ -1,65 +0,0 @@
-GIT
-  remote: git://github.com/osheroff/mysql2.git
-  revision: a1ab7bae6252746c68677ad7a0d362e385dcd446
-  ref: a1ab7ba
-  specs:
-    mysql2 (0.2.18)
-
-PATH
-  remote: /Users/ben/src/global_uid
-  specs:
-    global_uid (1.2.6)
-      activerecord
-      activesupport
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    appraisal (0.4.1)
-      bundler
-      rake
-    columnize (0.3.6)
-    debugger (1.1.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1)
-      debugger-ruby_core_source (~> 1.1)
-    debugger-linecache (1.1.1)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    mysql (2.8.1)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.9)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 2.3.14)
-  appraisal
-  bundler
-  debugger
-  global_uid!
-  mocha
-  mysql (= 2.8.1)
-  mysql2!
-  rake
-  ruby-debug
-  shoulda

data/gemfiles/rails3.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "ruby-debug", :platform=>"mri_18", :group=>"test"
-gem "debugger", :platform=>"mri_19", :require=>"ruby-debug", :group=>"test"
-gem "activerecord", "3.2.2"
-
-gemspec :path=>"../"

data/gemfiles/rails3.gemfile.lock

@@ -1,66 +0,0 @@
-PATH
-  remote: /Users/ben/src/global_uid
-  specs:
-    global_uid (1.2.6)
-      activerecord
-      activesupport
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
-      builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.4.0)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.0)
-    columnize (0.3.5)
-    debugger (1.1.1)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1)
-      debugger-ruby_core_source (~> 1.1)
-    debugger-linecache (1.1.1)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.1)
-    i18n (0.6.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    metaclass (0.0.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.1.0)
-    mysql (2.8.1)
-    rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (2.11.3)
-    tzinfo (0.3.32)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.2.2)
-  appraisal
-  bundler
-  debugger
-  global_uid!
-  mocha
-  mysql (= 2.8.1)
-  rake
-  ruby-debug
-  shoulda

data/global_uid.gemspec

@@ -1,90 +0,0 @@
-## This is the rakegem gemspec template. Make sure you read and understand
-## all of the comments. Some sections require modification, and others can
-## be deleted if you don't need them. Once you understand the contents of
-## this file, feel free to delete any comments that begin with two hash marks.
-## You can find comprehensive Gem::Specification documentation, at
-## http://docs.rubygems.org/read/chapter/20
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.6'
-
-  ## Leave these as is they will be modified for you by the rake gemspec task.
-  ## If your rubyforge_project name is different, then edit it and comment out
-  ## the sub! line in the Rakefile
-  s.name              = 'global_uid'
-  s.version           = '1.4.0'
-  s.date              = '2013-04-01'
-  s.rubyforge_project = 'global_uid'
-
-  ## Make sure your summary is short. The description may be as long
-  ## as you like.
-  s.summary     = "GUID"
-  s.description = "GUIDs for sharded models"
-
-  ## List the primary authors. If there are a bunch of authors, it's probably
-  ## better to set the email to an email list or something. If you don't have
-  ## a custom homepage, consider using your GitHub URL or the like.
-  s.authors  = ["Ben Osheroff"]
-  s.email    = 'ben@zendesk.com'
-  s.homepage = 'http://github.com/zendesk/global_uid'
-
-  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
-  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
-  s.require_paths = %w[lib]
-
-  ## This sections is only necessary if you have C extensions.
-  ## s.require_paths << 'ext'
-  ## s.extensions = %w[ext/extconf.rb]
-
-  ## If your gem includes any executables, list them here.
-  # s.executables = ["name"]
-
-  ## Specify any RDoc options here. You'll want to add your README and
-  ## LICENSE files to the extra_rdoc_files list.
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.md]
-
-  ## List your runtime dependencies here. Runtime dependencies are those
-  ## that are needed for an end user to actually USE your code.
-  s.add_dependency('activerecord')
-  s.add_dependency('activesupport')
-
-  ## List your development dependencies here. Development dependencies are
-  ## those that are only needed during development
-  s.add_development_dependency('mysql', '2.8.1')
-  s.add_development_dependency("appraisal")
-  s.add_development_dependency('rake')
-  s.add_development_dependency('bundler')
-  s.add_development_dependency('shoulda')
-  s.add_development_dependency('mocha')
-
-  ## Leave this section as-is. It will be automatically generated from the
-  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
-  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
-  # = MANIFEST =
-  s.files = %w[
-    Appraisals
-    Gemfile
-    README.md
-    Rakefile
-    gemfiles/rails2.gemfile
-    gemfiles/rails2.gemfile.lock
-    gemfiles/rails2mysql2.gemfile.lock
-    gemfiles/rails3.gemfile
-    gemfiles/rails3.gemfile.lock
-    global_uid.gemspec
-    lib/global_uid.rb
-    lib/global_uid/active_record_extension.rb
-    lib/global_uid/base.rb
-    lib/global_uid/migration_extension.rb
-    test/config/database.yml.example
-    test/global_uid_test.rb
-    test/test_helper.rb
-  ]
-  # = MANIFEST =
-
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
-  s.test_files = s.files.select { |path| path =~ /^test\/(test_.*|.*_test)\.rb/ }
-end

data/test/config/database.yml.example

@@ -1,20 +0,0 @@
-test:
-  adapter: mysql
-  encoding: utf8
-  database: global_uid_test
-  username: root
-  password:
-
-test_id_server_1:
-  adapter: mysql
-  encoding: utf8
-  database: global_uid_test_id_server_1
-  username: root
-  password:
-
-test_id_server_2:
-  adapter: mysql
-  encoding: utf8
-  database: global_uid_test_id_server_2
-  username: root
-  password:

data/test/global_uid_test.rb

@@ -1,475 +0,0 @@
-require 'test_helper'
-
-class CreateWithNoParams < ActiveRecord::Migration
-  group :change if self.respond_to?(:group)
-
-  def self.up
-    create_table :with_global_uids do |t|
-      t.string  :description
-    end
-  end
-
-  def self.down
-    drop_table :with_global_uids
-  end
-end
-
-class CreateWithExplicitUidTrue < ActiveRecord::Migration
-  group :change if self.respond_to?(:group)
-
-  def self.up
-    create_table :with_global_uids, :use_global_uid => true do |t|
-      t.string  :description
-    end
-  end
-
-  def self.down
-    drop_table :with_global_uids, :use_global_uid => true
-  end
-end
-
-class CreateWithNamedID < ActiveRecord::Migration
-  group :change if self.respond_to?(:group)
-
-  def self.up
-    create_table :with_global_uids, :id => 'hello' do |t|
-      t.string  :description
-    end
-  end
-
-  def self.down
-    drop_table :with_global_uids
-  end
-end
-
-class CreateWithoutGlobalUIDs < ActiveRecord::Migration
-  group :change if self.respond_to?(:group)
-
-  def self.up
-    create_table :without_global_uids, :use_global_uid => false do |t|
-      t.string  :description
-    end
-  end
-
-  def self.down
-    drop_table :without_global_uids, :use_global_uid => false
-  end
-end
-
-class WithGlobalUID < ActiveRecord::Base
-end
-
-class WithoutGlobalUID < ActiveRecord::Base
-end
-
-class Parent < ActiveRecord::Base
-  def self.reset
-    @global_uid_disabled = nil
-  end
-end
-
-class ParentSubclass < Parent
-end
-
-class ParentSubclassSubclass < ParentSubclass
-end
-
-class GlobalUIDTest < ActiveSupport::TestCase
-  ActiveRecord::Migration.verbose = false
-
-  context "#global_uid_disabled" do
-    setup do
-      [ Parent, ParentSubclass, ParentSubclassSubclass ].each { |k| k.reset }
-    end
-
-    should "default to the parent value or false" do
-      assert !ParentSubclass.global_uid_disabled
-
-      ParentSubclass.disable_global_uid
-      assert ParentSubclass.global_uid_disabled
-      assert ParentSubclassSubclass.global_uid_disabled
-
-      ParentSubclass.reset
-      assert !ParentSubclass.global_uid_disabled
-      assert ParentSubclassSubclass.global_uid_disabled
-
-      ParentSubclassSubclass.reset
-      assert !ParentSubclass.global_uid_disabled
-      assert !ParentSubclassSubclass.global_uid_disabled
-    end
-  end
-
-  context "migrations" do
-    setup do
-      restore_defaults!
-      reset_connections!
-      drop_old_test_tables!
-    end
-
-    context "without explicit parameters" do
-      context "with global-uid enabled" do
-        setup do
-          GlobalUid::Base.global_uid_options[:disabled] = false
-          GlobalUid::Base.global_uid_options[:storage_engine] = "InnoDB"
-          CreateWithNoParams.up
-          @create_table = show_create_sql(WithGlobalUID, "with_global_uids").split("\n")
-        end
-
-        should "create the global_uids table" do
-          GlobalUid::Base.with_connections do |cx|
-            assert cx.table_exists?('with_global_uids_ids')
-          end
-        end
-
-        should "create global_uids tables with matching ids" do
-          GlobalUid::Base.with_connections do |cx|
-            foo = cx.select_all("select id from with_global_uids_ids")
-            assert(foo.first['id'].to_i == 1)
-          end
-        end
-
-        should "create tables with the given storage_engine" do
-          GlobalUid::Base.with_connections do |cx|
-            foo = cx.select_all("show create table with_global_uids_ids")
-            assert_match /ENGINE=InnoDB/, foo.first.values.join
-          end
-
-        end
-
-        should "tear off the auto_increment part of the primary key from the created table" do
-          id_line = @create_table.grep(/\`id\` int/i).first
-          assert_no_match /auto_increment/i, id_line
-        end
-
-        should "create a primary key on id" do
-          assert @create_table.grep(/primary key/i).size > 0
-        end
-
-        teardown do
-          CreateWithNoParams.down
-        end
-      end
-
-      context "dropping a table" do
-        should "not drop the global-uid tables" do
-          CreateWithNoParams.up
-          GlobalUid::Base.with_connections do |cx|
-            assert cx.table_exists?('with_global_uids_ids')
-          end
-
-          CreateWithNoParams.down
-          GlobalUid::Base.with_connections do |cx|
-            assert cx.table_exists?('with_global_uids_ids')
-          end
-        end
-      end
-
-      context "with global-uid disabled, globally" do
-        setup do
-          GlobalUid::Base.global_uid_options[:disabled] = true
-          CreateWithNoParams.up
-        end
-
-        should "not create the global_uids table" do
-          GlobalUid::Base.with_connections do |cx|
-            assert !cx.table_exists?('with_global_uids_ids')
-          end
-        end
-
-        teardown do
-          CreateWithNoParams.down
-          GlobalUid::Base.global_uid_options[:disabled] = false
-        end
-      end
-
-      context "with a named ID key" do
-        setup do
-          CreateWithNamedID.up
-        end
-
-        should "preserve the name of the ID key" do
-          @create_table = show_create_sql(WithGlobalUID, "with_global_uids").split("\n")
-          assert(@create_table.grep(/hello.*int/i))
-          assert(@create_table.grep(/primary key.*hello/i))
-        end
-
-        teardown do
-          CreateWithNamedID.down
-        end
-      end
-    end
-
-    context "with :use_global_uid => true" do
-      context "dropping a table" do
-        should "drop the global-uid tables" do
-          CreateWithExplicitUidTrue.up
-          GlobalUid::Base.with_connections do |cx|
-            assert cx.table_exists?('with_global_uids_ids')
-          end
-
-          CreateWithExplicitUidTrue.down
-          GlobalUid::Base.with_connections do |cx|
-            assert !cx.table_exists?('with_global_uids_ids')
-          end
-        end
-      end
-    end
-
-    context "with global-uid disabled in the migration" do
-      setup do
-        CreateWithoutGlobalUIDs.up
-        @create_table = show_create_sql(WithoutGlobalUID, "without_global_uids").split("\n")
-      end
-
-      should "not create the global_uids table" do
-        GlobalUid::Base.with_connections do |cx|
-          assert !cx.table_exists?('without_global_uids_ids')
-        end
-      end
-
-      should "create standard auto-increment tables" do
-        id_line = @create_table.grep(/.id. int/i).first
-        assert_match /auto_increment/i, id_line
-      end
-
-      teardown do
-        CreateWithoutGlobalUIDs.down
-      end
-    end
-  end
-
-  context "With GlobalUID" do
-    setup do
-      reset_connections!
-      drop_old_test_tables!
-      restore_defaults!
-      CreateWithNoParams.up
-      CreateWithoutGlobalUIDs.up
-    end
-
-    context "normally" do
-      should "get a unique id" do
-        test_unique_ids
-      end
-
-      should "get bulk ids" do
-        res = GlobalUid::Base.get_many_uids_for_class(WithGlobalUID, 10)
-        assert res.size == 10
-        res += GlobalUid::Base.get_many_uids_for_class(WithGlobalUID, 10)
-        assert res.uniq.size == 20
-        # starting value of 1 with a step of 5, so we should get 6,11,16...
-        res.each_with_index do |val, i|
-          assert_equal val, ((i + 1) * 5) + 1
-        end
-      end
-    end
-
-    context "reserving ids" do
-      should "get 10 in bulk" do
-        WithGlobalUID.with_reserved_global_uids(10) do
-          WithGlobalUID.create!
-          # now we should be able to run without ever touching the cx again
-          GlobalUid::Base.get_connections.each.expects(:insert).never
-          GlobalUid::Base.get_connections.each.expects(:select_value).never
-          9.times { WithGlobalUID.create! }
-        end
-
-        GlobalUid::Base.get_connections.first.expects(:insert).once.returns(50)
-        WithGlobalUID.create!
-      end
-    end
-
-    context "With a timing out server" do
-      setup do
-        reset_connections!
-        @a_decent_cx = GlobalUid::Base.new_connection(GlobalUid::Base.global_uid_servers.first, 50, 1, 5, true)
-        ActiveRecord::Base.stubs(:mysql_connection).raises(GlobalUid::ConnectionTimeoutException).then.returns(@a_decent_cx)
-        @connections = GlobalUid::Base.get_connections
-      end
-
-      should "limp along with one functioning server" do
-        assert @connections.include?(@a_decent_cx)
-        assert_equal GlobalUid::Base.global_uid_servers.size - 1,  @connections.size, "get_connections size"
-      end
-
-      should "eventually retry the connection and get it back in place" do
-        # clear the state machine expectation
-        ActiveRecord::Base.mysql_connection rescue nil
-        ActiveRecord::Base.mysql_connection rescue nil
-
-        awhile = Time.now + 10.hours
-        Time.stubs(:now).returns(awhile)
-
-        assert GlobalUid::Base.get_connections.size == GlobalUid::Base.global_uid_servers.size
-
-      end
-
-      should "get some unique ids" do
-        test_unique_ids
-      end
-    end
-
-    context "With a server timing out on query" do
-      setup do
-        reset_connections!
-        @old_size = GlobalUid::Base.get_connections.size # prime them
-        GlobalUid::Base.get_connections.first.stubs(:insert).raises(GlobalUid::TimeoutException)
-        # trigger the failure -- have to do it it a bunch of times, as one call might not hit the server
-        # Even so there's a 1/(2^32) possibility of this test failing.
-        32.times do WithGlobalUID.create! end
-      end
-
-      should "pull the server out of the pool" do
-        assert GlobalUid::Base.get_connections.size == @old_size - 1
-      end
-
-      should "get ids from the remaining server" do
-        test_unique_ids
-      end
-
-      should "eventually retry the connection" do
-        awhile = Time.now + 10.hours
-        Time.stubs(:now).returns(awhile)
-
-        assert GlobalUid::Base.get_connections.size == GlobalUid::Base.global_uid_servers.size
-      end
-    end
-
-    context "With both servers throwing exceptions" do
-      setup do
-        # would prefer to do the below, but need Mocha 0.9.10 to do so
-        # ActiveRecord::ConnectionAdapters::MysqlAdapter.any_instance.stubs(:execute).raises(ActiveRecord::StatementInvalid)
-        GlobalUid::Base.with_connections do |cx|
-          cx.stubs(:insert).raises(ActiveRecord::StatementInvalid)
-        end
-      end
-
-      should "raise a NoServersAvailableException" do
-        assert_raises(GlobalUid::NoServersAvailableException) do
-          WithGlobalUID.create!
-        end
-      end
-
-      should "retry the servers immediately after failure" do
-        assert_raises(GlobalUid::NoServersAvailableException) do
-          WithGlobalUID.create!
-        end
-
-        assert WithGlobalUID.create!
-      end
-    end
-
-
-    context "with per-process_affinity" do
-      setup do
-        GlobalUid::Base.global_uid_options[:per_process_affinity] = true
-      end
-
-      should "increment sequentially" do
-        last_id = 0
-        10.times do
-          this_id = WithGlobalUID.create!.id
-          assert this_id > last_id
-        end
-      end
-
-      teardown do
-        GlobalUid::Base.global_uid_options[:per_process_affinity] = false
-      end
-    end
-
-    context "with global-uid disabled" do
-      setup do
-        WithoutGlobalUID.disable_global_uid
-      end
-
-      should "never call various unsafe methods" do
-        GlobalUid::Base.expects(:new_connection).never
-        GlobalUid::Base.expects(:get_uid_for_class).never
-        WithoutGlobalUID.expects(:generate_uid).never
-        WithoutGlobalUID.expects(:ensure_global_uid).never
-        GlobalUid::Base.expects(:get_uid_for_class).never
-      end
-
-      teardown do
-      end
-    end
-
-    teardown do
-      mocha_teardown # tear down mocha early to prevent some of this being tied to mocha expectations
-      reset_connections!
-      CreateWithNoParams.down
-      CreateWithoutGlobalUIDs.down
-    end
-  end
-
-  context "In dry-run mode" do
-    setup do
-      reset_connections!
-      drop_old_test_tables!
-      GlobalUid::Base.global_uid_options[:dry_run] = true
-      CreateWithNoParams.up
-    end
-
-    should "create a normal looking table" do
-
-    end
-
-    should "increment normally1" do
-      (1..10).each do |i|
-        assert_equal i, WithGlobalUID.create!.id
-      end
-    end
-
-    should "insert into the UID servers nonetheless" do
-      GlobalUid::Base.expects(:get_uid_for_class).at_least(10)
-      10.times { WithGlobalUID.create! }
-    end
-
-    should "log the results" do
-      ActiveRecord::Base.logger.expects(:info).at_least(10)
-      10.times { WithGlobalUID.create! }
-    end
-
-    teardown do
-      reset_connections!
-      CreateWithNoParams.down
-      GlobalUid::Base.global_uid_options[:dry_run] = false
-    end
-  end
-
-  private
-  def test_unique_ids
-    seen = {}
-    (0..10).each do
-      foo = WithGlobalUID.new
-      foo.save
-      assert !foo.id.nil?
-      assert foo.description.nil?
-      assert !seen.has_key?(foo.id)
-      seen[foo.id] = 1
-    end
-  end
-
-  def drop_old_test_tables!
-    GlobalUid::Base.with_connections do |cx|
-      cx.execute("DROP TABLE IF exists with_global_uids_ids")
-    end
-  end
-
-  def reset_connections!
-    GlobalUid::Base.class_eval "@@servers = nil"
-  end
-
-  def restore_defaults!
-    GlobalUid::Base.global_uid_options[:disabled] = false
-    GlobalUid::Base.global_uid_options[:use_server_variables] = true
-    GlobalUid::Base.global_uid_options[:dry_run] = false
-  end
-
-  def show_create_sql(klass, table)
-    klass.connection.select_rows("show create table #{table}")[0][1]
-  end
-end
-
-

data/test/test_helper.rb

@@ -1,34 +0,0 @@
-require 'rubygems'
-
-require 'bundler'
-Bundler.setup
-Bundler.setup(:test)
-
-require 'ruby-debug'
-require "active_record"
-require "active_support"
-require "active_support/test_case"
-require "shoulda"
-require "mocha"
-require "global_uid"
-
-GlobalUid::Base.global_uid_options = {
-  :use_server_variables => true,
-  :disabled   => false,
-  :id_servers => [
-    "test_id_server_1",
-    "test_id_server_2"
-  ]
-}
-
-yaml = YAML::load(IO.read(File.dirname(__FILE__) + "/config/database.yml"))
-
-if !Gem::Specification.find_all_by_name("mysql2").empty?
-  yaml.each do |k, v|
-    v['adapter'] = 'mysql2'
-  end
-end
-
-ActiveRecord::Base.configurations = yaml
-ActiveRecord::Base.establish_connection("test")
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")