diff --git a/examples/export.rb b/examples/export.rb index 0044286..a4c9206 100644 --- a/examples/export.rb +++ b/examples/export.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true $LOAD_PATH.unshift File.expand_path("../lib", __dir__) -require "awesome_print" require "archivesspace/client" # official sandbox diff --git a/examples/password_reset.rb b/examples/password_reset.rb index d7641d7..c4ebad1 100644 --- a/examples/password_reset.rb +++ b/examples/password_reset.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true $LOAD_PATH.unshift File.expand_path("../lib", __dir__) -require "awesome_print" require "archivesspace/client" username = "admin" diff --git a/examples/repo_and_user.rb b/examples/repo_and_user.rb index aa710df..0d69b37 100644 --- a/examples/repo_and_user.rb +++ b/examples/repo_and_user.rb @@ -1,13 +1,12 @@ # frozen_string_literal: true $LOAD_PATH.unshift File.expand_path("../lib", __dir__) -require "awesome_print" require "archivesspace/client" # official sandbox config = ArchivesSpace::Configuration.new( { - base_uri: "https://sandbox.archivesspace.org/api", + base_uri: "https://sandbox.archivesspace.org/staff/api", base_repo: "", username: "admin", password: "admin", @@ -19,7 +18,7 @@ client = ArchivesSpace::Client.new(config).login -ap ArchivesSpace::Template.list # view available templates +puts ArchivesSpace::Template.list # view available templates repo_data = { repo_code: "XYZ", @@ -40,20 +39,20 @@ response = client.post("/repositories/with_agent", repository) if response.result.success? repository = client.repositories.find { |r| r["repo_code"] == "XYZ" } - ap repository - ap client.delete(repository["uri"]) + puts repository + puts client.delete(repository["uri"]) else - ap response.parsed + puts response.parsed end user = ArchivesSpace::Template.process("user.json.erb", user_data) response = client.post("users", user, {password: user_password}) if response.result.success? user = client.users.find { |r| r["username"] == "lmessi" } - ap user - ap client.delete user["uri"] + puts user + puts client.delete(user["uri"]).inspect else - ap response.parsed + puts response.parsed end rescue ArchivesSpace::RequestError => e puts e.message diff --git a/examples/templates.rb b/examples/templates.rb index 37dde78..144976a 100644 --- a/examples/templates.rb +++ b/examples/templates.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true $LOAD_PATH.unshift File.expand_path("../lib", __dir__) -require "awesome_print" require "archivesspace/client" puts ArchivesSpace::Template.list diff --git a/examples/test_connection.rb b/examples/test_connection.rb index aa86eff..6e3ff55 100644 --- a/examples/test_connection.rb +++ b/examples/test_connection.rb @@ -1,13 +1,12 @@ # frozen_string_literal: true $LOAD_PATH.unshift File.expand_path("../lib", __dir__) -require "awesome_print" require "archivesspace/client" # official sandbox config = ArchivesSpace::Configuration.new( { - base_uri: "https://sandbox.archivesspace.org/api", + base_uri: "https://sandbox.archivesspace.org/staff/api", base_repo: "", username: "admin", password: "admin", diff --git a/examples/user_groups.rb b/examples/user_groups.rb index 6982f16..9b9c95f 100644 --- a/examples/user_groups.rb +++ b/examples/user_groups.rb @@ -1,13 +1,12 @@ # frozen_string_literal: true $LOAD_PATH.unshift File.expand_path("../lib", __dir__) -require "awesome_print" require "archivesspace/client" # official sandbox config = ArchivesSpace::Configuration.new( { - base_uri: "https://sandbox.archivesspace.org/api", + base_uri: "https://sandbox.archivesspace.org/staff/api", base_repo: "", username: "admin", password: "admin", @@ -19,17 +18,13 @@ client = ArchivesSpace::Client.new(config).login -user_data = { +user_data = ArchivesSpace::Template.process("user.json.erb", { username: "bde", name: "BDE", is_admin: false -} +}) -client.post( - "users", - ArchivesSpace::Template.process("user.json.erb", user_data), - {password: "123456"} -) +client.post("users", user_data, {password: "123456"}) users_with_roles = { "bde" => ["repository-basic-data-entry"] @@ -38,7 +33,7 @@ begin client.config.base_repo = "repositories/2" results = client.group_user_assignment users_with_roles - ap results.map(&:parsed) + puts results.map(&:parsed) rescue ArchivesSpace::RequestError => e puts e.message end diff --git a/lib/archivesspace/client/task.rb b/lib/archivesspace/client/task.rb index 32cc704..60f08e7 100644 --- a/lib/archivesspace/client/task.rb +++ b/lib/archivesspace/client/task.rb @@ -3,10 +3,6 @@ module ArchivesSpace # Perform specific API tasks module Task - # def batch_import(payload, params = {}) - # # TODO: create "batch_import", payload, params - # end - def group_user_assignment(users_with_roles) updated = [] groups.each do |group| @@ -29,7 +25,7 @@ def group_user_assignment(users_with_roles) next unless update - response = post("/groups/#{uri_to_id(group["uri"])}", group.to_json) + response = post("/groups/#{uri_to_id(group["uri"])}", group) updated << response end updated @@ -54,13 +50,9 @@ def password_reset(username, password) user = all("users").find { |u| u["username"] == username } raise RequestError, user.status unless user - post(user["uri"], user.to_json, {password: password}) + post(user["uri"], user, {password: password}) end - # def search(params) - # # TODO: get "search", params - # end - private def uri_to_id(uri) diff --git a/lib/archivesspace/client/template.rb b/lib/archivesspace/client/template.rb index 3c41a6a..419a9d3 100644 --- a/lib/archivesspace/client/template.rb +++ b/lib/archivesspace/client/template.rb @@ -50,7 +50,7 @@ def extension def process t = ERB.new(read_template) r = t.result(binding).squeeze("\n") - JSON.parse(r).to_json + JSON.parse(r) end end diff --git a/spec/archivesspace/templates_spec.rb b/spec/archivesspace/templates_spec.rb index 6888cca..52ba3cc 100644 --- a/spec/archivesspace/templates_spec.rb +++ b/spec/archivesspace/templates_spec.rb @@ -21,7 +21,7 @@ it "can process an erb template" do data = {repo_code: "ABC", name: "ABC Archive", agent_contact_name: "ABC Admin"} - json = JSON.parse(ArchivesSpace::Template.process("repository_with_agent.json.erb", data)) + json = JSON.parse(ArchivesSpace::Template.process("repository_with_agent.json.erb", data).to_json) expect(json["repository"]["repo_code"]).to eq data[:repo_code] end