apipie-dsl 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4621977ecc3d0783dc21032bb8790fd1d2a1c7cc81635f91932813d1ce2a9148
-  data.tar.gz: bb80ac4c8d298274fadf8edaf25d1ca77e98cb094d7d81f6e7fcb78db85318b5
+  metadata.gz: 06cfa92a5d84bc9ca6db419ec1948d66541b414a57a68cc5316c335142b98c8f
+  data.tar.gz: 5b2a03b6201ddcd2a61fd8e481be673a0383e06b012ba433f0b76cf266094f05
 SHA512:
-  metadata.gz: 1d4c14f184ca3595052c95dfab5f2df1cd52bebddfc466dbe47eb43a13eb1d19ba680db6455d61c0d3ba3e776a3b7ee3fb3a78d4f0eb296c56da5931277cc2ff
-  data.tar.gz: eb47d1566806421e25164d76ac6e3afb20d55733e4ae94bc358c5e24cf411b92f10829e9a960823a1f9a192d07aa83b23d675d3970be9ee5e20b98a6e3a1cef0
+  metadata.gz: f9684334d6aa6a515e4993601ca0b5f53187aebe2e64de43baad932f95abc51f5730945b8d81260baf61cc4af934b235d51bef161593334f4369111f9fc568e5
+  data.tar.gz: 77a23f53bb07eb0795a709f15b492e1cad04912770e0f32328092ba5cbe6cd1c70bc94f05564a05c97fa397daa8ac61ac9f44f6d0ab8fe9dd784364eebf4389d

data/app/helpers/apipie_dsl_helper.rb

@@ -12,8 +12,26 @@ module ApipieDslHelper
     end
   end
 
-  def escaped_method_name(method, escaping = '')
-    return method.gsub('?', escaping) if method.is_a?(String)
+  def escaped_method_name(method, options = {})
+    options[:escaping] ||= ''
+    options[:pattern] ||= /[?]/
+    return method.gsub(options[:pattern], options[:escaping]) if method.is_a?(String)
+  end
+
+  def apipie_dsl_menu
+    content_tag(:ul, class: 'breadcrumb') do
+      content = dsl_sections.map do |section|
+        content_tag(:li, class: section == @section ? 'active' : '') do
+          link_to(t("apipie_dsl.#{section}"), @doc[:doc_url] + section_ext(section) + @doc[:link_extension])
+        end
+      end.join(' | ').html_safe
+
+      unless ApipieDSL.configuration.help_layout.nil?
+        content += content_tag(:li, class: "pull-right #{'active' if @section == 'help'}") do
+          link_to(t("apipie_dsl.help"), @doc[:doc_url] + section_ext('help') + @doc[:link_extension])
+        end
+      end
+    end
   end
 
   def apipie_dsl_example(source, output = nil)
@@ -45,6 +63,8 @@ module ApipieDslHelper
       'nil'
     when ''
       "\"\""
+    when Symbol
+      ":#{default}"
     else
       default
     end

data/app/views/apipie_dsl/apipie_dsls/_index_class_prop.html.erb

@@ -1,7 +1,7 @@
 <% if prop[:show] %>
   <tr>
     <td>
-      <a href='<%= doc_url %><%= link_extension %>#link-description-<%= escaped_method_name(prop[:name], '_') %>'>
+      <a href='<%= doc_url %><%= link_extension %>#link-description-<%= escaped_method_name(prop[:name], escaping: '_') %>'>
         <%= prop[:name] %>
       </a>
       <% if prop[:deprecated] %>

data/app/views/apipie_dsl/apipie_dsls/_method.html.erb

@@ -8,7 +8,7 @@
       <div>
         <% (meth[:signature] || [method_signature(meth)]).each do |signature| %>
           <h2>
-            <a href='#description-<%= escaped_method_name(meth[:name], '_') %>'
+            <a href='#description-<%= escaped_method_name(meth[:name], escaping: '_') %>'
              class='accordion-toggle'
              data-toggle='collapse'
              data-parent='#meth-accordion'>
@@ -29,7 +29,7 @@
         Also see <%= meth[:see].map { |s| link_to(s[:description] || s[:link], "#{s[:url]}#{link_extension}") }.to_sentence.html_safe %>.
       <% end %>
 
-      <div id='description-<%= escaped_method_name(meth[:name], '_') %>' class='collapse accordion-body'>
+      <div id='description-<%= escaped_method_name(meth[:name], escaping: '_') %>' class='collapse accordion-body'>
         <%= render partial: 'method_detail', locals: { method: meth, h_level: 3 } %>
       </div>
     </td>

data/app/views/apipie_dsl/apipie_dsls/_property.html.erb

@@ -4,7 +4,7 @@
       <td>
         <div>
           <h2>
-            <a id='link-description-<%= escaped_method_name(prop[:name], '_') %>' href='#description-<%= escaped_method_name(prop[:name], '_') %>'
+            <a id='link-description-<%= escaped_method_name(prop[:name], escaping: '_', pattern: /[?!]/) %>' href='#description-<%= escaped_method_name(prop[:name], escaping: '_', pattern: /[?!]/) %>'
              class='accordion-toggle'
              data-toggle='collapse'
              data-parent='#prop-accordion'>
@@ -15,7 +15,7 @@
           </h2>
         </div>
 
-        <div id='description-<%= escaped_method_name(prop[:name], '_') %>' class='collapse accordion-body'>
+        <div id='description-<%= escaped_method_name(prop[:name], escaping: '_', pattern: /[?!]/) %>' class='collapse accordion-body'>
           <%= render partial: 'property_detail', locals: { property: prop, h_level: 3 } %>
         </div>
       </td>

data/app/views/apipie_dsl/apipie_dsls/class.html.erb

@@ -1,18 +1,4 @@
-<ul class='breadcrumb'>
-  <% dsl_sections.each do |section| %>
-    <% if section == @section %>
-      <li class='active'><a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{@section}") %></a></li>
-    <% else %>
-      <li><a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a></li>
-    <% end %>
-  <% end %>
-  <% unless ApipieDSL.configuration.help_layout.nil? %>
-    <li class='pull-right'>
-      <% section = 'help' %>
-      <a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a>
-    </li>
-  <% end %>
-</ul>
+<%= apipie_dsl_menu %>
 <ul class='breadcrumb'>
   <li>
     <a href='<%= @doc[:doc_url] %><%= section_ext(@section) %><%= @doc[:link_extension] %>'><%= @doc[:name] %> <%= @klass[:version] %></a>

data/app/views/apipie_dsl/apipie_dsls/custom_help.html.erb

@@ -1,12 +1,4 @@
 <% if ApipieDSL.configuration.help_layout %>
-  <ul class='breadcrumb'>
-    <% dsl_sections.each do |section| %>
-      <li><a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a></li>
-    <% end %>
-      <li class='active pull-right'>
-        <% section = 'help' %>
-        <a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a>
-      </li>
-  </ul>
+  <%= apipie_dsl_menu %>
   <%= render_help %>
 <% end %>

data/app/views/apipie_dsl/apipie_dsls/index.html.erb

@@ -1,18 +1,5 @@
-<ul class='breadcrumb'>
-  <% dsl_sections.each do |section| %>
-    <% if section == @section %>
-      <li class='active'><a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{@section}") %></a></li>
-    <% else %>
-      <li><a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a></li>
-    <% end %>
-  <% end %>
-  <% unless ApipieDSL.configuration.help_layout.nil? %>
-    <li class='pull-right'>
-      <% section = 'help' %>
-      <a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a>
-    </li>
-  <% end %>
-</ul>
+<%= apipie_dsl_menu %>
+
 <ul class='breadcrumb'>
   <li class='active'><a href='<%= @doc[:doc_url] %><%= section_ext(@section) %><%= @doc[:link_extension] %>'><%= @doc[:name] %> <%= current_version(@doc[:classes]) %></a></li>
   <%= render(partial: 'languages', locals: { doc_url: @doc[:doc_url] + section_ext(@section) }) %>

data/app/views/apipie_dsl/apipie_dsls/method.html.erb

@@ -1,18 +1,4 @@
-<ul class='breadcrumb'>
-  <% dsl_sections.each do |section| %>
-    <% if section == @section %>
-      <li class='active'><a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{@section}") %></a></li>
-    <% else %>
-      <li><a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a></li>
-    <% end %>
-  <% end %>
-  <% unless ApipieDSL.configuration.help_layout.nil? %>
-    <li class='pull-right'>
-      <% section = 'help' %>
-      <a href='<%= @doc[:doc_url] %><%= section_ext(section) %><%= @doc[:link_extension] %>'><%= t("apipie_dsl.#{section}") %></a>
-    </li>
-  <% end %>
-</ul>
+<%= apipie_dsl_menu %>
 <ul class='breadcrumb'>
   <li>
     <a href='<%= @doc[:doc_url] %><%= section_ext(@section) %><%= @doc[:link_extension] %>'><%= @doc[:name] %> <%= @klass[:version] %></a>

data/lib/apipie_dsl/version.rb

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

metadata

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