luna_park 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3491b1852cab029d5f1b60cdc9ff638e2eac71a1d366e1463e31b7c6a4afa127
-  data.tar.gz: f0b5abc0af74a11ac5d6e392def3daa5e565ac7ba5033315981013dae3f0734a
+  metadata.gz: '06428c4acf0f2aafb70f1bc68ab52335aab96c64408b1a3bbf12b0bebb840e82'
+  data.tar.gz: 24a00cd21ba73f3ed7244531c981d46ea542c9fb1734c2c67c54f83716064bf0
 SHA512:
-  metadata.gz: 25f821e41e63fcb3bfcc8744ea203b861360126cc7edc12f5032e7153831a514e527ef80e8453fc5b8f24e5bf5f458c88226f1103ab8bcf85249222d4c7355b5
-  data.tar.gz: 903dd8923a134ea14d8f3611e3c803989f976f923e5b251cc65e47bef6cecc923173ae6654f2361ac2cc49190231d7d24c427d4144720abdbd9d0368b5ae386b
+  metadata.gz: 482d49c124763eb9ca7f93225365abc348f5d83b9db98cd6b888304d3c7ecb824a7047f03e5f6eff47ab7c989158538d689b4a116c886d21ecfee2fe3fc97056
+  data.tar.gz: 23ed759b552c29608170b5c29db85e040822b3a546d205f7e8f25564c358f0cf713c7839aafaaa1a81476b74450a010174472933232c220b6b0e150bd6c34227

data/CHANGELOG.md

@@ -4,11 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.13.0] - 2023-06-06
+## [0.13.1] - 2023-12-06
 Changed
 - `Extensions::Repositories::Postgres::Delete` returns boolean
 - DataMapper became more safe: it will raise `MoreThanOneRecord` if `#read_one` received array with multiple items,
   so it will show you your critical logic mistake
+- `Extensions::Repositories::Postgres::Delete#delete` can receive entity, Hash, and can not accept nil pk
 
 Added
 - `DataMapper.mapper` now can receive block instead of class, to describe anonymous mapper;

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    luna_park (0.13.0)
+    luna_park (0.13.1)
 
 GEM
   remote: https://rubygems.org/
@@ -219,4 +219,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.2.30
+   2.3.20

data/lib/luna_park/extensions/data_mapper.rb

@@ -145,7 +145,7 @@ module LunaPark
           @mapper_class
         end
 
-        def __build_entity_coercion__(coercion) # rubocop:disable Metrics/AbcSize
+        def __build_entity_coercion__(coercion)
           return entity_class.method(coercion) if coercion.is_a? Symbol
           return coercion                      if coercion.respond_to?(:call)
 
@@ -154,7 +154,7 @@ module LunaPark
           infer_entity_coercion
         end
 
-        def infer_entity_coercion # rubocop:disable Metrics/AbcSize
+        def infer_entity_coercion
           return entity_class.method(:call) if entity_class.respond_to?(:call)
           return entity_class.method(:wrap) if entity_class.respond_to?(:wrap)
 
@@ -179,13 +179,13 @@ module LunaPark
         end
 
         def primary_key(attr)
-          @primary_key_attr = attr
+          @row_primary_key = attr
         end
 
         DEFAULT_PRIMARY_KEY = :id
 
-        def primary_key_attr
-          @primary_key_attr || DEFAULT_PRIMARY_KEY
+        def row_primary_key
+          @row_primary_key || DEFAULT_PRIMARY_KEY
         end
 
         def __define_constants__(not_found: LunaPark::Extensions::DataMapper::NotFound)
@@ -201,6 +201,7 @@ module LunaPark
           klass.__define_constants__(not_found: NotFound)
           klass.entity entity_class, __entity_coercion__
           klass.mapper mapper_class
+          klass.primary_key row_primary_key
           super
         end
 
@@ -264,7 +265,7 @@ module LunaPark
         #   end
         #
         def found!(value, not_found_by: nil)
-          return value unless value.nil?
+          return value unless value.nil? || value.respond_to?(:empty?) && value.empty?
 
           raise self.class::NotFound.new name: self.class.entity_class.name, by: not_found_by
         end
@@ -385,7 +386,7 @@ module LunaPark
         # Read config
 
         def primary_key
-          self.class.primary_key_attr
+          self.class.row_primary_key
         end
 
         # Factory Methods

data/lib/luna_park/extensions/repositories/postgres/create.rb

@@ -5,7 +5,7 @@ module LunaPark
     module Repositories
       module Postgres
         module Create
-          def create(input)
+          def create(input, **scope_opts)
             entity = wrap(input)
 
             time = Time.now
@@ -13,7 +13,7 @@ module LunaPark
             entity.updated_at = time if entity.respond_to?(:updated_at)
 
             row       = to_row(entity)
-            new_row   = dataset.returning.insert(row).first
+            new_row   = scoped(**scope_opts).returning.insert(row).first
             new_attrs = from_row(new_row)
 
             entity.set_attributes(new_attrs)

data/lib/luna_park/extensions/repositories/postgres/delete.rb

@@ -5,8 +5,16 @@ module LunaPark
     module Repositories
       module Postgres
         module Delete
-          def delete(uid)
-            dataset.where(primary_key => uid).delete.positive?
+          def delete(input, **scope_opts)
+            pk_value = case input
+                       when self.class.entity_class then input.public_send(primary_key)
+                       when Hash                    then input[primary_key]
+                       else input
+                       end
+
+            raise ArgumentError, "primary key '#{primary_key}' value can't be nil" if pk_value.nil?
+
+            scoped(**scope_opts).where(primary_key => pk_value).delete.positive?
           end
         end
       end

data/lib/luna_park/extensions/repositories/postgres/read.rb

@@ -25,6 +25,15 @@ module LunaPark
             read_one scoped(**scope).where(primary_key => pk_value)
           end
 
+          def reload!(entity, **scope)
+            new_rows = scoped(**scope).where(primary_key => entity.public_send(primary_key))
+            found! new_rows, not_found_by: { primary_key => entity.public_send(primary_key)}
+
+            new_attrs = from_row __one_from__ new_rows
+            entity.set_attributes(new_attrs)
+            entity
+          end
+
           def count(**scope)
             scoped(**scope).count
           end

data/lib/luna_park/extensions/repositories/postgres/update.rb

@@ -5,13 +5,15 @@ module LunaPark
     module Repositories
       module Postgres
         module Update
-          def save(input)
+          def save(input, **scope_opts)
             entity = wrap(input)
 
             entity.updated_at = Time.now if entity.respond_to?(:updated_at)
 
-            row       = to_row(entity)
-            new_row   = dataset.where(primary_key => row[primary_key]).returning.update(row).first
+            row     = to_row(entity)
+            new_row = scoped(**scope_opts).where(primary_key => row[primary_key]).returning.update(row).first
+            found! new_row, not_found_by: { primary_key => row[primary_key] }
+
             new_attrs = from_row(new_row)
 
             entity.set_attributes(new_attrs)

data/lib/luna_park/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LunaPark
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luna_park
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Alexander Kudrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bugsnag