better_rest 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e391c09a3930c6c9f2d5bdcc35aedf4296109aad
-  data.tar.gz: 944d0e611bc34c43717109678ec441b4e8ff2aab
+  metadata.gz: eec73eed2d71fd24e5ef1a6380ba9b96c0c3cc86
+  data.tar.gz: d31fae1445848a5ceac23ea96fecdcd53f707291
 SHA512:
-  metadata.gz: c38a7f7355728f3dec51213ac23dc4c29ad5cb8bdd478a9ccdf671a6eb5e715d15201f3fcb5466a4332471d2331877eb5ea48c9345441820d3fac6ac333e44e3
-  data.tar.gz: 2e51051265116b638ddd25bea50ad1fbb761b81d1555011e8146aa8e7cdbbb115c31d51780deac028d3b239df5336d221aa80b77534bae90bce687ca579ba29e
+  metadata.gz: 4de8bf79426d9fcd5fde7879d08fbd9c9fcd324431e0dad4b9d1e6d691069693aea5123c4b90d008000e04f8985eccf1b7901377076d1b1123ec5e44f1aefef2
+  data.tar.gz: 70c11e61852ad401b97063cac090335b6a7aa075c88347e8d9423ea5c269616dc290080a5da19112547d8f4715f2d91f1389b2fab38d95dffaf76622530153e1

data/.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.gem
 requests
 logs
 tmp

data/README.md

@@ -26,9 +26,8 @@ See Gemfile for dependencies
 
 ### TODO
 
-* POSTMAN import
 * OAuth/OAuth2 support
 * Update current deprecated Basic/Digest Auth method
 * Download to file
 * Support more than one variable
-* Delete logs
+* Delete logs (front-end)

data/better_rest.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = "better_rest"
-  s.version     = "0.2.0"
+  s.version     = "0.2.1"
   s.licenses	  = ['MIT']
   s.summary     = "REST Test Client"
   s.date        = "2014-12-13"
-  s.description = "A Configurable REST API test client accessible via your browser"
+  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"

data/lib/better_rest.rb

@@ -24,6 +24,7 @@ configure do
 end
 
 BETTER_SIGNATURE = "BetteR - https://github.com/at1as/BetteR"
+API_VERSION = 1.0
 
 
 # Return default values
@@ -32,7 +33,7 @@ get '/?' do
   @times = ["1", "2", "5", "10"]
   @header_hash = {"" => ""}
   @follow, @verbose, @ssl, @log_requests = true, true, false, false
-  @timeout_interval = 1
+  @timeout_interval = 2
 
   erb :index
 end
@@ -96,14 +97,20 @@ post '/request' do
     end
   end
 
-  # View response parameters
+  # Response parameters return to View
   @response_body = {}
   request.options[:url] = request.url
   @response_body['request_options'] = JSON.pretty_generate(request.options)
-  @response_body['return_msg'] = response.return_code.upcase
+
+  # Return message OK can be confused with 200 OK
+  @response_body['return_msg'] = ''
+  unless response.return_code.upcase.to_s == 'OK'
+    @response_body['return_msg'] = response.return_code.upcase
+  end
+
   @response_body['return_code'] = response.code
   @response_body['return_time'] = response.time
-  @response_body['return_body'] = response.body.force_encoding('UTF-8')
+  @response_body['return_body'] = response.body.force_encoding('ISO-8859-1')
   @response_body['return_headers'] = response.response_headers
 
   @response_body.to_json
@@ -214,10 +221,23 @@ get '/logs/:log' do
 end
 
 
+# Delete log
+delete '/logs/:log' do
+  if File.exists? "logs/#{params[:log]}.log"
+    File.delete("logs/#{params[:log]}.log")
+  else
+    return 404
+  end
+  200
+end
+
+
 # Upload file
-# Clear directory writing file
 post '/upload' do
+
+  # Clear directory before writing file
   FileUtils.rm_rf(Dir.glob('tmp/*'))
+
   unless request.body.nil?
     File.open('tmp/' + params[:file][:filename], 'w') do |f|
       f.write(params[:file][:tempfile].read)
@@ -227,6 +247,63 @@ post '/upload' do
 end
 
 
+# Import from POSTMAN Collection
+post '/import' do
+
+  # Clear tmp directory before writing file
+  FileUtils.rm_rf(Dir.glob('tmp/*'))
+
+  # Save File
+  unless request.body.nil?
+    File.open('tmp/postman_import.json', 'w') do |f|
+      f.write(params[:file][:tempfile].read)
+    end
+  end
+
+  # Read File
+  if File.exists? "tmp/postman_import.json"
+    stored_collection = JSON.parse File.read("tmp/postman_import.json") rescue return 500
+
+    # Data dump of multiple collections
+    if stored_collection['collections']
+      stored_collection = stored_collection['collections']
+    # Single collection
+    else
+      stored_collection = [stored_collection]
+    end
+  end
+
+  # Extract File information
+  stored_collection.each do |collection|
+    new_collection = {}
+
+    collection['requests'].each do |request|
+      request_details = {}
+      request_details['name'] = request['name']
+      request_details['collection'] = collection['name']
+      request_details['url'] = request['url']
+      request_details['request'] = request['method']
+      request_details['headers'] = request['headers']
+      request_details['payload'] = request['data']
+      request_details['quantity'] = 1
+
+      new_collection[request['name']] = request_details
+    end
+
+    # Write file
+    begin
+      File.open("requests/#{collection['name']}.json", 'w') do |f|
+        f.write(new_collection.to_json)
+      end
+    rescue
+      return 500
+    end
+  end
+
+  200
+end
+
+
 # Defaults to main page
 not_found do
   redirect '/'
@@ -238,7 +315,8 @@ get '/env' do
   <<-ENDRESPONSE
       Ruby:    #{RUBY_VERSION} <br/>
       Rack:    #{Rack::VERSION} <br/>
-      Sinatra: #{Sinatra::VERSION}
+      Sinatra: #{Sinatra::VERSION} <br/>
+      API:     v#{API_VERSION}
   ENDRESPONSE
 end
 

data/public/main.css

@@ -10,7 +10,7 @@ h1 {
 }
 h2 {
   font-size: 15px;
-  margin-top: 18px;
+  margin-top: 16px;
   color: red;
   display: inline-block;
 }
@@ -96,7 +96,6 @@ ul li:hover ul {
 /* Classes */
 .container{
   max-width:700px;
-  margin:2px auto 2px auto;
 }
 .width13{
   width:13%;
@@ -269,6 +268,9 @@ ul li:hover ul {
   padding-left:40px;
   padding-right:40px;
 }
+.navbar-nav>li>a {
+  line-height:1.2;
+}
 
 
 /* By ID */
@@ -292,6 +294,11 @@ ul li:hover ul {
   border:none;
   box-shadow:none;
 }
+#importfile{
+  width:100%;
+  border:none;
+  box-shadow:none;
+}
 #backdrop{
   background: rgba(0, 0, 0, 0.6);
   position: fixed;

data/views/index.erb

@@ -17,7 +17,7 @@
 
         <!-- BRANDING -->
         <li style="float:left">
-          <h1>BetteR &mdash; REST API Test Client</h1>
+          <h1 style="margin-top:16px">BetteR &mdash; REST API Test Client</h1>
         </li>
 
         <!-- DROPDOWN MENU -->
@@ -30,6 +30,7 @@
             <li onclick="savedRequestList()"><a>Load Request</a></li>
             <li onclick="modalToggle('variables-modal')"><a>Variables</a></li>
             <li onclick="modalToggle('file-upload-modal')"><a>File Upload</a></li>
+            <li onclick="modalToggle('import-modal')"><a>Import</a></li>
             <li onclick="logsList()"><a>Logs</a></li>
             <li onclick="quit()"><a>Quit</a></li>
           </ul>
@@ -235,6 +236,23 @@
         </div>
 
 
+        <!-- IMPORT MODAL -->
+        <div id="import-modal" class="centered" tabindex="-1" role="dialog" style="display:none; z-index:11" onclick="returnFalse(event)">
+          <div class="modal-content" style="padding-left:15px; padding-right:15px;">
+            <h4 style="text-align:center"><strong>Import from POSTMAN</strong></h4>
+            <hr>
+            <div class="modal-body">
+              <form id="import_form" method="post" action="/import" enctype="multipart/form-data">
+                <input type="file" id="importfile" name="importfile">
+                <div style="margin-top:25px; margin-bottom:5px; text-align:center">
+                  <input type="submit" id="import_submit" class="btn btn-block btn-simple" style="width:140px; margin-left:auto; margin-right:auto;" value="Import">
+                </div>
+              </form>
+            </div>
+          </div>
+        </div>
+
+
         <!-- SAVE REQUEST MODAL -->
         <div id="save-modal" class="centered" tabindex="-1" role="dialog" style="display:none; z-index:11" onclick="returnFalse(event)">
           <div class="modal-content" style="padding-left:15px; padding-right:15px;">
@@ -376,15 +394,6 @@
     return body;
   }
 
-  // TODO
-  /* Upload file for request */
-  function uploadFile() {
-    var vFD = new FormData(document.getElementById('datavalue'));
-
-    var client = new XMLHttpRequest();
-    client.open('POST', 'upload');
-    client.send(vFD);
-  }
 
   /* Prepare and then send the request */
   function sendRequest() {
@@ -510,6 +519,7 @@
 
     if (client.status == 200) {
       modalToggle('load-modal');
+      clearFile();
       populateView(JSON.parse(client.responseText));
     } else {
       console.log('Unknown Error: GET ' + url + ' failed');
@@ -645,6 +655,7 @@
 
 
   /* Retrieve a list of all log entries */
+  /* TODO: Add Log Deletion */
   function logsList(){
     var url     = '/logs';
     var client  = new XMLHttpRequest();
@@ -666,9 +677,14 @@
       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');
+
         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);
       }
     } else {
@@ -693,6 +709,7 @@
     document.getElementById('save-modal').style.display         = 'none';
     document.getElementById('load-modal').style.display         = 'none';
     document.getElementById('file-upload-modal').style.display  = 'none';
+    document.getElementById('import-modal').style.display       = 'none';
     document.getElementById('variables-modal').style.display    = 'none';
     document.getElementById('logs-modal').style.display         = 'none';
   }
@@ -849,8 +866,6 @@
     document.getElementById('usr').value            = '';
     document.getElementById('pwd').value            = '';
     document.getElementById('payload').value        = '';
-    document.getElementById('varKey').value         = '';
-    document.getElementById('varValue').value       = '';
     document.getElementById('payload').style.height = '100px';
 
     if (document.getElementById('resultsBody')) {
@@ -868,6 +883,8 @@
     while (headerfieldsAll.firstChild) {
       headerfieldsAll.removeChild(headerfieldsAll.firstChild);
     }
+    document.getElementById('requestTime').innerHTML  = '';
+    document.getElementById('returnCode').innerHTML   = '';
     clearFile();
   }
 
@@ -894,21 +911,6 @@
     }
   }
 
-  function setHeight() {
-    var payloadHeight = document.getElementById('payload').style.height;
-    document.getElementById('payloadHeight').value = payloadHeight;
-    if (document.getElementById('resultsBody').style.display != 'none'){
-      var resHeight = document.getElementById('resultsBody').style.height;
-    }
-    if (document.getElementById('results-req-head').style.display != 'none') {
-      var resHeight = document.getElementById('results-req-head').style.height;
-    }
-    if (document.getElementById('results-resp-head').style.display != 'none') {
-      var resHeight = document.getElementById('results-req-head').style.height;
-    }
-    document.getElementById('responseHeight').value = resHeight;
-  }
-
 
   /* Shut down server and then reload page */
   function quit(){
@@ -969,7 +971,30 @@
   }
 
 
-  /* Upload form data without form submit */
+  /* Import from POSTMAN */
+  document.getElementById('import_form').onsubmit = function(event) {
+    event.preventDefault();
+
+    var data_store  = document.getElementById('importfile');
+    var form        = new FormData();
+    form.append('file', data_store.files[0]);
+
+    var client = new XMLHttpRequest();
+
+    client.onreadystatechange = function() {
+      if (client.readyState == 4 && client.status == 200) {
+        modalHideAll();
+      } else if (client.readyState == 4) {
+        console.log('Error importing POSTMAN file');
+      }
+    }
+
+    client.open('POST', '/import', true);
+    client.send(form);
+  }
+
+
+  /* Upload file */
   document.getElementById('upload_form').onsubmit = function(event) {
     event.preventDefault();
 
@@ -981,13 +1006,11 @@
 
     client.onreadystatechange = function() {
       if (client.readyState == 4 && client.status == 200) {
-        var height    = document.getElementById('payload').offsetHeight;
         var filename  = document.getElementById('datafile').files[0].name;
 
         document.getElementById('payload').style.display    = 'none';
         document.getElementById('filename').style.display   = '';
         document.getElementById('clear-file').style.display = '';
-        document.getElementById('filename').height          = height;
         document.getElementById('filename').innerHTML       = filename;
 
         modalHideAll();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_rest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Willems
@@ -10,7 +10,7 @@ bindir: bin
 cert_chain: []
 date: 2014-12-13 00:00:00.000000000 Z
 dependencies: []
-description: A Configurable REST API test client accessible via your browser
+description: Configurable REST API test client accessible via your browser
 email:
 - jason@willems.ca
 executables: