rails_spotlight 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3080195b8e2481d0af07b1c8a7c0e5d59dc7b90d95afc82e722514676003d01
-  data.tar.gz: 472e0580e0e7fceb406bc6810be98ea2945232f673deaaecd28737d3c9bf54ff
+  metadata.gz: 97fa9dc74cea28532602f60c83e5dd0c5ca79f6bd63ad68f8d1b1cd84a5ce0b7
+  data.tar.gz: 002f2d9081c6877a6c569f49db2f17e2fcb02d4cc2800e0a69cff5375c89ab2f
 SHA512:
-  metadata.gz: f72425d6484fe1574d05d5f44189265bab421e834fdde23c9e2c96df0911f0b673750395d86e2b45563cac53dc3f0fc2d82794262c7d24ab3787161890259225
-  data.tar.gz: 98cf2fb54e51e960022a2819aabe04f21bfa66d2f7dd34057fb2fb2d5c4a23481c635d3f40deabc1f387d700b6a1dfb152b1ed5be0135c7ec0139e947db9cb78
+  metadata.gz: 637f0d742d42129342fc6733a823e72c2fdf9f00c627dd137f78f2f7b0801108c5c522c208123383139f84335e6d02c3e3493efd986b0bd328e8097f7d769678
+  data.tar.gz: 80eac812bd515eda62d6ed28123b114b287e35b8467542837ef789fda7f43498f2188227ec5c3eb8959691d4b6d0b70d7279fe9b2b166fec2b48d18c92df8921

data/.rubocop.yml

@@ -1,9 +1,7 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.1
   DefaultFormatter: progress
-  SuggestExtensions:
-    rubocop-rake: true
-    rubocop-rspec: true
+  SuggestExtensions: false
   NewCops: enable
   Exclude:
     - "bin/**/*"
@@ -11,6 +9,8 @@ AllCops:
     - "tmp/**/*"
     - "extensions/**/*"
     - "spec/**/*"
+    - "fake_spec_res/**/*"
+    - "lib/tasks/init.rake"
 
 Style/StringLiterals:
   Enabled: true

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine
+FROM ruby:3.1.2-alpine
 
 RUN apk add --update --no-cache \
     build-base git openssh
@@ -10,7 +10,6 @@ COPY Gemfile /app
 COPY rails_spotlight.gemspec /app
 COPY lib/rails_spotlight/version.rb /app/lib/rails_spotlight/version.rb
 RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc"
-RUN gem update --system 3.2.3
 RUN gem install bundler -v 2.4.6
 RUN bundle install
 

data/Dockerfile-rails-6.0

@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine
+FROM ruby:3.1.2-alpine
 
 RUN apk add --update --no-cache \
         build-base \
@@ -18,7 +18,6 @@ WORKDIR /app
 
 RUN bundle config set force_ruby_platform true
 RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc"
-RUN gem update --system 3.2.3
 RUN gem install bundler -v 2.4.6
 RUN gem install rails -v 6.0.6
 RUN gem install rspec-rails -v 4.1.1
@@ -31,6 +30,7 @@ RUN bundle install
 RUN rails generate rspec:install
 
 COPY fake_spec_res/routes.rb /app/config/
+COPY fake_spec_res/config/rails_spotlight.yml /app/config/
 COPY fake_spec_res/dummy_controller.rb /app/app/controllers/
 COPY fake_spec_res/dummy /app/app/views/dummy
 COPY fake_spec_res/rails_spotlight_spec.rb /app/spec/integration/

data/Dockerfile-rails-6.1

@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine
+FROM ruby:3.1.2-alpine
 
 RUN apk add --update --no-cache \
         build-base \
@@ -18,7 +18,6 @@ WORKDIR /app
 
 RUN bundle config set force_ruby_platform true
 RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc"
-RUN gem update --system 3.2.3
 RUN gem install bundler -v 2.4.6
 RUN gem install rails -v 6.1.7
 RUN gem install rspec-rails -v 4.1.1
@@ -31,6 +30,7 @@ RUN bundle install
 RUN rails generate rspec:install
 
 COPY fake_spec_res/routes.rb /app/config/
+COPY fake_spec_res/config/rails_spotlight.yml /app/config/
 COPY fake_spec_res/dummy_controller.rb /app/app/controllers/
 COPY fake_spec_res/dummy /app/app/views/dummy
 COPY fake_spec_res/rails_spotlight_spec.rb /app/spec/integration/

data/Dockerfile-rails-7.1

@@ -0,0 +1,44 @@
+FROM ruby:3.1.2-alpine
+
+RUN apk add --update --no-cache \
+        build-base \
+        curl-dev \
+        git \
+        nodejs \
+        shared-mime-info \
+        sqlite-dev \
+        tzdata \
+        yaml-dev \
+        yarn \
+        zlib-dev \
+        gcompat \
+        ruby-dev
+
+RUN mkdir /app /gem
+WORKDIR /app
+
+RUN bundle config set force_ruby_platform true
+RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc"
+# RUN gem update --system 3.2.3
+RUN gem install bundler -v 2.4.6
+RUN gem install rails -v 7.1
+RUN gem install rspec-rails
+RUN rails new .
+
+COPY . /gem
+RUN bundle add rails_spotlight --path /gem
+RUN echo 'gem "rspec-rails"' >> "Gemfile"
+RUN bundle install
+RUN rails generate rspec:install
+
+COPY fake_spec_res/routes.rb /app/config/
+COPY fake_spec_res/config/rails_spotlight.yml /app/config/
+COPY fake_spec_res/dummy_controller.rb /app/app/controllers/
+COPY fake_spec_res/dummy /app/app/views/dummy
+COPY fake_spec_res/rails_spotlight_spec.rb /app/spec/integration/
+
+RUN bundle exec rails db:migrate
+
+ENV PARALLEL_WORKERS 1
+
+CMD ["bin/rake"]

data/{Dockerfile-rails-7.0 → Dockerfile-rails-8.0}

@@ -1,4 +1,4 @@
-FROM ruby:3.0-alpine
+FROM ruby:3.2.2-alpine
 
 RUN apk add --update --no-cache \
         build-base \
@@ -18,9 +18,8 @@ WORKDIR /app
 
 RUN bundle config set force_ruby_platform true
 RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc"
-RUN gem update --system 3.2.3
 RUN gem install bundler -v 2.4.6
-RUN gem install rails -v 7.0.4
+RUN gem install rails -v 8.0.0
 RUN gem install rspec-rails
 RUN rails new .
 
@@ -31,6 +30,7 @@ RUN bundle install
 RUN rails generate rspec:install
 
 COPY fake_spec_res/routes.rb /app/config/
+COPY fake_spec_res/config/rails_spotlight.yml /app/config/
 COPY fake_spec_res/dummy_controller.rb /app/app/controllers/
 COPY fake_spec_res/dummy /app/app/views/dummy
 COPY fake_spec_res/rails_spotlight_spec.rb /app/spec/integration/

data/{Dockerfile-rails-5.2 → Dockerfile-rails-8.0.2}

@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine
+FROM ruby:3.2.2-alpine
 
 RUN apk add --update --no-cache \
         build-base \
@@ -11,17 +11,17 @@ RUN apk add --update --no-cache \
         yaml-dev \
         yarn \
         zlib-dev \
-        gcompat
+        gcompat \
+        postgresql-dev
 
 RUN mkdir /app /gem
 WORKDIR /app
 
 RUN bundle config set force_ruby_platform true
 RUN echo 'gem: --no-rdoc --no-ri' >> "$HOME/.gemrc"
-RUN gem update --system 3.2.3
 RUN gem install bundler -v 2.4.6
-RUN gem install rails -v 5.2.3
-RUN gem install rspec-rails -v 4.1.1
+RUN gem install rails -v 8.0.2
+RUN gem install rspec-rails
 RUN rails new .
 
 COPY . /gem
@@ -31,8 +31,13 @@ RUN bundle install
 RUN rails generate rspec:install
 
 COPY fake_spec_res/routes.rb /app/config/
+COPY fake_spec_res/config/rails_spotlight.yml /app/config/
 COPY fake_spec_res/dummy_controller.rb /app/app/controllers/
 COPY fake_spec_res/dummy /app/app/views/dummy
 COPY fake_spec_res/rails_spotlight_spec.rb /app/spec/integration/
 
+RUN bundle exec rails db:migrate
+
+ENV PARALLEL_WORKERS 1
+
 CMD ["bin/rake"]

data/README.md

@@ -4,8 +4,8 @@ Chrome extension [Rails Spotlight](https://chrome.google.com/webstore/detail/rai
 
 ## Support for
 
-* Rails 5+
-* Ruby 2.6+
+* Rails 6+
+* Ruby 3.1+
 
 ## Installation
 
@@ -44,24 +44,47 @@ file will be created in `config/rails_spotlight.yml`
   STORAGE_PATH: <%=Rails.root.join('tmp', 'data', 'rails_spotlight')%>
   STORAGE_POOL_SIZE: 20
   LOGGER: <%=Logger.new(Rails.root.join('log', 'rails_spotlight.log'))%>
+  
+  # Security configuration
+  DATA_ACCESS_TOKEN: # prevent from unauthorized access to the data
+  RAILS_SPOTLIGHT_PROJECT:
+  
+  # Prevent from processing and sending some data to the extension
   MIDDLEWARE_SKIPPED_PATHS: []
   NOT_ENCODABLE_EVENT_VALUES:
   SKIP_RENDERED_IVARS: []
+  
+  # Features
+  FILE_MANAGER_ENABLED: true
+  RUBOCOP_ENABLED: true
+  SQL_CONSOLE_ENABLED: true
+  IRB_CONSOLE_ENABLED: true
+  
+  # File manager configuration
   BLOCK_EDITING_FILES: false
   BLOCK_EDITING_FILES_OUTSIDE_OF_THE_PROJECT: true
   DIRECTORY_INDEX_IGNORE: ['/.git', '**/*.lock', '**/.DS_Store', '/app/assets/images/**', '/app/assets/fonts/**', '/app/assets/builds/**']
+  
+  # Rubocop configuration
   RUBOCOP_CONFIG_PATH: '.rubocop.yml'
-  # Rest of the configuration is required for ActionCable. It will be disabled automatically in when ActionCable is not available.
-  AUTO_MOUNT_ACTION_CABLE: false
-  ACTION_CABLE_MOUNT_PATH: /cable
+  
+  # Workarounds of CSP restrictions for form JS execution from the extension
+  FORM_JS_EXECUTION_TOKEN: <%= Digest::MD5.hexdigest(Rails.application.class.respond_to?(:module_parent_name) ? Rails.application.class.module_parent_name : Rails.application.class.parent_name)%>
+  
   # Required for all action cable features
-  USE_ACTION_CABLE: false
-  LIVE_CONSOLE_ENABLED: false
+  USE_CABLE: false
+  
+  # Rest of the configuration is required for ActionCable. It will be disabled automatically in when ActionCable is not available.
+  AUTO_MOUNT_CABLE: false
+  CABLE_MOUNT_PATH: /cable
+  
   # Experimental feature.
-  REQUEST_COMPLETED_BROADCAST_ENABLED: false
-  LIVE_LOGS_ENABLED: false
+  CABLE_LOGS_ENABLED: false
   DEFAULT_RS_SRC: default
-  FORM_JS_EXECUTION_TOKEN: <%= Digest::MD5.hexdigest(Rails.application.class.respond_to?(:module_parent_name) ? Rails.application.class.module_parent_name : Rails.application.class.parent_name)%>
+  
+  CABLE_CONSOLE_ENABLED: false
+  
+  REQUEST_COMPLETED_BROADCAST_ENABLED: false
 ```
 
 ## Additional metrics
@@ -69,7 +92,7 @@ file will be created in `config/rails_spotlight.yml`
 To enable additional rendering metrics like local variables, instance variables, params etc. add to your layout file:
 
 ```erb
-<% if Rails.env.development? %>
+<% if Rails.env.development? && defined?(::RailsSpotlight)%>
   <%= RailsSpotlight::RenderViewReporter.report_rendered_view_locals(self, locals: local_assigns, params: params, skip_vars: %i[current_template], metadata: { just_test: 'Works' }) %>
 <% end %>
 ```
@@ -77,8 +100,8 @@ To enable additional rendering metrics like local variables, instance variables,
 ## Experimental features
 Live logs requires action cable to be enabled. 
 
-USE_ACTION_CABLE: true
-LIVE_LOGS_ENABLED: true
+USE_CABLE: true
+CABLE_LOGS_ENABLED: true
 
 When you want to use different sources for the cable logs you need to update `cable.yml` file. 
 
@@ -127,10 +150,10 @@ Known issue:
 
 Authentication error when using: 
   - Specific authentication method and action cable
-  - AUTO_MOUNT_ACTION_CABLE: true
+  - AUTO_MOUNT_CABLE: true
 
 Solution:
-  - Set AUTO_MOUNT_ACTION_CABLE: false
+  - Set AUTO_MOUNT_CABLE: false
   - Add manually `mount ActionCable.server => '/cable'` to `config/routes.rb` with proper authentication method
 
 ---
@@ -141,6 +164,15 @@ Solution:
   - Switch flag off
   - REQUEST_COMPLETED_BROADCAST_ENABLED: false
 
+---
+
+SQL manager query execution freeze
+
+It may happen in rail 8
+
+Solution:
+  - Use `Execute query with write access toggle` to skip transactional/cancellable execution -> ![Toggle button](docs/assets/images/sql_execution_toggle.gif)
+
 ## Testing
 
 To run tests for all versions of Rails and Ruby, run:

data/docker-compose.yml

@@ -1,16 +1,9 @@
-version: '3.7'
 services:
   rubocop:
     env_file:
      - 'docker-variables.env'
     build: .
     command: bundle exec rubocop
-  spec-rails-5.2:
-    env_file:
-     - 'docker-variables.env'
-    build:
-      context: .
-      dockerfile: Dockerfile-rails-5.2
   spec-rails-6.0:
     env_file:
      - 'docker-variables.env'
@@ -23,9 +16,21 @@ services:
     build:
       context: .
       dockerfile: Dockerfile-rails-6.1
-  spec-rails-7.0:
+  spec-rails-7.1:
+    env_file:
+     - 'docker-variables.env'
+    build:
+      context: .
+      dockerfile: Dockerfile-rails-7.1
+  spec-rails-8.0:
+    env_file:
+     - 'docker-variables.env'
+    build:
+      context: .
+      dockerfile: Dockerfile-rails-8.0
+  spec-rails-8.0.2:
     env_file:
      - 'docker-variables.env'
     build:
       context: .
-      dockerfile: Dockerfile-rails-7.0
+      dockerfile: Dockerfile-rails-8.0.2

data/fake_spec_res/config/rails_spotlight.yml

@@ -0,0 +1,47 @@
+  # Default configuration for RailsSpotlight
+  PROJECT_NAME: <%=Rails.application.class.respond_to?(:module_parent_name) ? Rails.application.class.module_parent_name : Rails.application.class.parent_name%>
+  SOURCE_PATH: <%=Rails.root%>
+  STORAGE_PATH: <%=Rails.root.join('tmp', 'data', 'rails_spotlight')%>
+  STORAGE_POOL_SIZE: 20
+  LOGGER: <%=Logger.new(Rails.root.join('log', 'rails_spotlight.log'))%>
+  
+  # Security configuration
+  DATA_ACCESS_TOKEN: # prevent from unauthorized access to the data
+  RAILS_SPOTLIGHT_PROJECT:
+  
+  # Prevent from processing and sending some data to the extension
+  MIDDLEWARE_SKIPPED_PATHS: []
+  NOT_ENCODABLE_EVENT_VALUES:
+  SKIP_RENDERED_IVARS: []
+  
+  # Features
+  FILE_MANAGER_ENABLED: true
+  RUBOCOP_ENABLED: true
+  SQL_CONSOLE_ENABLED: true
+  IRB_CONSOLE_ENABLED: true
+  
+  # File manager configuration
+  BLOCK_EDITING_FILES: false
+  BLOCK_EDITING_FILES_OUTSIDE_OF_THE_PROJECT: true
+  DIRECTORY_INDEX_IGNORE: ['/.git', '**/*.lock', '**/.DS_Store', '/app/assets/images/**', '/app/assets/fonts/**', '/app/assets/builds/**']
+  
+  # Rubocop configuration
+  RUBOCOP_CONFIG_PATH: '.rubocop.yml'
+  
+  # Workarounds of CSP restrictions for form JS execution from the extension
+  FORM_JS_EXECUTION_TOKEN: <%= Digest::MD5.hexdigest(Rails.application.class.respond_to?(:module_parent_name) ? Rails.application.class.module_parent_name : Rails.application.class.parent_name)%>
+  
+  # Required for all action cable features
+  USE_CABLE: false
+  
+  # Rest of the configuration is required for ActionCable. It will be disabled automatically in when ActionCable is not available.
+  AUTO_MOUNT_CABLE: false
+  CABLE_MOUNT_PATH: /cable
+  
+  # Experimental feature.
+  CABLE_LOGS_ENABLED: false
+  DEFAULT_RS_SRC: default
+  
+  CABLE_CONSOLE_ENABLED: false
+  
+  REQUEST_COMPLETED_BROADCAST_ENABLED: false

data/fake_spec_res/rails_spotlight_spec.rb

@@ -6,7 +6,9 @@ require 'fileutils'
 RSpec.describe DummyController, type: :request do # rubocop:disable Metrics/BlockLength
   context 'rails_spotlight' do
     it 'serve a file source' do
-      post '/__rails_spotlight/file.json', params: { file: 'config/application.rb', mode: :read }.to_json
+      post '/__rails_spotlight/file.json',
+           params: { file: 'config/application.rb', mode: :read }.to_json,
+           headers: { 'CONTENT_TYPE' => 'application/json' }
 
       expect(response).to be_successful
       expect(response.body).to include('# Require the gems listed in Gemfile, including any gems')
@@ -18,20 +20,36 @@ RSpec.describe DummyController, type: :request do # rubocop:disable Metrics/Bloc
       File.write(Rails.root.join(file), 'OLD')
       expect(File.read(Rails.root.join(file))).to_not eq content
 
-      post '/__rails_spotlight/file.json', params: { file: file, mode: :write, content: content }.to_json
+      post '/__rails_spotlight/file.json',
+           params: { file: file, mode: :write, content: content }.to_json,
+           headers: { 'CONTENT_TYPE' => 'application/json' }
 
       expect(response).to be_successful
-      expect(response.body).to eq({ source: content, changed: true, project: 'App', new_content: 'TEST' }.to_json)
+      expect(response.body).to eq({
+        source: content,
+        changed: true,
+        in_project: true,
+        relative_path: file,
+        root_path: '/app',
+        new_content: content,
+        project: 'App'
+      }.to_json)
+
       expect(File.read(Rails.root.join(file))).to eq content
     end
 
     it 'serve a verify info' do
-      get '/__rails_spotlight/verify.json'
+      body = { test: 'ok' }.to_json
+      post '/__rails_spotlight/verify.json?check=yes',
+           params: body,
+           headers: { 'CONTENT_TYPE' => 'application/json', 'HTTP_X_RAILS_SPOTLIGHT' => '1.0.0' }
       expect(response).to be_successful
     end
 
     it 'serve a sql result' do
-      post '/__rails_spotlight/sql.json', params: { query: 'select sqlite_version();' }.to_json
+      post '/__rails_spotlight/sql.json',
+           params: { query: 'select sqlite_version();' }.to_json,
+           headers: { 'CONTENT_TYPE' => 'application/json' }
       expect(response).to be_successful
       expect(JSON.parse(response.body).keys).to eq(%w[query result logs error query_mode project])
     end

data/lib/rails_spotlight/app_notifications.rb

@@ -59,14 +59,13 @@ module RailsSpotlight
       Event.new(name, start, ending, transaction_id, payload)
     }
 
-    # Subscribe to all events relevant to RailsPanel
-    #
+    # Subscribe to all relevant events
     def self.subscribe
       # Skip RailsSpotlight subscriptions during migrations
       return if migrating?
 
       new
-        .subscribe('rsl.notification.log')
+        # .subscribe('rsl.notification.log') # We do not publish events to this channel for now
         .subscribe('sql.active_record', &SQL_BLOCK)
         .subscribe('sql.sequel', &SQL_BLOCK)
         .subscribe('render_partial.action_view', &VIEW_BLOCK)

data/lib/rails_spotlight/channels/handlers/{live_console_handler.rb → console_handler.rb}

@@ -5,7 +5,7 @@ require_relative '../../rails_command_executor'
 module RailsSpotlight
   module Channels
     module Handlers
-      class LiveConsoleHandler
+      class ConsoleHandler
         TYPE = 'console'
 
         def initialize(data)
@@ -15,7 +15,7 @@ module RailsSpotlight
         attr_reader :data
 
         def call
-          return unless ::RailsSpotlight.config.live_logs_enabled?
+          return unless ::RailsSpotlight.config.cable_logs_enabled?
           return unless data['type'] == TYPE
 
           command = data['command']
@@ -44,7 +44,7 @@ module RailsSpotlight
           executor.execute(command)
           if executor.execution_successful?
             {
-              payload: { result: executor.result_as_json(inspect_types: inspect_types) }
+              payload: { result: executor.result_as_json(inspect_types:) }
             }
           else
             {

data/lib/rails_spotlight/channels/handlers/logs_handler.rb

@@ -13,7 +13,7 @@ module RailsSpotlight
         attr_reader :data
 
         def call
-          return unless ::RailsSpotlight.config.live_logs_enabled?
+          return unless ::RailsSpotlight.config.cable_logs_enabled?
           return unless data['type'] == TYPE
 
           for_project = Array(data['project'])

data/lib/rails_spotlight/channels/handlers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'handlers/live_console_handler'
+require_relative 'handlers/console_handler'
 require_relative 'handlers/logs_handler'
 
 module RailsSpotlight
@@ -14,11 +14,11 @@ module RailsSpotlight
 
         attr_reader :code
       end
-      TYPES = [LiveConsoleHandler::TYPE, LogsHandler::TYPE].freeze
+      TYPES = [ConsoleHandler::TYPE, LogsHandler::TYPE].freeze
 
       def self.handle(data)
         case data['type']
-        when LiveConsoleHandler::TYPE then LiveConsoleHandler.new(data).call
+        when ConsoleHandler::TYPE then ConsoleHandler.new(data).call
         when LogsHandler::TYPE then LogsHandler.new(data).call
         end
       end

data/lib/rails_spotlight/channels/spotlight_channel.rb

@@ -33,6 +33,25 @@ module RailsSpotlight
         RailsSpotlight.config.logger.fatal("#{e.message}\n #{e.backtrace.join("\n ")}")
       end
 
+      def self.broadcast_log(message, level, callsite = {}, name = nil) # rubocop:disable Metrics/CyclomaticComplexity
+        return unless ::RailsSpotlight.config.use_cable?
+        return if message.blank?
+
+        broadcast(
+          type: 'logs',
+          payload: (callsite || {}).merge(
+            msg: message,
+            src: ENV['RS_SRC'] || RailsSpotlight.config.default_rs_src,
+            l: level,
+            dt: Time.now.to_f,
+            id: AppRequest.current&.id,
+            pg: name
+          )
+        )
+      rescue StandardError => e
+        RailsSpotlight.config.logger.fatal("#{e.message}\n #{e.backtrace&.join("\n ")}")
+      end
+
       def subscribed
         stream_from ::RailsSpotlight::Channels::SPOTLIGHT_CHANNEL
         publish({ message: "Your #{project} project is now connected to the spotlight channel.", code: :connected, type: :info })
@@ -54,7 +73,7 @@ module RailsSpotlight
       private
 
       def publish(data)
-        connection.transmit identifier: @identifier, message: data.merge(project: project, version: version)
+        connection.transmit identifier: @identifier, message: data.merge(project:, version:)
         # we do not use transmit because it is triggering logs and can cause an infinite loop
         # transmit(data.merge(project: project, version: version))
       end