rest-terminal 0.1.6 → 0.1.7

data/lib/rest/terminal/commands.rb

@@ -49,7 +49,7 @@ module Rest
       def _cd
         fp = full_path(@prm[0])
         if File.directory?("services#{fp}")
-          @pwd = fp
+          @cpath = @pwd = fp
         else
           fp = "Service not exists! #{fp}".red
         end
@@ -76,7 +76,7 @@ module Rest
       def _ls
         path = Dir["#{current_path}*/"]
         path.collect do |x|
-          puts x.sub(current_path,'/')
+          puts x.sub(current_path,'').sub(/\/$/,'')
         end
         @_status = "#{path.length} services"
         # p "lolllll >>#{@serv}<< ."
@@ -89,32 +89,33 @@ module Rest
       def _info
         multi_exec(:_info)
         @_status = ""
-        # @_status = @services[@pwd]._info(@prm)
+        # @_status = @services[@cpath]._info(@prm)
       end
 
       def _response
-        @_status = @services[@pwd]._response(@prm)
+        @_status = @services[@capth]._response(@prm)
       end
 
       def _headers
-        @_status = @services[@pwd]._headers(@prm)
+        @_status = @services[@cpath]._headers(@prm)
       end
 
       def _body
-        @_status = @services[@pwd]._body(@prm)
+        @_status = @services[@cpath]._body(@prm)
       end
 
       def _vars
+        # p "CPATH: >>#{@cpath}<<"
         if @prm.length>1 && !@prm[/\=/]
           pth = @prm.shift
           @_status = @services[pth]._vars(@prm)
         else
-          @_status = @services[@pwd]._vars(@prm)
+          @_status = @services[@cpath]._vars(@prm)
         end
       end
 
       def _reset
-        @_status = @services[@pwd]._reset(@prm)
+        @_status = @services[@cpath]._reset(@prm)
       end
 
       def _send

data/lib/rest/terminal/persistent.rb

@@ -15,8 +15,10 @@ module Rest
         end
         pr = @services[@pwd]
         path = Dir["#{current_path}*/"]
+        # p "CHILDPATH #{path.inspect}  >>#{current_path}*/<<"
         path.collect do |px|
           p2 = px[/\/.*/]
+          # p "CHILD #{p2}"
           @services[p2] = ServiceBase.new(pr,p2)
         end
       end

data/lib/rest/terminal.rb

@@ -23,6 +23,7 @@ module Rest
         @prm      = [ ]
         @pwd      = '/'
         @cmd      = ''
+        @cpath    = ''
         @_status  = ''
       end
 
@@ -53,16 +54,23 @@ module Rest
       def load_state
         if File.exists?('./.rest-terminal/persistent_rc.rb')
           require './.rest-terminal/persistent_rc'
-          load_vars
+          load_vars 
+          @cpath = @capth ? "#{@pwd}#{@cpath}/" : @pwd
           load_services
         end
       end
 
+      # sometime command can include the child service 
+      # Ex: rest vars@child
+      # old code for this action use @pwd as current service path
+      # new code for this action introduce @cpath as current path
       def is_cmd_in_commands?
         puts ARGV.inspect.red
-        @cmd = ARGV[0].to_s
-        parm = ARGV[1,99]
-        @prm = parm ? parm : [ ] #.join(' ') : ''
+        cmdp   = ARGV[0].to_s.split('@')
+        parm   = ARGV[1,99]
+        @cmd   = cmdp[0]
+        @cpath = cmdp[1]
+        @prm   = parm ? parm : [ ] #.join(' ') : ''
         commands.index(@cmd) ? @cmd : nil
         # if singleton_class.private_instance_methods(false).index(@@cmd.to_sym) 
       end
@@ -94,11 +102,11 @@ module Rest
       end
 
       def space_path(spc)
-        (spc[0] == '/')  ? spc : "#{@pwd}#{spc}"
+        (spc[0] == '/')  ? spc : "#{@cpath}#{spc}"
       end
 
       def full_path(spc)
-        x = "#{@pwd} "
+        x = "#{@cpath} "
         l = x.count('/')+1
         dots = spc[/\.+/]
         if dots && 
@@ -114,9 +122,10 @@ module Rest
       def multi_exec(cmd)
         @prm = ['.'] if @prm==[]
         @prm.each do |prm|
-          prm = @pwd if prm=='.'
+          prm = @cpath if prm=='.'
           pth = full_path(prm)
           puts "Service: #{pth}".yellow
+          # puts @services.keys.inspect
           @_status = @services[pth].send(cmd,prm)
         end
       end

data/lib/rest/version.rb

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

data/lib/service_base.rb

@@ -155,9 +155,14 @@ class ServiceBase
   end
 
   def body_join
-    bodies.collect do |k,v|
-      "#{k}=#{v}"
-    end.join("&")
+    if headers[:"content-type"]=='application/json'
+      body = bodies.to_json
+    else
+      body = bodies.collect do |k,v|
+        "#{k}=#{v}"
+      end.join("&")
+    end
+    body
   end
 
   def set_value(key,prm)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-terminal
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors: