forest_admin_rails 1.0.0.pre.beta.48 → 1.0.0.pre.beta.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd8ef4c3bf64c07d76874bd52c19b12ac52532a16e67978b6fc0053bb746cf2
-  data.tar.gz: bdd776d4677a04f1d634fc51d787c180c34ef5e568b0bacb8ff9b0f2ee05fff4
+  metadata.gz: 67436e50177b80815908a56e521e344ef770ff6f3f4b3d8d4a1969d62aff96e7
+  data.tar.gz: 3fd653d28b29598d08ef7587391ca8a554d7e5b722c69fafe234964229413266
 SHA512:
-  metadata.gz: 8e438d102cea49a4df22eb7906f201ad784ec67cf34351ca4ee99428ef1a399974462c5a92f61a11d300c1960333d8be0771a73cca7e8438bb28543084f90b06
-  data.tar.gz: f181f852157cb356981809319bd97aeaa6604cb8952a15800606782ef5a08183936a5b8da19ec96068232857cc25208bcac0976386a91c871aae08d59325ae07
+  metadata.gz: 4db457f778f5824edf92e58f6978e75dd42bafff982fed1939cd07649d589ade46ea84b18b7b3359ab37a538d4f55bbb421ebef576433022aff072c2a7017396
+  data.tar.gz: fce8ea0aaa4cbc5ee516796415908b3f0db1a967e91df7b2d5fc034083432575c777900a2247ed5d840438f492d27f03f5e3f2467201fbdb5371c0ad8206ab32

data/app/controllers/forest_admin_rails/forest_controller.rb

@@ -1,5 +1,7 @@
 module ForestAdminRails
   class ForestController < ActionController::Base
+    include ForestAdminAgent::Http::ErrorHandling
+
     skip_forgery_protection
 
     def index
@@ -22,8 +24,10 @@ module ForestAdminRails
                                                   disposition: 'attachment'
       end
 
-      response.headers.merge!(data[:content][:headers] || {})
-      data[:content].delete(:headers)
+      if data.dig(:content, :headers)
+        response.headers.merge!(data[:content][:headers] || {})
+        data[:content].delete(:headers)
+      end
 
       respond_to do |format|
         format.json { render json: data[:content], status: data[:status] || data[:content][:status] || 200 }
@@ -43,7 +47,7 @@ module ForestAdminRails
           errors: [
             {
               name: exception.name,
-              detail: exception.message,
+              detail: get_error_message(exception),
               status: exception.try(:status)
             }
           ]
@@ -52,7 +56,7 @@ module ForestAdminRails
         data[:errors][0][:data] = exception.try(:data)
       end
 
-      unless Facades::Container.cache(:is_production)
+      unless ForestAdminAgent::Facades::Container.cache(:is_production)
         ForestAdminAgent::Facades::Container.logger.log('Debug', exception.full_message)
       end
 

data/config/initializers/forest_admin_error_subscriber.rb

@@ -1,6 +1,6 @@
 class ForestAdminErrorSubscriber
-  def report(error, _handled:, _severity:, _context:, _source: nil)
-    return if Facades::Container.cache(:is_production)
+  def report(error, handled:, severity:, context:, source: nil)
+    return if ForestAdminAgent::Facades::Container.cache(:is_production)
 
     ForestAdminAgent::Facades::Container.logger.log('Debug', error.full_message)
   end

data/config/routes.rb

@@ -1,8 +1,14 @@
 ForestAdminRails::Engine.routes.draw do
   Rails.error.handle(ForestAdminDatasourceToolkit::Exceptions::ForestException) do
-    ForestAdminAgent::Http::Router.routes.each do |name, agent_route|
-      match agent_route[:uri], defaults: { format: agent_route[:format] }, to: 'forest#index',
-                               via: agent_route[:method], as: name, route_alias: name
+    scope '/forest' do
+      ForestAdminAgent::Http::Router.routes.each do |name, agent_route|
+        match agent_route[:uri],
+              defaults: { format: agent_route[:format] },
+              to: 'forest#index',
+              via: agent_route[:method],
+              as: name,
+              route_alias: name
+      end
     end
   end
 end

data/lib/forest_admin_rails/engine.rb

@@ -38,14 +38,11 @@ module ForestAdminRails
     end
 
     def load_configuration
-      return unless File.exist?(Rails.root.join('lib', 'forest_admin_rails', 'create_agent.rb'))
+      return unless File.exist?(Rails.root.join('app', 'lib', 'forest_admin_rails', 'create_agent.rb'))
 
       # force eager loading models
       Rails.application.eager_load!
 
-      # setup agent
-      Dir[Rails.root.join('lib', 'forest_admin_rails', '**', '*.rb')].each { |file| require file }
-
       ForestAdminRails::CreateAgent.setup!
 
       sse = ForestAdminAgent::Services::SSECacheInvalidation

data/lib/forest_admin_rails/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminRails
-  VERSION = "1.0.0-beta.48"
+  VERSION = "1.0.0-beta.49"
 end

data/lib/forest_admin_rails.rb

@@ -17,13 +17,14 @@ module ForestAdminRails
   setting :env_secret
   setting :forest_server_url, default: 'https://api.forestadmin.com'
   setting :is_production, default: Rails.env.production?
-  setting :prefix, default: 'forest'
+  setting :prefix, default: nil
   setting :permission_expiration, default: 900
   setting :cache_dir, default: :'tmp/cache/forest_admin'
   setting :schema_path, default: File.join(Dir.pwd, '.forestadmin-schema.json')
   setting :project_dir, default: Dir.pwd
   setting :loggerLevel, default: 'info'
   setting :logger, default: nil
+  setting :customize_error_message, default: nil
   setting :instant_cache_refresh, default: Rails.env.production?
 
   if defined?(Rails::Railtie)

data/lib/generators/forest_admin_rails/install_generator.rb

@@ -8,8 +8,8 @@ module ForestAdminRails
         @auth_secret = SecureRandom.hex(20)
         @env_secret = env_secret
         template 'initializers/config.rb', 'config/initializers/forest_admin_rails.rb'
-        template 'create_agent.rb', 'lib/forest_admin_rails/create_agent.rb'
-        route "mount ForestAdminRails::Engine => '/#{ForestAdminRails.config[:prefix]}'"
+        template 'create_agent.rb', 'app/lib/forest_admin_rails/create_agent.rb'
+        route 'mount ForestAdminRails::Engine => "#{ForestAdminRails.config[:prefix]}"'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.48
+  version: 1.0.0.pre.beta.49
 platform: ruby
 authors:
 - Matthieu