ree_lib 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84e4aade5b4eaae42f95c7664db6dd35ea318caf734d2890482d8e6d8fec060a
-  data.tar.gz: 65969441395458b1520c85e1f71dc610e8d2787a1c2cdcc493477eff93c0fa9a
+  metadata.gz: '0384a60b8e6da77137b281c223ae80df078ad10389876fb719bd6eb7264f305c'
+  data.tar.gz: 3771e23d3f69dbb9ba8ff56375b35ee039b92c2132e0398912e32677754f444b
 SHA512:
-  metadata.gz: a486a292e460edfd1ffb3304d7168ae8f5c9c615c6ae2b32dce08fa661f76f081b9082faa35b5077b43dc28fa0aa39dfb9eb7917fada4736e94cf7c0bbbc2260
-  data.tar.gz: 6582341e1519c1e06261d1c1e8faa85106e26c12ea4afe7f2a6788fcbf5d19f2c14c39e32b3f29e4ffa7c1bceba052608cbc5d9fdd39245ca09dbcf031dcd12b
+  metadata.gz: b0e8d42f124e6252ce81fc64a7980c22c85e252ebdcedb5130fcaa53fda721d80c87804e33926251e5da9b753389593252309e5c09a9df4a769399084b0c158d
+  data.tar.gz: a8c6acc47b934e848ef7a98ad579b114cd8988bb78872ef5f2c616638e1e6cbe2d64a5618d6efd8fd5dd1ee1000397bab178fe16948617dff574cfa594eb3cf8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.29)
+    ree_lib (1.0.30)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -36,9 +36,9 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
-    nokogiri (1.14.0-x86_64-darwin)
+    nokogiri (1.14.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.0-x86_64-linux)
+    nokogiri (1.14.1-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.5)
@@ -46,7 +46,7 @@ GEM
     racc (1.6.2)
     rainbow (3.1.1)
     rake (13.0.6)
-    ree (1.0.18)
+    ree (1.0.22)
       commander (~> 4.6.0)
     rexml (3.2.5)
     rollbar (3.3.3)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/dataset_extensions.rb

@@ -110,29 +110,20 @@ module ReeDao
         nil
       end
 
-      def update(entity)
-        if opts[:schema_mapper]
-          raw = opts[:schema_mapper].db_dump(entity)
-          raw = extract_changes(entity, raw)
-
-          unless raw.empty?
-            update_persistence_state(entity, raw)
-            key_condition = prepare_key_condition_from_entity(entity)
-            where(key_condition).__original_update(raw)
-          end
+      def update(hash_or_entity)
+        return __original_update(hash_or_entity) if !opts[:schema_mapper]
+        return __original_update(hash_or_entity) if hash_or_entity.is_a?(Hash)
 
-          entity
-        else
-          __original_update(entity)
-        end
-      end
+        raw = opts[:schema_mapper].db_dump(hash_or_entity)
+        raw = extract_changes(hash_or_entity, raw)
 
-      def update_where(conditions)
-        __original_update(conditions)
-      end
+        unless raw.empty?
+          update_persistence_state(hash_or_entity, raw)
+          key_condition = prepare_key_condition_from_entity(hash_or_entity)
+          where(key_condition).__original_update(raw)
+        end
 
-      def delete_where(conditions)
-        __original_delete(conditions)
+        hash_or_entity
       end
 
       def naked_first
@@ -143,13 +134,12 @@ module ReeDao
         __original_last
       end
 
-      def delete(entity = nil)
-        if entity
-          key_condition = prepare_key_condition_from_entity(entity)
-          where(key_condition).__original_delete
-        else
-          __original_delete
-        end
+      def delete(hash_or_entity = nil)
+        return __original_delete if hash_or_entity.nil?
+        return where(hash_or_entity).__original_delete if hash_or_entity.is_a?(Hash)
+
+        key_condition = prepare_key_condition_from_entity(hash_or_entity)
+        where(key_condition).__original_delete
       end
 
       def with_lock

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection_spec.rb

@@ -227,4 +227,88 @@ RSpec.describe :build_sqlite_connection do
       expect(dao.count).to eq(1)
     }
   end
+
+  context "update by condition" do
+    it {
+      dao.delete_all
+
+      user = ReeDaoTest::User.new(name: 'John', age: 30)
+      other_user = ReeDaoTest::User.new(name: 'Steve', age: 30)
+      dao.put(user)
+      dao.put(other_user)
+
+      dao.where(name: 'John').update(name: 'Doe')
+
+      user = dao.find(user.id)
+      other_user = dao.find(other_user.id)
+      expect(user.name).to eq('Doe')
+      expect(other_user.name).to eq('Steve')
+    }
+  end
+
+  context "uodate by entity" do
+    it {
+      dao.delete_all
+
+      user = ReeDaoTest::User.new(name: 'John', age: 30)
+      dao.put(user)
+
+      user.name = 'Doe'
+
+      dao.where(name: 'John').update(user)
+
+      user = dao.find(user.id)
+      expect(user.name).to eq('Doe')
+    }
+  end
+
+  context "delete by condition" do
+    it {
+      dao.delete_all
+
+      user = ReeDaoTest::User.new(name: 'John', age: 30)
+      other_user = ReeDaoTest::User.new(name: 'Steve', age: 30)
+
+      dao.put(user)
+      dao.put(other_user)
+
+      dao.where(name: 'John').delete(name: 'John')
+
+      user = dao.find(user.id)
+      other_user = dao.find(other_user.id)
+
+      expect(user).to eq(nil)
+      expect(other_user.id).to be_a(Integer)
+    }
+  end
+
+  context "delete by entity" do
+    it {
+      dao.delete_all
+
+      user = ReeDaoTest::User.new(name: 'John', age: 30)
+      dao.put(user)
+
+      user.name = 'Doe'
+
+      dao.where(name: 'John').delete(user)
+
+      user = dao.find(user.id)
+      expect(user).to eq(nil)
+    }
+
+    it {
+      dao.delete_all
+
+      user = ReeDaoTest::User.new(name: 'John', age: 30)
+      dao.put(user)
+
+      user.name = 'Doe'
+
+      dao.delete(user)
+
+      user = dao.find(user.id)
+      expect(user).to eq(nil)
+    }
+  end
 end

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.29"
+  VERSION = "1.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree