ros-apartment 3.0.4 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d65efc6c04fa15ba20b2cc39f72d586b5dc338e74d7c9ee72efc5a2e4c0442ae
-  data.tar.gz: ac6292feee7f151d735a7193a5795c37fe139e340bb795595936192752c406ee
+  metadata.gz: 2494257d1e615c2ef2e79647f3d5b62762dec8c51af19f2c5fe352b01572e752
+  data.tar.gz: 23b24db12c93d35cf10e34e1c71455a6fe05c9afe162dca6de5115212cb052b7
 SHA512:
-  metadata.gz: 400c31dce7d56979a3781932cfce1466d56c001c1a37d469f2580a8ac1d7be65de0f6671a6c56fd623a10f9e4cc0b0dc201e14d4b1a354b5bc97d84f3fb21441
-  data.tar.gz: e27b4ff8f0bce850f733824ce57c766aa2a3e70d048106e260af582c9957e0166e3da6ffd8cd223e3519663a7343e52630c2c391363b6d6a72d312b417ad27f7
+  metadata.gz: e13fe607631fe0953b16ec42a64ba162deb3fc1522b70ac09b152acbc47b6bebd63a25cc35a6873a3190304de40166f89e9782ceced0259932116739890526f2
+  data.tar.gz: 035b1b87cdf43f463a6895981d63100a238a2a8b3ad0e0b529d74fa261f6138005e0f5aecd425e857d9ba10ee11c613cb8d6b3002cd35484b34b58f4df367e9a

data/.rubocop_todo.yml

@@ -207,6 +207,7 @@ RSpec/ExampleWording:
 RSpec/FilePath:
   Exclude:
     - 'spec/adapters/mysql2_adapter_spec.rb'
+    - 'spec/adapters/trilogy_adapter_spec.rb'
     - 'spec/adapters/postgresql_adapter_spec.rb'
     - 'spec/adapters/sqlite3_adapter_spec.rb'
     - 'spec/tenant_spec.rb'
@@ -292,6 +293,7 @@ RSpec/MultipleExpectations:
 RSpec/NamedSubject:
   Exclude:
     - 'spec/adapters/mysql2_adapter_spec.rb'
+    - 'spec/adapters/trilogy_adapter_spec.rb'
     - 'spec/adapters/sqlite3_adapter_spec.rb'
     - 'spec/support/contexts.rb'
     - 'spec/support/requirements.rb'
@@ -315,6 +317,7 @@ RSpec/NoExpectationExample:
 RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/adapters/mysql2_adapter_spec.rb'
+    - 'spec/adapters/trilogy_adapter_spec.rb'
     - 'spec/adapters/postgresql_adapter_spec.rb'
     - 'spec/adapters/sqlite3_adapter_spec.rb'
     - 'spec/tenant_spec.rb'

data/lib/apartment/adapters/trilogy_adapter.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'apartment/adapters/mysql2_adapter'
+
+module Apartment
+  # Helper module to decide wether to use trilogy adapter or trilogy adapter with schemas
+  module Tenant
+    def self.trilogy_adapter(config)
+      if Apartment.use_schemas
+        Adapters::TrilogySchemaAdapter.new(config)
+      else
+        Adapters::TrilogyAdapter.new(config)
+      end
+    end
+  end
+
+  module Adapters
+    class TrilogyAdapter < Mysql2Adapter
+      protected
+
+      def rescue_from
+        Trilogy::Error
+      end
+    end
+
+    class TrilogySchemaAdapter < Mysql2SchemaAdapter
+    end
+  end
+end

data/lib/apartment/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Apartment
-  VERSION = '3.0.4'
+  VERSION = '3.1.0'
 end

data/ros-apartment.gemspec

@@ -60,5 +60,6 @@ Gem::Specification.new do |s|
     s.add_development_dependency 'mysql2',  '~> 0.5'
     s.add_development_dependency 'pg',      '~> 1.5'
     s.add_development_dependency 'sqlite3', '< 2.0'
+    s.add_development_dependency 'trilogy', '< 3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ros-apartment
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
 platform: ruby
 authors:
 - Ryan Brunner
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -302,6 +302,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: trilogy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Apartment allows Rack applications to deal with database multitenancy
   through ActiveRecord
 email:
@@ -337,6 +351,7 @@ files:
 - lib/apartment/adapters/postgis_adapter.rb
 - lib/apartment/adapters/postgresql_adapter.rb
 - lib/apartment/adapters/sqlite3_adapter.rb
+- lib/apartment/adapters/trilogy_adapter.rb
 - lib/apartment/console.rb
 - lib/apartment/custom_console.rb
 - lib/apartment/deprecation.rb