better_rest 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eec73eed2d71fd24e5ef1a6380ba9b96c0c3cc86
-  data.tar.gz: d31fae1445848a5ceac23ea96fecdcd53f707291
+  metadata.gz: e990eb58751881bf19708d2bb4a521c954a07850
+  data.tar.gz: baee501acb9b69804a6b903601e1dc1d96c6e24e
 SHA512:
-  metadata.gz: 4de8bf79426d9fcd5fde7879d08fbd9c9fcd324431e0dad4b9d1e6d691069693aea5123c4b90d008000e04f8985eccf1b7901377076d1b1123ec5e44f1aefef2
-  data.tar.gz: 70c11e61852ad401b97063cac090335b6a7aa075c88347e8d9423ea5c269616dc290080a5da19112547d8f4715f2d91f1389b2fab38d95dffaf76622530153e1
+  metadata.gz: 6840e1c632dd3d70ee43979c40bffdf63585787a016b0fdba43a5d555433e16f0a261df189226d01632bb7e577068823e22e8ecbdcf3adb3ea61340bbdbdf822
+  data.tar.gz: 361612d6422112d2fd219ec56397f859fc1a35e37f3d161b5917ee2ee7ed1112d8b116a523abed26ae86e0be97f2fbcf2ef967364ed85349ea0106c0f0334565

data/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
-.gem
 requests
 logs
 tmp
+cookiejar
+*.gem

data/README.md

@@ -8,9 +8,16 @@ BetteR emphasises both a clean and easy to use interface, as well as allowing us
 
 ![Screenshot](http://at1as.github.io/github_repo_assets/better-rest-client.jpg)
 
+### Features
+
+* Import collections from POSTMAN
+* Save and load Requests
+* Attach files to requests
+* Send parallel requests
+
 ### Usage
 
-The easiest way to use BetteR is to install it using the [Ruby Gem](http://rubygems.org/gems/better_rest) (note that this usually lags a few commits behind):
+The easiest way to use BetteR is to install it using the [Ruby Gem](http://rubygems.org/gems/better_rest) (note that I usually keep the gem several commits behind the github repo):
 ```bash
 $ gem install better_rest
 ```
@@ -18,7 +25,7 @@ Or download the repository here for the latest version and launch via:
 ```bash
 $ ./bin/better_rest
 ```
-To try BetteR, without installing the Gem, it's also hosted on [Heroku](http://better-rest.herokuapp.com/). Note that when run on Heroku, some of functionality won't work due to lack of access to the filesystem (saving logs, etc.). Also note that this is likely to be from an older commit.
+To try BetteR, without installing the Gem, it's also hosted on [Heroku](http://better-rest.herokuapp.com/). Note that when run on Heroku, the build is likely to be from a much older commit.
 
 ### Dependencies
 

data/better_rest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "better_rest"
-  s.version     = "0.2.1"
+  s.version     = "0.2.2"
   s.licenses	  = ['MIT']
   s.summary     = "REST Test Client"
   s.date        = "2014-12-13"

data/lib/better_rest.rb

@@ -14,6 +14,32 @@ set :views, File.expand_path('../../views', __FILE__)
 helpers do
   include Rack::Utils
   alias_method :h, :escape_html
+
+  def parse_cookies(cookies)
+    cookie_hash = {}
+    cookies.each do |c|
+      key, value = c.split('; ').first.split('=', 2)
+      cookie_hash[key] = value
+    end
+    cookie_hash.to_json
+  end
+
+  def stringify_cookies(cookies)
+    JSON.parse(cookies).map { |key, value| "#{key}=#{value}" }.join('; ')
+  end
+
+  def parse_postman_headers(headers)
+    header_hash = {}
+    header_list = headers.strip.split(': ')
+    keys = header_list.select.each_with_index { |str, i| i.even? }
+    values = header_list.select.each_with_index { |str, i| i.odd? }
+
+    keys.each_with_index do |key, index|
+      header_hash[key] = values[index]
+    end
+    header_hash
+  end
+
 end
 
 configure do
@@ -32,7 +58,8 @@ get '/?' do
   @requests = ["GET","POST","PUT","DELETE","HEAD","OPTIONS","PATCH"]
   @times = ["1", "2", "5", "10"]
   @header_hash = {"" => ""}
-  @follow, @verbose, @ssl, @log_requests = true, true, false, false
+  @follow, @cookies, @verbose = [true] * 3
+  @ssl, @log_requests = [false] * 2
   @timeout_interval = 2
 
   erb :index
@@ -53,6 +80,7 @@ post '/request' do
   @verbose = @request_body['verbose'] rescue false
   @ssl = @request_body['ssl_ver'] rescue false
   @log_requests = @request_body['logging'] rescue false
+  @cookies = @request_body['cookies'] rescue true
   @timeout_interval = Integer(@request_body['timeout']) rescue 1
   @request_body['headers']['User-Agent'] = BETTER_SIGNATURE unless @request_body['headers']['User-Agent']
 
@@ -77,6 +105,15 @@ post '/request' do
     request.options[:body] = { file: File.open('tmp/' + @request_body['file'], 'r') }
   end
 
+  # Attach cookie to header
+  if @cookies && @request_body['headers']['Cookie'].nil?
+    if File.exists? "cookiejar"
+      cookie = File.read("cookiejar")
+    end
+    request.options[:headers]['Cookie'] = stringify_cookies(cookie) unless cookie.empty?
+  end
+
+
   # Remove unused fields from request
   request.options.delete(:body) if request.options[:body].empty?
   if @request_body['user'].empty? || @request_body['password'].empty?
@@ -97,6 +134,12 @@ post '/request' do
     end
   end
 
+  # Write cookie to file
+  if response.headers_hash['set-cookie']
+    cookies = parse_cookies(response.headers_hash['set-cookie'])
+    File.open('cookiejar', 'w') { |file| file.write(cookies) }
+  end
+
   # Response parameters return to View
   @response_body = {}
   request.options[:url] = request.url
@@ -110,7 +153,14 @@ post '/request' do
 
   @response_body['return_code'] = response.code
   @response_body['return_time'] = response.time
-  @response_body['return_body'] = response.body.force_encoding('ISO-8859-1')
+
+  # Return body with correct encoding
+  if response.headers_hash['Content-Type'] == "application/json"
+    @response_body['return_body'] = JSON.pretty_generate(JSON.parse(response.body)).force_encoding('ISO-8859-1')
+  else
+    @response_body['return_body'] = response.body.force_encoding('ISO-8859-1')
+  end
+
   @response_body['return_headers'] = response.response_headers
 
   @response_body.to_json
@@ -168,6 +218,7 @@ get '/savedrequests/:collection/:request' do
   if File.exists? "requests/#{params[:collection]}.json"
     collection = JSON.parse File.read("requests/#{params[:collection]}.json")
     request = collection[params[:request]]
+
     return request.to_json
   else
     return 404
@@ -178,8 +229,10 @@ end
 
 # Delete Request Collection
 delete '/collections/:collection' do
-  if File.exists? "requests/#{params[:collection]}.json"
-    File.delete("requests/#{params[:collection]}.json")
+  collection = "requests/#{params[:collection]}.json"
+
+  if File.exists? collection
+    File.delete(collection)
   else
     return 404
   end
@@ -189,11 +242,13 @@ end
 
 # Delete Request from Collection
 delete '/collections/:collection/:request' do
-  if File.exists? "requests/#{params[:collection]}.json"
-    stored_collection = JSON.parse File.read("requests/#{params[:collection]}.json")
+  collection = "requests/#{params[:collection]}.json"
+
+  if File.exists? collection
+    stored_collection = JSON.parse File.read(collection)
     stored_collection.delete(params[:request])
 
-    File.open("requests/#{params[:collection]}.json", "w") do |f|
+    File.open(collection, "w") do |f|
       f.write(stored_collection.to_json)
     end
   else
@@ -223,8 +278,10 @@ end
 
 # Delete log
 delete '/logs/:log' do
-  if File.exists? "logs/#{params[:log]}.log"
-    File.delete("logs/#{params[:log]}.log")
+  log = "logs/#{params[:log]}.log"
+
+  if File.exists? log
+    File.delete(log)
   else
     return 404
   end
@@ -250,19 +307,21 @@ end
 # Import from POSTMAN Collection
 post '/import' do
 
+  file = 'tmp/postman_import.json'
+
   # 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|
+    File.open(file, '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
+  if File.exists? file
+    stored_collection = JSON.parse File.read(file) rescue return 500
 
     # Data dump of multiple collections
     if stored_collection['collections']
@@ -283,7 +342,7 @@ post '/import' do
       request_details['collection'] = collection['name']
       request_details['url'] = request['url']
       request_details['request'] = request['method']
-      request_details['headers'] = request['headers']
+      request_details['headers'] = parse_postman_headers(request['headers'])
       request_details['payload'] = request['data']
       request_details['quantity'] = 1
 

data/public/main.css

@@ -17,6 +17,9 @@ h2 {
 h2:hover{
   color:black;
 }
+hr{
+  margin-bottom:10px;
+}
 input{
   border-radius: 2px;
   background-color:#FEFEFE;
@@ -239,6 +242,7 @@ ul li:hover ul {
     width: -moz-calc(100% - 40px);
     width: -webkit-calc(100% - 40px);
     width: calc(100% - 40px);
+    overflow: hidden;
 }
 .rm-collection{
   line-height:inherit;
@@ -311,14 +315,13 @@ ul li:hover ul {
 #auth-span{
   display:inline-block;
   white-space:nowrap;
-  margin-top:4px;
   margin-bottom:4px;
   margin-left:15px;
 }
 #response-status{
   margin-left:15px;
   margin-top: 10px;
-  margin-bottom: 12px;
+  margin-bottom: 10px;
 }
 #response-filters{
   margin-left:0px;
@@ -327,7 +330,7 @@ ul li:hover ul {
   margin-top:4px;
 }
 #reqdata{
-  width:250px;
+  width:400px;
   max-height:300px;
   overflow:scroll;
 }
@@ -360,6 +363,9 @@ ul li:hover ul {
   overflow:scroll;
   padding-bottom:15px;
 }
+#logs-modal{
+  width:400px;
+}
 
 
 /* Tooltips */

data/views/index.erb

@@ -194,6 +194,11 @@
                 <input type="checkbox" name="followlocation" id="followlocation" class="checkbox" style="float:right"
                 <% if @follow %>checked<% end %>>
               </div>
+              <div>
+                <label class="form-label conf-label" for="cookies">Send Cookies</label>
+                <input type="checkbox" name="cookies" id="cookies" class="checkbox" style="float:right"
+                <% if @cookies %>checked<% end %>>
+              </div>
               <div>
                 <label class="form-label conf-label" for="verbose">Verbose Response</label>
                 <input type="checkbox" name="verbose" id="verbose" class="checkbox" style="float:right"
@@ -371,6 +376,7 @@
 
     /* SETTINGS */
     body.redirect = document.getElementById('followlocation').checked;
+    body.cookies  = document.getElementById('cookies').checked;
     body.verbose  = document.getElementById('verbose').checked;
     body.ssl_ver  = document.getElementById('ssl_verifypeer').checked;
     body.logging  = document.getElementById('logging').checked;
@@ -518,9 +524,10 @@
     client.send();
 
     if (client.status == 200) {
-      modalToggle('load-modal');
+      modalHideAll();
       clearFile();
       populateView(JSON.parse(client.responseText));
+      warn();
     } else {
       console.log('Unknown Error: GET ' + url + ' failed');
     }
@@ -565,6 +572,9 @@
     if (fielddata.redirect) {
       document.getElementById('followlocation').value = fielddata.redirect;
     }
+    if (fielddata.cookies) {
+      document.getElementById('cookies').value = fielddata.cookies;
+    }
     if (fielddata.verbose) {
       document.getElementById('verbose').value = fielddata.verbose;
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_rest
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jason Willems