couchbase-id 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad6585c5467f6033260f1ec187e753ecc91208f
-  data.tar.gz: 68f6f9aa0fd6d3241b14a500455fb42463ade10c
+  metadata.gz: 76cad00122eedaa52d97d989e130faff4a9ce0eb
+  data.tar.gz: c1883158b04f85e3315814b54a69cb2d7db801a5
 SHA512:
-  metadata.gz: 960510c878e491bb88f1035ca7e06d01517284bf347362b030082850feee1bc71bec5a85fcabc5b5d4914883f279df882b21a256cf53f064c87628268a29fc1f
-  data.tar.gz: 959d532e9d72242eb036a39eed10f147cc19dd3b02ef44fa8affba4f41d4bcf47cfe2ddbc5edbcae7b36f381ad0223f849d96f47c6ee0309ede20ca333499693
+  metadata.gz: 62176c3dc63b501089916f75761c6a715589f026f90eac885c01873c1b1109f6dc49d2797e418faaa93aceb0741deddb8454fadc1af08ff621e1082a3f5468e1
+  data.tar.gz: 5ccba7537d9cb5b6cc72b4594154af643c14fc92d679b69da2fe976f7bc7da7f05b66aa38dcf37dffe10567525f0568c79a4e4c951ab7019448df4b949e5a6b7

data/lib/couchbase-id/generator.rb

@@ -38,18 +38,18 @@ module CouchbaseId
                 #
                 # Generate the id (incrementing values as required)
                 #
-                overflow = @@__overflow__ ||= self.class.bucket.get("#{@@__class_name__}:#{CLUSTER_ID}:overflow", :quiet => true) # Don't error if not there
-                count = self.class.bucket.incr("#{@@__class_name__}:#{CLUSTER_ID}:count", :create => true)     # This models current id count
+                overflow = self.class.__overflow__ ||= self.class.bucket.get("#{self.class.__class_name__}:#{CLUSTER_ID}:overflow", :quiet => true) # Don't error if not there
+                count = self.class.bucket.incr("#{self.class.__class_name__}:#{CLUSTER_ID}:count", :create => true)     # This models current id count
                 if count == 0 || overflow.nil?
                     overflow ||= 0
                     overflow += 1
                     # We shouldn't need to worry about concurrency here due to the size of count
                     # Would require ~18446744073709551615 concurrent writes
-                    self.class.bucket.set("#{@@__class_name__}:#{CLUSTER_ID}:overflow", overflow)
-                    @@__overflow__ = overflow
+                    self.class.bucket.set("#{self.class.__class_name__}:#{CLUSTER_ID}:overflow", overflow)
+                    self.class.__overflow__ = overflow
                 end
                 
-                self.id = @@__class_id_generator__.call(overflow, count)
+                self.id = self.class.__class_id_generator__.call(overflow, count)
                 
                 
                 #
@@ -63,21 +63,28 @@ module CouchbaseId
                 while self.class.bucket.get(self.id, :quiet => true).present?
                     # Set in-case we are here due to a crash (concurrency is not an issue)
                     # Note we are not incrementing the @__overflow__ variable
-                    self.class.bucket.set("#{@@__class_name__}:#{CLUSTER_ID}:overflow", overflow + 1)
-                    count = self.class.bucket.incr("#{@@__class_name__}:#{CLUSTER_ID}:count")               # Increment just in case (attempt to avoid infinite loops)
+                    self.class.bucket.set("#{self.class.__class_name__}:#{CLUSTER_ID}:overflow", overflow + 1)
+                    count = self.class.bucket.incr("#{self.class.__class_name__}:#{CLUSTER_ID}:count")               # Increment just in case (attempt to avoid infinite loops)
                     
                     # Reset the overflow
-                    if @@__overflow__ == overflow
-                        @@__overflow__ = nil
+                    if self.class.__overflow__ == overflow
+                        self.class.__overflow__ = nil
                     end
 
                     # Generate the new id
-                    self.id = @@__class_id_generator__.call(overflow + 1, count)
+                    self.id = self.class.__class_id_generator__.call(overflow + 1, count)
                 end
             end
         end
 
         def self.included(base)
+            class << base
+                attr_accessor :__overflow__
+                attr_accessor :__class_id_generator__
+                attr_accessor :__class_name__
+            end
+
+
             base.class_eval do
                 #
                 # Best case we have 18446744073709551615 * 18446744073709551615 model entries for each database cluster
@@ -89,7 +96,7 @@ module CouchbaseId
 
                 def self.default_class_id_generator(overflow, count)
                     id = Radix.convert([overflow, CLUSTER_ID].join.to_i, B10, B65) + Radix.convert(count, B10, B65)
-                    "#{@__class_name__}-#{id}"
+                    "#{self.__class_name__}-#{id}"
                 end
 
                 #
@@ -97,14 +104,14 @@ module CouchbaseId
                 #
                 def self.set_class_id_generator(callback = nil, &block)
                     callback ||= block
-                    @__class_id_generator__ = callback
+                    self.__class_id_generator__ = callback
                 end
 
                 #
                 # Configure class level variables
-                @__overflow__ = nil
-                @__class_id_generator__ = method(:default_class_id_generator)
-                @__class_name__ = self.name.underscore.gsub(/\/|_/, '-')      # The included classes name
+                base.__overflow__ = nil
+                base.__class_id_generator__ = method(:default_class_id_generator)
+                base.__class_name__ = self.name.underscore.gsub(/\/|_/, '-')      # The included classes name
             end
         end
     end # END:: Generator

data/lib/couchbase-id/version.rb

@@ -1,3 +1,3 @@
 module CouchbaseId
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-id
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Stephen von Takach