fixes for new chefstyle

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

24 files changed, 53 insertions, 53 deletions

diff --git a/Rakefile b/Rakefile
index 25d7db4..048e97a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,14 +8,14 @@ def run_oc_pedant(env = {})
   require File.expand_path("spec/run_oc_pedant")
 end
 
-ENV_DOCS = <<END
-Environment:
- - RSPEC_OPTS   Options to pass to RSpec
-                e.g. RSPEC_OPTS="--fail-fast --profile 5"
- - PEDANT_OPTS  Options to pass to oc-chef-pedant
-                e.g. PEDANT_OPTS="--focus-keys --skip-users"
- - LOG_LEVEL    Set the log level (default: warn)
-                e.g. LOG_LEVEL=debug
+ENV_DOCS = <<~END.freeze
+  Environment:
+   - RSPEC_OPTS   Options to pass to RSpec
+                  e.g. RSPEC_OPTS="--fail-fast --profile 5"
+   - PEDANT_OPTS  Options to pass to oc-chef-pedant
+                  e.g. PEDANT_OPTS="--focus-keys --skip-users"
+   - LOG_LEVEL    Set the log level (default: warn)
+                  e.g. LOG_LEVEL=debug
 END
 
 task default: :pedant
diff --git a/lib/chef_zero.rb b/lib/chef_zero.rb
index bdb6511..4fdb4a0 100644
--- a/lib/chef_zero.rb
+++ b/lib/chef_zero.rb
@@ -4,7 +4,7 @@ module ChefZero
   MIN_API_VERSION = 0
   MAX_API_VERSION = 2
 
-  CERTIFICATE = "-----BEGIN CERTIFICATE-----\nMIIDMzCCApygAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx\nEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM\nDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw\nBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t\nMB4XDTEyMTEyMTAwMzQyMVoXDTIyMTExOTAwMzQyMVowgZsxEDAOBgNVBAcTB1Nl\nYXR0bGUxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAYTAlVTMRwwGgYDVQQL\nExNDZXJ0aWZpY2F0ZSBTZXJ2aWNlMRYwFAYDVQQKEw1PcHNjb2RlLCBJbmMuMS8w\nLQYDVQQDFCZVUkk6aHR0cDovL29wc2NvZGUuY29tL0dVSURTL3VzZXJfZ3VpZDCC\nASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLDmPbR71bS2esZlZh/HfC6\n0azXFjl2677wq2ovk9xrUb0Ui4ZLC66TqQ9C/RBzOjXU4TRf3hgPTqvlCgHusl0d\nIcLCrsSl6kPEhJpYWWfRoroIAwf82A9yLQekhqXZEXu5EKkwoUMqyF6m0ZCasaE1\ny8niQxdLAsk3ady/CGQlFqHTPKFfU5UASR2LRtYC1MCIvJHDFRKAp9kPJbQo9P37\nZ8IU7cDudkZFgNLmDixlWsh7C0ghX8fgAlj1P6FgsFufygam973k79GhIP54dELB\nc0S6E8ekkRSOXU9jX/IoiXuFglBvFihAdhvED58bMXzj2AwXUyeAlxItnvs+NVUC\nAwEAATANBgkqhkiG9w0BAQUFAAOBgQBkFZRbMoywK3hb0/X7MXmPYa7nlfnd5UXq\nr2n32ettzZNmEPaI2d1j+//nL5qqhOlrWPS88eKEPnBOX/jZpUWOuAAddnrvFzgw\nrp/C2H7oMT+29F+5ezeViLKbzoFYb4yECHBoi66IFXNae13yj7taMboBeUmE664G\nTB/MZpRr8g==\n-----END CERTIFICATE-----\n"
-  PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0sOY9tHvVtLZ6xmVmH8d\n8LrRrNcWOXbrvvCrai+T3GtRvRSLhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6y\nXR0hwsKuxKXqQ8SEmlhZZ9GiuggDB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqx\noTXLyeJDF0sCyTdp3L8IZCUWodM8oV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0\n/ftnwhTtwO52RkWA0uYOLGVayHsLSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0\nQsFzRLoTx6SRFI5dT2Nf8iiJe4WCUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41\nVQIDAQAB\n-----END PUBLIC KEY-----\n"
-  PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA0sOY9tHvVtLZ6xmVmH8d8LrRrNcWOXbrvvCrai+T3GtRvRSL\nhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6yXR0hwsKuxKXqQ8SEmlhZZ9GiuggD\nB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqxoTXLyeJDF0sCyTdp3L8IZCUWodM8\noV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0/ftnwhTtwO52RkWA0uYOLGVayHsL\nSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0QsFzRLoTx6SRFI5dT2Nf8iiJe4WC\nUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41VQIDAQABAoIBAALhqbW2KQ+G0nPk\nZacwFbi01SkHx8YBWjfCEpXhEKRy0ytCnKW5YO+CFU2gHNWcva7+uhV9OgwaKXkw\nKHLeUJH1VADVqI4Htqw2g5mYm6BPvWnNsjzpuAp+BR+VoEGkNhj67r9hatMAQr0I\nitTvSH5rvd2EumYXIHKfz1K1SegUk1u1EL1RcMzRmZe4gDb6eNBs9Sg4im4ybTG6\npPIytA8vBQVWhjuAR2Tm+wZHiy0Az6Vu7c2mS07FSX6FO4E8SxWf8idaK9ijMGSq\nFvIS04mrY6XCPUPUC4qm1qNnhDPpOr7CpI2OO98SqGanStS5NFlSFXeXPpM280/u\nfZUA0AECgYEA+x7QUnffDrt7LK2cX6wbvn4mRnFxet7bJjrfWIHf+Rm0URikaNma\nh0/wNKpKBwIH+eHK/LslgzcplrqPytGGHLOG97Gyo5tGAzyLHUWBmsNkRksY2sPL\nuHq6pYWJNkqhnWGnIbmqCr0EWih82x/y4qxbJYpYqXMrit0wVf7yAgkCgYEA1twI\ngFaXqesetTPoEHSQSgC8S4D5/NkdriUXCYb06REcvo9IpFMuiOkVUYNN5d3MDNTP\nIdBicfmvfNELvBtXDomEUD8ls1UuoTIXRNGZ0VsZXu7OErXCK0JKNNyqRmOwcvYL\nJRqLfnlei5Ndo1lu286yL74c5rdTLs/nI2p4e+0CgYB079ZmcLeILrmfBoFI8+Y/\ngJLmPrFvXBOE6+lRV7kqUFPtZ6I3yQzyccETZTDvrnx0WjaiFavUPH27WMjY01S2\nTMtO0Iq1MPsbSrglO1as8MvjB9ldFcvp7gy4Q0Sv6XT0yqJ/S+vo8Df0m+H4UBpU\nf5o6EwBSd/UQxwtZIE0lsQKBgQCswfjX8Eg8KL/lJNpIOOE3j4XXE9ptksmJl2sB\njxDnQYoiMqVO808saHVquC/vTrpd6tKtNpehWwjeTFuqITWLi8jmmQ+gNTKsC9Gn\n1Pxf2Gb67PqnEpwQGln+TRtgQ5HBrdHiQIi+5am+gnw89pDrjjO5rZwhanAo6KPJ\n1zcPNQKBgQDxFu8v4frDmRNCVaZS4f1B6wTrcMrnibIDlnzrK9GG6Hz1U7dDv8s8\nNf4UmeMzDXjlPWZVOvS5+9HKJPdPj7/onv8B2m18+lcgTTDJBkza7R1mjL1Cje/Z\nKcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==\n-----END RSA PRIVATE KEY-----\n"
+  CERTIFICATE = "-----BEGIN CERTIFICATE-----\nMIIDMzCCApygAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx\nEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxFjAUBgNVBAoM\nDU9wc2NvZGUsIEluYy4xHDAaBgNVBAsME0NlcnRpZmljYXRlIFNlcnZpY2UxMjAw\nBgNVBAMMKW9wc2NvZGUuY29tL2VtYWlsQWRkcmVzcz1hdXRoQG9wc2NvZGUuY29t\nMB4XDTEyMTEyMTAwMzQyMVoXDTIyMTExOTAwMzQyMVowgZsxEDAOBgNVBAcTB1Nl\nYXR0bGUxEzARBgNVBAgTCldhc2hpbmd0b24xCzAJBgNVBAYTAlVTMRwwGgYDVQQL\nExNDZXJ0aWZpY2F0ZSBTZXJ2aWNlMRYwFAYDVQQKEw1PcHNjb2RlLCBJbmMuMS8w\nLQYDVQQDFCZVUkk6aHR0cDovL29wc2NvZGUuY29tL0dVSURTL3VzZXJfZ3VpZDCC\nASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANLDmPbR71bS2esZlZh/HfC6\n0azXFjl2677wq2ovk9xrUb0Ui4ZLC66TqQ9C/RBzOjXU4TRf3hgPTqvlCgHusl0d\nIcLCrsSl6kPEhJpYWWfRoroIAwf82A9yLQekhqXZEXu5EKkwoUMqyF6m0ZCasaE1\ny8niQxdLAsk3ady/CGQlFqHTPKFfU5UASR2LRtYC1MCIvJHDFRKAp9kPJbQo9P37\nZ8IU7cDudkZFgNLmDixlWsh7C0ghX8fgAlj1P6FgsFufygam973k79GhIP54dELB\nc0S6E8ekkRSOXU9jX/IoiXuFglBvFihAdhvED58bMXzj2AwXUyeAlxItnvs+NVUC\nAwEAATANBgkqhkiG9w0BAQUFAAOBgQBkFZRbMoywK3hb0/X7MXmPYa7nlfnd5UXq\nr2n32ettzZNmEPaI2d1j+//nL5qqhOlrWPS88eKEPnBOX/jZpUWOuAAddnrvFzgw\nrp/C2H7oMT+29F+5ezeViLKbzoFYb4yECHBoi66IFXNae13yj7taMboBeUmE664G\nTB/MZpRr8g==\n-----END CERTIFICATE-----\n".freeze
+  PUBLIC_KEY = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0sOY9tHvVtLZ6xmVmH8d\n8LrRrNcWOXbrvvCrai+T3GtRvRSLhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6y\nXR0hwsKuxKXqQ8SEmlhZZ9GiuggDB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqx\noTXLyeJDF0sCyTdp3L8IZCUWodM8oV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0\n/ftnwhTtwO52RkWA0uYOLGVayHsLSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0\nQsFzRLoTx6SRFI5dT2Nf8iiJe4WCUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41\nVQIDAQAB\n-----END PUBLIC KEY-----\n".freeze
+  PRIVATE_KEY = "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA0sOY9tHvVtLZ6xmVmH8d8LrRrNcWOXbrvvCrai+T3GtRvRSL\nhksLrpOpD0L9EHM6NdThNF/eGA9Oq+UKAe6yXR0hwsKuxKXqQ8SEmlhZZ9GiuggD\nB/zYD3ItB6SGpdkRe7kQqTChQyrIXqbRkJqxoTXLyeJDF0sCyTdp3L8IZCUWodM8\noV9TlQBJHYtG1gLUwIi8kcMVEoCn2Q8ltCj0/ftnwhTtwO52RkWA0uYOLGVayHsL\nSCFfx+ACWPU/oWCwW5/KBqb3veTv0aEg/nh0QsFzRLoTx6SRFI5dT2Nf8iiJe4WC\nUG8WKEB2G8QPnxsxfOPYDBdTJ4CXEi2e+z41VQIDAQABAoIBAALhqbW2KQ+G0nPk\nZacwFbi01SkHx8YBWjfCEpXhEKRy0ytCnKW5YO+CFU2gHNWcva7+uhV9OgwaKXkw\nKHLeUJH1VADVqI4Htqw2g5mYm6BPvWnNsjzpuAp+BR+VoEGkNhj67r9hatMAQr0I\nitTvSH5rvd2EumYXIHKfz1K1SegUk1u1EL1RcMzRmZe4gDb6eNBs9Sg4im4ybTG6\npPIytA8vBQVWhjuAR2Tm+wZHiy0Az6Vu7c2mS07FSX6FO4E8SxWf8idaK9ijMGSq\nFvIS04mrY6XCPUPUC4qm1qNnhDPpOr7CpI2OO98SqGanStS5NFlSFXeXPpM280/u\nfZUA0AECgYEA+x7QUnffDrt7LK2cX6wbvn4mRnFxet7bJjrfWIHf+Rm0URikaNma\nh0/wNKpKBwIH+eHK/LslgzcplrqPytGGHLOG97Gyo5tGAzyLHUWBmsNkRksY2sPL\nuHq6pYWJNkqhnWGnIbmqCr0EWih82x/y4qxbJYpYqXMrit0wVf7yAgkCgYEA1twI\ngFaXqesetTPoEHSQSgC8S4D5/NkdriUXCYb06REcvo9IpFMuiOkVUYNN5d3MDNTP\nIdBicfmvfNELvBtXDomEUD8ls1UuoTIXRNGZ0VsZXu7OErXCK0JKNNyqRmOwcvYL\nJRqLfnlei5Ndo1lu286yL74c5rdTLs/nI2p4e+0CgYB079ZmcLeILrmfBoFI8+Y/\ngJLmPrFvXBOE6+lRV7kqUFPtZ6I3yQzyccETZTDvrnx0WjaiFavUPH27WMjY01S2\nTMtO0Iq1MPsbSrglO1as8MvjB9ldFcvp7gy4Q0Sv6XT0yqJ/S+vo8Df0m+H4UBpU\nf5o6EwBSd/UQxwtZIE0lsQKBgQCswfjX8Eg8KL/lJNpIOOE3j4XXE9ptksmJl2sB\njxDnQYoiMqVO808saHVquC/vTrpd6tKtNpehWwjeTFuqITWLi8jmmQ+gNTKsC9Gn\n1Pxf2Gb67PqnEpwQGln+TRtgQ5HBrdHiQIi+5am+gnw89pDrjjO5rZwhanAo6KPJ\n1zcPNQKBgQDxFu8v4frDmRNCVaZS4f1B6wTrcMrnibIDlnzrK9GG6Hz1U7dDv8s8\nNf4UmeMzDXjlPWZVOvS5+9HKJPdPj7/onv8B2m18+lcgTTDJBkza7R1mjL1Cje/Z\nKcVGsryKN6cjE7yCDasnA7R2rVBV/7NWeJV77bmzT5O//rW4yIfUIg==\n-----END RSA PRIVATE KEY-----\n".freeze
 end
diff --git a/lib/chef_zero/chef_data/acl_path.rb b/lib/chef_zero/chef_data/acl_path.rb
index 6286287..db7c8ff 100644
--- a/lib/chef_zero/chef_data/acl_path.rb
+++ b/lib/chef_zero/chef_data/acl_path.rb
@@ -14,8 +14,8 @@ module ChefZero
     # - stop adding pivotal to acls (he already has access to what he needs)
     module AclPath
       ORG_DATA_TYPES = %w{clients cookbook_artifacts cookbooks containers data environments groups
-                          nodes policies policy_groups roles sandboxes}
-      TOP_DATA_TYPES = %w{containers organizations users}
+                          nodes policies policy_groups roles sandboxes}.freeze
+      TOP_DATA_TYPES = %w{containers organizations users}.freeze
 
       # ACL data paths for a partition are:
       # /          -> /acls/root
diff --git a/lib/chef_zero/chef_data/cookbook_data.rb b/lib/chef_zero/chef_data/cookbook_data.rb
index 74bc9e7..e4ec9b3 100644
--- a/lib/chef_zero/chef_data/cookbook_data.rb
+++ b/lib/chef_zero/chef_data/cookbook_data.rb
@@ -11,7 +11,7 @@ module ChefZero
       class << self
         def to_hash(cookbook, name, version = nil)
           frozen = false
-          if cookbook.has_key?(:frozen)
+          if cookbook.key?(:frozen)
             frozen = cookbook[:frozen]
             cookbook = cookbook.dup
             cookbook.delete(:frozen)
@@ -72,7 +72,7 @@ module ChefZero
 
         def has_child(directory, name)
           if directory.is_a?(Hash)
-            directory.has_key?(name)
+            directory.key?(name)
           else
             directory.child(name).exists?
           end
diff --git a/lib/chef_zero/chef_data/data_normalizer.rb b/lib/chef_zero/chef_data/data_normalizer.rb
index 6e96f85..b69fcaf 100644
--- a/lib/chef_zero/chef_data/data_normalizer.rb
+++ b/lib/chef_zero/chef_data/data_normalizer.rb
@@ -6,13 +6,13 @@ module ChefZero
   module ChefData
     class DataNormalizer
 
-      COOKBOOK_SEGMENTS = %w{ resources providers recipes definitions libraries attributes files templates root_files }
+      COOKBOOK_SEGMENTS = %w{ resources providers recipes definitions libraries attributes files templates root_files }.freeze
 
       def self.normalize_acls(acls)
         ChefData::DefaultCreator::PERMISSIONS.each do |perm|
           acls[perm] ||= {}
           acls[perm]["groups"] ||= []
-          if acls[perm].has_key? "users"
+          if acls[perm].key? "users"
             # When clients and users are split, their combined list
             # is the final list of actors that a subsequent GET will
             # provide. Each list is guaranteed to be unique, but the
@@ -98,7 +98,7 @@ module ChefZero
         if method == "PUT" && api_version < 2
           cookbook["all_files"] = cookbook.delete(["root_files"]) { [] }
           COOKBOOK_SEGMENTS.each do |segment|
-            next unless cookbook.has_key? segment
+            next unless cookbook.key? segment
             cookbook[segment].each do |file|
               file["name"] = "#{segment}/#{file['name']}"
               cookbook["all_files"] << file
@@ -108,7 +108,7 @@ module ChefZero
         elsif method != "PUT"
           if cookbook.key? "all_files"
             cookbook["all_files"].each do |file|
-              if file.is_a?(Hash) && file.has_key?("checksum")
+              if file.is_a?(Hash) && file.key?("checksum")
                 file["url"] ||= endpoint.build_uri(base_uri, org_prefix + ["file_store", "checksums", file["checksum"]])
               end
             end
diff --git a/lib/chef_zero/chef_data/default_creator.rb b/lib/chef_zero/chef_data/default_creator.rb
index 1af04a1..0b155f2 100644
--- a/lib/chef_zero/chef_data/default_creator.rb
+++ b/lib/chef_zero/chef_data/default_creator.rb
@@ -24,8 +24,8 @@ module ChefZero
       attr_reader :creators
       attr_writer :deleted
 
-      PERMISSIONS = %w{create read update delete grant}
-      DEFAULT_SUPERUSERS = %w{pivotal}
+      PERMISSIONS = %w{create read update delete grant}.freeze
+      DEFAULT_SUPERUSERS = %w{pivotal}.freeze
 
       def clear
         @creators = { [] => @superusers }
@@ -166,7 +166,7 @@ module ChefZero
         "containers" => %w{clients containers cookbook_artifacts cookbooks data environments groups nodes policies policy_groups roles sandboxes},
         "groups" => %w{admins billing-admins clients users},
         "association_requests" => {},
-      }
+      }.freeze
 
       def list_org_default(path)
         if path.size >= 3 && path[2] == "acls"
@@ -373,7 +373,7 @@ module ChefZero
           end
           owners = filter_owners(path, unknown_owners)
 
-          #ANGRY
+          # ANGRY
           # Non-default containers do not get superusers added to them,
           # because reasons.
           unless path.size == 4 && path[0] == "organizations" && path[2] == "containers" && !exists?(path)
diff --git a/lib/chef_zero/data_store/memory_store_v2.rb b/lib/chef_zero/data_store/memory_store_v2.rb
index 85f8b3d..8e041b5 100644
--- a/lib/chef_zero/data_store/memory_store_v2.rb
+++ b/lib/chef_zero/data_store/memory_store_v2.rb
@@ -36,7 +36,7 @@ module ChefZero
       def create_dir(path, name, *options)
         parent = _get(path, options.include?(:recursive))
 
-        if parent.has_key?(name)
+        if parent.key?(name)
           if !options.include?(:recursive)
             raise DataAlreadyExistsError.new(path + [name])
           end
@@ -52,7 +52,7 @@ module ChefZero
 
         parent = _get(path, options.include?(:create_dir))
 
-        if parent.has_key?(name)
+        if parent.key?(name)
           raise DataAlreadyExistsError.new(path + [name])
         end
         parent[name] = data
@@ -82,7 +82,7 @@ module ChefZero
 
       def delete(path)
         parent = _get(path[0, path.length - 1])
-        if !parent.has_key?(path[-1])
+        if !parent.key?(path[-1])
           raise DataNotFoundError.new(path)
         end
         if !parent[path[-1]].is_a?(String)
@@ -93,7 +93,7 @@ module ChefZero
 
       def delete_dir(path, *options)
         parent = _get(path[0, path.length - 1])
-        if !parent.has_key?(path[-1])
+        if !parent.key?(path[-1])
           raise DataNotFoundError.new(path)
         end
         if !parent[path[-1]].is_a?(Hash)
@@ -135,7 +135,7 @@ module ChefZero
       def _get(path, create_dir = false)
         value = @data
         path.each_with_index do |path_part, index|
-          if !value.has_key?(path_part)
+          if !value.key?(path_part)
             if create_dir
               value[path_part] = {}
             else
diff --git a/lib/chef_zero/endpoints/acl_endpoint.rb b/lib/chef_zero/endpoints/acl_endpoint.rb
index cfa3a97..e389f2d 100644
--- a/lib/chef_zero/endpoints/acl_endpoint.rb
+++ b/lib/chef_zero/endpoints/acl_endpoint.rb
@@ -31,7 +31,7 @@ module ChefZero
         acls = FFI_Yajl::Parser.parse(get_data(request, path))
         acls[perm] = FFI_Yajl::Parser.parse(request.body)[perm]
         set_data(request, path, FFI_Yajl::Encoder.encode(acls, pretty: true))
-        json_response(200, { "uri" => "#{build_uri(request.base_uri, request.rest_path)}" })
+        json_response(200, { "uri" => (build_uri(request.base_uri, request.rest_path)).to_s })
       end
     end
   end
diff --git a/lib/chef_zero/endpoints/actor_keys_endpoint.rb b/lib/chef_zero/endpoints/actor_keys_endpoint.rb
index 00c11d0..b3bab9a 100644
--- a/lib/chef_zero/endpoints/actor_keys_endpoint.rb
+++ b/lib/chef_zero/endpoints/actor_keys_endpoint.rb
@@ -5,8 +5,8 @@ module ChefZero
     # /users/USER/keys
     # /organizations/ORG/clients/CLIENT/keys
     class ActorKeysEndpoint < RestBase
-      DEFAULT_PUBLIC_KEY_NAME = "default"
-      DATE_FORMAT = "%FT%TZ" # e.g. 2015-12-24T21:00:00Z
+      DEFAULT_PUBLIC_KEY_NAME = "default".freeze
+      DATE_FORMAT = "%FT%TZ".freeze # e.g. 2015-12-24T21:00:00Z
 
       def get(request, alt_uri_root = nil)
         path = data_path(request)
diff --git a/lib/chef_zero/endpoints/cookbook_version_endpoint.rb b/lib/chef_zero/endpoints/cookbook_version_endpoint.rb
index 97b0ce4..0ee5be7 100644
--- a/lib/chef_zero/endpoints/cookbook_version_endpoint.rb
+++ b/lib/chef_zero/endpoints/cookbook_version_endpoint.rb
@@ -74,7 +74,7 @@ module ChefZero
         FFI_Yajl::Parser.parse(cookbook).each_pair do |key, value|
           if value.is_a?(Array)
             value.each do |file|
-              if file.is_a?(Hash) && file.has_key?("checksum")
+              if file.is_a?(Hash) && file.key?("checksum")
                 result << file["checksum"]
               end
             end
diff --git a/lib/chef_zero/endpoints/data_bags_endpoint.rb b/lib/chef_zero/endpoints/data_bags_endpoint.rb
index 0ddb34e..5b9dd14 100644
--- a/lib/chef_zero/endpoints/data_bags_endpoint.rb
+++ b/lib/chef_zero/endpoints/data_bags_endpoint.rb
@@ -15,7 +15,7 @@ module ChefZero
           error(409, "Object already exists")
         else
           create_data_dir(request, request.rest_path[0..1] + ["data"], name, :recursive)
-          json_response(201, { "uri" => "#{build_uri(request.base_uri, request.rest_path + [name])}" })
+          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [name])).to_s })
         end
       end
     end
diff --git a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
index ddd44d3..43ef4ce 100644
--- a/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
+++ b/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb
@@ -81,7 +81,7 @@ module ChefZero
           cookbook_dependencies.each_pair do |dep_name, dep_constraint|
             # If the dep is not already in the list, add it to the list to solve
             # and bring in all environment-allowed cookbook versions to desired_versions
-            if !new_desired_versions.has_key?(dep_name)
+            if !new_desired_versions.key?(dep_name)
               new_unsolved += [dep_name]
               # If the dep is missing, we will try other versions of the cookbook that might not have the bad dep.
               if !exists_data_dir?(request, request.rest_path[0..1] + ["cookbooks", dep_name])
diff --git a/lib/chef_zero/endpoints/node_endpoint.rb b/lib/chef_zero/endpoints/node_endpoint.rb
index ee07678..689b631 100644
--- a/lib/chef_zero/endpoints/node_endpoint.rb
+++ b/lib/chef_zero/endpoints/node_endpoint.rb
@@ -9,11 +9,11 @@ module ChefZero
       def put(request)
         data = parse_json(request.body)
 
-        if data.has_key?("policy_name") && policy_name_invalid?(data["policy_name"])
+        if data.key?("policy_name") && policy_name_invalid?(data["policy_name"])
           return error(400, "Field 'policy_name' invalid", pretty: false)
         end
 
-        if data.has_key?("policy_group") && policy_name_invalid?(data["policy_group"])
+        if data.key?("policy_group") && policy_name_invalid?(data["policy_group"])
           return error(400, "Field 'policy_group' invalid", pretty: false)
         end
 
diff --git a/lib/chef_zero/endpoints/nodes_endpoint.rb b/lib/chef_zero/endpoints/nodes_endpoint.rb
index 8b141f8..d828a11 100644
--- a/lib/chef_zero/endpoints/nodes_endpoint.rb
+++ b/lib/chef_zero/endpoints/nodes_endpoint.rb
@@ -12,11 +12,11 @@ module ChefZero
         if request.rest_path.last == "nodes"
           data = parse_json(request.body)
 
-          if data.has_key?("policy_name") && policy_name_invalid?(data["policy_name"])
+          if data.key?("policy_name") && policy_name_invalid?(data["policy_name"])
             return error(400, "Field 'policy_name' invalid", pretty: false)
           end
 
-          if data.has_key?("policy_group") && policy_name_invalid?(data["policy_group"])
+          if data.key?("policy_group") && policy_name_invalid?(data["policy_group"])
             return error(400, "Field 'policy_group' invalid", pretty: false)
           end
         end
diff --git a/lib/chef_zero/endpoints/organization_endpoint.rb b/lib/chef_zero/endpoints/organization_endpoint.rb
index 4cf9e12..3c14548 100644
--- a/lib/chef_zero/endpoints/organization_endpoint.rb
+++ b/lib/chef_zero/endpoints/organization_endpoint.rb
@@ -23,7 +23,7 @@ module ChefZero
         end
         set_data(request, request.rest_path + [ "org" ], save_org)
         json_response(200, {
-          "uri" => "#{build_uri(request.base_uri, request.rest_path)}",
+          "uri" => (build_uri(request.base_uri, request.rest_path)).to_s,
           "name" => org["name"],
           "org_type" => org["org_type"],
           "full_name" => org["full_name"],
diff --git a/lib/chef_zero/endpoints/organizations_endpoint.rb b/lib/chef_zero/endpoints/organizations_endpoint.rb
index 9fe6573..6ad46fe 100644
--- a/lib/chef_zero/endpoints/organizations_endpoint.rb
+++ b/lib/chef_zero/endpoints/organizations_endpoint.rb
@@ -47,7 +47,7 @@ module ChefZero
           end
 
           json_response(201, {
-            "uri" => "#{build_uri(request.base_uri, org_path)}",
+            "uri" => (build_uri(request.base_uri, org_path)).to_s,
             "name" => name,
             "org_type" => org["org_type"],
             "full_name" => full_name,
diff --git a/lib/chef_zero/endpoints/rest_list_endpoint.rb b/lib/chef_zero/endpoints/rest_list_endpoint.rb
index b1e3d5c..135f0e9 100644
--- a/lib/chef_zero/endpoints/rest_list_endpoint.rb
+++ b/lib/chef_zero/endpoints/rest_list_endpoint.rb
@@ -17,7 +17,7 @@ module ChefZero
         # Get the result
         result_hash = {}
         list_data(request).sort.each do |name|
-          result_hash[name] = "#{build_uri(request.base_uri, request.rest_path + [name])}"
+          result_hash[name] = (build_uri(request.base_uri, request.rest_path + [name])).to_s
         end
         json_response(200, result_hash)
       end
@@ -29,7 +29,7 @@ module ChefZero
           error(400, "Must specify #{identity_keys.map { |k| k.inspect }.join(' or ')} in JSON")
         else
           create_data(request, request.rest_path, key, contents)
-          json_response(201, { "uri" => "#{build_uri(request.base_uri, request.rest_path + [key])}" })
+          json_response(201, { "uri" => (build_uri(request.base_uri, request.rest_path + [key])).to_s })
         end
       end
 
diff --git a/lib/chef_zero/rspec.rb b/lib/chef_zero/rspec.rb
index b6d6dd1..e1fdfcc 100644
--- a/lib/chef_zero/rspec.rb
+++ b/lib/chef_zero/rspec.rb
@@ -219,7 +219,7 @@ module ChefZero
         with_object_path("cookbooks/#{name}") do
           # If you didn't specify metadata.rb, we generate it for you. If you
           # explicitly set it to nil, that means you don't want it at all.
-          if data.has_key?("metadata.rb")
+          if data.key?("metadata.rb")
             if data["metadata.rb"].nil?
               data.delete("metadata.rb")
             end
@@ -235,7 +235,7 @@ module ChefZero
         with_object_path("cookbook_artifacts/#{name}") do
           # If you didn't specify metadata.rb, we generate it for you. If you
           # explicitly set it to nil, that means you don't want it at all.
-          if data.has_key?("metadata.rb")
+          if data.key?("metadata.rb")
             if data["metadata.rb"].nil?
               data.delete("metadata.rb")
             end
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index cadf8c3..9800913 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -124,11 +124,11 @@ module ChefZero
       "/license",
       "/version",
       "/server_api_version",
-    ]
+    ].freeze
 
     def initialize(options = {})
       @options = DEFAULT_OPTIONS.merge(options)
-      if @options[:single_org] && !@options.has_key?(:osc_compat)
+      if @options[:single_org] && !@options.key?(:osc_compat)
         @options[:osc_compat] = true
       end
       @options.freeze
diff --git a/lib/chef_zero/solr/query/range_query.rb b/lib/chef_zero/solr/query/range_query.rb
index 76ec828..67ce1ce 100644
--- a/lib/chef_zero/solr/query/range_query.rb
+++ b/lib/chef_zero/solr/query/range_query.rb
@@ -39,7 +39,7 @@ module ChefZero
           matches_values?(doc[DEFAULT_FIELD])
         end
 
-        DEFAULT_FIELD = "text"
+        DEFAULT_FIELD = "text".freeze
       end
     end
   end
diff --git a/lib/chef_zero/solr/query/regexpable_query.rb b/lib/chef_zero/solr/query/regexpable_query.rb
index 62d7fc7..4cf6748 100644
--- a/lib/chef_zero/solr/query/regexpable_query.rb
+++ b/lib/chef_zero/solr/query/regexpable_query.rb
@@ -21,9 +21,9 @@ module ChefZero
           values.any? { |value| !@regexp.match(value).nil? }
         end
 
-        DEFAULT_FIELD = "text"
-        WORD_CHARACTER = "[A-Za-z0-9@._':\-]"
-        NON_WORD_CHARACTER = "[^A-Za-z0-9@._':\-]"
+        DEFAULT_FIELD = "text".freeze
+        WORD_CHARACTER = "[A-Za-z0-9@._':\-]".freeze
+        NON_WORD_CHARACTER = "[^A-Za-z0-9@._':\-]".freeze
       end
     end
   end
diff --git a/lib/chef_zero/solr/solr_parser.rb b/lib/chef_zero/solr/solr_parser.rb
index cec1b34..86c232f 100644
--- a/lib/chef_zero/solr/solr_parser.rb
+++ b/lib/chef_zero/solr/solr_parser.rb
@@ -200,7 +200,7 @@ module ChefZero
         end
       end
 
-      DEFAULT_FIELD = "text"
+      DEFAULT_FIELD = "text".freeze
     end
   end
 end
diff --git a/lib/chef_zero/version.rb b/lib/chef_zero/version.rb
index 27f9632..cf5897f 100644
--- a/lib/chef_zero/version.rb
+++ b/lib/chef_zero/version.rb
@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "14.0.7"
+  VERSION = "14.0.7".freeze
 end
diff --git a/spec/support/oc_pedant.rb b/spec/support/oc_pedant.rb
index 9a59e4c..03c4db1 100644
--- a/spec/support/oc_pedant.rb
+++ b/spec/support/oc_pedant.rb
@@ -32,7 +32,7 @@ chef_server "http://127.0.0.1:8889"
 # testing location, you should not specify a value for this parameter.
 # The tests will still run, albeit slower, as they will now need to
 # poll for a period to ensure they are querying committed results.
-#search_server "http://localhost:8983"
+# search_server "http://localhost:8983"
 
 # Related to the 'search_server' parameter, this specifies the maximum
 # amout of time (in seconds) that search endpoint requests should be