ree_lib 1.0.17 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6160f2952d35b381ccb85c48139a84187d975ec72297a13ba240656398610bb1
-  data.tar.gz: d8aa690997677ddf8ae5bf2f219b00e5d7cad9bb0dcea89905f496bca2389072
+  metadata.gz: 1d8cd14e79d5afde9de80c29a5965a4ee4b6d4ca38c125b13395ffb3a5df478a
+  data.tar.gz: 41644392ed50e289e66d53e81d6b319d584baf9de2b16b81fb89b5678a4977f6
 SHA512:
-  metadata.gz: 666753ee3a5ff1057d1d8b371d84b9a2510b0d89ce4a259ded6bdf0466f61f0009c18505f70bee8e92e65058cc1d460510cf9121ee3980845c3fd05936aa1f1f
-  data.tar.gz: d543b184c95e126f6623e339dcfe17d6966aa19b50c19378701f250d45f599b4734f2bf0c0a194effb4af0bd194b88d244060076362e7e569215b1470cee0275
+  metadata.gz: 726b87bca18fbe71a47d1795da1cff4ca146a414d960aee747676710ad6003ae02b3fdc968fd37ef17e9ebba0d5af749620011d2664d06a0162b524d7f03e524
+  data.tar.gz: d46cf728e250cfd710bd9f651e4817e0dbf8f3a7a44fe5d797026d924c93b9808a6ef8ccd2887109015a2e656ffda86427ba335f8754385caf3b023d2cb95995

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.17)
+    ree_lib (1.0.19)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)

data/lib/ree_lib/packages/ree_dao/Package.schema.json

@@ -7,6 +7,9 @@
     "ree_dao"
   ],
   "depends_on": [
+    {
+      "name": "ree_array"
+    },
     {
       "name": "ree_dto"
     },
@@ -44,6 +47,14 @@
       "name": "connections",
       "schema": "packages/ree_dao/schemas/ree_dao/beans/connections.schema.json"
     },
+    {
+      "name": "one_to_many",
+      "schema": "packages/ree_dao/schemas/ree_dao/functions/one_to_many.schema.json"
+    },
+    {
+      "name": "one_to_one",
+      "schema": "packages/ree_dao/schemas/ree_dao/functions/one_to_one.schema.json"
+    },
     {
       "name": "persist_assoc",
       "schema": "packages/ree_dao/schemas/ree_dao/functions/persist_assoc.schema.json"

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

@@ -0,0 +1,51 @@
+class ReeDao::OneToMany
+  include Ree::FnDSL
+
+  fn :one_to_many do
+    link :demodulize, from: :ree_string
+    link :underscore, from: :ree_string
+    link :group_by, from: :ree_array
+  end
+
+  contract(
+    ArrayOf[ -> (v) { v.class.ancestors.include?(ReeDto::EntityDSL) } ],
+    Sequel::Dataset,
+    Ksplat[
+      foreign_key?: Symbol,
+      assoc_setter?: Symbol
+    ] => nil
+  )
+  def call(list, assoc_dao, **opts)
+    return if list.empty?
+    root_ids = list.map(&:id)
+
+    assoc_setter = if opts.key?(:assoc_setter)
+      opts[:assoc_setter]
+    else
+      dto_class = assoc_dao
+        .opts[:schema_mapper]
+        .strategies
+        .detect {_1 .method == :db_load }
+        .output
+        .dto
+
+      name = underscore(demodulize(dto_class.name))
+      "set_#{name}s".to_sym
+    end
+
+    foreign_key = if opts.key?(:foreign_key)
+      opts[:foreign_key]
+    else
+      name = underscore(demodulize(list.first.class.name))
+      "#{name}_id".to_sym
+    end
+
+    assoc_by_group = group_by(assoc_dao.where(foreign_key => root_ids).all) { _1.send(foreign_key) }
+
+    list.each do |item|
+      item.send(assoc_setter, assoc_by_group[item.id] || [])
+    end
+
+    nil
+  end
+end

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

@@ -0,0 +1,63 @@
+class ReeDao::OneToOne
+  include Ree::FnDSL
+
+  fn :one_to_one do
+    link :demodulize, from: :ree_string
+    link :underscore, from: :ree_string
+    link :index_by, from: :ree_array
+  end
+
+  contract(
+    ArrayOf[ -> (v) { v.class.ancestors.include?(ReeDto::EntityDSL) } ],
+    Sequel::Dataset,
+    Ksplat[
+      reverse?: Bool,
+      foreign_key?: Symbol,
+      assoc_setter?: Symbol
+    ] => nil
+  )
+  def call(list, assoc_dao, **opts)
+    return if list.empty?
+
+    dto_class = assoc_dao
+      .opts[:schema_mapper]
+      .strategies
+      .detect {_1 .method == :db_load }
+      .output
+      .dto
+
+    assoc_name = underscore(demodulize(dto_class.name))
+    reverse = opts[:reverse]
+
+    assoc_setter = if opts.key?(:assoc_setter)
+      opts[:assoc_setter]
+    else
+      "set_#{assoc_name}"
+    end
+
+    foreign_key = if opts.key?(:foreign_key)
+      opts[:foreign_key]
+    else
+      if reverse
+        name = underscore(demodulize(list.first.class.name))
+        "#{name}_id".to_sym
+      else
+        :id
+      end
+    end
+
+    root_ids = if reverse
+      list.map(&:id)
+    else
+      list.map(&:"#{foreign_key}")
+    end
+
+    assoc_by_fk = index_by(assoc_dao.where(foreign_key => root_ids).all) { _1.send(foreign_key) }
+
+    list.each do |item|
+      item.send(assoc_setter, assoc_by_fk[item.id])
+    end
+
+    nil
+  end
+end

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

@@ -6,6 +6,7 @@ module ReeDao
   include Ree::PackageDSL
 
   package do
+    depends_on :ree_array
     depends_on :ree_dto
     depends_on :ree_enum
     depends_on :ree_mapper

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

@@ -0,0 +1,58 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.0",
+  "name": "one_to_many",
+  "path": "packages/ree_dao/package/ree_dao/functions/one_to_many.rb",
+  "mount_as": "fn",
+  "class": "ReeDao::OneToMany",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "Any",
+      "args": [
+        {
+          "arg": "list",
+          "type": "ArrayOf[Proc#call]"
+        },
+        {
+          "arg": "assoc_dao",
+          "type": "Sequel::Dataset"
+        },
+        {
+          "arg": "opts",
+          "type": "Ksplat[:foreign_key? => Symbol, :assoc_setter? => Symbol]"
+        }
+      ]
+    }
+  ],
+  "links": [
+    {
+      "target": "demodulize",
+      "package_name": "ree_string",
+      "as": "demodulize",
+      "imports": [
+
+      ]
+    },
+    {
+      "target": "group_by",
+      "package_name": "ree_array",
+      "as": "group_by",
+      "imports": [
+
+      ]
+    },
+    {
+      "target": "underscore",
+      "package_name": "ree_string",
+      "as": "underscore",
+      "imports": [
+
+      ]
+    }
+  ]
+}

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

@@ -0,0 +1,58 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.0",
+  "name": "one_to_one",
+  "path": "packages/ree_dao/package/ree_dao/functions/one_to_one.rb",
+  "mount_as": "fn",
+  "class": "ReeDao::OneToOne",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "Any",
+      "args": [
+        {
+          "arg": "list",
+          "type": "ArrayOf[Proc#call]"
+        },
+        {
+          "arg": "assoc_dao",
+          "type": "Sequel::Dataset"
+        },
+        {
+          "arg": "opts",
+          "type": "Ksplat[:reverse? => Bool, :foreign_key? => Symbol, :assoc_setter? => Symbol]"
+        }
+      ]
+    }
+  ],
+  "links": [
+    {
+      "target": "demodulize",
+      "package_name": "ree_string",
+      "as": "demodulize",
+      "imports": [
+
+      ]
+    },
+    {
+      "target": "index_by",
+      "package_name": "ree_array",
+      "as": "index_by",
+      "imports": [
+
+      ]
+    },
+    {
+      "target": "underscore",
+      "package_name": "ree_string",
+      "as": "underscore",
+      "imports": [
+
+      ]
+    }
+  ]
+}

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

@@ -0,0 +1,152 @@
+# frozen_string_literal = true
+
+RSpec.describe :one_to_many do
+  link :one_to_many, from: :ree_dao
+  link :persist_assoc, from: :ree_dao
+  link :build_sqlite_connection, from: :ree_dao
+
+  let(:connection) { build_sqlite_connection({database: 'sqlite_db'}) }
+
+  before :all do
+    Ree.enable_irb_mode
+  end
+
+  before :each do
+    [:projects, :project_users].each do |name|
+      if connection.table_exists?(name)
+        connection.drop_table(name)
+      end
+    end
+
+    connection.create_table :projects do
+      primary_key :id
+    end
+
+    connection.create_table :project_users do
+      primary_key :id
+      foreign_key :project_id, :projects, null: false, on_delete: :cascade
+    end
+
+    connection.disconnect
+  end
+
+  after do
+    Ree.disable_irb_mode
+    connection.disconnect
+  end
+
+  it {
+    module TestOneToMany
+      include Ree::PackageDSL
+
+      package do
+        depends_on :ree_dao
+      end
+
+      class Db
+        include Ree::BeanDSL
+
+        bean :db do
+          singleton
+          factory :build
+
+          link :build_sqlite_connection, from: :ree_dao
+        end
+
+        def build
+          build_sqlite_connection({database: 'sqlite_db'})
+        end
+      end
+
+      class Project
+        include ReeDto::EntityDSL
+
+        properties(
+          id: Nilor[Integer]
+        )
+
+        def project_users
+          @project_users ||= []
+        end
+
+        def set_project_users(list)
+          @project_users = list
+        end
+
+        def add_project_user(pu)
+          project_users.push(pu)
+        end
+      end
+
+      class ProjectUser
+        include ReeDto::EntityDSL
+
+        properties(
+          id: Nilor[Integer],
+          project_id: Nilor[Integer]
+        )
+
+        contract Integer => Integer
+        def project_id=(id)
+          @project_id = id
+        end
+      end
+
+      class ProjectsDao
+        include ReeDao::DSL
+
+        dao :projects_dao do
+          link :db
+        end
+
+        schema Project do
+          integer :id, null: true
+        end
+      end
+
+      class ProjectUsersDao
+        include ReeDao::DSL
+
+        dao :project_users_dao do
+          link :db
+        end
+
+        schema ProjectUser do
+          integer :id, null: true
+          integer :project_id
+        end
+      end
+    end
+
+    project = TestOneToMany::Project.new(id: 1)
+
+    project.add_project_user(
+      TestOneToMany::ProjectUser.new
+    )
+
+    project.add_project_user(
+      TestOneToMany::ProjectUser.new
+    )
+
+    TestOneToMany::ProjectsDao.new.put(project)
+    persist_assoc(project, TestOneToMany::ProjectUsersDao.new)
+
+    project_users_dao = TestOneToMany::ProjectUsersDao.new
+
+    project.set_project_users([])
+    one_to_many([project], project_users_dao)
+
+    expect(project.project_users.size).to eq(2)
+
+    project.set_project_users([])
+
+    one_to_many(
+      [project],
+      project_users_dao,
+      foreign_key: :project_id,
+      assoc_setter: :set_project_users
+    )
+
+    expect(project.project_users.size).to eq(2)
+  }
+end

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

@@ -0,0 +1,174 @@
+# frozen_string_literal = true
+
+RSpec.describe :one_to_one do
+  link :one_to_one, from: :ree_dao
+  link :persist_assoc, from: :ree_dao
+  link :build_sqlite_connection, from: :ree_dao
+
+  let(:connection) { build_sqlite_connection({database: 'sqlite_db'}) }
+
+  before :all do
+    Ree.enable_irb_mode
+  end
+
+  before :each do
+    [:projects, :project_users].each do |name|
+      if connection.table_exists?(name)
+        connection.drop_table(name)
+      end
+    end
+
+    connection.create_table :projects do
+      primary_key :id
+    end
+
+    connection.create_table :project_users do
+      primary_key :id
+      foreign_key :project_id, :projects, null: false, on_delete: :cascade
+    end
+
+    connection.alter_table :projects do
+      add_foreign_key :project_user_id, :project_users, on_delete: :cascade
+    end
+
+    connection.disconnect
+  end
+
+  after do
+    Ree.disable_irb_mode
+    connection.disconnect
+  end
+
+  it {
+    module TestOneToOne
+      include Ree::PackageDSL
+
+      package do
+        depends_on :ree_dao
+      end
+
+      class Db
+        include Ree::BeanDSL
+
+        bean :db do
+          singleton
+          factory :build
+
+          link :build_sqlite_connection, from: :ree_dao
+        end
+
+        def build
+          build_sqlite_connection({database: 'sqlite_db'})
+        end
+      end
+
+      class Project
+        include ReeDto::EntityDSL
+
+        properties(
+          id: Nilor[Integer]
+        )
+
+        def project_user
+          @project_user
+        end
+
+        def project_user_id=(id)
+          @project_user_id = id
+        end
+
+        attr_reader :project_user_id
+
+        def set_project_user(pu)
+          @project_user = pu
+        end
+
+        def project_users
+          [@project_user]
+        end
+      end
+
+      class ProjectUser
+        include ReeDto::EntityDSL
+
+        properties(
+          id: Nilor[Integer],
+          project_id: Nilor[Integer]
+        )
+
+        contract Integer => Integer
+        def project_id=(id)
+          @project_id = id
+        end
+      end
+
+      class ProjectsDao
+        include ReeDao::DSL
+
+        dao :projects_dao do
+          link :db
+        end
+
+        schema Project do
+          integer :id, null: true
+          integer :project_user_id, null: true
+        end
+      end
+
+      class ProjectUsersDao
+        include ReeDao::DSL
+
+        dao :project_users_dao do
+          link :db
+        end
+
+        schema ProjectUser do
+          integer :id, null: true
+          integer :project_id
+        end
+      end
+    end
+
+    project = TestOneToOne::Project.new(id: 1)
+
+    project.set_project_user(
+      TestOneToOne::ProjectUser.new
+    )
+
+    TestOneToOne::ProjectsDao.new.put(project)
+    persist_assoc(project, TestOneToOne::ProjectUsersDao.new)
+
+    project.project_user_id = project.project_users.first.id
+    persist_assoc(project, TestOneToOne::ProjectUsersDao.new)
+
+    project_users_dao = TestOneToOne::ProjectUsersDao.new
+
+    project.set_project_user(nil)
+    one_to_one([project], project_users_dao)
+
+    expect(project.project_user.project_id).to eq(project.id)
+
+    project.set_project_user(nil)
+
+    one_to_one(
+      [project],
+      project_users_dao,
+      reverse: true,
+      foreign_key: :project_id,
+      assoc_setter: :set_project_user
+    )
+
+    expect(project.project_user.project_id).to eq(project.id)
+
+    project.set_project_user(nil)
+
+    one_to_one(
+      [project],
+      project_users_dao,
+      reverse: true,
+      assoc_setter: :set_project_user
+    )
+
+    expect(project.project_user.project_id).to eq(project.id)
+  }
+end

data/lib/ree_lib/packages/ree_enum/package/ree_enum/dsl.rb

@@ -34,25 +34,27 @@ module ReeEnum
             contract(
               ReeEnum::Value,
               Kwargs[
+                name: String,
                 role: Nilor[Symbol, ArrayOf[Symbol]]
               ] => String
             )
-            def serialize(value, role: nil)
+            def serialize(value, name:, role: nil)
               value.to_s
             end
 
             contract(
               Any,
               Kwargs[
+                name: String,
                 role: Nilor[Symbol, ArrayOf[Symbol]]
               ] => ReeEnum::Value
             ).throws(ReeMapper::CoercionError)
-            def cast(value, role: nil)
+            def cast(value, name:, role: nil)
               if value.is_a?(String)
                 enum_val = @enum.values.all.detect { |v| v.to_s == value }
 
                 if !enum_val
-                  raise ReeMapper::CoercionError, "should be one of #{@enum.values.all.map(&:to_s).inspect}"
+                  raise ReeMapper::CoercionError, "`#{name}` should be one of #{@enum.values.all.map(&:to_s).inspect}"
                 end
 
                 enum_val
@@ -60,33 +62,35 @@ module ReeEnum
                 enum_val = @enum.values.all.detect { |v| v.to_i == value }
 
                 if !enum_val
-                  raise ReeMapper::CoercionError, "should be one of #{@enum.values.all.map(&:to_s).inspect}"
+                  raise ReeMapper::CoercionError, "`#{name}` should be one of #{@enum.values.all.map(&:to_s).inspect}"
                 end
 
                 enum_val
               else
-                raise ReeMapper::CoercionError, "should be one of #{@enum.values.all.map(&:to_s).inspect}"
+                raise ReeMapper::CoercionError, "`#{name}` should be one of #{@enum.values.all.map(&:to_s).inspect}"
               end
             end
 
             contract(
               ReeEnum::Value,
               Kwargs[
+                name: String,
                 role: Nilor[Symbol, ArrayOf[Symbol]]
               ] => Integer
             )
-            def db_dump(value, role: nil)
+            def db_dump(value, name:, role: nil)
               value.to_i
             end
 
             contract(
               Integer,
               Kwargs[
+                name: String,
                 role: Nilor[Symbol, ArrayOf[Symbol]]
               ] => ReeEnum::Value
             ).throws(ReeMapper::TypeError)
-            def db_load(value, role: nil)
-              cast(value, role: role)
+            def db_load(value, name:, role: nil)
+              cast(value, name: name, role: role)
             end
           end
 

data/lib/ree_lib/packages/ree_enum/spec/ree_enum/dsl_spec.rb

@@ -112,7 +112,7 @@ RSpec.describe ReeEnum::DSL do
         state: 'first',
         type: 'invalid',
       })
-      }.to raise_error(ReeMapper::CoercionError, 'should be one of ["account"]')
+      }.to raise_error(ReeMapper::CoercionError, '`type` should be one of ["account"]')
 
     expect(
       mapper.cast({

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.19
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -248,15 +248,21 @@ files:
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_dao.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_pg_connection.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/build_sqlite_connection.rb
+- lib/ree_lib/packages/ree_dao/package/ree_dao/functions/one_to_many.rb
+- lib/ree_lib/packages/ree_dao/package/ree_dao/functions/one_to_one.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/functions/persist_assoc.rb
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/beans/connections.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_connection.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_dao.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_pg_connection.schema.json
 - lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/build_sqlite_connection.schema.json
+- lib/ree_lib/packages/ree_dao/schemas/ree_dao/functions/one_to_many.schema.json
+- 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_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
 - lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/persist_assoc_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/spec_helper.rb
 - lib/ree_lib/packages/ree_date/.gitignore