apipie-dsl 2.2.10 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990ebec629f1450a927333b32acec610e62378a52dd4d04247de392fa15376ad
-  data.tar.gz: 15a19b903fa3a51096eda59a022ffcfaaaf1bbe82d9253a25b7696a6c04321bc
+  metadata.gz: d8be129129902b76525b6f6f49af8ceb5966f658cb12734725a15d7a85e44612
+  data.tar.gz: 538ddde32dfe9058739a350a0f641ed64fbc40d8ae529a0ce48e08ce8aa6bbb5
 SHA512:
-  metadata.gz: 8b0a2d9ea7df944cb6b1585db1bc18bc98220ffab60e612e832e9eddbd0e19668067da1b950b342b906a36e922c4f539d35ccf4a9d70977593a5931195d16e94
-  data.tar.gz: ab9e8070fed5ce6cb24c5da93ec3c4b297cb792fa704b5e3fcc2f74c40927deaf608e0401de6dc5eef46fc784e9a89300b9317768398a44f78805c2ccb766333
+  metadata.gz: 7c645ba1b449e181d24b1e4710a493056f0332b6408ee6adf51fb2e496d42c37dee53895f03f89425e2a9d10dd5151a163e9c5d1e04a1b8adea6d75dd17860ef
+  data.tar.gz: 3b1ae75bc8dc25968e5fc0524a66339212598abe751b9254b21715ab705b42dd9e9b29c6e06c54accb2ec1901a149eb58d1dff60bb8b0b507ba4ae7bad14eb2b

data/lib/apipie_dsl/application.rb

@@ -6,7 +6,7 @@ module ApipieDSL
       require 'apipie_dsl/static_dispatcher'
 
       class Engine < Rails::Engine
-        initializer 'static assets', :before => :build_middleware_stack do |app|
+        initializer 'static assets', before: :build_middleware_stack do |app|
           app.middleware.use ::ApipieDSL::StaticDispatcher, "#{root}/app/public"
         end
       end

data/lib/apipie_dsl/dsl.rb

@@ -388,7 +388,6 @@ module ApipieDSL
         @extension_data ||= { methods: [] }
       end
 
-      # rubocop:disable Metrics/AbcSize
       def self.define_validators(class_scope, method_desc)
         return if method_desc.nil? || ![true, :implicitly, :explicitly].include?(ApipieDSL.configuration.validate)
         return unless [true, :implicitly].include?(ApipieDSL.configuration.validate)
@@ -430,7 +429,6 @@ module ApipieDSL
         end
         ParameterDescription.merge(method_desc.plain_params, params)
       end
-      # rubocop:enable Metrics/AbcSize
     end
   end
 

data/lib/apipie_dsl/parameter_description.rb

@@ -33,43 +33,41 @@ module ApipieDSL
       end
     end
 
-    # rubocop:disable Metrics/ParameterLists
     def initialize(method_description, name, validator, desc_or_options = nil, options = {}, &block)
-      if desc_or_options.is_a?(Hash)
-        options = options.merge(desc_or_options)
-      elsif desc_or_options.is_a?(String)
-        options[:desc] = desc_or_options
-      elsif !desc_or_options.nil?
-        raise ArgumentError, 'Parameter description: expected description or options as 3rd parameter'
-      end
+  if desc_or_options.is_a?(Hash)
+    options = options.merge(desc_or_options)
+  elsif desc_or_options.is_a?(String)
+    options[:desc] = desc_or_options
+  elsif !desc_or_options.nil?
+    raise ArgumentError, 'Parameter description: expected description or options as 3rd parameter'
+  end
 
-      @options = options.transform_keys(&:to_sym)
+  @options = options.transform_keys(&:to_sym)
 
-      @method_description = method_description
-      @name = name
-      @desc = @options[:desc]
-      @type = @options[:type] || :required
-      @schema = @options[:schema]
-      @default_value = @options[:default]
-      @parent = @options[:parent]
-      @metadata = @options[:meta]
-      @show = @options.key?(:show) ? @options[:show] : true
+  @method_description = method_description
+  @name = name
+  @desc = @options[:desc]
+  @type = @options[:type] || :required
+  @schema = @options[:schema]
+  @default_value = @options[:default]
+  @parent = @options[:parent]
+  @metadata = @options[:meta]
+  @show = @options.key?(:show) ? @options[:show] : true
 
-      return unless validator
+  return unless validator
 
-      @validator = if validator.is_a?(String)
-        ApipieDSL::Validator::Lazy.new(self, validator, @options, block)
-      else
-        ApipieDSL::Validator::BaseValidator.find(self, validator, @options, block)
-      end
-      raise StandardError, "Validator for #{validator} not found." unless @validator
+  @validator = if validator.is_a?(String)
+    ApipieDSL::Validator::Lazy.new(self, validator, @options, block)
+  else
+    ApipieDSL::Validator::BaseValidator.find(self, validator, @options, block)
+  end
+  raise StandardError, "Validator for #{validator} not found." unless @validator
     end
-    # rubocop:enable Metrics/ParameterLists
 
     def validator
-      return @validator unless @validator.is_a?(ApipieDSL::Validator::Lazy)
+  return @validator unless @validator.is_a?(ApipieDSL::Validator::Lazy)
 
-      @validator = @validator.build
+  @validator = @validator.build
     end
 
     def validate(value)

data/lib/apipie_dsl/routing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApipieDSL
   module Routing
     module MapperExtensions

data/lib/apipie_dsl/tasks/apipie_dsl/cache.rake

@@ -8,6 +8,9 @@ namespace :apipie_dsl do
     task :cache, [:include_json] => :environment do |_task, args|
       args.with_defaults(include_json: false)
       include_json = %w[1 true].include?(args[:include_json])
+      cache_part = ENV['cache_part']
+      generate_index = (cache_part == 'classes' ? false : true)
+      generate_classes = (cache_part == 'index' ? false : true)
       time_start = Time.now
       puts "#{time_start} | Started"
       ApipieDSL::TasksUtils.with_loaded_documentation do
@@ -24,12 +27,16 @@ namespace :apipie_dsl do
               ApipieDSL.url_prefix = "../../#{subdir}"
               doc = ApipieDSL.docs(version, nil, nil, lang, section)
               doc[:docs][:link_extension] = "#{ApipieDSL::TasksUtils.lang_ext(lang)}.html"
-              ApipieDSL::TasksUtils.generate_index_page(file_base_version, doc, include_json, true, lang, section)
-              ApipieDSL.url_prefix = "../../../#{subdir}"
-              section_out = "#{file_base_version}/#{section}"
-              ApipieDSL::TasksUtils.generate_class_pages(version, section_out, doc, include_json, lang, section)
-              ApipieDSL.url_prefix = "../../../../#{subdir}"
-              ApipieDSL::TasksUtils.generate_method_pages(version, section_out, doc, include_json, lang, section)
+              if generate_index
+                ApipieDSL::TasksUtils.generate_index_page(file_base_version, doc, include_json, true, lang, section)
+              end
+              if generate_classes
+                ApipieDSL.url_prefix = "../../../#{subdir}"
+                section_out = "#{file_base_version}/#{section}"
+                ApipieDSL::TasksUtils.generate_class_pages(version, section_out, doc, include_json, lang, section)
+                ApipieDSL.url_prefix = "../../../../#{subdir}"
+                ApipieDSL::TasksUtils.generate_method_pages(version, section_out, doc, include_json, lang, section)
+              end
             end
             ApipieDSL.url_prefix = "../../#{subdir}"
             doc = ApipieDSL.docs(version, nil, nil, lang)
@@ -61,12 +68,16 @@ namespace :apipie_dsl do
               ApipieDSL.url_prefix = "../../#{subdir}"
               doc = ApipieDSL.docs(version, nil, nil, lang, section)
               doc[:docs][:link_extension] = "#{ApipieDSL::TasksUtils.lang_ext(lang)}.html"
-              ApipieDSL::TasksUtils.generate_index_page(file_base_version, doc, include_json, true, lang, section)
-              ApipieDSL.url_prefix = "../../../#{subdir}"
-              section_out = "#{file_base_version}/#{section}"
-              ApipieDSL::TasksUtils.generate_class_pages(version, section_out, doc, include_json, lang, section)
-              ApipieDSL.url_prefix = "../../../../#{subdir}"
-              ApipieDSL::TasksUtils.generate_method_pages(version, section_out, doc, include_json, lang, section)
+              if generate_index
+                ApipieDSL::TasksUtils.generate_index_page(file_base_version, doc, include_json, true, lang, section)
+              end
+              if generate_classes
+                ApipieDSL.url_prefix = "../../../#{subdir}"
+                section_out = "#{file_base_version}/#{section}"
+                ApipieDSL::TasksUtils.generate_class_pages(version, section_out, doc, include_json, lang, section)
+                ApipieDSL.url_prefix = "../../../../#{subdir}"
+                ApipieDSL::TasksUtils.generate_method_pages(version, section_out, doc, include_json, lang, section)
+              end
             end
             ApipieDSL.url_prefix = "../../#{subdir}"
             doc = ApipieDSL.docs(version, nil, nil, lang)

data/lib/apipie_dsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApipieDSL
-  VERSION = '2.2.10'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apipie-dsl
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.3.0
 platform: ruby
 authors:
 - Oleh Fedorenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler