couchbase-orm 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6b544f90684482165751da680f83f674fd3241a
-  data.tar.gz: 94f1a789ec55e715ebdcd11bd5ae1f823f760934
+  metadata.gz: 30ece0939354be24d837389441c065a99526b79e
+  data.tar.gz: 152e0ab95ae5b843e8c3aeb4d697f863666759b2
 SHA512:
-  metadata.gz: 9e61eaa42f447b675ee46a6853a3329d1e25ee397c1cd36d4fec588c187c4f2d8a6963bc94c37c429d8e05ea6cbfcdd86e56668d2680ddb04528e299d06e3f75
-  data.tar.gz: a77601b7fa9b369a3beb0d214d0e736a9c7691cd6341585791cc1e49d0e9683d3af91228954923a84d5bafe2050afab12c49f7e996a00b141ffb6a631d427bfb
+  metadata.gz: 3a00046733b74236cb88e68075b1eecaa6c54a65696daace7847b643c871221647c07aff574d36b011a848142260f17ff54a8489d81c7a14b832603c503005b4
+  data.tar.gz: 92d43d339fb8af9c4d07113d55868d17c766a037d2cf3c7ec04ae5db6b33434df7a6dbf1a27135c66c2d9fc0466287848383e7d8e12be841446592d4389e481e

data/couchbase-orm.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
     gem.required_ruby_version = '>= 2.1.0'
     gem.require_paths = ["lib"]
 
-    gem.add_runtime_dependency     'libcouchbase', '~> 0.0'
+    gem.add_runtime_dependency     'libcouchbase', '~> 0.1'
     gem.add_runtime_dependency     'activemodel',  '~> 5.0'
     gem.add_runtime_dependency     'radix',        '~> 2.2' # converting numbers to and from any base
 

data/lib/couchbase-orm.rb

@@ -10,10 +10,8 @@ module CouchbaseOrm
 
     def self.try_load(id)
         result = nil
-        ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-            result = id.respond_to?(:cas) ? id : CouchbaseOrm::Base.bucket.get(id, quiet: true, extended: true)
-        end
-        
+        result = id.respond_to?(:cas) ? id : CouchbaseOrm::Base.bucket.get(id, quiet: true, extended: true)
+
         if result && result.value.is_a?(Hash) && result.value[:type]
             ddoc = result.value[:type]
             ::CouchbaseOrm::Base.descendants.each do |model|

data/lib/couchbase-orm/base.rb

@@ -52,11 +52,6 @@ module CouchbaseOrm
                 @bucket ||= Connection.bucket
             end
 
-            at_exit do
-                # This will disconnect the database connection
-                @bucket = nil
-            end
-
             def uuid_generator
                 @uuid_generator ||= IdGenerator
             end
@@ -102,12 +97,8 @@ module CouchbaseOrm
                     raise Libcouchbase::Error::EmptyKey, 'no id(s) provided'
                 end
 
-                records = nil
-                ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                    records = bucket.get(*ids, **options)
-                end
-
-                records = records.is_a?(Array) ? records : [records]
+                record = bucket.get(*ids, **options)
+                records = record.is_a?(Array) ? record : [record]
                 records.map! { |record|
                     if record
                         self.new(record)
@@ -126,11 +117,7 @@ module CouchbaseOrm
             alias_method :[], :find_by_id
 
             def exists?(id)
-                val = false
-                ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                    val = bucket.get(id, quiet: true).nil?
-                end
-                !val
+                !bucket.get(id, quiet: true).nil?
             end
             alias_method :has_key?, :exists?
         end
@@ -280,7 +267,12 @@ module CouchbaseOrm
         #
         # Returns a boolean.
         def ==(other)
-            hash == other.hash
+            case other
+            when self.class
+                hash == other.hash
+            else
+                false
+            end
         end
     end
 end

data/lib/couchbase-orm/connection.rb

@@ -12,11 +12,5 @@ module CouchbaseOrm
         def self.bucket
             @bucket ||= ::Libcouchbase::Bucket.new(**@options)
         end
-
-        # This will disconnect the database connection,
-        # allowing the application to exit
-        at_exit do
-            @bucket = nil
-        end
     end
 end

data/lib/couchbase-orm/persistence.rb

@@ -99,9 +99,7 @@ module CouchbaseOrm
         # The record is simply removed, no callbacks are executed.
         def delete(with_cas: false, **options)
             options[:cas] = @__metadata__.cas if with_cas
-            ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                self.class.bucket.delete(@__metadata__.key, options)
-            end
+            self.class.bucket.delete(@__metadata__.key, options)
 
             @__metadata__.key = nil
             @id = nil
@@ -123,9 +121,7 @@ module CouchbaseOrm
                 destroy_associations!
 
                 options[:cas] = @__metadata__.cas if with_cas
-                ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                    self.class.bucket.delete(@__metadata__.key, options)
-                end
+                self.class.bucket.delete(@__metadata__.key, options)
 
                 @__metadata__.key = nil
                 @id = nil
@@ -176,10 +172,7 @@ module CouchbaseOrm
             options = {}
             options[:cas] = @__metadata__.cas if with_cas
 
-            resp = nil
-            ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                resp = self.class.bucket.replace(_id, @__attributes__, **options)
-            end
+            resp = self.class.bucket.replace(_id, @__attributes__, **options)
 
             # Ensure the model is up to date
             @__metadata__.key = resp.key
@@ -196,10 +189,7 @@ module CouchbaseOrm
             key = @__metadata__.key
             raise "unable to reload, model not persisted" unless key
 
-            resp = nil
-            ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                resp = self.class.bucket.get(key, quiet: false, extended: true)
-            end
+            resp = self.class.bucket.get(key, quiet: false, extended: true)
             @__attributes__ = ::ActiveSupport::HashWithIndifferentAccess.new(resp.value)
             @__metadata__.key = resp.key
             @__metadata__.cas = resp.cas
@@ -211,10 +201,7 @@ module CouchbaseOrm
 
         # Updates the TTL of the document
         def touch(**options)
-            res = nil
-            ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                res = self.class.bucket.touch(@__metadata__.key, async: false, **options)
-            end
+            res = self.class.bucket.touch(@__metadata__.key, async: false, **options)
             @__metadata__.cas = resp.cas
             self
         end
@@ -236,10 +223,7 @@ module CouchbaseOrm
                     _id = @__metadata__.key
                     options[:cas] = @__metadata__.cas if with_cas
 
-                    resp = nil
-                    ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                        resp = self.class.bucket.replace(_id, @__attributes__, **options)
-                    end
+                    resp = self.class.bucket.replace(_id, @__attributes__, **options)
 
                     # Ensure the model is up to date
                     @__metadata__.key = resp.key
@@ -261,10 +245,7 @@ module CouchbaseOrm
                     @__attributes__.delete(:id)
 
                     _id = @id || self.class.uuid_generator.next(self)
-                    resp = nil
-                    ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                        resp = self.class.bucket.add(_id, @__attributes__, **options)
-                    end
+                    resp = self.class.bucket.add(_id, @__attributes__, **options)
 
                     # Ensure the model is up to date
                     @__metadata__.key = resp.key

data/lib/couchbase-orm/utilities/index.rb

@@ -50,18 +50,13 @@ module CouchbaseOrm
             # use the bucket key as an index - lookup records by attr values
             define_singleton_method(find_by_method) do |*values|
                 key = self.send(class_bucket_key_method, *values)
-                id  = nil
-                ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                    id = self.bucket.get(key, quiet: true)
-                end
+                id = self.bucket.get(key, quiet: true)
                 if id
                     mod = self.find_by_id(id)
                     return mod if mod
 
                     # Clean up record if the id doesn't exist
-                    ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                        self.bucket.delete(key, quiet: true)
-                    end
+                    self.bucket.delete(key, quiet: true)
                 end
 
                 nil
@@ -103,14 +98,10 @@ module CouchbaseOrm
             # new one. the id of the current record is used as the key's value.
             after_save do |record|
                 original_key = instance_variable_get(original_bucket_key_var)
-                ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                    record.class.bucket.delete(original_key, quiet: true) if original_key
-                end
+                record.class.bucket.delete(original_key, quiet: true) if original_key
 
                 unless presence == false && attrs.length == 1 && record[attrs[0]].nil?
-                    ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                        record.class.bucket.set(record.send(bucket_key_method), record.id, plain: true)
-                    end
+                    record.class.bucket.set(record.send(bucket_key_method), record.id, plain: true)
                 end
                 instance_variable_set(original_bucket_key_var, nil)
             end
@@ -118,9 +109,7 @@ module CouchbaseOrm
             # cleanup by removing the bucket key before the record is deleted
             # TODO: handle unpersisted, modified component values
             before_destroy do |record|
-                ::ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
-                    record.class.bucket.delete(record.send(bucket_key_method), quiet: true)
-                end
+                record.class.bucket.delete(record.send(bucket_key_method), quiet: true)
                 true
             end
 

data/lib/couchbase-orm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module CouchbaseOrm
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-orm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libcouchbase
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Couchbase ORM for Rails