global_uid 1.2.3 → 1.2.4

data/Appraisals

@@ -2,6 +2,11 @@ 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

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

data/gemfiles/rails2.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "ruby-debug", :group=>"test", :platform=>"mri_18"
-gem "ruby-debug19", :group=>"test", :require=>"ruby-debug", :platform=>"mri_19"
+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,7 +1,7 @@
 PATH
   remote: /Users/ben/src/global_uid
   specs:
-    global_uid (1.2.2)
+    global_uid (1.2.3)
       activerecord
       activesupport
 
@@ -14,12 +14,16 @@ GEM
     appraisal (0.4.0)
       bundler
       rake
-    archive-tar-minitar (0.5.2)
     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)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
@@ -31,16 +35,6 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     shoulda (2.11.3)
 
 PLATFORMS
@@ -50,10 +44,10 @@ DEPENDENCIES
   activerecord (= 2.3.14)
   appraisal
   bundler
+  debugger
   global_uid!
   mocha
   mysql (= 2.8.1)
   rake
   ruby-debug
-  ruby-debug19
   shoulda

data/gemfiles/rails3.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "ruby-debug", :group=>"test", :platform=>"mri_18"
-gem "ruby-debug19", :group=>"test", :require=>"ruby-debug", :platform=>"mri_19"
+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,7 +1,7 @@
 PATH
   remote: /Users/ben/src/global_uid
   specs:
-    global_uid (1.2.2)
+    global_uid (1.2.3)
       activerecord
       activesupport
 
@@ -22,15 +22,19 @@ GEM
     appraisal (0.4.0)
       bundler
       rake
-    archive-tar-minitar (0.5.2)
     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)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
@@ -43,16 +47,6 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     shoulda (2.11.3)
     tzinfo (0.3.32)
 
@@ -63,10 +57,10 @@ DEPENDENCIES
   activerecord (= 3.2.2)
   appraisal
   bundler
+  debugger
   global_uid!
   mocha
   mysql (= 2.8.1)
   rake
   ruby-debug
-  ruby-debug19
   shoulda

data/global_uid.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## 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.2.3'
+  s.version           = '1.2.4'
   s.date              = '2012-03-13'
   s.rubyforge_project = 'global_uid'
 

data/lib/global_uid/base.rb

@@ -3,6 +3,12 @@ require "active_support/all"
 
 require "timeout"
 
+begin
+  require 'mysql2'
+rescue LoadError
+end
+
+
 module GlobalUid
   class Base
     @@servers = nil
@@ -53,27 +59,17 @@ module GlobalUid
       GlobalUidTimer = Timeout
     end
 
-    def self.connection_method
-      @@connection_method ||= begin
-        if ActiveRecord::Base.respond_to?(:mysql2_connection)
-          :mysql2_connection
-        elsif ActiveRecord::Base.respond_to?(:mysql_connection)
-          :mysql_connection
-        else
-          raise "No Mysql Connection Adapter found..."
-        end
-      end
-    end
-
-
     def self.new_connection(name, connection_timeout, offset, increment_by, use_server_variables)
       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
+
+      raise "No global_uid support for adapter #{c[:adapter]}" unless ['mysql', 'mysql2'].include?(c[:adapter])
 
       con = nil
       begin
         GlobalUidTimer.timeout(connection_timeout, ConnectionTimeoutException) do
-          con = ActiveRecord::Base.send(self.connection_method, config)
+          con = ActiveRecord::Base.send("#{c[:adapter]}_connection", config)
         end
       rescue ConnectionTimeoutException => e
         notify e, "Timed out establishing a connection to #{name}"

data/test/test_helper.rb

@@ -20,6 +20,14 @@ GlobalUid::Base.global_uid_options = {
   ]
 }
 
-ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + "/config/database.yml"))
+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")

metadata

@@ -1,145 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: global_uid
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.2.4
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 3
-  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 2
-        - 8
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.8.1
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  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: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - Appraisals
 - Gemfile
 - README.md
@@ -158,39 +164,29 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/zendesk/global_uid
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: global_uid
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 2
 summary: GUID
-test_files: 
+test_files:
 - test/global_uid_test.rb
 - test/test_helper.rb