better_rest 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e990eb58751881bf19708d2bb4a521c954a07850
-  data.tar.gz: baee501acb9b69804a6b903601e1dc1d96c6e24e
+  metadata.gz: bfaa3bbcd0d6672673e20e65445adf86c73f5a6e
+  data.tar.gz: 12f00f9fe9fde98badb210259983162dad385666
 SHA512:
-  metadata.gz: 6840e1c632dd3d70ee43979c40bffdf63585787a016b0fdba43a5d555433e16f0a261df189226d01632bb7e577068823e22e8ecbdcf3adb3ea61340bbdbdf822
-  data.tar.gz: 361612d6422112d2fd219ec56397f859fc1a35e37f3d161b5917ee2ee7ed1112d8b116a523abed26ae86e0be97f2fbcf2ef967364ed85349ea0106c0f0334565
+  metadata.gz: 141d47a6c68f753520bbc8f84b21bcc3d2e8e9be62ac10bf9e0c03d80a6c1fd3b28c0e012383b186cfad111b27bccd704e2b859b91a7917b54b9fe453ffdfe68
+  data.tar.gz: 179de131c5a8df2f23d95dbe4dae2df4f692090a564957a0d0acf31d1122e382a6a3adc4026512606f3f6c041c617f4b59c754eda385fe1afd887d46705c60a5

data/better_rest.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
-  s.name        = "better_rest"
-  s.version     = "0.2.2"
-  s.licenses	  = ['MIT']
-  s.summary     = "REST Test Client"
-  s.date        = "2014-12-13"
-  s.description = "Configurable REST API test client accessible via your browser"
-  s.authors     = ["Jason Willems"]
-  s.email       = ["jason@willems.ca"]
-  s.homepage    = "https://github.com/at1as/BetteR"
-  s.files       = `git ls-files`.split("\n")
+  s.name          = "better_rest"
+  s.version       = "0.2.3"
+  s.licenses	    = ['MIT']
+  s.summary       = "REST Test Client"
+  s.date          = "2015-02-01"
+  s.description   = "Configurable REST API test client accessible via your browser"
+  s.authors       = ["Jason Willems"]
+  s.email         = ["jason@willems.ca"]
+  s.homepage      = "https://github.com/at1as/BetteR"
+  s.files         = `git ls-files`.split("\n")
   s.executables << 'better_rest'
 end

data/lib/better_rest.rb

@@ -8,8 +8,16 @@ require 'sinatra'
 require 'typhoeus'
 require 'json'
 
+set :environment, :development
 set :public_dir, File.expand_path('../../public', __FILE__)
 set :views, File.expand_path('../../views', __FILE__)
+set :bind, '0.0.0.0'
+
+configure :development do
+  enable :logging, :dump_errors, :raise_errors
+end
+set :show_exceptions, true if development?
+
 
 helpers do
   include Rack::Utils
@@ -17,9 +25,12 @@ helpers do
 
   def parse_cookies(cookies)
     cookie_hash = {}
-    cookies.each do |c|
-      key, value = c.split('; ').first.split('=', 2)
-      cookie_hash[key] = value
+    cookies_list = [*cookies]
+    cookies_list.each do |cookie|
+      cookie.split('; ').each do |c|
+	key, value = c.split('=', 2)
+	cookie_hash[key] = value
+      end
     end
     cookie_hash.to_json
   end
@@ -135,7 +146,7 @@ post '/request' do
   end
 
   # Write cookie to file
-  if response.headers_hash['set-cookie']
+  if @cookies && response.headers_hash['set-cookie']
     cookies = parse_cookies(response.headers_hash['set-cookie'])
     File.open('cookiejar', 'w') { |file| file.write(cookies) }
   end
@@ -161,7 +172,7 @@ post '/request' do
     @response_body['return_body'] = response.body.force_encoding('ISO-8859-1')
   end
 
-  @response_body['return_headers'] = response.response_headers
+  @response_body['return_headers'] = response.response_headers.force_encoding('ISO-8859-1')
 
   @response_body.to_json
 end
@@ -276,7 +287,18 @@ get '/logs/:log' do
 end
 
 
-# Delete log
+# Delete logs
+delete '/logs' do
+  logs = Dir["logs/*.log"]
+
+  logs.each do |log|
+    File.delete(log)
+  end
+  200
+end
+
+
+# Delete log entry
 delete '/logs/:log' do
   log = "logs/#{params[:log]}.log"
 
@@ -375,7 +397,8 @@ get '/env' do
       Ruby:    #{RUBY_VERSION} <br/>
       Rack:    #{Rack::VERSION} <br/>
       Sinatra: #{Sinatra::VERSION} <br/>
-      API:     v#{API_VERSION}
+      API:     v#{API_VERSION} <br/>
+      Env:     #{settings.environment}
   ENDRESPONSE
 end
 

data/public/main.css

@@ -98,7 +98,7 @@ ul li:hover ul {
 
 /* Classes */
 .container{
-  max-width:700px;
+  max-width:720px;
 }
 .width13{
   width:13%;
@@ -264,18 +264,30 @@ ul li:hover ul {
 .semi-bold{
   font-weight:500;
 }
+.logEntry{
+  text-align:center;
+  padding-top:4px;
+  padding-bottom:4px;
+}
 .logNodes{
-  display:block;
+  display:inline-block;
   text-align:center;
   margin-right:auto;
   margin-left:auto;
-  padding-left:40px;
   padding-right:40px;
 }
 .navbar-nav>li>a {
   line-height:1.2;
 }
-
+.headerContainer{
+  margin-bottom:2px;
+}
+.float-red:hover{
+  color:red;
+}
+.form-control{
+  height: 32px;
+}
 
 /* By ID */
 #add{
@@ -366,6 +378,13 @@ ul li:hover ul {
 #logs-modal{
   width:400px;
 }
+#clearAllLogs{
+  margin-left:auto;
+  margin-right:auto;
+  margin-top:15px;
+  width:100%;
+  text-align:center;
+}
 
 
 /* Tooltips */

data/views/index.erb

@@ -105,9 +105,9 @@
         <div class="box" id="headers">
           <div id="headerfieldsAll">
             <% @header_hash.each_with_index do |(key, value), index| %>
-            <div id="headerfields<%= index %>" style="margin-bottom:2px;" >
-              <input type="text" value="<%=key%>" name="key<%=index%>" id="key<%=index%>" placeholder=" Name" class="key form-control head-input" />
-              <input type="text" value="<%=value%>" name="value<%=index%>" id="value<%=index%>" placeholder=" Value" class="value form-control head-input" />
+            <div id="headerfields<%= index %>" class="headerContainer" >
+              <input type="text" value="<%=key%>" name="key" id="key<%=index%>" placeholder=" Name" class="key form-control head-input" autocomplete="off"/>
+              <input type="text" value="<%=value%>" name="value" id="value<%=index%>" placeholder=" Value" class="value form-control head-input" autocomplete="off"/>
 
               <button id="close<%= index %>" tabindex="-1" type="button" class="close" onclick="removeRow(this)">
                 <span style="line-height:inherit" aria-hidden="true">&times;</span>
@@ -299,6 +299,9 @@
             <hr>
             <div class="modal-body">
               <div id="logsdata"></div>
+              <div id="clearAllLogs">
+                <div class="btn btn-simple" style="width:200px" onclick="deleteAllLogs()">Delete All</div>
+              </div>
             </div>
           </div>
         </div>
@@ -664,8 +667,28 @@
   }
 
 
+  /* delete log from list */
+  function deleteLog(button_id){
+    var log_name = button_id.getAttribute('name');
+
+    var url     = '/logs/' + log_name;
+    var client  = new XMLHttpRequest();
+
+    client.onreadystatechange = function() {
+      if (client.readyState == 4 && client.status == 200) {
+        modalHideAll();
+        logsList();
+      } else if (client.readyState == 4) {
+        console.log('Unknown Error: DELETE ' + log_name + ' failed');
+      }
+    }
+
+    client.open('DELETE', url, true);
+    client.send();
+  }
+
+
   /* Retrieve a list of all log entries */
-  /* TODO: Add Log Deletion */
   function logsList(){
     var url     = '/logs';
     var client  = new XMLHttpRequest();
@@ -687,15 +710,21 @@
       for (j=0; j<log_list.length; j++) {
         var log_item        = document.createElement('a');
         var item_txt        = document.createTextNode(log_list[j]);
-        //var close           = document.createElement('span');
-        //var entry_container = document.createElement('div');
+        var close           = document.createElement('span');
+        var entry_container = document.createElement('div');
 
         log_item.href       = '/logs/' + log_list[j];
         log_item.className  = 'logNodes';
         log_item.appendChild(item_txt);
-        //close.innerHTML   = 'x';
-        //close.setAttribute('onclick', deleteLog(log_list[j]));
-        document.getElementById('logsdata').appendChild(log_item);
+        close.innerHTML     = 'x';
+        close.className     = 'float-red';
+        close.setAttribute('onclick', 'deleteLog(this)');
+        close.setAttribute('name', log_list[j]);
+
+        entry_container.className = 'logEntry';
+        entry_container.appendChild(log_item);
+        entry_container.appendChild(close);
+        document.getElementById('logsdata').appendChild(entry_container);
       }
     } else {
       console.log('Unknown Error: GET ' + logs + ' failed');
@@ -781,12 +810,12 @@
     var header_val      = document.createElement('input');
     var close_btn       = document.createElement('button');
 
-    input_container.type    = 'div';
-    input_container.style   = 'margin-bottom:2px;';
-    input_container.id      = 'headerfields' + clickCount;
+    input_container.type      = 'div';
+    input_container.id        = 'headerfields' + clickCount;
+    input_container.className = 'headerContainer';
 
     header_key.type         = 'text';
-    header_key.name         = 'key' + clickCount;
+    header_key.name         = 'key';
     header_key.id           = 'key' + clickCount;
     header_key.className    = 'key form-control head-input';
     header_key.placeholder  = ' Name';
@@ -795,10 +824,10 @@
     header_key.value        = header_key.value.replace('key', 'key' + clickCount);
 
     /* Not sure why this is necessary. But it is */
-    header_key.style        = 'margin-right:9px';
+    //header_key.style        = 'margin-right:9px';
 
     header_val.type         = 'text';
-    header_val.name         = 'value' + clickCount;
+    header_val.name         = 'value';
     header_val.id           = 'value' + clickCount;
     header_val.className    = 'value form-control head-input';
     header_val.placeholder  = ' Value';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_rest
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jason Willems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies: []
 description: Configurable REST API test client accessible via your browser
 email: