archivesspace-client 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d62f24f62e27e4dcb265982a09d19929029a12d7926983137f7835b9e945ec8d
-  data.tar.gz: 88b7f1d79f02207cba4dfbb6334fae4a7080adca8634c6c52b53d6616398dfd0
+  metadata.gz: 5c792727aefb570967d0bd3d69330cc609275d0553cfb439392330bcab2af638
+  data.tar.gz: c33eb46a9194ade5465a64c0bce98b9f5796f22ef097f0e628e171659437a03f
 SHA512:
-  metadata.gz: d776656385e5e84c4ba0adfec158e6a43ef60720aec43108a15e6e307adaf5022eb2168d463cdc74f4657aae62bbea80662d851dc65aee8a4ed02b1f9cc432d2
-  data.tar.gz: 482eeab5c389e3433bae0102a687dfc42ede31792bf0b9bafcd2b0ec22492769523c42639718f9c202fc83abd2b08b6b798a7827826441c2ee951de9d817eda9
+  metadata.gz: afcb7ffbf95842a8c62a7e1a8616c98f3a5113cfdedd8a47d069cde7a495604a02476f3cbfe75a9192fc14772738da22ea61f1c47682e6d094eaf590070ee722
+  data.tar.gz: e8ea7debe60ac9eaf21b4e413703e12c322f935842e54488fcde08806b1babecba1bf91e1ad4e6cf9df53447416b23267f27a0cdc514244db1510b41707a46ac

data/README.md

@@ -145,7 +145,8 @@ end
 ```
 
 Scopes restore the previous context on exit (even if the block raises) and can
-be nested:
+be nested. Call `repository` with no id to nest a global-scope block inside a
+repository scope:
 
 ```ruby
 client.repository(2) do
@@ -153,6 +154,11 @@ client.repository(2) do
     client.resources  # scoped to repo 3
   end
   client.resources    # back to repo 2
+
+  client.repository do
+    client.get('repositories')  # global scope
+  end
+  client.resources    # back to repo 2 again
 end
 
 # now back in the global scope
@@ -260,6 +266,15 @@ main/master branch a new release will be built and published.
 
 ## Changelog
 
+### 0.6.0
+
+* Support global scope within a nested context. This makes it much
+  more ergonomic to request uris within a repository context.
+
+### 0.5.1
+
+* Fix: prevent caller options passed to request from being mutated.
+
 ### 0.5.0
 
 Breaking changes:

data/lib/archivesspace/client/client.rb

@@ -42,18 +42,22 @@ module ArchivesSpace
     end
 
     # Scoping requests
-    def repository(id)
-      return use_global_repository if id.nil?
-
-      begin
-        Integer(id)
-      rescue ArgumentError, TypeError
-        raise RepositoryIdError, "Invalid Repository id: #{id}"
+    def repository(id = nil)
+      if id.nil?
+        return use_global_repository unless block_given?
+
+        new_context = nil
+      else
+        begin
+          Integer(id)
+        rescue ArgumentError, TypeError
+          raise RepositoryIdError, "Invalid Repository id: #{id}"
+        end
+
+        new_context = "repositories/#{id}"
+        return @context = new_context unless block_given?
       end
 
-      new_context = "repositories/#{id}"
-      return @context = new_context unless block_given?
-
       previous = @context
       @context = new_context
       begin

data/lib/archivesspace/client/version.rb

@@ -2,6 +2,6 @@
 
 module ArchivesSpace
   class Client
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/spec/archivesspace/client_spec.rb

@@ -141,6 +141,39 @@ describe ArchivesSpace::Client do
       expect(client.context).to eq "repositories/2"
     end
 
+    it "scopes to the global repository within a block and restores afterwards" do
+      client.repository 2
+      client.repository(nil) do
+        expect(client.context).to be_nil
+      end
+      expect(client.context).to eq "repositories/2"
+    end
+
+    it "scopes to the global repository when called with no id and a block" do
+      client.repository 2
+      client.repository do
+        expect(client.context).to be_nil
+      end
+      expect(client.context).to eq "repositories/2"
+    end
+
+    it "nests a no-arg global block inside a repository block and restores both contexts" do
+      client.repository(2) do
+        expect(client.context).to eq "repositories/2"
+        client.repository do
+          expect(client.context).to be_nil
+        end
+        expect(client.context).to eq "repositories/2"
+      end
+      expect(client.context).to be_nil
+    end
+
+    it "restores the previous repository context even if a nil-scoped block raises" do
+      client.repository 2
+      expect { client.repository(nil) { raise "boom" } }.to raise_error("boom")
+      expect(client.context).to eq "repositories/2"
+    end
+
     it "restores the context even if the block raises" do
       expect { client.repository(2) { raise "boom" } }.to raise_error("boom")
       expect(client.context).to be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archivesspace-client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Mark Cooper
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Interact with ArchivesSpace via the API.
 test_files: []