cabbage_doc 0.1.2 → 0.1.3

data/web/public/css/highlight/thankful_eyes.css

@@ -0,0 +1,173 @@
+.highlight table td { padding: 5px; }
+.highlight table pre { margin: 0; }
+.highlight {
+  color: #faf6e4;
+  background-color: #122b3b;
+}
+.highlight .gl {
+  color: #dee5e7;
+  background-color: #4e5d62;
+}
+.highlight .gp {
+  color: #a8e1fe;
+  font-weight: bold;
+}
+.highlight .c, .highlight .cd, .highlight .cm, .highlight .c1, .highlight .cs {
+  color: #6c8b9f;
+  font-style: italic;
+}
+.highlight .cp {
+  color: #b2fd6d;
+  font-weight: bold;
+  font-style: italic;
+}
+.highlight .err {
+  color: #fefeec;
+  background-color: #cc0000;
+}
+.highlight .gr {
+  color: #cc0000;
+  font-weight: bold;
+  font-style: italic;
+}
+.highlight .k, .highlight .kd, .highlight .kv {
+  color: #f6dd62;
+  font-weight: bold;
+}
+.highlight .o, .highlight .ow {
+  color: #4df4ff;
+  font-weight: bold;
+}
+.highlight .p, .highlight .pi {
+  color: #4df4ff;
+}
+.highlight .gd {
+  color: #cc0000;
+}
+.highlight .gi {
+  color: #b2fd6d;
+}
+.highlight .ge {
+  font-style: italic;
+}
+.highlight .gs {
+  font-weight: bold;
+}
+.highlight .gt {
+  color: #dee5e7;
+  background-color: #4e5d62;
+}
+.highlight .kc {
+  color: #f696db;
+  font-weight: bold;
+}
+.highlight .kn {
+  color: #ffb000;
+  font-weight: bold;
+}
+.highlight .kp {
+  color: #ffb000;
+  font-weight: bold;
+}
+.highlight .kr {
+  color: #ffb000;
+  font-weight: bold;
+}
+.highlight .gh {
+  color: #ffb000;
+  font-weight: bold;
+}
+.highlight .gu {
+  color: #ffb000;
+  font-weight: bold;
+}
+.highlight .kt {
+  color: #b2fd6d;
+  font-weight: bold;
+}
+.highlight .no {
+  color: #b2fd6d;
+  font-weight: bold;
+}
+.highlight .nc {
+  color: #b2fd6d;
+  font-weight: bold;
+}
+.highlight .nd {
+  color: #b2fd6d;
+  font-weight: bold;
+}
+.highlight .nn {
+  color: #b2fd6d;
+  font-weight: bold;
+}
+.highlight .bp {
+  color: #b2fd6d;
+  font-weight: bold;
+}
+.highlight .ne {
+  color: #b2fd6d;
+  font-weight: bold;
+}
+.highlight .nl {
+  color: #ffb000;
+  font-weight: bold;
+}
+.highlight .nt {
+  color: #ffb000;
+  font-weight: bold;
+}
+.highlight .m, .highlight .mf, .highlight .mh, .highlight .mi, .highlight .il, .highlight .mo, .highlight .mb, .highlight .mx {
+  color: #f696db;
+  font-weight: bold;
+}
+.highlight .ld {
+  color: #f696db;
+  font-weight: bold;
+}
+.highlight .ss {
+  color: #f696db;
+  font-weight: bold;
+}
+.highlight .s, .highlight .sb, .highlight .sd, .highlight .s2, .highlight .sh, .highlight .sx, .highlight .sr, .highlight .s1 {
+  color: #fff0a6;
+  font-weight: bold;
+}
+.highlight .se {
+  color: #4df4ff;
+  font-weight: bold;
+}
+.highlight .sc {
+  color: #4df4ff;
+  font-weight: bold;
+}
+.highlight .si {
+  color: #4df4ff;
+  font-weight: bold;
+}
+.highlight .nb {
+  font-weight: bold;
+}
+.highlight .ni {
+  color: #999999;
+  font-weight: bold;
+}
+.highlight .w {
+  color: #BBBBBB;
+}
+.highlight .go {
+  color: #BBBBBB;
+}
+.highlight .nf {
+  color: #a8e1fe;
+}
+.highlight .py {
+  color: #a8e1fe;
+}
+.highlight .na {
+  color: #a8e1fe;
+}
+.highlight .nv, .highlight .vc, .highlight .vg, .highlight .vi {
+  color: #a8e1fe;
+  font-weight: bold;
+}

data/web/public/css/{application.css → styles.css}

@@ -1,7 +1,39 @@
-pre, code, .authentication form
+html
 {
-	font-family: monospace;
-	border: 1px solid #e5e0c6;
+	-webkit-font-smoothing: antialiased;
+	text-rendering: optimizeLegibility;
+}
+
+body
+{
+	margin: 0;
+	padding: 0;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+a, a:active, a:visited, a:hover
+{
+	color: #000000;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+a:hover
+{
+	text-decoration: underline;
+}
+
+.application, .page
+{
+	margin: 10px auto;
+	width: 1024px;
+}
+
+p code
+{
+  font-weight: bold;
+  font-style: italic;
+  font-family: inherit;
 }
 
 .authentication form
@@ -191,3 +223,22 @@ input[type=button], input[type=submit]
   padding: 10px;
   margin-bottom: 10px;
 }
+
+div.highlight pre
+{
+	margin: 0;
+	padding: 0;
+}
+
+div.highlight
+{
+	padding: 10px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	border: 1px solid #e5e0c6;
+}
+
+.example div.highlight
+{
+	padding: 5px;
+}

data/web/public/js/application.js

@@ -1,12 +1,5 @@
 $(document).ready(function()
 {
-  function highlight(selector)
-  {
-    selector.each(function(i, e) { hljs.highlightBlock(e); });
-  }
-
-  highlight($('code'));
-
   function compose_path(path)
   {
     return [window.location.pathname, path].join('/').replace(/\/\/+/, '/');
@@ -42,8 +35,6 @@ $(document).ready(function()
 
     form.find('.clear').removeClass('hidden');
 
-    highlight(response.find('pre code'));
-
     enable_submit_buttons();
   }
 

data/web/views/example.haml

@@ -1,5 +1,3 @@
 .example
   .label="#{example.label}:"
-  %pre
-    %code.bash
-      = config.format_example.call(example, action, auth)
+  = highlighter.format(config.format_example.call(example, action, auth), :sh)

data/web/views/layout.haml

@@ -2,13 +2,12 @@
 %html
   %head
     %link{ rel: :stylesheet, href: theme_path, type: 'text/css' }
-    %link{ rel: :stylesheet, href: asset_path('css/base.css'), type: 'text/css' }
-    %link{ rel: :stylesheet, href: asset_path('css/application.css'), type: 'text/css' }
+    %link{ rel: :stylesheet, href: asset_path('css/styles.css'), type: 'text/css' }
     %script{ src: asset_path('js/jquery-1.12.3.min.js'), type: 'text/javascript' }
-    %script{ src: asset_path('js/highlight.min.js'), type: 'text/javascript' }
     %script{ src: asset_path('js/application.js'), type: 'text/javascript' }
 
   %title= title
   %body
     .application
-      = yield
+      = preserve do
+        = yield

data/web/views/page_layout.haml

@@ -1,7 +1,8 @@
 !!!
 %html
   %head
-    %link{ rel: :stylesheet, href: asset_path('css/base.css'), type: 'text/css' }
+    %link{ rel: :stylesheet, href: theme_path, type: 'text/css' }
+    %link{ rel: :stylesheet, href: asset_path('css/styles.css'), type: 'text/css' }
 
   %title= title
   %body
@@ -10,4 +11,5 @@
         %h1=title
         %a{href: '/'}="< Back"
       .body
-        = yield
+        = preserve do
+          = yield

data/web/views/response.haml

@@ -3,17 +3,12 @@
   %input.clear.hidden{ type: 'button', value: 'Clear' }
   .response.hidden
     %p="Url:"
-    %pre
-      %code.url.http
+    .url
     %p="Query:"
-    %pre
-      %code.query.http
+    .query
     %p="Code:"
-    %pre
-      %code.code.http
+    .code
     %p="Headers:"
-    %pre
-      %code.headers.json
+    .headers
     %p="Body:"
-    %pre
-      %code.body.json
+    .body

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cabbage_doc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mihail Szabolcs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-16 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,8 @@ files:
 - lib/cabbage_doc/example.rb
 - lib/cabbage_doc/generator.rb
 - lib/cabbage_doc/generators/api.rb
+- lib/cabbage_doc/highlighter.rb
+- lib/cabbage_doc/markdown.rb
 - lib/cabbage_doc/parameter.rb
 - lib/cabbage_doc/params.rb
 - lib/cabbage_doc/parser.rb
@@ -168,45 +184,12 @@ files:
 - lib/cabbage_doc/web_helper.rb
 - lib/cabbage_doc/worker.rb
 - web/helpers/helper.rb
-- web/public/css/application.css
-- web/public/css/base.css
-- web/public/css/highlight/agate.css
-- web/public/css/highlight/androidstudio.css
-- web/public/css/highlight/arduino-light.css
-- web/public/css/highlight/arta.css
-- web/public/css/highlight/ascetic.css
-- web/public/css/highlight/codepen-embed.css
-- web/public/css/highlight/darkula.css
-- web/public/css/highlight/default.css
-- web/public/css/highlight/docco.css
-- web/public/css/highlight/dracula.css
-- web/public/css/highlight/foundation.css
-- web/public/css/highlight/github-gist.css
 - web/public/css/highlight/github.css
-- web/public/css/highlight/googlecode.css
-- web/public/css/highlight/grayscale.css
-- web/public/css/highlight/hybrid.css
-- web/public/css/highlight/idea.css
-- web/public/css/highlight/ir-black.css
-- web/public/css/highlight/magula.css
-- web/public/css/highlight/mono-blue.css
-- web/public/css/highlight/monokai-sublime.css
+- web/public/css/highlight/molokai.css
 - web/public/css/highlight/monokai.css
-- web/public/css/highlight/obsidian.css
-- web/public/css/highlight/purebasic.css
-- web/public/css/highlight/qtcreator_dark.css
-- web/public/css/highlight/qtcreator_light.css
-- web/public/css/highlight/railscasts.css
-- web/public/css/highlight/rainbow.css
-- web/public/css/highlight/school-book.css
-- web/public/css/highlight/solarized-dark.css
-- web/public/css/highlight/solarized-light.css
-- web/public/css/highlight/sunburst.css
-- web/public/css/highlight/vs.css
-- web/public/css/highlight/xcode.css
-- web/public/css/highlight/zenburn.css
+- web/public/css/highlight/thankful_eyes.css
+- web/public/css/styles.css
 - web/public/js/application.js
-- web/public/js/highlight.min.js
 - web/public/js/jquery-1.12.3.min.js
 - web/views/action.haml
 - web/views/api.haml
@@ -244,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Interactive API documentation generator.