file_sv 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8c717829a4044f5970f099311a51d86317e009cb04d01e2b596e2ac24ee5296
-  data.tar.gz: 64a21579ccd9c87ea14a0e8b634f9095450cea66167ef0d414bff97e77f7ce3f
+  metadata.gz: 7207368213637f9e6b91164ea82a398553db87e01743a0a191d5328635e91b84
+  data.tar.gz: 70f93031650207bc4df46cbee90ecea4da58c0b2ade43db384a76e034db58cf2
 SHA512:
-  metadata.gz: 594bfe0862c82585f8568cf3a46d2952bd631bf6795fd7b518a74a4b578eb9eab500523016602110f5ca60094f9a53bfe91c395970ad3ca5774d3d51f2a8427e
-  data.tar.gz: dd153f38c16a882d3ff806dcec71a7b798e7578aea0fe5322f868ea77bd6af7958e7eefc23b47e31f18bb35a78c869e0386155b7936e62086e07411734a2a9ab
+  metadata.gz: 5402cb767636ad98243cab0adae1008a6e9683abdffc3d98a52de3987e9042eae1b703a3394d41213e8bd6591c59b17fef2afd8bc7facd4609d5ed8755a0666c
+  data.tar.gz: d95d5443fccb5db6e05892c403667c77e216296edad1e5dd37688b4d15bf5e23f61c88175496f60ca98d06bbd68de3fc0c497120d58a93e7c64e71f8623f1bb9

data/lib/file_sv.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "yaml"
 require_relative "file_sv/version"
 require_relative "file_sv/global_settings"
 require_relative "file_sv/sv_plan"
@@ -29,14 +30,20 @@ CONFIG_FILE = "file_sv.yaml"
 
 # Set values in global settings based on config
 def load_default_config(file_path)
-  require "yaml"
   return unless File.exist? file_path
 
   config = YAML.load_file file_path
+  return unless config # Handle empty YAML file
+
   config["global"]&.each do |key, value|
     GlobalSettings.send("#{key}=", value)
   end
 
+  load_rest_method_config config
+end
+
+# Load details of each REST method
+def load_rest_method_config(config)
   FileSv.rest_methods.each do |method, setting_class|
     config[method.to_s]&.each { |key, value| setting_class.send("#{key}=", value) }
   end

data/lib/file_sv/planned_endpoint.rb

@@ -3,6 +3,7 @@
 require "erb"
 require "securerandom"
 require "faker"
+require "pathname"
 
 # Endpoint planned to be served
 class PlannedEndpoint
@@ -21,7 +22,7 @@ class PlannedEndpoint
   # Represent a new endpoint
   def initialize(path)
     self.file_path = path
-    self.path = File.split(path).first
+    self.path = serving_loc_for path
     @file = true if not_text?
     assign_params_from_name
     self.method ||= GlobalSettings.default_method
@@ -30,6 +31,11 @@ class PlannedEndpoint
     set_default_status_code
   end
 
+  def serving_loc_for(path)
+    loc = File.split(path).first # TODO: Handle if path has a % at beginning of a folder
+    loc.gsub("#{File::SEPARATOR}%", "#{File::SEPARATOR}:")
+  end
+
   # @return [Boolean] Whether endpoint serves a file not a string
   def file?
     @file
@@ -39,7 +45,7 @@ class PlannedEndpoint
   def default_empty_code
     return false if not_text?
 
-    if content.strip.empty?
+    if content(binding).strip.empty?
       self.status_code = GlobalSettings.empty_body_status
       return true
     end
@@ -93,8 +99,8 @@ class PlannedEndpoint
   end
 
   # @return [Object] Content of file
-  def content
-    render_text
+  def content(binding)
+    render_text(binding)
   end
 
   def not_text?
@@ -103,7 +109,7 @@ class PlannedEndpoint
   end
 
   # @return [String] Render text
-  def render_text
+  def render_text(binding)
     ERB.new(File.read(serving_file_name)).result(binding)
   end
 end

data/lib/file_sv/sv_plan.rb

@@ -37,7 +37,7 @@ class SvPlan
       endpoints.sort { |a, b| a[0].length - b[0].length }.each do |endpoint, methods|
         endpoint_desc += "#{endpoint} \n"
         methods.each do |method_name, endpoints|
-          endpoint_desc += "  #{method_name.upcase} (#{endpoints.size} responses)\n"
+          endpoint_desc += description_message method_name, endpoints
         end
       end
 
@@ -51,10 +51,19 @@ Serving based on folder: #{Dir.pwd}. Related to folder executed: #{serving_folde
       "Endpoints: #{endpoints.inspect}"
     end
 
+    # Add endpoint to plan
+    # @param [PlannedEndpoint] other Endpoint to add to plan
     def +(other)
       @endpoints[other.path] ||= {}
       @endpoints[other.path][other.method] ||= []
       @endpoints[other.path][other.method] << other
     end
+
+    private
+
+    # @return [String]
+    def description_message(method_name, endpoints)
+      "  #{method_name.upcase} (#{endpoints.size} responses) #{endpoints.collect(&:status_code)}\n"
+    end
   end
 end

data/lib/file_sv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FileSv
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/file_sv/virtual_server.rb

@@ -24,28 +24,38 @@ for more details'
 
   doc_endpoint "/docs"
 
+  # Output for endpoint, either a file or text content
+  # @param [PlannedEndpoint] endpoint Planned endpoint to serve
+  def output_for(endpoint, binding)
+    endpoint.file? ? send_file(endpoint.serving_file_name) : endpoint.content(binding)
+  end
+
+  # Log endpoint. Return content and status code defined by endpoint
+  # @param [PlannedEndpoint] endpoint Planned endpoint to serve
+  def serve(endpoint, id = nil)
+    message = "Using endpoint based on file #{endpoint.serving_file_name}."
+    @id = id
+    message += " Using param '#{@id}'" if id
+    puts message
+    [endpoint.status_code, output_for(endpoint, binding)]
+  end
+
   SvPlan.endpoints.each do |_endpoint_path, endpoint_value|
     endpoint_value.each do |_method_name, endpoints|
-      if endpoints.size < 2
-        endpoint = endpoints[0]
-        documentation "Endpoint #{endpoint.path}" do
-          response "1 kind of response"
-          status endpoint.status_code
-        end
-        send(endpoint.method, endpoint.path) do
-          [endpoint.status_code, endpoint.file? ? send_file(endpoint.serving_file_name) : endpoint.content]
+      endpoint_base = endpoints[0]
+      documentation "Endpoint #{endpoint_base.path}" do
+        response "#{endpoints.size} kinds of response"
+      end
+      if endpoint_base.path.include? "#{File::Separator}:"
+        send(endpoint_base.method, endpoint_base.path) do |id|
+          endpoint = endpoints.sample
+          serve endpoint, id
         end
       else
-        endpoint_base = endpoints[0]
-        documentation "Endpoint #{endpoint_base.path}" do
-          response "#{endpoints.size} kinds of response"
-        end
         send(endpoint_base.method, endpoint_base.path) do
-          my_points = endpoints
-          endpoint = my_points.sample
-          [endpoint.status_code, endpoint.file? ? send_file(endpoint.serving_file_name) : endpoint.content]
+          endpoint = endpoints.sample
+          serve endpoint
         end
-        # Average same methods at same endpoint
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file_sv
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker