ree_lib 1.0.28 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dee10604487127cc63af20d01924626af8cdd4e5559a1b8716d2065f2ef0c95
-  data.tar.gz: 742e3d4ec4990eb9989cf904e7fb3eb5ed4eb6d06e5c3791a3188f1ec22cc7b5
+  metadata.gz: '0384a60b8e6da77137b281c223ae80df078ad10389876fb719bd6eb7264f305c'
+  data.tar.gz: 3771e23d3f69dbb9ba8ff56375b35ee039b92c2132e0398912e32677754f444b
 SHA512:
-  metadata.gz: 54aa51badb91b3b3dba8ff6429d3f219bb17e099fb22b0202b6a8a72a65ab0425c56d5237df5fb7a27b8622db2a3f7b453162a6a7d2fc4681acb5c4bda2f840b
-  data.tar.gz: 75729a0e3b80a7e57e18ba4a3c45a41a96d31dab16868e168e4a31e564166f32b2783ee16c0f4e27412c4edb56d01795875ca5e4d153159d68d71fa961aa3c2e
+  metadata.gz: b0e8d42f124e6252ce81fc64a7980c22c85e252ebdcedb5130fcaa53fda721d80c87804e33926251e5da9b753389593252309e5c09a9df4a769399084b0c158d
+  data.tar.gz: a8c6acc47b934e848ef7a98ad579b114cd8988bb78872ef5f2c616638e1e6cbe2d64a5618d6efd8fd5dd1ee1000397bab178fe16948617dff574cfa594eb3cf8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.28)
+    ree_lib (1.0.30)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -22,7 +22,7 @@ GEM
       msgpack (~> 1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -36,9 +36,9 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
-    nokogiri (1.13.10-x86_64-darwin)
+    nokogiri (1.14.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-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.14)
+    ree (1.0.22)
       commander (~> 4.6.0)
     rexml (3.2.5)
     rollbar (3.3.3)
@@ -66,7 +66,7 @@ GEM
     sequel (5.58.0)
     sqlite3 (1.4.4)
     timecop (0.9.6)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)

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/package/ree_dao/functions/build_pg_connection.rb

@@ -25,6 +25,7 @@ class ReeDao::BuildPgConnection
       sslrootcert?: String,
       search_path?: String,
       use_iso_date_format?: Bool,
+      max_connections?: Integer,
     },
     Ksplat[
       RestKeys => Any # inherited from `build_connection` opts

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_sqlite_connection.rb

@@ -13,6 +13,7 @@ class ReeDao::BuildSqliteConnection
       database: String,
       readonly?: Bool,
       timeout?: Integer,
+      max_connections?: Integer,
     },
     Ksplat[
       RestKeys => Any # inherited from `build_connection` opts

data/lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_pg_connection.schema.json

@@ -16,7 +16,7 @@
       "args": [
         {
           "arg": "conn_opts",
-          "type": "{:conn_str? => String, :adapter => String, :database? => String, :encoding? => String, :user? => String, :password? => String, :host? => String, :port? => String, :convert_infinite_timestamps? => Or[string, nil, float], :connect_timeout? => Integer, :driver_options? => Hash, :notice_receiver? => Proc, :sslmode? => Or[disable, allow, prefer, require, verify-ca, verify-full...], :sslrootcert? => String, :search_path? => String, :use_iso_date_format? => Bool}"
+          "type": "{:conn_str? => String, :adapter => String, :database? => String, :encoding? => String, :user? => String, :password? => String, :host? => String, :port? => String, :convert_infinite_timestamps? => Or[string, nil, float], :connect_timeout? => Integer, :driver_options? => Hash, :notice_receiver? => Proc, :sslmode? => Or[disable, allow, prefer, require, verify-ca, verify-full...], :sslrootcert? => String, :search_path? => String, :use_iso_date_format? => Bool, :max_connections? => Integer}"
         },
         {
           "arg": "opts",

data/lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_sqlite_connection.schema.json

@@ -16,7 +16,7 @@
       "args": [
         {
           "arg": "conn_opts",
-          "type": "{:database => String, :readonly? => Bool, :timeout? => Integer}"
+          "type": "{:database => String, :readonly? => Bool, :timeout? => Integer, :max_connections? => Integer}"
         },
         {
           "arg": "opts",

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection/max_connections_spec.rb

@@ -0,0 +1,10 @@
+package_require('ree_dao')
+
+RSpec.describe :build_sqlite_connection do
+  link :build_sqlite_connection, from: :ree_dao
+
+  it {
+    db = build_sqlite_connection({database: 'sqlite_db', max_connections: 2})
+    expect(db.pool.max_size).to eq 2
+  }
+end

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.28"
+  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.28
+  version: 1.0.30
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -260,6 +260,7 @@ files:
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/one_to_one.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/persist_assoc.schema.json
 - lib/ree_lib/packages/ree_dao/spec/package_schema_spec.rb
+- lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection/max_connections_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/build_sqlite_connection_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/one_to_many_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/one_to_one_spec.rb