ree_lib 1.0.87 → 1.0.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c70eda05d58f496b0eca7cbc95f853dd51c8b9e33b23c1fa1b51a74eb58104
-  data.tar.gz: bf15e2be0aa79c7696ec9bfb074c3748c7061a5aec1079c5fa208aa1cbc16f1c
+  metadata.gz: 42bfcdb43c2ebd44badd128321d5b277951829cd63f0ec4d28157ae6526b04f4
+  data.tar.gz: 0c42d2aa910eff7c1fc4da08aab37f21236b1e656b69399deb5f71cf10db127b
 SHA512:
-  metadata.gz: c068ce8ba9567eab38bd06c0bdc01731f223f1f4126ac70f5d49c9fc40a9e5034cb7e3cfb2fd84ef578018a31dd5934b6c9283b9a72b3d58e69bdf265af481ca
-  data.tar.gz: e2f1b8a4428e46d27e40f98d9134d47139c5de080eef52eeee63cf5cf9eb86fb76fdc54b6d437c810f8a8d5b71889e180903ee8dce4463e82ec2f2769c3bffdf
+  metadata.gz: d8b868775ba1f7f0e3b692c646389b591d7615289cdd717220568bef46641972d0e281cf4dc8bcdd535b977420503070a5ae7cd06256c2c3a6bdd2366018e62a
+  data.tar.gz: 1eef6d917be75f9169788f327bb36833378186ba453af0dd99a791f1a4c5e555e6f2d4976f5b1468a8604ea3f3584847c0dd201bed7317940c2171c6546c1b2e

data/Gemfile.lock

@@ -1,53 +1,52 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.87)
+    ree_lib (1.0.89)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
-      i18n (~> 1.12.0)
-      loofah (~> 2.18.0)
-      oj (~> 3.13.17)
+      i18n (~> 1.14.1)
+      loofah (~> 2.22.0)
+      oj (~> 3.16.3)
       rainbow (~> 3.1.1)
       ree (~> 1.0.0)
-      sequel (~> 5.58.0)
+      sequel (~> 5.76.0)
       tzinfo (~> 2.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abbrev (0.1.2)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     bigdecimal (3.1.6)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.17.0)
+    bootsnap (1.17.1)
       msgpack (~> 1.2)
     commander (5.0.0)
       highline (~> 3.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     crack (0.4.5)
       rexml
     crass (1.0.6)
     debug_inspector (1.2.0)
     diff-lcs (1.5.0)
-    faker (3.2.2)
+    faker (3.2.3)
       i18n (>= 1.8.11, < 2)
     hashdiff (1.1.0)
-    highline (3.0.0)
-      abbrev
-    i18n (1.12.0)
+    highline (3.0.1)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     msgpack (1.7.2)
     nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.23)
-    pg (1.4.6)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
+    pg (1.5.4)
     public_suffix (5.0.4)
     racc (1.7.3)
     rack (3.0.8)
@@ -58,9 +57,9 @@ GEM
     ree (1.0.34)
       commander (~> 5.0.0)
     rexml (3.2.6)
-    roda (3.58.0)
+    roda (3.76.0)
       rack
-    rollbar (3.3.3)
+    rollbar (3.5.1)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -74,7 +73,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    sequel (5.58.0)
+    sequel (5.76.0)
+      bigdecimal
     sqlite3 (1.4.4)
     timecop (0.9.8)
     tzinfo (2.0.6)
@@ -95,12 +95,12 @@ PLATFORMS
 DEPENDENCIES
   bootsnap
   faker (~> 3.2)
-  pg (~> 1.4.1)
+  pg (~> 1.5.4)
   rack-test
   rake (~> 13.0)
   ree_lib!
-  roda (~> 3.58.0)
-  rollbar (~> 3.3.1)
+  roda (~> 3.76.0)
+  rollbar (~> 3.5.1)
   rspec
   sqlite3 (~> 1.4.4)
   timecop (~> 0.9.5)

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

@@ -7,19 +7,11 @@ module ReeActions
     def self.included(base)
       base.extend(ClassMethods)
       base.include(ReeMapper::DSL)
-      link_dao_cache(base)
     end
 
     def self.extended(base)
       base.extend(ClassMethods)
       base.include(ReeMapper::DSL)
-      link_dao_cache(base)
-    end
-
-    private_class_method def self.link_dao_cache(base)
-      base.include(Ree::LinkDSL)
-      base.link :drop_cache, as: :__ree_dao_drop_cache, from: :ree_dao
-      base.link :init_cache, as: :__ree_dao_init_cache, from: :ree_dao
     end
 
     module ClassMethods
@@ -52,8 +44,6 @@ module ReeActions
         alias_method(:__original_call, :call)
 
         define_method :call do |user_access, attrs|
-          __ree_dao_init_cache
-
           if self.class.const_defined?(:ActionCaster)
             caster = self.class.const_get(:ActionCaster)
 
@@ -69,8 +59,6 @@ module ReeActions
           end
 
           __original_call(user_access, attrs)
-        ensure
-          __ree_dao_drop_cache
         end
 
         nil

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

@@ -89,94 +89,4 @@ RSpec.describe ReeActions::DSL, type: [:autoclean] do
     result = ReeActionsTest::TestAction2.new.call('user_access', {user_id: 1})
     expect(result).to eq(1)
   }
-
-  it {
-    module ReeActionsTest
-      include Ree::PackageDSL
-
-      package do
-        depends_on :ree_mapper
-        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 User
-        include ReeDto::EntityDSL
-
-        properties(
-          id: Nilor[Integer],
-          name: String,
-          age: Integer,
-        )
-
-        attr_accessor :name
-      end
-
-      class UsersDao
-        include ReeDao::DSL
-
-        dao :users_dao do
-          link :db
-        end
-
-        table :users
-
-        schema ReeActionsTest::User do
-          integer :id, null: true
-          string :name
-          integer :age
-        end
-      end
-
-      class TestAction3
-        include ReeActions::DSL
-
-        action :test_action3 do
-          link :users_dao
-        end
-
-        contract Any, Hash => Integer
-        def call(user_access, attrs)
-          $user = ReeActionsTest::User.new(name: 'John', age: 30)
-          users_dao.put($user)
-
-          Thread.new do
-            users_dao.put(ReeActionsTest::User.new(name: 'Alex', age: 33))
-          end.join
-
-          Thread.new do
-            users_dao.put(ReeActionsTest::User.new(name: 'David', age: 21))
-
-            Thread.new do
-              users_dao.put(ReeActionsTest::User.new(name: 'Sam', age: 19))
-            end.join
-          end.join
-
-          $thread_cache = ReeDao::DaoCache.new.get(:users, $user.id)
-
-          attrs[:user_id]
-        end
-      end
-    end
-
-    Thread.new do
-      ReeActionsTest::TestAction3.new.call('user_access', {user_id: 1})
-    end.join
-
-    expect($thread_cache).to eq($user.to_h)
-  }
 end

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

@@ -75,34 +75,6 @@
         "object"
       ]
     },
-    {
-      "name": "dao_cache",
-      "schema": "packages/ree_dao/schemas/ree_dao/beans/dao_cache.schema.json",
-      "tags": [
-        "object"
-      ]
-    },
-    {
-      "name": "drop_cache",
-      "schema": "packages/ree_dao/schemas/ree_dao/functions/drop_cache.schema.json",
-      "tags": [
-        "fn"
-      ]
-    },
-    {
-      "name": "extract_changes",
-      "schema": "packages/ree_dao/schemas/ree_dao/functions/extract_changes.schema.json",
-      "tags": [
-        "fn"
-      ]
-    },
-    {
-      "name": "init_cache",
-      "schema": "packages/ree_dao/schemas/ree_dao/functions/init_cache.schema.json",
-      "tags": [
-        "fn"
-      ]
-    },
     {
       "name": "one_to_many",
       "schema": "packages/ree_dao/schemas/ree_dao/functions/one_to_many.schema.json",

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

@@ -19,10 +19,9 @@ module ReeDao
     end
 
     module InstanceMethods
+      PERSISTENCE_STATE_VARIABLE = :@persistence_state
       IMPORT_BATCH_SIZE = 1000
 
-      package_require("ree_dao/functions/extract_changes")
-
       # override methods
       def find(id, mapper: nil)
         where(primary_key => id).first(mapper: mapper)
@@ -50,7 +49,7 @@ module ReeDao
         key = insert(raw)
 
         set_entity_primary_key(entity, raw, key)
-        set_entity_cache(entity, raw)
+        set_persistence_state(entity, raw)
 
         entity
       end
@@ -74,7 +73,7 @@ module ReeDao
         key = insert_conflict(conflict_opts).insert(raw)
 
         set_entity_primary_key(entity, raw, key)
-        set_entity_cache(entity, raw)
+        set_persistence_state(entity, raw)
 
         where(primary_key => key).first
       end
@@ -105,7 +104,7 @@ module ReeDao
           raw_data = raw[entity]
 
           set_entity_primary_key(entity, raw_data, id)
-          set_entity_cache(entity, raw_data)
+          set_persistence_state(entity, raw_data)
         end
 
         nil
@@ -120,10 +119,10 @@ module ReeDao
         return __original_update(hash_or_entity) if hash_or_entity.is_a?(Hash)
 
         raw = opts[:schema_mapper].db_dump(hash_or_entity)
-        raw = ReeDao::ExtractChanges.new.call(table_name, extract_primary_key(hash_or_entity), raw)
+        raw = extract_changes(hash_or_entity, raw)
 
         unless raw.empty?
-          update_entity_cache(hash_or_entity, raw)
+          update_persistence_state(hash_or_entity, raw)
           key_condition = prepare_key_condition_from_entity(hash_or_entity)
           where(key_condition).__original_update(raw)
         end
@@ -161,7 +160,7 @@ module ReeDao
             if m
               entity = m.db_load(hash)
 
-              self.set_entity_cache(entity, hash)
+              self.set_persistence_state(entity, hash)
 
               entity
             else
@@ -173,10 +172,6 @@ module ReeDao
 
       private
 
-      def __ree_dao_cache
-        ReeDao::DaoCache.new
-      end
-
       def primary_key
         opts[:primary_key] || :id
       end
@@ -209,22 +204,35 @@ module ReeDao
         end
       end
 
-      def set_entity_cache(entity, raw)
+      def set_persistence_state(entity, raw)
         if !entity.is_a?(Integer) && !entity.is_a?(Symbol)
-          p_key = extract_primary_key(entity)
+          entity.instance_variable_set(PERSISTENCE_STATE_VARIABLE, raw)
+        end
+      end
 
-          if p_key
-            __ree_dao_cache.set(table_name, p_key, raw)
-          end
+      def update_persistence_state(entity, raw)
+        persistence_state = entity.instance_variable_get(PERSISTENCE_STATE_VARIABLE)
+
+        if persistence_state
+          persistence_state.merge!(raw)
         end
       end
 
-      def update_entity_cache(entity, raw)
-        cache = __ree_dao_cache.get(table_name, extract_primary_key(entity))
+      def extract_changes(entity, hash)
+        return hash unless entity.instance_variable_defined?(PERSISTENCE_STATE_VARIABLE)
+        changes = {}
+
+        persistence_state = entity.instance_variable_get(PERSISTENCE_STATE_VARIABLE)
+
+        hash.each do |column, value|
+          previous_column_value = persistence_state[column]
 
-        if cache
-          __ree_dao_cache.set(table_name, extract_primary_key(entity), cache.merge(raw))
+          if persistence_state.has_key?(column) && previous_column_value != value
+            changes[column] = value
+          end
         end
+
+        changes
       end
 
       def set_entity_primary_key(entity, raw, key)

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

@@ -134,10 +134,17 @@ RSpec.describe :build_pg_connection do
   it {
     products_dao.delete_all
 
-    product = ReeDaoTestPg::Product.new(title: "Product", info: { price: 1337, count: 200 }, labels: ["Sale"])
+    product = ReeDaoTestPg::Product.new(
+      title: "Product",
+      info: {
+        price: 1337, count: 200
+      },
+      labels: ["Sale"]
+    )
+
     products_dao.put(product)
 
-    product.info[:price] = 1440
+    product.info = {price: 1440, count: 200}
     product.labels << "New"
 
     products_dao.update(product)
@@ -152,7 +159,7 @@ RSpec.describe :build_pg_connection do
     products_dao.delete_all
 
     products = Array.new(3) { |i| ReeDaoTestPg::Product.new(title: "Product#{i}", info: { price: 1337, count: 200 }, labels: ["Sale"]) }
-    
+
     products_dao.import_all(products)
 
     expect(products_dao.count).to eq 3

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

@@ -5,7 +5,6 @@ package_require('ree_dto/entity_dsl')
 
 RSpec.describe :build_sqlite_connection do
   link :build_sqlite_connection, from: :ree_dao
-  link :dao_cache, from: :ree_dao
 
   after do
     Ree.disable_irb_mode
@@ -131,42 +130,6 @@ RSpec.describe :build_sqlite_connection do
     expect(user.age).to eq(u.age)
   }
 
-  it {
-    dao.delete_all
-
-    user = ReeDaoTest::User.new(name: 'John', age: 30)
-    dao.put(user)
-
-    u = dao.find(user.id)
-
-    expect(u).to be_a(ReeDaoTest::User)
-
-    state = dao_cache.get(:users, u.id)
-
-    expect(state).to be_a(Hash)
-    expect(state[:id]).to eq(user.id)
-    expect(state[:age]).to eq(user.age)
-    expect(state[:name]).to eq(user.name)
-  }
-
-  it {
-    dao.delete_all
-
-    user = ReeDaoTest::User.new(name: 'John', age: 30)
-    dao.put(user)
-
-    u = dao.find(user.id)
-    expect(u).to be_a(ReeDaoTest::User)
-    expect(dao_cache.get(:users, u.id)).to_not eq(nil)
-
-    all = dao.all
-    expect(all.size).to eq(1)
-    u = all.first
-
-    expect(u).to be_a(ReeDaoTest::User)
-    expect(dao_cache.get(:users, u.id)).to be_a(Hash)
-  }
-
   it {
     dao.delete_all
 

data/lib/ree_lib/packages/ree_http/package/ree_http/functions/execute_request.rb

@@ -4,13 +4,13 @@ class ReeHttp::ExecuteRequest
   include Ree::FnDSL
 
   fn :execute_request do
+    link :build_request
     link :build_request_executor
     link :slice, from: :ree_hash
-    link 'ree_http/http_exceptions', -> { HttpExceptions }
-
     link 'ree_http/constants', -> {
       DEFAULT_TIMEOUT & DEFAULT_WRITE_TIMEOUT & DEFAULT_FORCE_SSL
     }
+    link 'ree_http/http_exceptions', -> { HttpExceptions }
   end
 
   include HttpExceptions
@@ -89,7 +89,9 @@ class ReeHttp::ExecuteRequest
       "Got #{response.code} response on request URI #{request.uri}\n With BODY: #{response.body}\n"
     )
 
-    process_redirect_response(response, request, opts, &block)
+    if response.is_a?(Net::HTTPRedirection)
+      return process_redirect_response(response, request, opts, &block)
+    end
 
     response
   end
@@ -97,27 +99,32 @@ class ReeHttp::ExecuteRequest
   private
 
   def process_redirect_response(response, request, opts, &block)
-    if response.is_a?(Net::HTTPRedirection)
-      if opts[:redirects_count] == 0
-        raise TooManyRedirectsError, "Got too match redirects, if you want more redirects, use redirects_count"
-      end
+    if opts[:redirects_count] == 0
+      raise TooManyRedirectsError, "Got too match redirects, if you want more redirects, use redirects_count"
+    end
 
-      if opts[:strict_redirect_mode] && STRICT_SENSITIVE_CODES.include?(response.code.to_i) && UNSAFE_VERBS.include?(request.method.to_sym)
-        raise RedirectMethodError, "Got #{response.code.to_i} with strict_mode"
-      end
+    if opts[:strict_redirect_mode] && STRICT_SENSITIVE_CODES.include?(response.code.to_i) && UNSAFE_VERBS.include?(request.method.to_sym)
+      raise RedirectMethodError, "Got #{response.code.to_i} with strict_mode"
+    end
 
-      if (ALWAYS_GET_CODES.include?(response.code.to_i) || STRICT_SENSITIVE_CODES.include?(response.code.to_i)) && UNSAFE_VERBS.include?(request.method.downcase.to_sym)
-        request.instance_variable_set(:@method, 'GET')
-      end
+    if (ALWAYS_GET_CODES.include?(response.code.to_i) || STRICT_SENSITIVE_CODES.include?(response.code.to_i)) && UNSAFE_VERBS.include?(request.method.downcase.to_sym)
+      new_request_method = :get
+    end
 
-      request.instance_variable_set(:@uri, URI(response['Location']))
-      request.instance_variable_set(:@path, request.uri.path)
+    new_request_method ||= request.method.downcase.to_sym
 
-      opts[:redirects_count] -= 1
+    new_uri = URI(response['Location'] || response['location'])
+    new_request = build_request(
+      new_request_method,
+      new_uri.to_s,
+      **slice(opts, [
+          :headers, :body, :form_data, :query_params,
+          :force_ssl, :ca_certs, :basic_auth, :bearer_token
+      ])
+    )
 
-      return call(request, **opts, &block)
-    end
+    opts[:redirects_count] -= 1
 
-    response
+    call(new_request, **opts, &block)
   end
-end
+end

data/lib/ree_lib/packages/ree_http/schemas/ree_http/functions/execute_request.schema.json

@@ -34,6 +34,14 @@
     }
   ],
   "links": [
+    {
+      "target": "build_request",
+      "package_name": "ree_http",
+      "as": "build_request",
+      "imports": [
+
+      ]
+    },
     {
       "target": "build_request_executor",
       "package_name": "ree_http",

data/lib/ree_lib/packages/ree_http/spec/ree_http/functions/http_delete_spec.rb

@@ -129,11 +129,11 @@ RSpec.describe :http_delete do
           headers: {
             'Accept'=>'*/*',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'User-Agent'=>'Ruby',
-            'Token'=>'123'
+            'Host' => 'www.example.com',
+            'User-Agent'=>'Ruby'
           }
         )
-        .to_return(status: 200, headers: {'Token': '123'})
+        .to_return(status: 200)
     end
     after :all do
       WebMock.reset!
@@ -142,7 +142,7 @@ RSpec.describe :http_delete do
     let(:err_result) {
       http_delete(
         host_with_ssl + '/redirect_303_infinity',
-        force_ssl: true, headers: { token: '123'}
+        force_ssl: true
       )
     }
 
@@ -151,15 +151,17 @@ RSpec.describe :http_delete do
 
       http_delete(
         host_with_ssl + '/redirect_307',
-        force_ssl: true, headers: { token: '123'}
+        force_ssl: true, headers: { "Token" => 123 }
       )
-      expect(WebMock).to have_requested(:delete, host_with_ssl).with(headers: { 'Token'=>'123' })
+      expect(WebMock).to have_requested(:delete, host_with_ssl + "/redirect_307").with(headers: { "Token" => 123}).once
+      expect(WebMock).to have_requested(:delete, host_with_ssl).once
 
       http_delete(
         host_with_ssl + '/redirect_303',
-        force_ssl: true, headers: { token: '123'}
+        force_ssl: true, headers: { "Token" => 123 }
       )
-      expect(WebMock).to have_requested(:get, host_with_ssl).with(headers: { 'Token'=>'123' })
+      expect(WebMock).to have_requested(:delete, host_with_ssl + "/redirect_303").with(headers: { "Token" => 123}).once
+      expect(WebMock).to have_requested(:get, host_with_ssl).once
     end
   end
 end