apipie-dsl 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751af0c065bd8a384dc9c710dc53da2275015666c7076c3a13eb4c89f47860d3
-  data.tar.gz: fab345212215d732917c7c16375088d850933f147f4c49d757732dea8576ad0f
+  metadata.gz: 4621977ecc3d0783dc21032bb8790fd1d2a1c7cc81635f91932813d1ce2a9148
+  data.tar.gz: bb80ac4c8d298274fadf8edaf25d1ca77e98cb094d7d81f6e7fcb78db85318b5
 SHA512:
-  metadata.gz: 490ad088339064f5495b3c1271ec549446444b17b4c0b7fc71b16ad1afc5b458b6d22525e2e2158a73f41aab346c4201333410f95c509bad971dcda5f17aa694
-  data.tar.gz: 9e6285a8b353bdc8e87bf7485955bd6ce250734bd2140272329518080da2ebe316d9fc7c7f70b146d04263d601f8eb0b017b3cc8eda4e3f44dee730279c61954
+  metadata.gz: 1d4c14f184ca3595052c95dfab5f2df1cd52bebddfc466dbe47eb43a13eb1d19ba680db6455d61c0d3ba3e776a3b7ee3fb3a78d4f0eb296c56da5931277cc2ff
+  data.tar.gz: eb47d1566806421e25164d76ac6e3afb20d55733e4ae94bc358c5e24cf411b92f10829e9a960823a1f9a192d07aa83b23d675d3970be9ee5e20b98a6e3a1cef0

data/app/helpers/apipie_dsl_helper.rb

@@ -81,6 +81,9 @@ module ApipieDslHelper
     # Try to convert to a constant in case of LazyValidator usage
     # Will raise const missing exception in case of wrong usage of the method
     if obj.is_a?(String)
+      ref = ApipieDSL.refs[version][ApipieDSL.get_class_name(obj)]
+      return "<a href='#{ref.doc_url(ref.sections.first)}#{link_extension}'>#{obj}</a>" if ref
+
       obj = ApipieDSL.configuration.rails? ? obj.constantize : obj.split('::').reduce(::Module, :const_get)
     end
     return obj.to_s unless [::Module, ::Class, ::Array].include?(obj.class)

data/lib/apipie_dsl/class_description.rb

@@ -12,7 +12,7 @@ module ApipieDSL
       @properties = []
       @version = version || ApipieDSL.configuration.default_version
       @parent = ApipieDSL.get_class_description(ApipieDSL.superclass_for(klass), version)
-      @refs = []
+      @refs = [@name]
       @sections = []
       @show = true
       update_from_dsl_data(dsl_data) if dsl_data
@@ -20,17 +20,22 @@ module ApipieDSL
 
     def update_from_dsl_data(dsl_data)
       @name = dsl_data[:class_name] if dsl_data[:class_name]
-      @full_description = ApipieDSL.markup_to_html(dsl_data[:description])
-      @short_description = dsl_data[:short_description]
+      @full_description = ApipieDSL.markup_to_html(dsl_data[:description]) if dsl_data[:description]
+      @short_description = dsl_data[:short_description] || @short_description
       @tag_list = dsl_data[:tag_list]
-      @metadata = dsl_data[:meta]
+      if dsl_data[:meta]&.is_a?(Hash)
+        @metadata&.merge!(dsl_data[:meta])
+      elsif dsl_data[:meta]
+        @metadata = dsl_data[:meta]
+      end
       @deprecated = dsl_data[:deprecated] || false
       @show = dsl_data[:show] || @show
-      @properties = (dsl_data[:properties] || []).map do |args|
-        ApipieDSL::MethodDescription.from_dsl_data(self, args)
+      prop_names = @properties.map(&:name)
+      (dsl_data[:properties] || []).each do |args|
+        @properties << ApipieDSL::MethodDescription.from_dsl_data(self, args) unless prop_names.include?(args.first.to_s)
       end
-      @refs = dsl_data[:refs] || [@name]
-      @sections = dsl_data[:sections] || @sections
+      @refs = (@refs + dsl_data[:refs]).uniq if dsl_data[:refs]
+      @sections = (@sections + dsl_data[:sections]).uniq if dsl_data[:sections]
       return unless dsl_data[:app_info]
 
       ApipieDSL.configuration.app_info[version] = dsl_data[:app_info]
@@ -65,10 +70,6 @@ module ApipieDSL
       @methods.values
     end
 
-    def property_descriptions
-      @properties
-    end
-
     def doc_url(section = nil)
       crumbs = []
       crumbs << version if ApipieDSL.configuration.version_in_url

data/lib/apipie_dsl/dsl.rb

@@ -347,7 +347,7 @@ module ApipieDSL
       include ApipieDSL::Klass
       include ApipieDSL::Method
 
-      attr_reader :class_scope
+      attr_accessor :class_scope
 
       def initialize(class_scope)
         @class_scope = class_scope
@@ -385,7 +385,7 @@ module ApipieDSL
       end
 
       def self.extension_data
-        @extension_data ||= []
+        @extension_data ||= { methods: [] }
       end
 
       # rubocop:disable Metrics/AbcSize
@@ -553,16 +553,19 @@ module ApipieDSL
 
       delegatee = Delegatee.instance_for(self).with(&block)
       delegatee.dsl_data[:update_only] = true
-      # Don't eval the block, since it will be evaluated after method is defined
+
       return if context == :method
 
-      # Currently method extensions are supported only
+      # Save instance to reuse when actual scope is set
+      Delegatee.extension_data[:class] = delegatee
       Delegatee.instance_reset
     end
 
     def prepended(klass)
       super
-      Delegatee.extension_data.each do |method_name, dsl_data|
+      Delegatee.extension_data[:class]&.class_scope = klass
+      Delegatee.extension_data[:class]&.eval_dsl_for(:class)
+      Delegatee.extension_data[:methods].each do |method_name, dsl_data|
         class_scope = klass
         if dsl_data[:update_only]
           class_name = ApipieDSL.get_class_name(class_scope)
@@ -592,7 +595,7 @@ module ApipieDSL
       return if Delegatee.instance.nil?
 
       dsl_data = Delegatee.instance.eval_dsl_for(:method)
-      Delegatee.extension_data << [method_name, dsl_data]
+      Delegatee.extension_data[:methods] << [method_name, dsl_data]
     ensure
       Delegatee.instance_reset
     end

data/lib/apipie_dsl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apipie-dsl
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.8
 platform: ruby
 authors:
 - Oleh Fedorenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler