swagger-shell 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e597c90a4b76d100bc2b694fb7d389346bb71a4a
-  data.tar.gz: c41111166cd641a11160ea6d36e9125ee4955af7
+  metadata.gz: 1bd6ce946b0365ed91e0ca911f5d9d4436b0ece7
+  data.tar.gz: 25bbe6155712671baa6d4b83cdc23a6d166722f2
 SHA512:
-  metadata.gz: 532e20ab70c63eae78e26ecc26936ccd481b50f1cae09275e25f99123ade51bf507108c2947e0148e44d89e283328cc86903d3e933daaedcd908f95d5dd61ddf
-  data.tar.gz: e82eb55767a67935952862495cdd6fcb42595124a18f12c250b2de7ad7553eec60325d482636eadd3dad6498cf11c31a663624b56e5683b9eb04cfea7c28ff6e
+  metadata.gz: ee5ed7bfc54c02a84486617a94e68910f4de050bffabcfe02c834677cf15210e41f5edc9983b5ccadb224fe0d362e25283774150a6e0aff9be31c7d67c73f56e
+  data.tar.gz: ea4d05d4e6a0f5ca2e0719621511af783156456574e4dd30e882944f29ea710d40d688f7d8245524cf05cbeb9b37f639079594445b3ee23ed3fa13fbee278281

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swagger-shell (0.0.1)
+    swagger-shell (0.0.2)
       faraday (~> 0.10)
       parallel (~> 1.12)
       pry (~> 0.11)

data/lib/swagger/shell.rb

@@ -8,29 +8,28 @@ require "json"
 module Swagger
   module Shell
     class << self
+      attr_reader :env, :config_api, :config_pry
+
       def env=(env)
         @env = env
       end
 
-      def env
-        @env
+      def config_env=(config)
+        @config_env_store = hash_to_struct(config)
       end
 
       def config_env
-        @config_env ||= hash_to_struct(YAML.load_file("config/env.yml")[env.to_s]).tap do |config|  # TODO: pass outside
-          raise "not exist env: #{env}" if config.nil?
+        @config_env ||= @config_env_store[env].tap do |config|
           config.docs_url = File.join(config.api_url, config.docs_url) unless config.docs_url.start_with? "http"
         end
       end
 
-      def config_api
-        @config_api ||= hash_to_struct(YAML.load_file("config/swagger-shell.yml")["api"]).tap do |_config|  # TODO: pass outside
-          # noting to do
-        end
+      def config_api=(config)
+        @config_api = hash_to_struct(config)
       end
 
-      def config_pry
-        @config_local ||= hash_to_struct(YAML.load_file("config/swagger-shell.yml")["pry"]).tap do |config| # TODO: pass outside
+      def config_pry=(config)
+        @config_pry = hash_to_struct(config).tap do |config|
           config.home = config.home.gsub(/^~/, Dir.home) if config.home.start_with?("~/")
           config.history_path = File.join(config.home, config.history_file)
           config.users_path = File.join(config.home, config.users_file)

data/lib/swagger/shell/api_struct.rb

@@ -1,24 +1,28 @@
 module Swagger
   module Shell
     module ApiGet
+      attr_accessor :get_api_info
       def get(message = {})
         _get(api_url, message)
       end
     end
 
     module ApiPost
+      attr_accessor :post_api_info
       def post(message = {})
         _post(api_url, message)
       end
     end
 
     module ApiPut
+      attr_accessor :put_api_info
       def put(message = {})
         _put(api_url, message)
       end
     end
 
     module ApiDelete
+      attr_accessor :delete_api_info
       def delete(message = {})
         _delete(api_url, message)
       end
@@ -45,9 +49,9 @@ module Swagger
         root? ? "api" : @key
       end
 
-      def add_api(path_keys, method, api_info: nil)
+      def add_api(path_keys, method, api_info = nil)
         find_or_create_api_struct(path_keys).tap do |api_struct|
-          api_struct.add_api_module(method) if api_struct
+          api_struct.add_api_module(method, api_info) if api_struct
         end
       end
 
@@ -55,8 +59,8 @@ module Swagger
         @children.each_with_object({}) do |key, hash|
           hash.merge!(instance_variable_get("@#{key}").api_list)
         end.tap do |hash|
-          api_methods.each do |api_method|
-            hash[api_method] = ""
+          api_methods.each do |method|
+            hash[(api_ancestors.map(&:method_key) << method).join(".")] = send("#{method}_api_info")
           end
         end
       end
@@ -68,7 +72,8 @@ module Swagger
 
       def api_methods
         %i[get post put delete].map do |method|
-          (api_ancestors.map(&:method_key) << method).join(".") if singleton_class.include? self.class.module_class(method)
+          # (api_ancestors.map(&:method_key) << method).join(".") if singleton_class.include? self.class.module_class(method)
+          method if singleton_class.include? self.class.module_class(method)
         end.compact
       end
 
@@ -80,8 +85,9 @@ module Swagger
         end.reverse
       end
 
-      def add_api_module(method)
+      def add_api_module(method, api_info)
         extend self.class.module_class(method)
+        send("#{method}_api_info=", api_info)
       end
 
       def child(path_key)

data/lib/swagger/shell/doc_loader.rb

@@ -16,7 +16,15 @@ module Swagger
                 path = api2["path"].gsub(/^#{Swagger::Shell.config_api.ignore_top_url}/, "")
                 path_keys = path.split("/").reject {|s| s == "" }.tap {|p| p.last.gsub!(".json", "") }
 
-                root_api.add_api(path_keys, api2["operations"].first["method"])
+                info = api2["operations"].first
+                api_info = OpenStruct.new(
+                  summary: info["summary"],
+                  notes: info["notes"],
+                  parameters: info["parameters"],
+                  response_messages: info["responseMessages"],
+                  nickname: info["nickname"],
+                )
+                root_api.add_api(path_keys, info["method"], api_info)
               end
             end
           elsif swagger_version == "2.0"
@@ -24,7 +32,7 @@ module Swagger
               methods.each do |method, api_info|
                 # TODO: ignore path
                 path_keys = path.split("/").reject {|s| s == "" } # TODO: format // .tap {|p| p.last.gsub!(".json", "") }
-                root_api.add_api(path_keys, method, api_info: api_info)
+                root_api.add_api(path_keys, method) # TODO: api_info
               end
             end
           end

data/lib/swagger/shell/interface.rb

@@ -44,15 +44,15 @@ module Swagger
 
       # output API list
       #
-      # option # TODO: implement
+      # option
       # p: output parameter name
       # s: output summary
       #
       # no option output summary.
       #
       # e.g.:
-      # swagger-shell(main)> apis :p
-      def apis(option = "")
+      # swagger-shell(main)> apis :ps
+      def apis(option = :ps)
         option = option.to_s
 
         with_parameter = option.include?("p")
@@ -61,11 +61,13 @@ module Swagger
         api_list = api.api_list
         max_key_size = api_list.keys.map(&:size).max
         api_list.sort.each do |api, operation|
-          output = "#{api}#{" " * (max_key_size - api.size)}"
-          output += " # #{(operation["parameters"] || []).map {|p| p["name"][8..-2] }.join(" ")}" if with_parameter
-          output += " # #{operation["summary"]}" if with_summary
-          puts output
+          comments = []
+          comments << operation.summary if with_summary
+          comments << "(#{(operation.parameters || []).map {|p| p["name"][8..-2] }.map {|n| "#{n}:" }.join(", ")})" if with_parameter
+
+          puts "#{api}#{" " * (max_key_size - api.size)} # #{comments.join(" ")}"
         end
+
         nil
       end
     end

data/lib/swagger/shell/user.rb

@@ -6,10 +6,10 @@ module Swagger
       def load_sample
         id = list.sample
         return if id.nil?
-        load_by(id)
+        load(id)
       end
 
-      def load_by(id)
+      def load(id)
         @id = id
         @info = YAML.load_file("#{users_path}/#{Swagger::Shell.env}.#{@id}.yml")
       end

data/lib/swagger/shell/version.rb

@@ -1,5 +1,5 @@
 module Swagger
   module Shell
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swagger-shell
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Junya Tokumori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday