fix: gemspecs load packages from rubygems (#60)

ForestAdmin · Jun 25, 2024 · 8c3feaf · 8c3feaf
1 parent 62b21f6
commit 8c3feaf
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -238,7 +238,7 @@ Metrics/ClassLength:
     - 'packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/generator_field.rb'
     - 'packages/forest_admin_agent/lib/forest_admin_agent/services/permissions.rb'
     - 'packages/forest_admin_agent/lib/forest_admin_agent/routes/charts/charts.rb'
-    - 'packages/forest_admin_agent/lib/forest_admin_agent/routes/action/action.rb'
+    - 'packages/forest_admin_agent/lib/forest_admin_agent/routes/action/actions.rb'
     - 'packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/frontend_validation_utils.rb'
     - 'packages/forest_admin_datasource_active_record/lib/forest_admin_datasource_active_record/utils/query.rb'
     - 'packages/forest_admin_datasource_customizer/lib/forest_admin_datasource_customizer/collection_customizer.rb'

diff --git a/packages/forest_admin_agent/Gemfile b/packages/forest_admin_agent/Gemfile
@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'forest_admin_datasource_customizer', path: '../forest_admin_datasource_customizer'
-gem 'forest_admin_datasource_toolkit', path: '../forest_admin_datasource_toolkit'
+gem 'forest_admin_datasource_customizer'
+gem 'forest_admin_datasource_toolkit'
 
 group :development, :test do
   gem 'rspec', '~> 3.0'

diff --git a/packages/forest_admin_agent/lib/forest_admin_agent/http/router.rb b/packages/forest_admin_agent/lib/forest_admin_agent/http/router.rb
@@ -30,7 +30,7 @@ def self.actions_routes
         routes = {}
         Facades::Container.datasource.collections.each_value do |collection|
           collection.schema[:actions].each_key do |action_name|
-            routes.merge!(Action::Action.new(collection, action_name).routes)
+            routes.merge!(Action::Actions.new(collection, action_name).routes)
           end
         end
 

diff --git a/...orest_admin_agent/routes/action/action.rb → ...rest_admin_agent/routes/action/actions.rb b/...orest_admin_agent/routes/action/action.rb → ...rest_admin_agent/routes/action/actions.rb
@@ -5,7 +5,7 @@
 module ForestAdminAgent
   module Routes
     module Action
-      class Action < AbstractAuthenticatedRoute
+      class Actions < AbstractAuthenticatedRoute
         include ForestAdminAgent::Builder
         include ForestAdminAgent::Utils
         include ForestAdminDatasourceToolkit::Components::Query

diff --git a/packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/schema_emitter.rb b/packages/forest_admin_agent/lib/forest_admin_agent/utils/schema/schema_emitter.rb
@@ -5,7 +5,7 @@ module ForestAdminAgent
   module Utils
     module Schema
       class SchemaEmitter
-        LIANA_NAME = "forest-rails"
+        LIANA_NAME = "agent-ruby"
 
         LIANA_VERSION = "1.0.0-beta.57"
 

diff --git a/...nt/routes/resources/action/action_spec.rb → ...t/routes/resources/action/actions_spec.rb b/...nt/routes/resources/action/action_spec.rb → ...t/routes/resources/action/actions_spec.rb
@@ -7,14 +7,13 @@
 module ForestAdminAgent
   module Routes
     module Action
-      include ForestAdminDatasourceCustomizer::Decorators::Action
       include ForestAdminDatasourceToolkit
       include ForestAdminDatasourceToolkit::Schema
       include ForestAdminDatasourceToolkit::Components::Query
       include ForestAdminDatasourceToolkit::Components::Query::ConditionTree
       include ForestAdminDatasourceToolkit::Components::Query::ConditionTree::Nodes
 
-      describe Action do
+      describe Actions do
         include_context 'with caller'
         let(:args) do
           {
@@ -91,10 +90,10 @@ module Action
           before do
             @action_collection.add_action(
               'foo',
-              BaseAction.new(
-                scope: Types::ActionScope::GLOBAL,
+              ForestAdminDatasourceCustomizer::Decorators::Action::BaseAction.new(
+                scope: ForestAdminDatasourceCustomizer::Decorators::Action::Types::ActionScope::GLOBAL,
                 form: [
-                  { type: Types::FieldType::STRING, label: 'firstname' }
+                  { type: ForestAdminDatasourceCustomizer::Decorators::Action::Types::FieldType::STRING, label: 'firstname' }
                 ]
               ) do |_context, result_builder|
                 result_builder.success
@@ -134,10 +133,10 @@ module Action
           before do
             @action_collection.add_action(
               'foo',
-              BaseAction.new(
-                scope: Types::ActionScope::SINGLE,
+              ForestAdminDatasourceCustomizer::Decorators::Action::BaseAction.new(
+                scope: ForestAdminDatasourceCustomizer::Decorators::Action::Types::ActionScope::SINGLE,
                 form: [
-                  { type: Types::FieldType::STRING, label: 'firstname' }
+                  { type: ForestAdminDatasourceCustomizer::Decorators::Action::Types::FieldType::STRING, label: 'firstname' }
                 ]
               ) do |_context, result_builder|
                 result_builder.success
@@ -189,10 +188,10 @@ module Action
           before do
             @action_collection.add_action(
               'foo',
-              BaseAction.new(
-                scope: Types::ActionScope::BULK,
+              ForestAdminDatasourceCustomizer::Decorators::Action::BaseAction.new(
+                scope: ForestAdminDatasourceCustomizer::Decorators::Action::Types::ActionScope::BULK,
                 form: [
-                  { type: Types::FieldType::STRING, label: 'firstname' }
+                  { type: ForestAdminDatasourceCustomizer::Decorators::Action::Types::FieldType::STRING, label: 'firstname' }
                 ]
               ) do |_context, result_builder|
                 result_builder.success
@@ -222,10 +221,10 @@ module Action
           before do
             @action_collection.add_action(
               'foo',
-              BaseAction.new(
-                scope: Types::ActionScope::GLOBAL,
+              ForestAdminDatasourceCustomizer::Decorators::Action::BaseAction.new(
+                scope: ForestAdminDatasourceCustomizer::Decorators::Action::Types::ActionScope::GLOBAL,
                 form: [
-                  { type: Types::FieldType::STRING, label: 'firstname' }
+                  { type: ForestAdminDatasourceCustomizer::Decorators::Action::Types::FieldType::STRING, label: 'firstname' }
                 ]
               ) do |_context, result_builder|
                 result_builder.success

diff --git a/...ages/forest_admin_agent/spec/lib/forest_admin_agent/utils/schema/generator_action_spec.rb b/...ages/forest_admin_agent/spec/lib/forest_admin_agent/utils/schema/generator_action_spec.rb
@@ -5,6 +5,7 @@ module Utils
     module Schema
       include ForestAdminDatasourceToolkit::Components::Actions
       include ForestAdminDatasourceCustomizer::Decorators::Action
+
       describe GeneratorAction do
         describe 'without form' do
           before do

diff --git a/packages/forest_admin_datasource_active_record/Gemfile b/packages/forest_admin_datasource_active_record/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in forest_admin_datasource_active_record.gemspec
 gemspec
 
-gem 'forest_admin_datasource_toolkit', path: '../forest_admin_datasource_toolkit'
+gem 'forest_admin_datasource_toolkit'
 
 gem 'rake', '~> 13.0'
 

diff --git a/packages/forest_admin_datasource_customizer/Gemfile b/packages/forest_admin_datasource_customizer/Gemfile
@@ -3,8 +3,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in forest_admin_datasource_toolkit.gemspec
 gemspec
 
-gem 'forest_admin_agent', path: '../forest_admin_agent'
-gem 'forest_admin_datasource_toolkit', path: '../forest_admin_datasource_toolkit'
+gem 'forest_admin_agent'
+gem 'forest_admin_datasource_toolkit'
 
 gem 'rake', '~> 13.0'
 gem 'rubocop', '~> 1.21'

diff --git a/packages/forest_admin_rails/Gemfile b/packages/forest_admin_rails/Gemfile
@@ -3,8 +3,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
-gem 'forest_admin_agent', path: '../forest_admin_agent'
-gem 'forest_admin_datasource_active_record', path: '../forest_admin_datasource_active_record'
+gem 'forest_admin_agent'
+gem 'forest_admin_datasource_active_record'
 
 group :development, :test do
   gem 'rspec-rails', '~> 6.0.0'