couchbase-orm 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f2b06085f930736b6220efb0e13013cc287a7891
-  data.tar.gz: b078737e87c3d752b317471fdf36b750b3a0d37d
+SHA256:
+  metadata.gz: 8d5a44e4dcc24a7d2e0d4dfdac8ea6cf2657cbf8cd2edf6499ab8ac002b82192
+  data.tar.gz: ff4554e430770fc9d69f83247e6089ed8ec2874afd2f5cc3543bd21ef7c9ae5c
 SHA512:
-  metadata.gz: e9e09cdc7885a995e5abff1dcd8282f1fda44060bda39d9690a1fc3a7ca909bc074816fecfde8e31cbbfd58ee582ef56de44f13b4d94991dc89fb9aa21a82d3e
-  data.tar.gz: d4bbe1ca233678304c2e1f811140f970ee796031483d5bdcfe50d228994d5158d6053223b25278ea0bc270acb0f39d4aced787dc6f3b4280230ed24a2bfefce6
+  metadata.gz: 50bf631a6df22796e99a6fc7a6d1c49b1a00dd19fbbab58e4035286b2388fb597168b2cdbfd335f8a6f89028526ac7f47c005d30d49aac19064b6d7bd67d87b4
+  data.tar.gz: 1b2c61ce24033f54779fa56e5ef51e3c12a9f8c3e603fa8b00c4b7837db5289d032a2041b4e72d45dc032383fe6d8d710c822a1814bac75ad3be03269c36dc87

data/.travis.yml

@@ -14,8 +14,8 @@ before_install:
   - git submodule update --init --recursive
   - gem install ffi
   - sudo apt-get install libev-dev python-httplib2
-  - sudo wget https://packages.couchbase.com/releases/5.0.0/couchbase-server-enterprise_5.0.0-ubuntu14.04_amd64.deb
-  - sudo dpkg -i couchbase-server-enterprise_5.0.0-ubuntu14.04_amd64.deb
+  - sudo wget https://packages.couchbase.com/releases/5.1.0/couchbase-server-enterprise_5.1.0-ubuntu14.04_amd64.deb
+  - sudo dpkg -i couchbase-server-enterprise_5.1.0-ubuntu14.04_amd64.deb
   - sleep 8
   - sudo service couchbase-server status
   - /opt/couchbase/bin/couchbase-cli cluster-init -c 127.0.0.1:8091 --cluster-username=admin --cluster-password=password --cluster-ramsize=320 --cluster-index-ramsize=256 --cluster-fts-ramsize=256 --services=data,index,query,fts

data/lib/couchbase-orm/persistence.rb

@@ -165,14 +165,22 @@ module CouchbaseOrm
 
             assign_attributes(hash)
 
-            # Ensure the type is set
-            @__attributes__[:type] = self.class.design_document
-            @__attributes__.delete(:id)
-
-            options = {}
+            options = {extended: true}
             options[:cas] = @__metadata__.cas if with_cas
 
-            resp = self.class.bucket.replace(_id, @__attributes__, **options)
+            # There is a limit of 16 subdoc operations per request
+            resp = if hash.length <= 16
+                subdoc = self.class.bucket.subdoc(_id)
+                hash.each do |key, value|
+                    subdoc.dict_upsert(key, value)
+                end
+                subdoc.execute!(options)
+            else
+                # Fallback to writing the whole document
+                @__attributes__[:type] = self.class.design_document
+                @__attributes__.delete(:id)
+                self.class.bucket.replace(_id, @__attributes__, **options)
+            end
 
             # Ensure the model is up to date
             @__metadata__.key = resp.key

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

@@ -98,7 +98,17 @@ 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)
-                record.class.bucket.delete(original_key, quiet: true) if original_key
+
+                if original_key
+                    check_ref_id = record.class.bucket.get(original_key, extended: true, quiet: true)
+                    if check_ref_id && check_ref_id.value == record.id
+                        begin
+                            record.class.bucket.delete(original_key, cas: check_ref_id.cas)
+                        rescue ::Libcouchbase::Error::KeyExists
+                            # Errors here can be ignored. Just means the key was updated elswhere
+                        end
+                    end
+                end
 
                 unless presence == false && attrs.length == 1 && record[attrs[0]].nil?
                     record.class.bucket.set(record.send(bucket_key_method), record.id, plain: true)
@@ -109,7 +119,14 @@ module CouchbaseOrm
             # cleanup by removing the bucket key before the record is deleted
             # TODO: handle unpersisted, modified component values
             before_destroy do |record|
-                record.class.bucket.delete(record.send(bucket_key_method), quiet: true)
+                check_ref_id = record.class.bucket.get(record.send(bucket_key_method), extended: true, quiet: true)
+                if check_ref_id && check_ref_id.value == record.id
+                    begin
+                        record.class.bucket.delete(record.send(bucket_key_method), cas: check_ref_id.cas)
+                    rescue ::Libcouchbase::Error::KeyExists
+                        # Errors here can be ignored. Just means the key was updated elswhere
+                    end
+                end
                 true
             end
 

data/lib/couchbase-orm/version.rb

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

data/spec/index_spec.rb

@@ -9,6 +9,13 @@ class IndexTest < CouchbaseOrm::Base
     ensure_unique :email, presence: false
 end
 
+class NoUniqueIndexTest < CouchbaseOrm::Base
+    attribute :email, type: String
+    attribute :name,  type: String, default: :joe
+
+    index :email, presence: false
+end
+
 class EnumTest < CouchbaseOrm::Base
     enum visibility: [:group, :authority, :public], default: :authority
 end
@@ -92,4 +99,40 @@ describe CouchbaseOrm::Index do
         expect(enum.visibility).to eq(2)
         enum.destroy
     end
+
+    it "should not overwrite index's that do not belong to the current model" do
+        joe = NoUniqueIndexTest.create!
+        expect(NoUniqueIndexTest.find_by_email(nil)).to eq(nil)
+
+        joe.email = 'joe@aca.com'
+        joe.save!
+        expect(NoUniqueIndexTest.find_by_email('joe@aca.com')).to eq(joe)
+
+        joe2 = NoUniqueIndexTest.create!
+        joe2.email = 'joe@aca.com' # joe here is deliberate
+        joe2.save!
+
+        expect(NoUniqueIndexTest.find_by_email('joe@aca.com')).to eq(joe2)
+
+        # Joe's indexing should not remove joe2 index
+        joe.email = nil
+        joe.save!
+        expect(NoUniqueIndexTest.find_by_email('joe@aca.com')).to eq(joe2)
+
+        # Test destroy
+        joe.email = 'joe@aca.com'
+        joe.save!
+        expect(NoUniqueIndexTest.find_by_email('joe@aca.com')).to eq(joe)
+
+        # Index should not be updated
+        joe2.destroy
+        expect(NoUniqueIndexTest.find_by_email('joe@aca.com')).to eq(joe)
+
+        # index should be updated
+        joe.email = nil
+        joe.save!
+        expect(NoUniqueIndexTest.find_by_email('joe@aca.com')).to eq(nil)
+
+        joe.destroy
+    end
 end

data/spec/views_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 require File.expand_path("../support", __FILE__)
-
+require 'set'
 
 class ViewTest < CouchbaseOrm::Base
     attribute :name, type: String
@@ -68,6 +68,6 @@ describe CouchbaseOrm::Views do
             ob.destroy
         }
 
-        expect(docs).to eq(['bob', 'jane'])
+        expect(Set.new(docs)).to eq(Set.new(['bob', 'jane']))
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-orm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libcouchbase
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Couchbase ORM for Rails