couchbase-id 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c0049a7aa83f9c40a73745146062faec8f8802a
-  data.tar.gz: 91b16ae8153a4dde5b9538fd2ceef49836738343
+  metadata.gz: 9824a439eb1b63a72d1392d31363bf64a30c4a45
+  data.tar.gz: 91b24dcc39a0c1a68d156d749be3679fdefcbfa5
 SHA512:
-  metadata.gz: 595a593873c6104558ae8bc93e0df7b30d6da9c9cb5b140e6faf1f4c5221e79fe31f90363b2c333622c5fef1b869bfee380a48bdc8fe9605af490d07fd2e3a43
-  data.tar.gz: 3f15376892527018890300b436ba5dac626073d4300430e4cf34012b44c88a482bab33c24a4f441e8aec82b7dfb888aa9fb0cec4ee9cfbc733d1741a893839e0
+  metadata.gz: bd7853709e57a9db2f8c6d7ce5af4271084a6d8e81e174eb4791a5e9e6733bc152426e40a5de5cf9041d63af64bd623b20105e2d1f80c70988598dd436951bfd
+  data.tar.gz: c639955b773352bc788769618004fa088d9b9f37397beccc747326680510439c37333f5a106fd58bf93a82068f1e1ed33435dadceda8f2d82e9e9945bf273006

data/lib/couchbase-id/generator.rb

@@ -34,24 +34,22 @@ module CouchbaseId
 
         # instance method
         def generate_id
-            if self.id.nil?
-                name = "#{self.class.name.underscore.gsub!(/\/|_/, '-')}"      # The included classes name
-                
+            if self.id.nil?                
                 #
                 # Generate the id (incrementing values as required)
                 #
-                overflow = @@__overflow__ ||= self.class.bucket.get("#{name}:#{CLUSTER_ID}:overflow", :quiet => true) # Don't error if not there
-                count = self.class.bucket.incr("#{name}:#{CLUSTER_ID}:count", :create => true)     # This models current id count
+                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
                 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("#{name}:#{CLUSTER_ID}:overflow", overflow)
+                    self.class.bucket.set("#{@@__class_name__}:#{CLUSTER_ID}:overflow", overflow)
                     @@__overflow__ = overflow
                 end
                 
-                self.id = @@__class_id_generator__.call(name, overflow, count)
+                self.id = @@__class_id_generator__.call(overflow, count)
                 
                 
                 #
@@ -65,8 +63,8 @@ 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("#{name}:#{CLUSTER_ID}:overflow", overflow + 1)
-                    count = self.class.bucket.incr("#{name}:#{CLUSTER_ID}:count")               # Increment just in case (attempt to avoid infinite loops)
+                    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)
                     
                     # Reset the overflow
                     if @@__overflow__ == overflow
@@ -74,36 +72,13 @@ module CouchbaseId
                     end
 
                     # Generate the new id
-                    self.id = @@__class_id_generator__.call(name, overflow + 1, count)
+                    self.id = @@__class_id_generator__.call(overflow + 1, count)
                 end
             end
         end
 
-        module ClassMethods
-            def default_class_id_generator(name, overflow, count)
-                id = Radix.convert([overflow, CLUSTER_ID].join.to_i, B10, B65) + Radix.convert(count, B10, B65)
-                "#{name}-#{id}"
-            end
-
-            #
-            # Override the default hashing function
-            #
-            def set_class_id_generator(callback = nil, &block)
-                callback ||= block
-                @@__class_id_generator__ = callback
-            end
-        end
-
         def self.included(base)
-            base.extend(ClassMethods)
-
             base.class_eval do
-                #
-                # Configure class level variables
-                @@__overflow__ ||= nil
-                @@__class_id_generator__ ||= method(:default_class_id_generator)
-
-                
                 #
                 # Best case we have 18446744073709551615 * 18446744073709551615 model entries for each database cluster
                 #  and we can always change the cluster id if this limit is reached
@@ -111,6 +86,25 @@ module CouchbaseId
                 define_model_callbacks :save, :create
                 before_save :generate_id
                 before_create :generate_id
+
+                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}"
+                end
+
+                #
+                # Override the default hashing function
+                #
+                def self.set_class_id_generator(callback = nil, &block)
+                    callback ||= block
+                    @@__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
             end
         end
     end # END:: Generator

data/lib/couchbase-id/version.rb

@@ -1,3 +1,3 @@
 module CouchbaseId
-    VERSION = '1.0.0'
+    VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-id
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase-model