couchbase-id 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76cad00122eedaa52d97d989e130faff4a9ce0eb
-  data.tar.gz: c1883158b04f85e3315814b54a69cb2d7db801a5
+  metadata.gz: 17a624b57deb062a71a3d26c05d8002508e9397d
+  data.tar.gz: eecf62f4e9f3385252796cea40dee43035588792
 SHA512:
-  metadata.gz: 62176c3dc63b501089916f75761c6a715589f026f90eac885c01873c1b1109f6dc49d2797e418faaa93aceb0741deddb8454fadc1af08ff621e1082a3f5468e1
-  data.tar.gz: 5ccba7537d9cb5b6cc72b4594154af643c14fc92d679b69da2fe976f7bc7da7f05b66aa38dcf37dffe10567525f0568c79a4e4c951ab7019448df4b949e5a6b7
+  metadata.gz: 5ea51e602a1522fe81ee1b76e11ccdd721a651f19081342bb32fd02d00b68eb95cae1fc7dd605311af1e3e16bebc3fda4f5e513bdc2f9554b0286660ce910c8f
+  data.tar.gz: 42525f06fc2df7cf0008c095b936870764ac25bea5270f11f683e29a7eed12f144968e185aa4f09271a083194b79d4e0df5360f3192b29131fb08f633979855c

data/lib/couchbase-id/generator.rb

@@ -38,14 +38,14 @@ module CouchbaseId
                 #
                 # Generate the id (incrementing values as required)
                 #
-                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
+                overflow = self.class.__overflow__ ||= self.class.bucket.get("#{self.class.design_document}:#{CLUSTER_ID}:overflow", :quiet => true) # Don't error if not there
+                count = self.class.bucket.incr("#{self.class.design_document}:#{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("#{self.class.__class_name__}:#{CLUSTER_ID}:overflow", overflow)
+                    self.class.bucket.set("#{self.class.design_document}:#{CLUSTER_ID}:overflow", overflow)
                     self.class.__overflow__ = overflow
                 end
                 
@@ -63,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("#{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)
+                    self.class.bucket.set("#{self.class.design_document}:#{CLUSTER_ID}:overflow", overflow + 1)
+                    count = self.class.bucket.incr("#{self.class.design_document}:#{CLUSTER_ID}:count")               # Increment just in case (attempt to avoid infinite loops)
                     
                     # Reset the overflow
                     if self.class.__overflow__ == overflow
@@ -81,7 +81,6 @@ module CouchbaseId
             class << base
                 attr_accessor :__overflow__
                 attr_accessor :__class_id_generator__
-                attr_accessor :__class_name__
             end
 
 
@@ -96,7 +95,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)
-                    "#{self.__class_name__}-#{id}"
+                    "#{self.design_document}-#{id}"
                 end
 
                 #
@@ -111,7 +110,6 @@ module CouchbaseId
                 # Configure class level variables
                 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.4'
+    VERSION = '1.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-id
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase-model