ree_lib 1.0.70 → 1.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e7e6a91b65f1bab58b667f1eebf153ac5fd1c85852e189af8d3a6d2ea8b163
-  data.tar.gz: 5ac2658d206e2aa8963fd90ed4ca4ef071b701a0d02414d571dcc95df825a88e
+  metadata.gz: 0421ad28472f902b4c53091515c749bdcb6aba9ef96ed42009abe27d115edf48
+  data.tar.gz: 3909bfecb3e92e05708a9be5effb672fc8042e2f53ed4aadb426539f0eba8574
 SHA512:
-  metadata.gz: 221b1612a9ddc52b73f6cd34a1f1228009a3459646d0f129281d5c4ae16557e1044359cb13e44085bf1e727ae07ce3be7cfae9e1728fae8260ed42f888a52010
-  data.tar.gz: e296d1413246f6813ec865ae1395eec11f71f2066d755d815ccac8a260278f122c20e6ca0c680204245a693aa9668dfaab46c0187e25e51288be6c4d523c5e7a
+  metadata.gz: bb696f99d8af84de496f0e6a3bf616256853302d952409832fd89eb24830c0f29cb2cead19b245eee883a2c9dc7d358633bccc308be56369c2d8aeb569a66c7d
+  data.tar.gz: 0accc79d4259f341f4fbf6306103e28521b070119b2ee6be3e7bb98e08802b78ad857f476524a128d9c51cd7ca02fb59298ac70886b70a1304de8d39455d13d5

data/Gemfile.lock

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

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

@@ -3,14 +3,12 @@ module ReeDao
     include Ree::LinkDSL
     include ReeDao::AssociationMethods
 
-    link :demodulize, from: :ree_string
     link :group_by, from: :ree_array
     link :index_by, from: :ree_array
-    link :underscore, from: :ree_string
 
     attr_reader :parent, :parent_dao, :list, :global_opts
 
-    contract(ReeDao::Associations, Sequel::Dataset, Array, Ksplat[RestKeys => Any] => Any)
+    contract(ReeDao::Associations, Nilor[Sequel::Dataset], Array, Ksplat[RestKeys => Any] => Any)
     def initialize(parent, parent_dao, list, **global_opts)
       @parent = parent
       @parent_dao = parent_dao
@@ -51,8 +49,7 @@ module ReeDao
 
       dao = if scope.is_a?(Array)
         return [] if scope.empty?
-        name = underscore(demodulize(scope.first.class.name))
-        find_dao(name, parent, nil)
+        nil
       else
         find_dao(assoc_name, parent, scope)
       end
@@ -125,7 +122,7 @@ module ReeDao
         **global_opts
       )
 
-      if parent_dao.db.in_transaction? || ReeDao::Associations.sync_mode?
+      if parent_dao.nil? || parent_dao.db.in_transaction? || ReeDao::Associations.sync_mode?
         associations.instance_exec(assoc_list, &block)
       else
         threads = associations.instance_exec(assoc_list, &block)
@@ -145,7 +142,7 @@ module ReeDao
     end
 
     contract(
-      Sequel::Dataset,
+      Nilor[Sequel::Dataset],
       Symbol,
       Array,
       Kwargs[
@@ -170,7 +167,11 @@ module ReeDao
         if reverse
           # has_one
           if !foreign_key
-            foreign_key = "#{parent_dao.first_source_table.to_s.gsub(/s$/,'')}_id".to_sym
+            if parent_dao.nil?
+              raise ArgumentError.new("foreign_key should be provided for :#{assoc_name} association")
+            end
+
+            foreign_key = foreign_key_from_dao(parent_dao)
           end
 
           root_ids = list.map(&:id).uniq
@@ -206,7 +207,7 @@ module ReeDao
     end
 
     contract(
-      Sequel::Dataset,
+      Nilor[Sequel::Dataset],
       Symbol,
       Array,
       Kwargs[
@@ -228,7 +229,13 @@ module ReeDao
         assoc_dao = nil
         assoc_dao = find_dao(assoc_name, parent, scope)
 
-        foreign_key ||= "#{parent_dao.first_source_table.to_s.gsub(/s$/, '')}_id".to_sym
+        if !foreign_key
+          if parent_dao.nil?
+            raise ArgumentError.new("foreign_key should be provided for :#{assoc_name} association")
+          end
+
+          foreign_key = foreign_key_from_dao(parent_dao)
+        end
 
         root_ids = list.map(&:"#{primary_key}")
 
@@ -343,5 +350,11 @@ module ReeDao
 
       parent.agg_caller.send(method, *args, &block)
     end
+
+    private
+
+    def foreign_key_from_dao(dao)
+      "#{dao.first_source_table.to_s.gsub(/s$/, '')}_id".to_sym
+    end
   end
 end

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

@@ -87,13 +87,13 @@ module ReeDao
       Optblock => Any
     )
     def association(assoc_type, assoc_name, __opts, &block)
-      if parent_dao.db.in_transaction? || self.class.sync_mode?
+      if parent_dao.nil? || parent_dao.db.in_transaction? || self.class.sync_mode?
         return if association_is_not_included?(assoc_name) || list.empty?
 
         association = Association.new(self, parent_dao, list, **global_opts)
 
         if assoc_type == :field
-          association.handle_field(assoc_name, __opts)
+          association.handle_field(__opts)
         else
           association.load(assoc_type, assoc_name, **get_assoc_opts(__opts), &block)
         end

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

@@ -48,7 +48,8 @@ class ReeDao::PgJsonb < ReeMapper::AbstractWrapper
       Float,
       String,
       Bool,
-      NilClass
+      NilClass,
+      Rational,
     ]
   ).throws(ReeMapper::TypeError)
   def db_load(value, name:, role: nil, fields_filters: [])

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

@@ -26,3 +26,11 @@ module ReeDao
     ENV.has_key?("REE_DAO_SYNC_ASSOCIATIONS") && ENV["REE_DAO_SYNC_ASSOCIATIONS"] == "true"
   end
 end
+
+# ReeEnum::Value#sql_literal is used to properly serialize enum values
+# for database queries
+class ReeEnum::Value
+  def sql_literal(*)
+    mapped_value.to_s
+  end
+end

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/load_agg/agg_spec.rb

@@ -130,8 +130,7 @@ RSpec.describe :agg do
     end
 
     def some_method(list)
-      # puts list.map(&:id)
-      # puts list.map { _1.class.name }
+      list.each { _1.some_field = :some_value if _1.respond_to?(:some_field=) }
     end
 
     def passport_opts
@@ -978,4 +977,20 @@ RSpec.describe :agg do
     res = agg(users, users.where(organization_id: organization.id))
     expect(res.count).to eq(2)
   }
+
+  context "when sync mode enabled" do
+    it {
+      organization = ReeDaoAggTest::Organization.new(name: "Test Org")
+      organizations.put(organization)
+      user = ReeDaoAggTest::User.new(name: "John", age: 33, organization_id: organization.id)
+      users.put(user)
+
+      allow(user).to receive(:some_field=)
+      expect(user).to receive(:some_field=).with(:some_value)
+
+      ENV['REE_DAO_SYNC_ASSOCIATIONS'] = "true"
+      res = agg_users.([user])
+      ENV.delete('REE_DAO_SYNC_ASSOCIATIONS')
+    }
+  end
 end

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/wrappers/pg_jsonb_spec.rb

@@ -29,6 +29,7 @@ RSpec.describe 'ReeDao::PgJsonb' do
       pg_jsonb? :number, integer
       pg_jsonb? :boolean, bool
       pg_jsonb? :any, any
+      pg_jsonb? :rational, rational
     end
   }
 
@@ -39,13 +40,15 @@ RSpec.describe 'ReeDao::PgJsonb' do
         numbers: [1, 2],
         figures: [{ coords: 'x=1,y=1' }],
         number: 1,
-        boolean: true
+        boolean: true,
+        rational: Rational("1/3"),
       })).to eq({
         payload: { key: 'key' },
         numbers: [1, 2],
         figures: [{ coords: 'x=1,y=1' }],
         number: 1,
-        boolean: true
+        boolean: true,
+        rational: "1/3",
       })
     }
 
@@ -69,13 +72,15 @@ RSpec.describe 'ReeDao::PgJsonb' do
         numbers: Sequel::Postgres::JSONBArray.new([1, 2]),
         figures: Sequel::Postgres::JSONBArray.new([{ coords: 'x=1,y=1' }]),
         number: 1,
-        boolean: true
+        boolean: true,
+        rational: "1/3"
       })).to eq({
         payload: { key: 'key' },
         numbers: [1, 2],
         figures: [{ coords: 'x=1,y=1' }],
         number: 1,
-        boolean: true
+        boolean: true,
+        rational: Rational("1/3"),
       })
     }
 

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

@@ -16,10 +16,6 @@ class ReeEnum::Value
     value
   end
 
-  def to_sql
-    mapped_value
-  end
-
   def as_json(*args)
     to_s
   end

data/lib/ree_lib/packages/ree_i18n/package/ree_i18n/functions/set_locale.rb

@@ -5,8 +5,8 @@ class ReeI18n::SetLocale
 
   fn :set_locale
 
-  contract(Symbol => Symbol).throws(I18n::InvalidLocale)
+  contract(Or[Symbol, String] => Symbol).throws(I18n::InvalidLocale)
   def call(locale)
-    I18n.locale = locale
+    I18n.locale = locale.to_sym
   end
 end

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/functions/build_mapper_factory.rb

@@ -27,6 +27,7 @@ class ReeMapper::BuildMapperFactory
     klass.register_type(:integer, ReeMapper::Integer.new)
     klass.register_type(:string, ReeMapper::String.new)
     klass.register_type(:any, ReeMapper::Any.new)
+    klass.register_type(:rational, ReeMapper::Rational.new)
 
     klass.register_wrapper(:array, ReeMapper::Array)
 

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/float.rb

@@ -12,8 +12,8 @@ class ReeMapper::Float < ReeMapper::AbstractType
 
   contract(Any, Kwargs[name: String, role: Nilor[Symbol, ArrayOf[Symbol]]] => Float).throws(ReeMapper::CoercionError, ReeMapper::TypeError)
   def cast(value, name:, role: nil)
-    if value.is_a?(Float)
-      value
+    if value.is_a?(Numeric)
+      value.to_f
     elsif value.is_a?(String)
       begin
         Float(value)

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/rational.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class ReeMapper::Rational < ReeMapper::AbstractType
+  contract(Any, Kwargs[name: String, role: Nilor[Symbol, ArrayOf[Symbol]]] => Rational).throws(ReeMapper::TypeError)
+  def serialize(value, name:, role: nil)
+    if value.is_a?(Rational)
+      value
+    else
+      raise ReeMapper::TypeError, "`#{name}` should be a rational"
+    end
+  end
+
+  contract(Any, Kwargs[name: String, role: Nilor[Symbol, ArrayOf[Symbol]]] => Rational).throws(ReeMapper::CoercionError, ReeMapper::TypeError)
+  def cast(value, name:, role: nil)
+    if value.is_a?(Rational)
+      value
+    elsif value.is_a?(String)
+      begin
+        Rational(value)
+      rescue ArgumentError, ZeroDivisionError => e
+        raise ReeMapper::CoercionError, "`#{name}` is invalid rational"
+      end
+    elsif value.is_a?(Numeric)
+      Rational(value)
+    else
+      raise ReeMapper::TypeError, "`#{name}` should be a rational"
+    end
+  end
+
+  contract(Any, Kwargs[name: String, role: Nilor[Symbol, ArrayOf[Symbol]]] => String)
+  def db_dump(value, name:, role: nil)
+    serialize(value, name: name, role: role).to_s
+  end
+
+  contract(Any, Kwargs[name: String, role: Nilor[Symbol, ArrayOf[Symbol]]] => Rational)
+  def db_load(value, name:, role: nil)
+    cast(value, name: name, role: role)
+  end
+end

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

@@ -34,6 +34,7 @@ module ReeMapper
   require_relative 'ree_mapper/types/float'
   require_relative 'ree_mapper/types/integer'
   require_relative 'ree_mapper/types/string'
+  require_relative 'ree_mapper/types/rational'
 
   require_relative 'ree_mapper/strategy_outputs/strategy_output'
   require_relative 'ree_mapper/strategy_outputs/object_output'

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/float_spec.rb

@@ -32,7 +32,11 @@ RSpec.describe 'ReeMapper::Float' do
     }
 
     it {
-      expect(mapper.db_load({ float: BigDecimal("1.1") })).to eq({ float: 1.1 })
+      expect(mapper.cast({ float: BigDecimal("1.1") })).to eq({ float: 1.1 })
+    }
+
+    it {
+      expect(mapper.cast({ float: 1 })).to eq({ float: 1.0 })
     }
 
     it {
@@ -40,7 +44,7 @@ RSpec.describe 'ReeMapper::Float' do
     }
 
     it {
-      expect { mapper.db_load({ float: '1.1a' }) }.to raise_error(ReeMapper::CoercionError, '`float` is invalid float')
+      expect { mapper.cast({ float: '1.1a' }) }.to raise_error(ReeMapper::CoercionError, '`float` is invalid float')
     }
 
     it {
@@ -97,6 +101,10 @@ RSpec.describe 'ReeMapper::Float' do
       expect(mapper.db_load({ float: BigDecimal("1.1") })).to eq({ float: 1.1 })
     }
 
+    it {
+      expect(mapper.db_load({ float: 1 })).to eq({ float: 1.0 })
+    }
+
     it {
       expect { mapper.db_load({ float: 'a1.1' }) }.to raise_error(ReeMapper::CoercionError, '`float` is invalid float')
     }

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/rational_spec.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+require 'bigdecimal'
+
+RSpec.describe 'ReeMapper::Rational' do
+  link :build_mapper_factory, from: :ree_mapper
+  link :build_mapper_strategy, from: :ree_mapper
+
+  let(:mapper_factory) {
+    build_mapper_factory(
+      strategies: [
+        build_mapper_strategy(method: :cast, dto: Hash),
+        build_mapper_strategy(method: :serialize, dto: Hash),
+        build_mapper_strategy(method: :db_dump, dto: Hash),
+        build_mapper_strategy(method: :db_load, dto: Hash)
+      ]
+    )
+  }
+
+  let(:mapper) {
+    mapper_factory.call.use(:cast).use(:serialize).use(:db_dump).use(:db_load) {
+      rational :rational
+    }
+  }
+
+  describe '#cast' do
+    it {
+      expect(mapper.cast({ rational: Rational("1/3") })).to eq({ rational: Rational("1/3") })
+    }
+
+    it {
+      expect(mapper.cast({ rational: 0.33 })).to eq({ rational: Rational(0.33) })
+    }
+
+    it {
+      expect(mapper.cast({ rational: '0.33' })).to eq({ rational: Rational('0.33') })
+    }
+
+    it {
+      expect(mapper.cast({ rational: BigDecimal("0.33") })).to eq({ rational: Rational(BigDecimal("0.33")) })
+    }
+
+    it {
+      expect { mapper.cast({ rational: 'a333' }) }.to raise_error(ReeMapper::CoercionError, '`rational` is invalid rational')
+    }
+
+    it {
+      expect { mapper.cast({ rational: '333a' }) }.to raise_error(ReeMapper::CoercionError, '`rational` is invalid rational')
+    }
+
+    it {
+      expect { mapper.cast({ rational: Object.new }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+  end
+
+  describe '#serialize' do
+    it {
+      expect(mapper.serialize({ rational: Rational("1/3") })).to eq({ rational: Rational("1/3") })
+    }
+
+    it {
+      expect { mapper.serialize({ rational: '1/3' }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+
+    it {
+      expect { mapper.serialize({ rational: nil }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+
+    it {
+      expect { mapper.serialize({ rational: Object.new }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+  end
+
+  describe '#db_dump' do
+    it {
+      expect(mapper.db_dump({ rational: Rational("1/3") })).to eq({ rational: "1/3" })
+    }
+
+    it {
+      expect { mapper.db_dump({ rational: '1/3' }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+
+    it {
+      expect { mapper.db_dump({ rational: nil }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+
+    it {
+      expect { mapper.db_dump({ rational: Object.new }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+  end
+
+  describe '#db_load' do
+    it {
+      expect(mapper.db_load({ rational: Rational("1/3") })).to eq({ rational: Rational("1/3") })
+    }
+
+    it {
+      expect(mapper.db_load({ rational: 0.33 })).to eq({ rational: Rational(0.33) })
+    }
+
+    it {
+      expect(mapper.db_load({ rational: '0.33' })).to eq({ rational: Rational('0.33') })
+    }
+
+    it {
+      expect(mapper.db_load({ rational: BigDecimal("0.33") })).to eq({ rational: Rational(BigDecimal("0.33")) })
+    }
+
+    it {
+      expect { mapper.db_load({ rational: 'a333' }) }.to raise_error(ReeMapper::CoercionError, '`rational` is invalid rational')
+    }
+
+    it {
+      expect { mapper.db_load({ rational: '333a' }) }.to raise_error(ReeMapper::CoercionError, '`rational` is invalid rational')
+    }
+
+    it {
+      expect { mapper.db_load({ rational: Object.new }) }.to raise_error(ReeMapper::TypeError, "`rational` should be a rational")
+    }
+  end
+end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.70
+  version: 1.0.72
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -1022,6 +1022,7 @@ files:
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/date_time.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/float.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/integer.rb
+- lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/rational.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/string.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/time.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/wrappers/abstract_wrapper.rb
@@ -1042,6 +1043,7 @@ files:
 - lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/float_spec.rb
 - lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/hash_spec.rb
 - lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/integer_spec.rb
+- lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/rational_spec.rb
 - lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/string_spec.rb
 - lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/time_spec.rb
 - lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/type_options_spec.rb