ree_lib 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50fd7b502f104dfc8e4fa0c36ccacdb6f398fb6c0fe00205f8f0c7881677bb7b
-  data.tar.gz: 8805dea30c4a4c25e88318e92ffcfd04b96884c61787752062fcce57bbd94c74
+  metadata.gz: 9005df5ff7af1e3f311ab2126f137560568d8e2c42bfb7da28b9a2e179675b4a
+  data.tar.gz: b0c9cd050d90ad8a2f66a738bfd3487c27d9561a367ce3a7d204c5ba6bf8d1cf
 SHA512:
-  metadata.gz: a5133c6ed7bb344519cad05fa0f0f1bf20521cc5872e2255a96288537371ddeb527630fdba0e9940bb78c477072cfced47be0d9811efbae2d62a217b0365c124
-  data.tar.gz: 0f2d2cfbaa485412af4ec05764f355d9a46a9f1b5509a102d6c6e2ba900ec4c10fb98950531aacb03b5dd02efb7e5d6661b84004a25b5360c7b25382bb1e7969
+  metadata.gz: 8816a34c2a7b69a9a82d61c5fc2f69055216cfe6ff02241c78850b9940fe37d09c1df87b49e0f137342f84ac304f6e3b0dfc4075af92f29a86fb4e77a92a981c
+  data.tar.gz: 9bd5bce19e5803ae000b362efcad7721802bc1c816dc1af26eefb80fc04c893b4b8c505471b033456c4b500a84b76de9b1ea319869adfab945c75ae2c52c675c

data/Gemfile.lock

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

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

@@ -43,6 +43,10 @@
     {
       "name": "connections",
       "schema": "packages/ree_dao/schemas/ree_dao/beans/connections.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/dsl.rb

@@ -28,7 +28,7 @@ module ReeDao::DSL
       dao = build_dao(
         connection: db,
         table_name: self.class.instance_variable_get(:@table),
-        mapper: self.class.instance_variable_get(:@schema_mapper) || (raise Ree::Error.new("Dao schema mapper is not set. Use `schema` DSL to define it", :invalid_dsl_usage)),
+        mapper: get_schema_mapper,
         primary_key: self.class.instance_variable_get(:@primary_key),
         default_select_columns: self.class.instance_variable_get(:@default_select_columns),
       )
@@ -37,6 +37,18 @@ module ReeDao::DSL
 
       dao
     end
+
+    def get_schema_mapper
+      mapper = self
+        .class
+        .instance_variable_get(:@schema_mapper)
+
+      if mapper.nil?
+        raise Ree::Error.new("Dao schema mapper is not set. Use `schema` DSL to define it", :invalid_dsl_usage)
+      end
+
+      mapper
+    end
   end
 
   module ClassMethods

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

@@ -0,0 +1,57 @@
+class ReeDao::PersistAssoc
+  include Ree::FnDSL
+
+  fn :persist_assoc do
+    link :demodulize, from: :ree_string
+    link :underscore, from: :ree_string
+  end
+
+  contract(
+    -> (v) {
+      v.class.ancestors.include?(ReeDto::EntityDSL)
+    },
+    Sequel::Dataset,
+    Ksplat[
+      root_setter?: Symbol,
+      child_assoc?: Symbol,
+    ] => nil
+  )
+  def call(agg_root, assoc_dao, **opts)
+    setter_method = if opts[:root_setter].nil?
+      name = underscore(demodulize(agg_root.class.name))
+      "#{name}_id="
+    else
+      "#{opts[:root_setter]}"
+    end
+
+    assoc_name = if opts[:child_assoc].nil?
+      dto_class = assoc_dao
+        .opts[:schema_mapper]
+        .strategies
+        .detect {_1 .method == :db_load }
+        .output
+        .dto
+
+      name = underscore(demodulize(dto_class.name))
+      "#{name}s"
+    else
+      opts[:child_assoc]
+    end
+
+    agg_root.send(assoc_name).each do |child|
+      if !child.respond_to?(setter_method)
+        raise ArgumentError.new("#{child.class} does not respond to `#{setter_method}` method")
+      end
+
+      child.send(setter_method, agg_root.id)
+
+      if child.id
+        assoc_dao.update(child)
+      else
+        assoc_dao.put(child)
+      end
+    end
+
+    nil
+  end
+end

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

@@ -0,0 +1,43 @@
+require "sequel/extensions/pg_array"
+
+class ReeDao::PgArray < ReeMapper::AbstractType
+  contract(
+    ReeEnum::Value,
+    Kwargs[
+      role: Nilor[Symbol, ArrayOf[Symbol]]
+    ] => String
+  )
+  def serialize(value, role: nil)
+    raise ArgumentError.new("not supported")
+  end
+
+  contract(
+    Any,
+    Kwargs[
+      role: Nilor[Symbol, ArrayOf[Symbol]]
+    ] => ReeEnum::Value
+  ).throws(ReeMapper::CoercionError)
+  def cast(value, role: nil)
+    raise ArgumentError.new("not supported")
+  end
+
+  contract(
+    ArrayOf[Any],
+    Kwargs[
+      role: Nilor[Symbol, ArrayOf[Symbol]]
+    ] => Sequel::Postgres::PGArray
+  )
+  def db_dump(value, role: nil)
+    Sequel.pg_array(value)
+  end
+
+  contract(
+    Sequel::Postgres::PGArray,
+    Kwargs[
+      role: Nilor[Symbol, ArrayOf[Symbol]]
+    ] => ArrayOf[Any]
+  ).throws(ReeMapper::TypeError)
+  def db_load(value, role: nil)
+    value.to_a
+  end
+end

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

@@ -6,10 +6,10 @@ module ReeDao
   include Ree::PackageDSL
 
   package do
+    depends_on :ree_dto
+    depends_on :ree_enum
     depends_on :ree_mapper
     depends_on :ree_string
-    depends_on :ree_enum
-    depends_on :ree_dto
   end
 
   require_relative "./ree_dao/dsl"

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

@@ -0,0 +1,50 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.0",
+  "name": "persist_assoc",
+  "path": "packages/ree_dao/package/ree_dao/functions/persist_assoc.rb",
+  "mount_as": "fn",
+  "class": "ReeDao::PersistAssoc",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "Any",
+      "args": [
+        {
+          "arg": "agg_root",
+          "type": "Proc#call"
+        },
+        {
+          "arg": "assoc_dao",
+          "type": "Sequel::Dataset"
+        },
+        {
+          "arg": "opts",
+          "type": "Ksplat[:root_setter? => Symbol, :child_assoc? => Symbol]"
+        }
+      ]
+    }
+  ],
+  "links": [
+    {
+      "target": "demodulize",
+      "package_name": "ree_string",
+      "as": "demodulize",
+      "imports": [
+
+      ]
+    },
+    {
+      "target": "underscore",
+      "package_name": "ree_string",
+      "as": "underscore",
+      "imports": [
+
+      ]
+    }
+  ]
+}

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

@@ -0,0 +1,162 @@
+# frozen_string_literal = true
+
+RSpec.describe :persist_assoc do
+  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 TestPersistAssoc
+      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 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 = TestPersistAssoc::Project.new(id: 1)
+
+    project.add_project_user(
+      TestPersistAssoc::ProjectUser.new
+    )
+
+    project.add_project_user(
+      TestPersistAssoc::ProjectUser.new
+    )
+
+    TestPersistAssoc::ProjectsDao.new.put(project)
+
+    persist_assoc(project, TestPersistAssoc::ProjectUsersDao.new)
+
+    expect(project.id).to be_a(Integer)
+    expect(project.project_users.first.id).to be_a(Integer)
+    expect(project.project_users.first.project_id).to eq(project.id)
+    expect(project.project_users.last.id).to be_a(Integer)
+    expect(project.project_users.last.project_id).to eq(project.id)
+
+    # test opts
+    project = TestPersistAssoc::Project.new(id: 2)
+
+    project.add_project_user(
+      TestPersistAssoc::ProjectUser.new
+    )
+
+    project.add_project_user(
+      TestPersistAssoc::ProjectUser.new
+    )
+
+    TestPersistAssoc::ProjectsDao.new.put(project)
+
+    persist_assoc(
+      project,
+      TestPersistAssoc::ProjectUsersDao.new,
+      root_setter: :project_id=,
+      child_assoc: :project_users,
+    )
+
+    expect(project.id).to be_a(Integer)
+    expect(project.project_users.first.id).to be_a(Integer)
+    expect(project.project_users.first.project_id).to eq(project.id)
+    expect(project.project_users.last.id).to be_a(Integer)
+    expect(project.project_users.last.project_id).to eq(project.id)
+  }
+end

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/types/pg_array_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal = true
+package_require("ree_dao/types/pg_array")
+
+RSpec.describe ReeDao::PgArray do
+  it {
+    type = ReeDao::PgArray.new
+
+    result = type.db_dump([1], role: nil)
+    expect(result).to be_a(Sequel::Postgres::PGArray)
+  }
+
+  it {
+    type = ReeDao::PgArray.new
+
+    result = type.db_dump([1], role: nil)
+    result = type.db_load(result, role: nil)
+    expect(result).to eq([1])
+  }
+end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -248,13 +248,18 @@ 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/persist_assoc.rb
+- lib/ree_lib/packages/ree_dao/package/ree_dao/types/pg_array.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/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/persist_assoc_spec.rb
+- lib/ree_lib/packages/ree_dao/spec/ree_dao/types/pg_array_spec.rb
 - lib/ree_lib/packages/ree_dao/spec/spec_helper.rb
 - lib/ree_lib/packages/ree_date/.gitignore
 - lib/ree_lib/packages/ree_date/.rspec