lurker 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0db77bd62f588abb4fb1578efb4a2bb549757c4
-  data.tar.gz: bee8c146efa0e12da5b93bf39f279cdfd798ca1e
+  metadata.gz: 952b043f8da8f4b196d52d6d24fb05aa4e1a5766
+  data.tar.gz: 19afcf3e67b54a0536e071f36ff99a3f8b76083e
 SHA512:
-  metadata.gz: 3b80cbbda321aec3d97d7773344afed7315267d3c4be8504278d9ac951eeeaa16d1290674c42bf5de802e09c3a373654e440880078e07a13561b42dd62b70bea
-  data.tar.gz: ce9992065fe080a56c59007fe6b2d67b22e0858632df68d23a4c20227ba040f996a47a2634e790cb06d3498d3f99621a57f74c7799fd104f4b78d94a7e0a1c61
+  metadata.gz: 17062f274191d624db5bfd6c3cc953744abd7474d53aa8ef5355b2578eec769514618fd3f26ffceb42993d8cc419a61e280578d5976a1948cd26bc7e1b28dad8
+  data.tar.gz: db85104a0f2e96a7a8a781ebbd672fb7493759d6ee500eebbc6eff9216919d2b47b140dd74527db8de570a4fc558970416a1acd0ee9f9860bc96f131c12c582a

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG v1
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJTaes0AAoJENcoxKfNVdjbTfwH/RoJGVRj3ReOEemgkXBTaCVm
-d3+jIU4Bj/hKl4l9bIy2izCwGuIropA9j4gHC8v8+slgpgtejggl1aH2FkNMrszS
-5wjLhJxXKCFWPZVe3k/LTg07JcJj9aInvP96jKyiwIKGnCQEYcAwVrko9tu3R8WV
-ENpDqkH8E69P0KZ2XDH22va4aH4VtVDrw4VCJWftEg91ufPzyrsPoNbb5j+jk6DQ
-X/IB4R+YDJ3ch3An2UuAQK6rpu1GFd5migwpdrYKUzZYO/6xenK/pjALia/Yj4jm
-jvnN7pJzPm9357Gg6h6iPY4Q8Us89Ri6XqZrdT7cQ1Zzclco7crxWT+syYi2PL0=
-=913O
+iQEcBAABCgAGBQJTa7ALAAoJENcoxKfNVdjbmXMIAIoAFZuoZELYYnXJqf1jXdfe
+7ZLYhPoI/J5TmxYoJ8D7pzJSw1IK00kmKitFsMmIRjDO5WlaOJoJJWKoQ4KFbo5K
+rCmRfwdOMNyWSK1dtdwpQkJHs1l/s/VQc9qydyRocjhFeDGh0QWlWyaOOwNXw6Wd
+Z5lMJRQIGF9AydjhQJxkQ8N7p675rnJanRtbZdWaO0QlYgSjDXYwmwnhmWfCHAIY
+obGKYXX6vEuUDvHkVpgmn/F33VCLOrsKv4GNh0VWZFmKxgeb937u06GxJawd+m+t
+XlHCtubTPwHx4quUNgo1/UARfsQqS8bMIHZgp7gADK4olz8iJY6MzMrtIdiyzbQ=
+=3uqV
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG v1
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABCgAGBQJTaesyAAoJENcoxKfNVdjbuuAIAM6HJ0fiHPEW8Jl1jXGNW8gK
-6KCxhB8w9yRtVj7bQf6WfPV00OzpS7CVH3ln/NzLF75DYG6b6JQ6C2zmYFqwSH+M
-LNrGef8gdIrTmanItakJ23xQ+ADxnNg6Ib0FCTCEs8BOfYoDtPnHv9Mp5hqLNQW3
-XeOD5f9Q6DrTuMssWTDA3ZvmMtBPDYAsI/Xr3Ku9fZGnoqorHBhCnELWGZVTg4xo
-IAhguO6vxMQPgyqSrPnj/kZLRVGiw2mF2LnlfRNAirKM+ByNklcwlrTvBcwRQhpJ
-tBptan36Aier/uEaBkncd/dfKCmm/f8APSPJubc8aG+3SSL7rkw2lG7aN6RPGQ0=
-=eB97
+iQEcBAABCgAGBQJTa7AIAAoJENcoxKfNVdjbojcIAOHRH9llFujEsRcOVizaQ2Sb
+DydmPntKMNLqRrkyR9xlLqrL5ybfDGMvd7gpHnpXLzeoKA07nnQk7MNyqUl71cps
+TJ+A6o5bY+DGL4/WTyrzEpNFlkOwi9pEXUUCgYik2JOTZ+xK+2m0J72eh1zXO+fp
+o4v/+g8crVqgOLMIK+VNABJCWH7rvP/7oJooRs46v2Av5u7HCgc9iQA0+uu9ry3d
+HNo3sFqRq3cFiYVVz8GXngcgQAv44ageYRXi1xXKAcXMKDgK0seZ+yuLbI/OKiNx
+ED1rbJavgA/mhp8mCsdhk74SwRyWDo2TvJCK96D7iSmb5FapBqByKK1JkFX3Vd4=
+=dJ5L
 -----END PGP SIGNATURE-----

data/Gemfile

@@ -14,6 +14,7 @@ group :development do
 
   # deploy site
   gem 'highline'
+  # gem 'coderay', path: '../coderay'
 
   # build template static
   # run `rake assets:precompile`

data/README.md

@@ -60,7 +60,8 @@ Now, you can test your API on-line (for real)
 - [Pretty submit form to test API endpoints (live) based on schemas][demo_live] (enter a name & press "Submit")
 - [Handling URLs with dynamic segments][nested_controller_spec_example] (such as `api/v1/:user_id/repos`)
 - [JSON-Schema partials][partial_example], also in YAML format ([demo][partial_example_demo])
-- Multiple docs for many test cases
+- [Generation PDF documentation][pdf_example]
+- [Multiple docs for many usecases][suffixes_example] (e.g `:lurker => '...'`)
 - ERB support inside `.json.yml.erb`
 - HTTP-Auth authorization for your online docs
 - Separate API-services generated within one test suite
@@ -157,6 +158,8 @@ Also thanks to [Andrey Deryabin][aderyabin] for advice and [React.js][reactjs] f
 [demo_app]: http://lurker-app.herokuapp.com
 [demo_app2]: http://lurker.razum2um.me
 [demo_live]: http://lurker.razum2um.me/lurker/api/v1/users-POST.html
+[pdf_example]: http://lurker.razum2um.me/lurker/LurkerApp.pdf
+[suffixes_example]: https://www.relishapp.com/razum2um/lurker/docs/request-specs/schema-suffixes
 
 [Gem Version]: https://rubygems.org/gems/lurker
 [Build Status]: https://travis-ci.org/razum2um/lurker

data/Rakefile

@@ -69,6 +69,7 @@ end
 
 # testing
 
+ENV['COVERALLS_NOISY'] = '1'
 Coveralls::RakeTask.new
 
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -105,14 +106,14 @@ namespace :generate do
   desc "generate a fresh app with rspec installed"
   task :app do |t|
     if needs_generation?
-      sh "bundle exec rails new #{EXAMPLE_APP} -d postgresql -m #{File.expand_path '../templates/lurker_app.rb', __FILE__} --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-keeps --quiet"
+      sh "bundle exec rails new #{EXAMPLE_APP} -d postgresql -m #{File.expand_path '../templates/lurker_app.rb', __FILE__} --skip-javascript --skip-git --skip-test-unit --skip-keeps --quiet"
     end
   end
 
   desc "generate a bunch of stuff with generators"
   task :stuff do
+    in_lurker_app "bundle install"
     if ENV['BUNDLE_GEMFILE'].to_s.match(/Gemfile(32|40)\.ci$/)
-      in_lurker_app "bundle install"
       %w[rake rspec-core spring].each do |gem|
         in_lurker_app "bundle binstubs #{gem}"
       end
@@ -163,6 +164,7 @@ task :features => [:regenerate, :cucumber]
 desc 'convert docs for example app'
 task :build_example_docs => :features do
   in_lurker_app "bin/lurker convert -c #{File.expand_path('../README.md', __FILE__)}"
+  in_lurker_app "bin/lurker convert -f pdf -o html"
 end
 
 def ask_for_deploy(name, callback)
@@ -220,7 +222,7 @@ namespace :razum2um do
   end
 end
 
-task :default => [:spec, :regenerate, :cucumber, 'coveralls:push']
+task :default => ["clobber:coverage", :spec, :regenerate, :cucumber, 'coveralls:push']
 
 desc 'commits lurker app'
 task :predeploy do

data/lib/lurker/cli.rb

@@ -1,4 +1,7 @@
 require 'thor'
+require 'execjs'
+require 'pdfkit'
+# require 'coderay'
 require 'digest/sha1'
 require 'lurker/service'
 
@@ -57,27 +60,41 @@ module Lurker
 
     no_tasks do
       def convert_to_pdf
-        # TODO
+        css = File.expand_path('application.css', self.class.precompiled_static_root)
+        in_root do
+          service_presenters.each do |service_presenter|
+            html = "<html><body>"
+            service_presenter.endpoints.each do |endpoint_prefix_group|
+              endpoint_prefix_group.each do |endpoint_presenter|
+                html << endpoint_presenter.to_html(layout: false)
+              end
+            end
+            html << "</body></html>"
+            kit = PDFKit.new(html, :page_size => 'Letter')
+            kit.stylesheets << css
+            create_file("#{service_presenter.name}.pdf", kit.to_pdf, force: true)
+          end
+        end
       end
 
       def convert_to_html
         in_root do
           # js, css, fonts
+          static = []
           Dir["#{self.class.precompiled_static_root}/*"].each do |fname|
             if match = fname.match(/application\.(js|css)$/)
               sha1 = Digest::SHA1.hexdigest(open(fname).read)
               html_options.merge! match[1] => sha1
-              to = destination.join("application-#{sha1}.#{match[1]}").to_s
+              static << (new_name = "application-#{sha1}.#{match[1]}")
+              to = destination.join(new_name).to_s
               FileUtils.cp_r fname, to
               spawn "cat #{to} | gzip -9 > #{to}.gz"
             else
               FileUtils.cp_r fname, destination.to_s
             end
           end
-        end
 
-        service_presenters.each do |service_presenter|
-          in_root do
+          service_presenters.each do |service_presenter|
             create_file("index.html", service_presenter.to_html, force: true)
 
             service_presenter.endpoints.each do |endpoint_prefix_group|
@@ -86,6 +103,17 @@ module Lurker
               end
             end
           end
+
+          # cleanup
+          Dir.glob("*.js").each do |fname|
+            FileUtils.rm fname unless static.include? fname
+          end
+          Dir.glob("*.css").each do |fname|
+            FileUtils.rm fname unless static.include? fname
+          end
+          Dir.glob("*.gz").each do |fname|
+            FileUtils.rm fname unless static.include? fname.sub(/\.gz/, '')
+          end
         end
       end
 

data/lib/lurker/form_builder.rb

@@ -44,13 +44,14 @@ module Lurker
         :partial => 'param_form_element',
         :locals  => {
           :label      => "#{print_labels(parent_labels)}#{label}",
-          :label_text => label,
+          :label_text => "#{print_labels(parent_labels)}#{label}",
           :value      => value
         }
       )
     end
 
     def add_legend_to_buffer(parent_labels, label)
+      return
       @_buffer += render(
         :partial => 'param_form_legend',
         :locals  => { :label => print_labels(parent_labels.clone << label) }

data/lib/lurker/presenters/endpoint_presenter.rb

@@ -12,12 +12,12 @@ class Lurker::EndpointPresenter < Lurker::BasePresenter
     @service_presenter = Lurker::ServicePresenter.new(endpoint.service)
   end
 
-  def to_html
+  def to_html(options={})
     @service_presenter = service_presenter
     @endpoint_presenter = self
     @url_params = endpoint.url_params
     @post_params = example_request.json
-    render('show')
+    render('show', options)
   end
 
   def relative_path(extension = ".html")
@@ -80,8 +80,20 @@ class Lurker::EndpointPresenter < Lurker::BasePresenter
   end
 
   def example_response
+    return @example_response if @example_response
     return if endpoint.response_parameters.empty?
-    Lurker::JsonPresenter.new(example_from_schema(endpoint.response_parameters, endpoint.schema))
+    response = example_from_schema(endpoint.response_parameters, endpoint.schema)
+    @example_response = response.to_json
+    if defined? ExecJS
+      jsfile = File.expand_path('javascripts/highlight.pack.js', Lurker::Cli.source_root)
+      source = open(jsfile).read
+      context = ExecJS.compile(source)
+      @example_response = context.exec("return hljs.highlightAuto(JSON.stringify(#{@example_response}, null, 2)).value")
+    elsif defined? CodeRay
+      @example_response = ::CodeRay.scan(@example_response, :json).html(wrap: nil, css: :class)
+      #::CodeRay.scan(response.to_json, :jjson).html(wrap: nil, css: :class)
+    end
+    @example_response
   end
 
   def deprecated?

data/lib/lurker/presenters/schema_presenter.rb

@@ -16,6 +16,7 @@ class Lurker::SchemaPresenter < Lurker::BasePresenter
   )
 
   def initialize(schema, options)
+    options[:nested] ||= 0
     super(options)
     @schema = schema
   end
@@ -25,7 +26,7 @@ class Lurker::SchemaPresenter < Lurker::BasePresenter
   end
 
   def nested?
-    options[:nested]
+    options[:nested] > 0
   end
 
   def to_html
@@ -115,7 +116,7 @@ class Lurker::SchemaPresenter < Lurker::BasePresenter
     html = ""
     html << '<li>Items'
 
-    sub_options = options.merge(:nested => true)
+    sub_options = options.merge(:nested => options[:nested] + 1)
 
     if items.kind_of? Array
       item.compact.each do |item|
@@ -152,7 +153,7 @@ class Lurker::SchemaPresenter < Lurker::BasePresenter
         '<tt>%s</tt>' % key,
         schema_slug(key, property)
       )
-      html << self.class.new(property, options.merge(:nested => true)).to_html
+      html << self.class.new(property, options.merge(:nested => options[:nested] + 1)).to_html
       html << '</li>'
     end
 
@@ -160,6 +161,6 @@ class Lurker::SchemaPresenter < Lurker::BasePresenter
   end
 
   def schema_slug(key, property)
-    "#{key}-#{property.hash}"
+    "#{key}-#{options[:nested]}-#{property.hash}"
   end
 end

data/lib/lurker/templates/javascripts/application.js

@@ -4,10 +4,6 @@
 //= require jquery.remotipart
 //= require bootstrap
 
-// Committed sb-admin
-//= require plugins/metisMenu/jquery.metisMenu
-//= require sb-admin
-
 // https://github.com/facebook/react/issues/945
 //= require phantomjs-shims
 
@@ -16,7 +12,6 @@
 //= require react-catalyst
 
 // Own
-//= require prettify
+//= require highlight.pack
 //= require lurker
 
-// require demo/dashboard-demo

data/lib/lurker/templates/javascripts/highlight.pack.js

@@ -0,0 +1 @@
+var hljs=new function(){function k(v){return v.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function t(v){return v.nodeName.toLowerCase()}function i(w,x){var v=w&&w.exec(x);return v&&v.index==0}function d(v){return Array.prototype.map.call(v.childNodes,function(w){if(w.nodeType==3){return b.useBR?w.nodeValue.replace(/\n/g,""):w.nodeValue}if(t(w)=="br"){return"\n"}return d(w)}).join("")}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^language-/,"")});return v.filter(function(x){return j(x)||x=="no-highlight"})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(t(A)=="br"){z+=1}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset<y[0].offset)?w:y}return y[0].event=="start"?w:y}function A(H){function G(I){return" "+I.nodeName+'="'+k(I.value)+'"'}F+="<"+t(H)+Array.prototype.map.call(H.attributes,G).join("")+">"}function E(G){F+="</"+t(G)+">"}function v(G){(G.event=="start"?A:E)(G.node)}while(w.length||y.length){var D=B();F+=k(C.substr(x,D[0].offset-x));x=D[0].offset;if(D==w){z.reverse().forEach(E);do{v(D.splice(0,1)[0]);D=B()}while(D==w&&D.length&&D[0].offset==x);z.reverse().forEach(A)}else{if(D[0].event=="start"){z.push(D[0].node)}else{z.pop()}v(D.splice(0,1)[0])}}return F+k(C.substr(x))}function m(y){function v(z){return(z&&z.source)||z}function w(A,z){return RegExp(v(A),"m"+(y.cI?"i":"")+(z?"g":""))}function x(D,C){if(D.compiled){return}D.compiled=true;D.k=D.k||D.bK;if(D.k){var z={};function E(G,F){if(y.cI){F=F.toLowerCase()}F.split(" ").forEach(function(H){var I=H.split("|");z[I[0]]=[G,I[1]?Number(I[1]):1]})}if(typeof D.k=="string"){E("keyword",D.k)}else{Object.keys(D.k).forEach(function(F){E(F,D.k[F])})}D.k=z}D.lR=w(D.l||/\b[A-Za-z0-9_]+\b/,true);if(C){if(D.bK){D.b=D.bK.split(" ").join("|")}if(!D.b){D.b=/\B|\b/}D.bR=w(D.b);if(!D.e&&!D.eW){D.e=/\B|\b/}if(D.e){D.eR=w(D.e)}D.tE=v(D.e)||"";if(D.eW&&C.tE){D.tE+=(D.e?"|":"")+C.tE}}if(D.i){D.iR=w(D.i)}if(D.r===undefined){D.r=1}if(!D.c){D.c=[]}var B=[];D.c.forEach(function(F){if(F.v){F.v.forEach(function(G){B.push(o(F,G))})}else{B.push(F=="self"?D:F)}});D.c=B;D.c.forEach(function(F){x(F,D)});if(D.starts){x(D.starts,C)}var A=D.c.map(function(F){return F.bK?"\\.?\\b("+F.b+")\\b\\.?":F.b}).concat([D.tE]).concat([D.i]).map(v).filter(Boolean);D.t=A.length?w(A.join("|"),true):{exec:function(F){return null}};D.continuation={}}x(y)}function c(S,L,J,R){function v(U,V){for(var T=0;T<V.c.length;T++){if(i(V.c[T].bR,U)){return V.c[T]}}}function z(U,T){if(i(U.eR,T)){return U}if(U.eW){return z(U.parent,T)}}function A(T,U){return !J&&i(U.iR,T)}function E(V,T){var U=M.cI?T[0].toLowerCase():T[0];return V.k.hasOwnProperty(U)&&V.k[U]}function w(Z,X,W,V){var T=V?"":b.classPrefix,U='<span class="'+T,Y=W?"":"</span>";U+=Z+'">';return U+X+Y}function N(){var U=k(C);if(!I.k){return U}var T="";var X=0;I.lR.lastIndex=0;var V=I.lR.exec(U);while(V){T+=U.substr(X,V.index-X);var W=E(I,V);if(W){H+=W[1];T+=w(W[0],V[0])}else{T+=V[0]}X=I.lR.lastIndex;V=I.lR.exec(U)}return T+U.substr(X)}function F(){if(I.sL&&!f[I.sL]){return k(C)}var T=I.sL?c(I.sL,C,true,I.continuation.top):g(C);if(I.r>0){H+=T.r}if(I.subLanguageMode=="continuous"){I.continuation.top=T.top}return w(T.language,T.value,false,true)}function Q(){return I.sL!==undefined?F():N()}function P(V,U){var T=V.cN?w(V.cN,"",true):"";if(V.rB){D+=T;C=""}else{if(V.eB){D+=k(U)+T;C=""}else{D+=T;C=U}}I=Object.create(V,{parent:{value:I}})}function G(T,X){C+=T;if(X===undefined){D+=Q();return 0}var V=v(X,I);if(V){D+=Q();P(V,X);return V.rB?0:X.length}var W=z(I,X);if(W){var U=I;if(!(U.rE||U.eE)){C+=X}D+=Q();do{if(I.cN){D+="</span>"}H+=I.r;I=I.parent}while(I!=W.parent);if(U.eE){D+=k(X)}C="";if(W.starts){P(W.starts,"")}return U.rE?0:X.length}if(A(X,I)){throw new Error('Illegal lexeme "'+X+'" for mode "'+(I.cN||"<unnamed>")+'"')}C+=X;return X.length||1}var M=j(S);if(!M){throw new Error('Unknown language: "'+S+'"')}m(M);var I=R||M;var D="";for(var K=I;K!=M;K=K.parent){if(K.cN){D=w(K.cN,D,true)}}var C="";var H=0;try{var B,y,x=0;while(true){I.t.lastIndex=x;B=I.t.exec(L);if(!B){break}y=G(L.substr(x,B.index-x),B[0]);x=B.index+y}G(L.substr(x));for(var K=I;K.parent;K=K.parent){if(K.cN){D+="</span>"}}return{r:H,value:D,language:S,top:I}}catch(O){if(O.message.indexOf("Illegal")!=-1){return{r:0,value:k(L)}}else{throw O}}}function g(y,x){x=x||b.languages||Object.keys(f);var v={r:0,value:k(y)};var w=v;x.forEach(function(z){if(!j(z)){return}var A=c(z,y,false);A.language=z;if(A.r>w.r){w=A}if(A.r>v.r){w=v;v=A}});if(w.language){v.second_best=w}return v}function h(v){if(b.tabReplace){v=v.replace(/^((<[^>]+>|\t)+)/gm,function(w,z,y,x){return z.replace(/\t/g,b.tabReplace)})}if(b.useBR){v=v.replace(/\n/g,"<br>")}return v}function p(z){var y=d(z);var A=r(z);if(A=="no-highlight"){return}var v=A?c(A,y,true):g(y);var w=u(z);if(w.length){var x=document.createElementNS("http://www.w3.org/1999/xhtml","pre");x.innerHTML=v.value;v.value=q(w,u(x),y)}v.value=h(v.value);z.innerHTML=v.value;z.className+=" hljs "+(!A&&v.language||"");z.result={language:v.language,re:v.r};if(v.second_best){z.second_best={language:v.second_best.language,re:v.second_best.r}}}var b={classPrefix:"hljs-",tabReplace:null,useBR:false,languages:undefined};function s(v){b=o(b,v)}function l(){if(l.called){return}l.called=true;var v=document.querySelectorAll("pre code");Array.prototype.forEach.call(v,p)}function a(){addEventListener("DOMContentLoaded",l,false);addEventListener("load",l,false)}var f={};var n={};function e(v,x){var w=f[v]=x(this);if(w.aliases){w.aliases.forEach(function(y){n[y]=v})}}function j(v){return f[v]||f[n[v]]}this.highlight=c;this.highlightAuto=g;this.fixMarkup=h;this.highlightBlock=p;this.configure=s;this.initHighlighting=l;this.initHighlightingOnLoad=a;this.registerLanguage=e;this.getLanguage=j;this.inherit=o;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE]};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE]};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.REGEXP_MODE={cN:"regexp",b:/\//,e:/\/[gim]*/,i:/\n/,c:[this.BE,{b:/\[/,e:/\]/,r:0,c:[this.BE]}]};this.TM={cN:"title",b:this.IR,r:0};this.UTM={cN:"title",b:this.UIR,r:0}}();hljs.registerLanguage("avrasm",function(a){return{cI:true,k:{keyword:"adc add adiw and andi asr bclr bld brbc brbs brcc brcs break breq brge brhc brhs brid brie brlo brlt brmi brne brpl brsh brtc brts brvc brvs bset bst call cbi cbr clc clh cli cln clr cls clt clv clz com cp cpc cpi cpse dec eicall eijmp elpm eor fmul fmuls fmulsu icall ijmp in inc jmp ld ldd ldi lds lpm lsl lsr mov movw mul muls mulsu neg nop or ori out pop push rcall ret reti rjmp rol ror sbc sbr sbrc sbrs sec seh sbi sbci sbic sbis sbiw sei sen ser ses set sev sez sleep spm st std sts sub subi swap tst wdr",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27 r28 r29 r30 r31 x|0 xh xl y|0 yh yl z|0 zh zl ucsr1c udr1 ucsr1a ucsr1b ubrr1l ubrr1h ucsr0c ubrr0h tccr3c tccr3a tccr3b tcnt3h tcnt3l ocr3ah ocr3al ocr3bh ocr3bl ocr3ch ocr3cl icr3h icr3l etimsk etifr tccr1c ocr1ch ocr1cl twcr twdr twar twsr twbr osccal xmcra xmcrb eicra spmcsr spmcr portg ddrg ping portf ddrf sreg sph spl xdiv rampz eicrb eimsk gimsk gicr eifr gifr timsk tifr mcucr mcucsr tccr0 tcnt0 ocr0 assr tccr1a tccr1b tcnt1h tcnt1l ocr1ah ocr1al ocr1bh ocr1bl icr1h icr1l tccr2 tcnt2 ocr2 ocdr wdtcr sfior eearh eearl eedr eecr porta ddra pina portb ddrb pinb portc ddrc pinc portd ddrd pind spdr spsr spcr udr0 ucsr0a ucsr0b ubrr0l acsr admux adcsr adch adcl porte ddre pine pinf"},c:[a.CBLCLM,{cN:"comment",b:";",e:"$",r:0},a.CNM,a.BNM,{cN:"number",b:"\\b(\\$[a-zA-Z0-9]+|0o[0-7]+)"},a.QSM,{cN:"string",b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"},{cN:"label",b:"^[A-Za-z0-9_.$]+:"},{cN:"preprocessor",b:"#",e:"$"},{cN:"preprocessor",b:"\\.[a-zA-Z]+"},{cN:"localvars",b:"@[0-9]+"}]}});hljs.registerLanguage("json",function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}});

data/lib/lurker/templates/javascripts/lurker.js

@@ -10,14 +10,6 @@ var Lurker = {
     $("#submit-api").attr("disabled", false);
   },
 
-  disableUrlParams: function() {
-    $("fieldset[ref=url-params] input").prop("disabled", true);
-  },
-
-  enableUrlParams: function() {
-    $("fieldset[ref=url-params] input").prop("disabled", false);
-  },
-
   detectContentType: function(response) {
     var contentType = response.getResponseHeader("Content-Type");
     var detectedContentType = null;
@@ -31,43 +23,36 @@ var Lurker = {
 
   fillInInfoTab: function($tab, xhr) {
     $tab.find('.status td.value').text(xhr.status + " " + xhr.statusText);
-    $tab.find('.headers td.value').text(xhr.getAllResponseHeaders());
+    $tab.find('#headers').text(xhr.getAllResponseHeaders());
 
     var realTimeTaken = Lurker.lastRequest.endTime - Lurker.lastRequest.startTime;
     $tab.find('.time td.value').text(realTimeTaken + " ms");
   },
 
-  onComplete: function(xhr) {
-    Lurker.lastRequest.endTime = Date.now();
-    Lurker.enableSubmitButton();
-    Lurker.enableUrlParams();
-
-    if ($("#show-api-response-div:visible").length === 0) {
-      $("#show-api-response-div").slideDown(100);
-    }
-
-    Lurker.fillInInfoTab(
-      $("#show-api-response-div").showNavTab("info"),
-      xhr
-    );
-
-    $("#show-api-response-div pre").hide();
+  fillInRawTab: function($tab, xhr) {
     switch (Lurker.detectContentType(xhr)) {
       case "json":
-        $("#show-api-response-div").showNavTab("json").text(
-          JSON.stringify(JSON.parse(xhr.responseText), null, 2)
-        );
+        var json = JSON.stringify(JSON.parse(xhr.responseText), null, 2);
+        var content = hljs.highlightAuto(json).value;
         break;
       default:
-        $("#show-api-response-div").showNavTab('raw').text(xhr.responseText);
+        var content = xhr.responseText;
     }
+    $tab.html(content);
+  },
 
-    window.prettyPrint();
+  onComplete: function(xhr) {
+    Lurker.lastRequest.endTime = Date.now();
+    Lurker.enableSubmitButton();
+
+    $("#show-api-response-div [ref^='response']").hide();
+
+    Lurker.fillInInfoTab($("#show-api-response-div").showNavTab("info"), xhr);
+    Lurker.fillInRawTab($("#show-api-response-div").showNavTab("raw"), xhr);
   },
 
   onSubmit: function($form) {
     Lurker.disableSubmitButton();
-    Lurker.disableUrlParams();
 
     $.ajax({
       url: $form.attr('action'),
@@ -83,8 +68,6 @@ var Lurker = {
 };
 
 $(function($) {
-  window.prettyPrint();
-
   var activeMenuItem = $('#side-menu a[href="' + window.location.pathname + '"]');
   if (activeMenuItem.length === 1) {
     activeMenuItem.addClass('hovered').parents('.collapse').addClass('in').parents('.endpoint-group').addClass('active');

data/lib/lurker/templates/layouts/_sidemenu.html.erb

@@ -1,9 +1,9 @@
 <% @service_presenter.endpoints_by_prefix.each do |prefix, endpoints| %>
-  <li class="endpoint-group">
-      <a href="#"><%= prefix %><span class="fa arrow"></span></a>
-      <ul class="nav nav-second-level">
+  <li class="endpoint-group <%= (@endpoint_presenter.nil? && 'opened') || (endpoints.map(&:url).include?(@endpoint_presenter.url) && 'active') %>">
+      <a href="#"><%= prefix %></a>
+      <ul class="nav">
           <% endpoints.each do |endpoint| %>
-            <li>
+            <li class="<%= (@endpoint_presenter.nil? && 'opened') || (endpoint.url == @endpoint_presenter.url && 'active') %>">
                 <a href="<%= endpoint.url %>">
                   <span class="btn btn-<%= endpoint.verb_colorname %> btn-xs"><%= endpoint.verb %>&nbsp;<%= endpoint.named_path %></span>
                   <br>

data/lib/lurker/templates/layouts/application.html.erb

@@ -25,42 +25,30 @@
 
 <body>
 
-    <div id="wrapper">
-
-        <nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 0">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <a class="navbar-brand" href="<%= @service_presenter.html_directory %>"><%= @service_presenter.name %></a>
-            </div>
-            <!-- /.navbar-header -->
-
-            <%#= render 'layouts/navbar_right' %>
-
-            <div class="navbar-default navbar-static-side" role="navigation">
-                <div class="sidebar-collapse">
-                    <ul class="nav" id="side-menu">
-                        <%#= render 'layouts/sidesearch' %>
-                        <%= render 'layouts/sidemenu' %>
-                    </ul>
-                    <!-- /#side-menu -->
-                </div>
-                <!-- /.sidebar-collapse -->
-            </div>
-            <!-- /.navbar-static-side -->
-        </nav>
-
-        <div id="page-wrapper">
-          <%= yield %>
+    <header class="navbar navbar-static-top bs-docs-nav" id="top" role="banner">
+      <div class="container">
+        <div class="navbar-header">
+          <a class="navbar-brand" href="<%= @service_presenter.html_directory %>"><%= @service_presenter.name %></a>
         </div>
-        <!-- /#page-wrapper -->
-
+      </div>
+    </header>
+
+    <div class="container bs-docs-container">
+      <div class="row">
+        <div class="col-md-9" role="main">
+          <div class="bs-docs-section">
+            <%= yield %>
+          </div>
+        </div>
+        <div class="col-md-3">
+          <div class="bs-docs-sidebar hidden-print" role="complementary">
+            <ul class="nav bs-docs-sidenav">
+              <%= render 'layouts/sidemenu' %>
+            </ul>
+          </div>
+        </div>
+      </div>
     </div>
-    <!-- /#wrapper -->
 
     <script src="<%= @service_presenter.html_directory %>/application-<%= @service_presenter.options['js'] %>.js"></script>
 </body>