global_uid 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c0d229f2e1c92809e0e1da6efab4e0d001d512
-  data.tar.gz: 678d63bb8e6ef692db3696da3b2e14c6f9c23ebe
+  metadata.gz: 3108ded87e7821a25a8078a56cc0a100a0a04b63
+  data.tar.gz: 75dcfb3c8dbd226df06c498bfe1bdc8886deeab4
 SHA512:
-  metadata.gz: 41b5c2c2716975be2b808e4ad0322ff04b00b2b0315034443ad4793ca8d95c43dff699a7905d602ae89eb40efeed35bb41dbd1593b8cad599185f159350cd66c
-  data.tar.gz: 9bc16fb1be55208a00088de408cb127d1974d330393ebfbdaa7cb36d915b6cde478db590f7baee6d0a4259a724606872fb0d7de23890a4ba6a87b27caa3f1670
+  metadata.gz: c20258a1f27e97756888d023bb063b17d283aac9514abe7eb2c3e361c1e5b5dcd701ca722671ed270eae4b10443fd6be64bd5e2d4b759f7b5e707751a9c902f7
+  data.tar.gz: c3ab5dce7e8efb3e5527d8bb6478936a5620e4336a25b794f7eec80ab2a68badea1b534bed6156f43efa352208619d39eebe754699d450f3d2b51ee24f1cb059

data/lib/global_uid/active_record_extension.rb

@@ -61,7 +61,11 @@ module GlobalUid
       def ensure_global_uid_table
         return @global_uid_table_exists if @global_uid_table_exists
         GlobalUid::Base.with_connections do |connection|
-          raise "Global UID table #{global_uid_table} not found!" unless connection.schema_cache.table_exists?(global_uid_table.to_s)
+          if ActiveRecord::VERSION::MAJOR >= 5
+            raise "Global UID table #{global_uid_table} not found!" unless connection.schema_cache.data_source_exists?(global_uid_table.to_s)
+          else
+            raise "Global UID table #{global_uid_table} not found!" unless connection.schema_cache.table_exists?(global_uid_table.to_s)
+          end
         end
         @global_uid_table_exists = true
       end

data/lib/global_uid/has_and_belongs_to_many_builder_extension.rb

@@ -1,13 +1,7 @@
 module GlobalUid
   module HasAndBelongsToManyBuilderExtension
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :through_model, :inherit_global_uid_disabled_from_lhs
-      end
-    end
-
-    def through_model_with_inherit_global_uid_disabled_from_lhs
-      model = through_model_without_inherit_global_uid_disabled_from_lhs
+    def through_model
+      model = super
       model.disable_global_uid if model.left_reflection.klass.global_uid_disabled
       model
     end

data/lib/global_uid.rb

@@ -19,10 +19,10 @@ if defined?(ActiveRecord::SchemaMigration)
   ActiveRecord::SchemaMigration.disable_global_uid
 end
 
-if ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR >= 1
-  ActiveRecord::Associations::Builder::HasAndBelongsToMany.send(:include, GlobalUid::HasAndBelongsToManyBuilderExtension)
+if ActiveRecord::VERSION::STRING >= '4.1.0'
+  ActiveRecord::Associations::Builder::HasAndBelongsToMany.send(:prepend, GlobalUid::HasAndBelongsToManyBuilderExtension)
 end
 
-if ActiveRecord::VERSION::MAJOR == 4 && RUBY_VERSION >= '2'
+if ActiveRecord::VERSION::MAJOR >= 4
   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: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -179,9 +179,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: GUID