summaryrefslogtreecommitdiff
path: root/lib/chef_zero/endpoints
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef_zero/endpoints')
-rw-r--r--lib/chef_zero/endpoints/acl_endpoint.rb2
-rw-r--r--lib/chef_zero/endpoints/actor_keys_endpoint.rb4
-rw-r--r--lib/chef_zero/endpoints/cookbook_version_endpoint.rb2
-rw-r--r--lib/chef_zero/endpoints/data_bags_endpoint.rb2
-rw-r--r--lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb2
-rw-r--r--lib/chef_zero/endpoints/node_endpoint.rb4
-rw-r--r--lib/chef_zero/endpoints/nodes_endpoint.rb4
-rw-r--r--lib/chef_zero/endpoints/organization_endpoint.rb2
-rw-r--r--lib/chef_zero/endpoints/organizations_endpoint.rb2
-rw-r--r--lib/chef_zero/endpoints/rest_list_endpoint.rb4
10 files changed, 14 insertions, 14 deletions
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
View Lorry Controller Status