rest-terminal 0.1.7 → 0.1.8

data/lib/rest.rb

@@ -20,4 +20,5 @@ require 'rest/version'
 require 'rest/terminal/commands'
 require 'rest/terminal/commands_info'
 require 'rest/terminal/persistent'
-require 'rest/terminal'
+require 'rest/terminal'
+require 'pry'

data/lib/rest/terminal.rb

@@ -16,6 +16,7 @@ module Rest
         @repl     = ''
         @type     = 'earth'
         @serv     = 'localhost'
+        @service  = ''
         @services = { }
         @response = { }
         @spaces   = [ ]
@@ -126,7 +127,9 @@ module Rest
           pth = full_path(prm)
           puts "Service: #{pth}".yellow
           # puts @services.keys.inspect
-          @_status = @services[pth].send(cmd,prm)
+          svc = @services[pth]
+          svc.load_service
+          @_status = svc.send(cmd,prm)
         end
       end
 

data/lib/rest/terminal/persistent.rb

@@ -34,6 +34,7 @@ module Rest
         b << "@pwd  = #{@pwd.inspect}"
         b << "@serv = #{@serv.inspect}"
         b << "@hist = #{@hist.inspect}"
+        b << "@service = #{@service.inspect}"
         b << "@response = #{@response.inspect}"
         c = b.join("\n        ")
         s = "#env_start(.*)#env_end" 

data/lib/rest/version.rb

@@ -23,7 +23,7 @@ module Rest
 
       # :nodoc:
       def patch
-      7
+      8
       end
 
       # :nodoc:

data/lib/service_base.rb

@@ -8,6 +8,11 @@ class ServiceBase
     @response = {}
     @parent   = vc 
     reset(%w(headers body vars))
+    load_service
+  end
+
+  def load_service
+    # p "services#{path}service.rb"
     if File.exists?("services#{path}service.rb")
       instance_eval(IO.read("services#{path}service.rb"))
     end
@@ -20,7 +25,6 @@ class ServiceBase
     line = ('-'*65)
 
     puts ('='*65).yellow
-    # puts "[#{varx[:conn]}] #{varx[:url]}".intense_blue
     puts line.blue
     puts "headers".intense_green 
     puts headerx.pj
@@ -59,7 +63,6 @@ class ServiceBase
   end
 
   def _send(prm)
-    #p Rest::Terminal.instance_variable_get("@response")
     headerx = headers
     bodyx = bodies
     varx = vars
@@ -76,7 +79,8 @@ class ServiceBase
         req.body = body_join 
         req.headers = headerx
       end.env
-      if /application\/json/=~resp[:response_headers]["content-type"]
+      ct = resp[:response_headers]["content-type"]
+      if ct && /application\/json/=~ct.downcase
         body = JSON.parse(resp[:body])
       else
         body = resp[:body]
@@ -86,10 +90,11 @@ class ServiceBase
         :headers => resp[:response_headers],
         :body => body
       }
+      Rest::Terminal.instance_variable_set("@service",@path)
       Rest::Terminal.instance_variable_set("@response",@response)
       puts line.red
       puts "response".intense_green 
-      puts @response.pj #[:response_headers].inspect
+      puts @response.pj
       save_vars
       ""
     rescue Faraday::Error::ConnectionFailed => e
@@ -99,15 +104,15 @@ class ServiceBase
   end
 
   def headers(up=true)
-    inheritances(:headers,up).select{|k,v|v && !v.empty?}
+    inheritances(:headers,up).select{|k,v|v} 
   end
 
   def bodies(up=true)
-    inheritances(:bodies,up).select{|k,v|v && !v.empty?}
+    inheritances(:bodies,up).select{|k,v|v} 
   end
 
   def vars(up=true)
-    inheritances(:vars,up).select{|k,v|v && !v.empty?}
+    inheritances(:vars,up).select{|k,v|v} 
   end
 
   def inheritances(key,up)
@@ -122,8 +127,17 @@ class ServiceBase
   end
 
   private
-  # ex: rest reset body
-  # reset value to def_value or empty/[]  
+
+  def last_service
+    t = Rest::Terminal
+    s = t.instance_variable_get("@service")
+    t.instance_variable_get("@services")[s]
+  end
+
+  def last_response
+    Rest::Terminal.instance_variable_get("@response")
+  end
+
   def reset(prm)
     params = prm - (prm - %w(headers body vars))
     params.each do |x|
@@ -155,7 +169,8 @@ class ServiceBase
   end
 
   def body_join
-    if headers[:"content-type"]=='application/json'
+    ct = headers[:"content-type"]
+    if ct && /application\/json/=~ct.downcase
       body = bodies.to_json
     else
       body = bodies.collect do |k,v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-terminal
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json