couchbase-id 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a42cd935e03306c97229c948846477f7644036d9
-  data.tar.gz: f5c44e666e4d4f1d7e02315d88abec759aefc16b
+  metadata.gz: 046810f6c16e5260ee2144091c69097392ca0ee2
+  data.tar.gz: 63d197aa49e4422fba7e8c901fbf8333d3c2a793
 SHA512:
-  metadata.gz: d241fe6f412f431c4ca8c65b9b3b7dfe90f1ff111f400cc01ca3e2896cf4545e51e977b74e952687a2886bced0ec383c475f743f7c4bb193a18150546c54aa1b
-  data.tar.gz: 51693ff03b89787c110d4628b709222ddf77b74e1688af71dde7f7986f7bcbae8c559500db9fff5ede74c9817b43066192cb7874e7681f3be4a35ea96ec95e12
+  metadata.gz: 4e043907810bedd9d349bac8483dcda50ee6f3192a3753e55efb0e9ed4c2fcdbceb655cbcfdae0aeff5975c5f981e7f4c9a393036787e11922fa3a289d7c3d38
+  data.tar.gz: 0f64d37efafa4aa8bfa99721e0b677439d0676ea46a608bfa76a4fd1e12deeacf689d3c5b22048bbc8dd95eee5d9530279234a4cb9f566c0ab0a91c4fa2d86aa

data/couchbase-id.gemspec

@@ -13,11 +13,6 @@ Gem::Specification.new do |gem|
     gem.required_ruby_version = '>= 1.9.2'
     gem.require_paths = ['lib']
 
-    if RUBY_PLATFORM == 'java'
-        gem.add_runtime_dependency 'couchbase-jruby-model' # couchbase active model orm
-    else
-        gem.add_runtime_dependency 'couchbase-model' # couchbase active model orm
-    end
     gem.add_runtime_dependency     'radix' # This converts numbers to the unicode representation
 
     gem.add_development_dependency 'rspec', '>= 2.14'

data/lib/couchbase-id/generator.rb

@@ -1,116 +1,116 @@
-#
-# This disables the built in generator, faster then running validations twice
-#  Forces models to include an ID generator
-#
-module Couchbase
-    class Model
-        class UUID
-            def initialize(*args)
-                
-            end
-            
-            def next(*args)
-                nil
-            end
-        end
-    end
-end
-
-#
-# This is our id generator, runs in the before save call back
-#
-module CouchbaseId
-    
-    # NOTE:: incr, decr, append, prepend == atomic
-    module Generator
-        
-
-        # Basic compression using UTF (more efficient for ID's stored as strings)
-        B65 = Radix::Base.new(Radix::BASE::B62 + ['-', '_', '~'])
-        B10 = Radix::Base.new(10)
-
-        # The cluster id this node belongs to (avoids XDCR clashes)
-        CLUSTER_ID ||= ENV['COUCHBASE_CLUSTER'] || 1     # Cluster ID number
-
-        # instance method
-        def generate_id
-            if self.id.nil?                
-                #
-                # Generate the id (incrementing values as required)
-                #
-                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.design_document}:#{CLUSTER_ID}:overflow", overflow)
-                    self.class.__overflow__ = overflow
-                end
-                
-                self.id = self.class.__class_id_generator__.call(overflow, count)
-                
-                
-                #
-                # So an existing id would only be present if:
-                # => something crashed before incrementing the overflow
-                # => this is another request was occurring before the overflow is incremented
-                #
-                # Basically only the overflow should be able to cause issues, we'll increment the count just to be sure
-                # One would hope this code only ever runs under high load during an overflow event
-                #
-                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.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
-                        self.class.__overflow__ = nil
-                    end
-
-                    # Generate the new id
-                    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__
-            end
-
-
-            base.class_eval do
-                #
-                # 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
-                #
-                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)
-                    "#{self.design_document}-#{id}"
-                end
-
-                #
-                # Override the default hashing function
-                #
-                def self.set_class_id_generator(callback = nil, &block)
-                    callback ||= block
-                    self.__class_id_generator__ = callback
-                end
-
-                #
-                # Configure class level variables
-                base.__overflow__ = nil
-                base.__class_id_generator__ = method(:default_class_id_generator)
-            end
-        end
-    end # END:: Generator
-end
+#
+# This disables the built in generator, faster then running validations twice
+#  Forces models to include an ID generator
+#
+module Couchbase
+    class Model
+        class UUID
+            def initialize(*args)
+                
+            end
+            
+            def next(*args)
+                nil
+            end
+        end
+    end
+end
+
+#
+# This is our id generator, runs in the before save call back
+#
+module CouchbaseId
+    
+    # NOTE:: incr, decr, append, prepend == atomic
+    module Generator
+        
+
+        # Basic compression using UTF (more efficient for ID's stored as strings)
+        B65 = Radix::Base.new(Radix::BASE::B62 + ['-', '_', '~'])
+        B10 = Radix::Base.new(10)
+
+        # The cluster id this node belongs to (avoids XDCR clashes)
+        CLUSTER_ID ||= ENV['COUCHBASE_CLUSTER'] || 1     # Cluster ID number
+
+        # instance method
+        def generate_id
+            if self.id.nil?                
+                #
+                # Generate the id (incrementing values as required)
+                #
+                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.design_document}:#{CLUSTER_ID}:overflow", overflow)
+                    self.class.__overflow__ = overflow
+                end
+                
+                self.id = self.class.__class_id_generator__.call(overflow, count)
+                
+                
+                #
+                # So an existing id would only be present if:
+                # => something crashed before incrementing the overflow
+                # => this is another request was occurring before the overflow is incremented
+                #
+                # Basically only the overflow should be able to cause issues, we'll increment the count just to be sure
+                # One would hope this code only ever runs under high load during an overflow event
+                #
+                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.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
+                        self.class.__overflow__ = nil
+                    end
+
+                    # Generate the new id
+                    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__
+            end
+
+
+            base.class_eval do
+                #
+                # 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
+                #
+                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)
+                    "#{self.design_document}-#{id}"
+                end
+
+                #
+                # Override the default hashing function
+                #
+                def self.set_class_id_generator(callback = nil, &block)
+                    callback ||= block
+                    self.__class_id_generator__ = callback
+                end
+
+                #
+                # Configure class level variables
+                base.__overflow__ = nil
+                base.__class_id_generator__ = method(:default_class_id_generator)
+            end
+        end
+    end # END:: Generator
+end

data/lib/couchbase-id/version.rb

@@ -1,3 +1,3 @@
-module CouchbaseId
-    VERSION = '1.0.7'
-end
+module CouchbaseId
+    VERSION = '1.0.8'
+end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-id
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Stephen von Takach
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: couchbase-model
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
+  name: radix
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: radix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.14'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.1'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
+  type: :development
 description: Overwrites the existing couchbase-model id implementation
 email:
 - steve@cotag.me
@@ -88,9 +74,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- lib/couchbase-id.rb
 - lib/couchbase-id/generator.rb
 - lib/couchbase-id/version.rb
-- lib/couchbase-id.rb
 - Rakefile
 - couchbase-id.gemspec
 - README.md
@@ -99,25 +85,24 @@ homepage: https://github.com/cotag/couchbase-id
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Couchbase ID generator with XDCR support
 test_files: []
-has_rdoc: