chef-zero 15.0.17 → 15.0.21

data/lib/chef_zero/rest_error_response.rb

@@ -1,11 +1,11 @@
-module ChefZero
-  class RestErrorResponse < StandardError
-    attr_reader :response_code, :error
-
-    def initialize(response_code, error)
-      @response_code = response_code
-      @error = error
-      super "#{response_code}: #{error}"
-    end
-  end
-end
+module ChefZero
+  class RestErrorResponse < StandardError
+    attr_reader :response_code, :error
+
+    def initialize(response_code, error)
+      @response_code = response_code
+      @error = error
+      super "#{response_code}: #{error}"
+    end
+  end
+end

data/lib/chef_zero/rest_request.rb

@@ -1,88 +1,84 @@
-require "rack/request"
-require "cgi" unless defined?(CGI)
-
-module ChefZero
-  class RestRequest
-    def initialize(env, rest_base_prefix = [])
-      @env = env
-      @rest_base_prefix = rest_base_prefix
-    end
-
-    attr_reader :env
-    attr_accessor :rest_base_prefix
-
-    def base_uri
-      # Load balancer awareness
-      if env["HTTP_X_FORWARDED_PROTO"]
-        scheme = env["HTTP_X_FORWARDED_PROTO"]
-      else
-        scheme = env["rack.url_scheme"]
-      end
-      @base_uri ||= "#{scheme}://#{env["HTTP_HOST"]}#{env["SCRIPT_NAME"]}"
-    end
-
-    def base_uri=(value)
-      @base_uri = value
-    end
-
-    def api_version
-      Integer(@env["HTTP_X_OPS_SERVER_API_VERSION"] || 0)
-    end
-
-    def api_v0?
-      api_version == 0
-    end
-
-    def requestor
-      @env["HTTP_X_OPS_USERID"]
-    end
-
-    def method
-      @env["REQUEST_METHOD"]
-    end
-
-    def rest_path
-      @rest_path ||= rest_base_prefix + env["PATH_INFO"].split("/").select { |part| part != "" }
-    end
-
-    def rest_path=(rest_path)
-      @rest_path = rest_path
-    end
-
-    def body=(body)
-      @body = body
-    end
-
-    def body
-      @body ||= env["rack.input"].read
-    end
-
-    def query_params
-      @query_params ||= begin
-        params = Rack::Request.new(env).GET
-        params.keys.each do |key|
-          params[key] = self.class.rfc2396_parser.unescape(params[key])
-        end
-        params
-      end
-    end
-
-    def to_s
-      result = "#{method} #{rest_path.join("/")}"
-      if query_params.size > 0
-        result << "?#{query_params.map { |k, v| "#{k}=#{v}" }.join("&")}"
-      end
-      if body.chomp != ""
-        result << "\n--- #{method} BODY ---\n"
-        result << body
-        result << "\n" unless body.end_with?("\n")
-        result << "--- END #{method} BODY ---"
-      end
-      result
-    end
-
-    def self.rfc2396_parser
-      @parser ||= URI::RFC2396_Parser.new
-    end
-  end
-end
+require "rack/request"
+require "cgi" unless defined?(CGI)
+
+module ChefZero
+  class RestRequest
+    def initialize(env, rest_base_prefix = [])
+      @env = env
+      @rest_base_prefix = rest_base_prefix
+    end
+
+    attr_reader :env
+    attr_accessor :rest_base_prefix
+
+    def base_uri
+      # Load balancer awareness
+      scheme = env["HTTP_X_FORWARDED_PROTO"] || env["rack.url_scheme"]
+      @base_uri ||= "#{scheme}://#{env["HTTP_HOST"]}#{env["SCRIPT_NAME"]}"
+    end
+
+    def base_uri=(value)
+      @base_uri = value
+    end
+
+    def api_version
+      Integer(@env["HTTP_X_OPS_SERVER_API_VERSION"] || 0)
+    end
+
+    def api_v0?
+      api_version == 0
+    end
+
+    def requestor
+      @env["HTTP_X_OPS_USERID"]
+    end
+
+    def method
+      @env["REQUEST_METHOD"]
+    end
+
+    def rest_path
+      @rest_path ||= rest_base_prefix + env["PATH_INFO"].split("/").select { |part| part != "" }
+    end
+
+    def rest_path=(rest_path)
+      @rest_path = rest_path
+    end
+
+    def body=(body)
+      @body = body
+    end
+
+    def body
+      @body ||= env["rack.input"].read
+    end
+
+    def query_params
+      @query_params ||= begin
+        params = Rack::Request.new(env).GET
+        params.keys.each do |key|
+          params[key] = self.class.rfc2396_parser.unescape(params[key])
+        end
+        params
+      end
+    end
+
+    def to_s
+      result = "#{method} #{rest_path.join("/")}"
+      if query_params.size > 0
+        result << "?#{query_params.map { |k, v| "#{k}=#{v}" }.join("&")}"
+      end
+      if body.chomp != ""
+        result << "\n--- #{method} BODY ---\n"
+        result << body
+        result << "\n" unless body.end_with?("\n")
+        result << "--- END #{method} BODY ---"
+      end
+      result
+    end
+
+    def self.rfc2396_parser
+      @parser ||= URI::RFC2396_Parser.new
+    end
+  end
+end

data/lib/chef_zero/rest_router.rb

@@ -1,72 +1,72 @@
-require "pp" unless defined?(PP)
-
-module ChefZero
-  class RestRouter
-    def initialize(routes)
-      @routes = routes.map do |route, endpoint|
-        if route =~ /\*\*$/
-          pattern = Regexp.new("^#{route[0..-3].gsub("*", "[^/]*")}")
-        else
-          pattern = Regexp.new("^#{route.gsub("*", "[^/]*")}$")
-        end
-        [ pattern, endpoint ]
-      end
-    end
-
-    attr_reader :routes
-    attr_accessor :not_found
-
-    def call(request)
-      log_request(request)
-
-      clean_path = "/" + request.rest_path.join("/")
-
-      find_endpoint(clean_path).call(request).tap do |response|
-        log_response(response)
-      end
-    rescue => ex
-      exception = "#{ex.inspect}\n#{ex.backtrace.join("\n")}"
-
-      ChefZero::Log.error(exception)
-      [ 500, { "Content-Type" => "text/plain" }, "Exception raised! #{exception}" ]
-    end
-
-    private
-
-    def find_endpoint(clean_path)
-      _, endpoint = routes.find { |route, endpoint| route.match(clean_path) }
-      endpoint || not_found
-    end
-
-    def log_request(request)
-      ChefZero::Log.debug do
-        "#{request.method} /#{request.rest_path.join("/")}".tap do |msg|
-          next unless request.method =~ /^(POST|PUT)$/
-
-          if request.body.nil? || request.body.empty?
-            msg << " (no body)"
-          else
-            msg << [
-              "",
-              "--- #{request.method} BODY ---",
-              request.body.chomp,
-              "--- END #{request.method} BODY ---",
-            ].join("\n")
-          end
-        end
-      end
-
-      ChefZero::Log.debug { request.pretty_inspect }
-    end
-
-    def log_response(response)
-      ChefZero::Log.debug do
-        [ "",
-          "--- RESPONSE (#{response[0]}) ---",
-          response[2].chomp,
-          "--- END RESPONSE ---",
-        ].join("\n")
-      end
-    end
-  end
-end
+require "pp" unless defined?(PP)
+
+module ChefZero
+  class RestRouter
+    def initialize(routes)
+      @routes = routes.map do |route, endpoint|
+        if route =~ /\*\*$/
+          pattern = Regexp.new("^#{route[0..-3].gsub("*", "[^/]*")}")
+        else
+          pattern = Regexp.new("^#{route.gsub("*", "[^/]*")}$")
+        end
+        [ pattern, endpoint ]
+      end
+    end
+
+    attr_reader :routes
+    attr_accessor :not_found
+
+    def call(request)
+      log_request(request)
+
+      clean_path = "/" + request.rest_path.join("/")
+
+      find_endpoint(clean_path).call(request).tap do |response|
+        log_response(response)
+      end
+    rescue => ex
+      exception = "#{ex.inspect}\n#{ex.backtrace.join("\n")}"
+
+      ChefZero::Log.error(exception)
+      [ 500, { "Content-Type" => "text/plain" }, "Exception raised! #{exception}" ]
+    end
+
+    private
+
+    def find_endpoint(clean_path)
+      _, endpoint = routes.find { |route, endpoint| route.match(clean_path) }
+      endpoint || not_found
+    end
+
+    def log_request(request)
+      ChefZero::Log.debug do
+        "#{request.method} /#{request.rest_path.join("/")}".tap do |msg|
+          next unless request.method =~ /^(POST|PUT)$/
+
+          if request.body.nil? || request.body.empty?
+            msg << " (no body)"
+          else
+            msg << [
+              "",
+              "--- #{request.method} BODY ---",
+              request.body.chomp,
+              "--- END #{request.method} BODY ---",
+            ].join("\n")
+          end
+        end
+      end
+
+      ChefZero::Log.debug { request.pretty_inspect }
+    end
+
+    def log_response(response)
+      ChefZero::Log.debug do
+        [ "",
+          "--- RESPONSE (#{response[0]}) ---",
+          response[2].chomp,
+          "--- END RESPONSE ---",
+        ].join("\n")
+      end
+    end
+  end
+end