global_uid 1.2.0 → 1.2.2

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "rails2" do
+  gem "activerecord", "2.3.14"
+end
+
+appraise "rails3" do
+  gem "activerecord", "3.1.3"
+end

data/Gemfile

@@ -2,7 +2,5 @@ source "http://rubygems.org"
 
 gemspec
 
-group "test" do 
-  gem "ruby-debug"
-end
-
+gem "ruby-debug", :platform => "mri_18", :group => "test"
+gem "ruby-debug19", :platform => "mri_19", :require => "ruby-debug", :group => "test"

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'date'
+require 'appraisal'
 
 #############################################################################
 #

data/gemfiles/rails2.gemfile

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

data/gemfiles/rails2.gemfile.lock

@@ -0,0 +1,59 @@
+PATH
+  remote: /Users/primdahl/Git/global_uid
+  specs:
+    global_uid (1.2.0)
+      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
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.5)
+    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)
+    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)
+    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
+  ruby
+
+DEPENDENCIES
+  activerecord (= 2.3.14)
+  appraisal
+  bundler
+  global_uid!
+  mocha
+  mysql (= 2.8.1)
+  rake
+  ruby-debug
+  ruby-debug19
+  shoulda

data/gemfiles/rails3.gemfile

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

data/gemfiles/rails3.gemfile.lock

@@ -0,0 +1,72 @@
+PATH
+  remote: /Users/primdahl/Git/global_uid
+  specs:
+    global_uid (1.2.0)
+      activerecord
+      activesupport
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    appraisal (0.4.0)
+      bundler
+      rake
+    archive-tar-minitar (0.5.2)
+    arel (2.2.1)
+    builder (3.0.0)
+    columnize (0.3.5)
+    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)
+    multi_json (1.0.4)
+    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)
+    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.31)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 3.1.3)
+  appraisal
+  bundler
+  global_uid!
+  mocha
+  mysql (= 2.8.1)
+  rake
+  ruby-debug
+  ruby-debug19
+  shoulda

data/global_uid.gemspec

@@ -13,8 +13,8 @@ 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.0'
-  s.date              = '2011-11-29'
+  s.version           = '1.2.2'
+  s.date              = '2011-12-07'
   s.rubyforge_project = 'global_uid'
 
   ## Make sure your summary is short. The description may be as long
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
   ## 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')
@@ -63,10 +64,14 @@ Gem::Specification.new do |s|
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    Appraisals
     Gemfile
-    Gemfile.lock
     README.md
     Rakefile
+    gemfiles/rails2.gemfile
+    gemfiles/rails2.gemfile.lock
+    gemfiles/rails3.gemfile
+    gemfiles/rails3.gemfile.lock
     global_uid.gemspec
     lib/global_uid.rb
     lib/global_uid/active_record_extension.rb

data/lib/global_uid/active_record_extension.rb

@@ -3,7 +3,6 @@ module GlobalUid
 
     def self.included(base)
       base.extend(ClassMethods)
-      base.class_inheritable_accessor :global_uid_disabled
       base.before_create :global_uid_before_create
     end
 
@@ -26,16 +25,26 @@ module GlobalUid
     end
 
     module ClassMethods
+      def global_uid_disabled
+        if @global_uid_disabled.nil?
+          if superclass.respond_to?(:global_uid_disabled)
+            @global_uid_disabled = superclass.send(:global_uid_disabled)
+          else
+            @global_uid_disabled = false
+          end
+        end
+
+        @global_uid_disabled
+      end
+
       def generate_uid(options = {})
         uid_table_name  = self.global_uid_table
-
         self.ensure_global_uid_table
-
         GlobalUid::Base.get_uid_for_class(self, options)
       end
 
       def disable_global_uid
-        self.global_uid_disabled = true
+        @global_uid_disabled = true
       end
 
       def global_uid_table

data/lib/global_uid.rb

@@ -3,7 +3,7 @@ require "global_uid/active_record_extension"
 require "global_uid/migration_extension"
 
 module GlobalUid
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 
   class NoServersAvailableException < Exception ; end
   class ConnectionTimeoutException < Exception ; end

data/test/global_uid_test.rb

@@ -62,9 +62,43 @@ 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!
@@ -118,8 +152,6 @@ class GlobalUIDTest < ActiveSupport::TestCase
           GlobalUid::Base.with_connections do |cx|
             assert cx.table_exists?('with_global_uids_ids')
           end
-
-
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: global_uid
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ben Osheroff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 -08:00
+date: 2011-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: appraisal
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,7 +77,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,7 +91,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: bundler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,7 +105,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: shoulda
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -118,6 +118,20 @@ dependencies:
         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"
+  type: :development
+  version_requirements: *id008
 description: GUIDs for sharded models
 email: ben@zendesk.com
 executables: []
@@ -127,10 +141,14 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- Appraisals
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
+- gemfiles/rails2.gemfile
+- gemfiles/rails2.gemfile.lock
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
 - global_uid.gemspec
 - lib/global_uid.rb
 - lib/global_uid/active_record_extension.rb
@@ -171,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: global_uid
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 2
 summary: GUID

data/Gemfile.lock

@@ -1,43 +0,0 @@
-PATH
-  remote: .
-  specs:
-    global_uid (1.0.3)
-      activerecord (= 2.3.14)
-      activesupport
-      global_uid
-      mysql (= 2.8.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    columnize (0.3.2)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    linecache (0.43)
-    mocha (0.9.12)
-    mysql (2.8.1)
-    rake (0.8.7)
-    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
-  bundler
-  global_uid!
-  jeweler
-  mocha
-  rake
-  ruby-debug
-  shoulda