ezid-client 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b99665638ed549f4b2aac8d64b4c0481c9ced185
-  data.tar.gz: 9a0425a9a6a7b7fb5d379b23ad886f8287061b92
+  metadata.gz: a0032991c2394702b7a0ad25e6c3c515ad3cf149
+  data.tar.gz: b45b2ef5d65adbcb9a297b42303f313db55af520
 SHA512:
-  metadata.gz: d4231d347ddb5a4d81a5f45997a0f3e578d4f3016a18faaefb3751bbfe2db5b7d2e52e387cfa0b4060dac359667e9fcffa36fa74f68afe4257c6e80cfdde1863
-  data.tar.gz: 132dd35cd17df14438744ce7aad382241d2cc9695a42582ba8f3ae3c651b26bf06889c400373bc1b40aaaf6f4f6b5a6b9f6cc489a41e0cc6070e9e8778124607
+  metadata.gz: 08d97b5a15168e921e585d926d4e42579911df6fe46f337791b60809d178906d3ccc8dfc772d20eb79b9894b0b1e5e671e07ce6755dee2f8f3372de4fd48ddf2
+  data.tar.gz: e0649750e6f411e69a86aa8fc4b5abc32fff0085c4303af41e0157a990a5cf8e42310019c21a840c54a733a3512a4ab0c3c31bcaf94cf5b26b6c535aede98f08

data/.travis.yml

@@ -3,6 +3,6 @@ rvm:
   - 2.2
   - 2.1
   - 2.0.0
-cache: 
+cache:
   - bundler
 script: "bundle exec rake ci"

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'coveralls', require: false

data/README.md

@@ -288,6 +288,8 @@ A convenience method `ezid_test_mode!` is provided to configure the client to:
 - use `TEST_ARK_SHOULDER` as the default shoulder
 - log to the null device (instead of default STDERR)
 
+See also https://github.com/duke-libraries/ezid-client/wiki/Mock-Identifier for an example of a mock identifier object.
+
 ## Running the ezid-client tests
 
 See http://ezid.cdlib.org/doc/apidoc.html#testing-the-api.

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/ezid-client.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = "~> 2.0"
 
+  spec.add_dependency "hashie"
+
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.1"

data/lib/ezid/client.rb

@@ -4,6 +4,7 @@ require_relative "configuration"
 require_relative "session"
 require_relative "metadata"
 require_relative "identifier"
+require_relative "proxy_identifier"
 require_relative "error"
 
 Dir[File.expand_path("../responses/*.rb", __FILE__)].each { |m| require m }
@@ -202,7 +203,7 @@ module Ezid
       message = "EZID #{request_name} -- #{response.status_line}"
       logger.log(log_level, message)
       raise response.exception if response.exception
-      response      
+      response
     end
 
     def execute(request_class, *args)

data/lib/ezid/identifier.rb

@@ -36,7 +36,7 @@ module Ezid
       # @raise [Ezid::Error] if the identifier does not exist in EZID
       def find(id)
         identifier = new(id: id)
-        identifier.reload
+        identifier.load_metadata
       end
     end
 
@@ -65,10 +65,10 @@ module Ezid
     end
 
     # Returns the identifier metadata
-    # @param refresh [Boolean] - flag to refresh the metadata from EZID if stale (default: `true`)
+    # @param load [Boolean] - flag to load the metadata from EZID if stale (default: `true`)
     # @return [Ezid::Metadata] the metadata
-    def metadata(refresh = true)
-      refresh_metadata if refresh && stale?
+    def metadata(load = true)
+      load_metadata if load && stale?
       @metadata
     end
 
@@ -114,11 +114,19 @@ module Ezid
       save
     end
 
-    # Reloads the metadata from EZID (local changes will be lost!)
+    # @deprecated Use {#load_metadata} instead.
+    def reload
+      warn "[DEPRECATION] `reload` is deprecated and will be removed in version 2.0. Use `load_metadata` instead."
+      load_metadata
+    end
+
+    # Loads the metadata from EZID (local changes will be lost!)
     # @return [Ezid::Identifier] the identifier
     # @raise [Ezid::Error]
-    def reload
-      refresh_metadata
+    def load_metadata
+      response = client.get_identifier_metadata(id)
+      self.metadata = Metadata.new(response.metadata)
+      self.state = :persisted
       self
     end
 
@@ -165,10 +173,15 @@ module Ezid
     end
 
     # Mark the identifier as unavailable
-    # @param reason [String] an optional reason 
+    # @param reason [String] an optional reason
     # @return [String] the new status
     def unavailable!(reason = nil)
-      raise Error, "Cannot make a reserved identifier unavailable." if persisted? && reserved?
+      if persisted? && reserved?
+        raise Error, "Cannot make a reserved identifier unavailable."
+      end
+      if unavailable? and reason.nil?
+        return
+      end
       value = UNAVAILABLE
       if reason
         value += " | #{reason}"
@@ -196,12 +209,6 @@ module Ezid
       persisted? && metadata(false).empty?
     end
 
-    def refresh_metadata
-      response = client.get_identifier_metadata(id)
-      self.metadata = Metadata.new response.metadata
-      self.state = :persisted
-    end
-
     def clear_metadata
       metadata(false).clear
     end

data/lib/ezid/metadata.rb

@@ -1,4 +1,4 @@
-require "forwardable"
+require "hashie"
 
 module Ezid
   #
@@ -6,171 +6,108 @@ module Ezid
   #
   # @api private
   #
-  class Metadata
-    extend Forwardable
-
-    attr_reader :elements
-
-    def_delegators :elements, :[], :[]=, :each, :clear, :to_h, :empty?
-    
-    class << self
-      def metadata_reader(element, alias_as=nil)
-        define_method element do
-          get(element)
-        end
-        if alias_as
-          alias_method alias_as, element
-        end
-      end
-
-      def metadata_writer(element, alias_as=nil)
-        define_method "#{element}=" do |value|
-          set(element, value)
-        end
-        if alias_as
-          alias_method "#{alias_as}=".to_sym, "#{element}=".to_sym
-        end 
-      end
-
-      def metadata_accessor(element, alias_as=nil)
-        metadata_reader element, alias_as
-        metadata_writer element, alias_as
-      end
-
-      def metadata_profile(profile, *elements)
-        elements.each do |element| 
-          profile_element = [profile, element].join(".")
-          method = [profile, element].join("_")
-          
-          define_method method do
-            get(profile_element)
-          end
-
-          define_method "#{method}=" do |value|
-            set(profile_element, value)
-          end
-        end
-      end
-    end
+  class Metadata < Hashie::Mash
 
     # EZID metadata field/value separator
     ANVL_SEPARATOR = ": "
-
+    # EZID metadata field value separator
     ELEMENT_VALUE_SEPARATOR = " | "
-
     # Characters to escape in element values on output to EZID
     # @see http://ezid.cdlib.org/doc/apidoc.html#request-response-bodies
     ESCAPE_VALUES_RE = /[%\r\n]/
-
     # Characters to escape in element names on output to EZID
     # @see http://ezid.cdlib.org/doc/apidoc.html#request-response-bodies
     ESCAPE_NAMES_RE = /[%:\r\n]/
-
     # Character sequence to unescape from EZID
     # @see http://ezid.cdlib.org/doc/apidoc.html#request-response-bodies
     UNESCAPE_RE = /%\h\h/
-
     # A comment line
     COMMENT_RE = /^#.*(\r?\n)?/
-
     # A line continuation
     LINE_CONTINUATION_RE = /\r?\n\s+/
-
     # A line ending
     LINE_ENDING_RE = /\r?\n/
-
     # EZID reserved metadata elements that are read-only
     # @see http://ezid.cdlib.org/doc/apidoc.html#internal-metadata
-    READONLY = %w( _owner _ownergroup _shadows _shadowedby _datacenter _created _updated )
-
-    # EZID metadata profiles - a hash of (profile => elements)
+    READONLY = %w( _owner _ownergroup _shadows _shadowedby _datacenter _created _updated ).freeze
+    # EZID metadata profiles
     # @see http://ezid.cdlib.org/doc/apidoc.html#metadata-profiles
     # @note crossref is not included because it is a simple element
-    PROFILES = {
-      dc: [:creator, :title, :publisher, :date, :type],
-      datacite: [:creator, :title, :publisher, :publicationyear, :resourcetype],
-      erc: [:who, :what, :when]
-    }
-    
-    PROFILES.each do |profile, elements|
-      metadata_profile profile, *elements 
-    end
-
-    # Accessors for EZID internal metadata elements
-    metadata_accessor :_coowners, :coowners
-    metadata_accessor :_crossref
-    metadata_accessor :_export, :export
-    metadata_accessor :_profile, :profile
-    metadata_accessor :_status, :status
-    metadata_accessor :_target, :target
-
-    # Readers for EZID read-only internal metadata elements
-    metadata_reader :_created 
-    metadata_reader :_datacenter, :datacenter
-    metadata_reader :_owner, :owner
-    metadata_reader :_ownergroup, :ownergroup
-    metadata_reader :_shadowedby, :shadowedby
-    metadata_reader :_shadows, :shadows
-    metadata_reader :_updated 
-
-    # Accessors for 
-    metadata_accessor :crossref
-    metadata_accessor :datacite
-    metadata_accessor :erc
+    PROFILES = %w( dc datacite erc ).freeze
+    RESERVED_ALIASES = [ :coowners=, :export=, :profile=, :status=, :target=,
+                         :coowners, :export, :profile, :status, :target,
+                         :datacenter, :owner, :ownergroup, :shadowedby, :shadows ]
 
     def initialize(data={})
-      @elements = coerce(data)
+      super coerce(data)
+    end
+
+    def elements
+      warn "[DEPRECATION] `elements` is deprecated and will be removed in ezid-client 2.0." \
+           " Use the Ezid::Metadata instance itself instead."
+      self
     end
 
     def created
-      to_time _created
+      to_time(_created)
     end
 
     def updated
-      to_time _updated
+      to_time(_updated)
     end
 
     # Output metadata in EZID ANVL format
     # @see http://ezid.cdlib.org/doc/apidoc.html#request-response-bodies
     # @return [String] the ANVL output
     def to_anvl(include_readonly = true)
-      hsh = elements.dup
+      hsh = to_h
       hsh.reject! { |k, v| READONLY.include?(k) } unless include_readonly
-      lines = hsh.map do |name, value| 
+      lines = hsh.map do |name, value|
         element = [escape(ESCAPE_NAMES_RE, name), escape(ESCAPE_VALUES_RE, value)]
         element.join(ANVL_SEPARATOR)
       end
       lines.join("\n").force_encoding(Encoding::UTF_8)
     end
 
-    def inspect
-      "#<#{self.class.name} elements=#{elements.inspect}>"
-    end
-
     def to_s
       to_anvl
     end
 
-    def get(element)
-      self[element.to_s]
+    protected
+
+    def method_missing(name, *args, &block)
+      if reserved_alias?(name)
+        reserved_alias(name, *args)
+      elsif profile_accessor?(name)
+        profile_accessor(name, *args)
+      else
+        super
+      end
+    end
+
+    private
+
+    def reserved_alias?(name)
+      RESERVED_ALIASES.include?(name)
     end
 
-    def set(element, value)
-      self[element.to_s] = value
+    def reserved_alias(name, *args)
+      send("_#{name}", *args)
     end
 
-    protected
+    def profile_accessor?(name)
+      PROFILES.include? name.to_s.split("_").first
+    end
 
-    def method_missing(method, *args)
-      return get(method) if args.size == 0
-      if element = method.to_s[/^([^=]+)=$/, 1]
-        return set(element, *args)
+    def profile_accessor(name, *args)
+      key = name.to_s.sub("_", ".")
+      if key.end_with?("=")
+        self[key[0..-2]] = args.first
+      else
+        self[key]
       end
-      super
     end
 
-    private
-
     def to_time(value)
       time = value.to_i
       (time == 0) ? nil : Time.at(time).utc
@@ -206,4 +143,3 @@ module Ezid
 
   end
 end
-

data/lib/ezid/proxy_identifier.rb

@@ -0,0 +1,22 @@
+module Ezid
+  class ProxyIdentifier
+
+    attr_reader :id
+    attr_accessor :__real
+
+    def initialize(id)
+      @id = id
+      @__real = nil
+    end
+
+    protected
+
+    def method_missing(name, *args, &block)
+      if __real.nil?
+        self.__real = Identifier.find(id)
+      end
+      __real.send(name, *args, &block)
+    end
+
+  end
+end

data/lib/ezid/requests/mint_identifier_request.rb

@@ -14,7 +14,7 @@ module Ezid
     self.response_class = MintIdentifierResponse
 
     attr_reader :shoulder, :metadata
-    
+
     def initialize(client, shoulder, metadata)
       @shoulder = shoulder
       @metadata = Metadata.new(metadata)

data/lib/ezid/requests/request.rb

@@ -32,7 +32,7 @@ module Ezid
 
       def short_name
         name.split("::").last.sub("Request", "")
-      end      
+      end
     end
 
     attr_reader :client
@@ -90,10 +90,10 @@ module Ezid
     private
 
     def get_response_for_request
-      connection.start do |conn| 
+      connection.start do |conn|
         add_authentication if authentication_required?
         add_metadata if has_metadata?
-        conn.request(__getobj__) 
+        conn.request(__getobj__)
       end
     end
 

data/lib/ezid/responses/delete_identifier_response.rb

@@ -1,7 +1,7 @@
 require_relative "identifier_response"
 
 module Ezid
-  # 
+  #
   # Response to a delete identifier request
   # @api private
   #

data/lib/ezid/responses/get_identifier_metadata_response.rb

@@ -1,7 +1,7 @@
 require_relative "identifier_response"
 
 module Ezid
-  # 
+  #
   # Response to a get identifier metadata request
   # @api private
   #

data/lib/ezid/responses/login_response.rb

@@ -1,7 +1,7 @@
 require_relative "response"
 
 module Ezid
-  # 
+  #
   # Response to a login request
   # @api private
   #

data/lib/ezid/responses/mint_identifier_response.rb

@@ -1,7 +1,7 @@
 require_relative "new_identifier_response"
 
 module Ezid
-  # 
+  #
   # Response to a mint identifier request
   # @api private
   #

data/lib/ezid/responses/response.rb

@@ -9,10 +9,10 @@ module Ezid
   class Response < SimpleDelegator
 
     # Success response status
-    SUCCESS = "success"
+    SUCCESS = "success".freeze
 
     # Error response status
-    ERROR = "error"
+    ERROR = "error".freeze
 
     # The response status -- "success" or "error"
     # @return [String] the status

data/spec/integration/client_spec.rb

@@ -15,7 +15,7 @@ module Ezid
         expect(retrieved.metadata).to match(/dc.title: Test/)
         deleted = client.delete_identifier(@id)
         expect(deleted).to be_success
-        expect { client.get_identifier_metadata(@id) }.to raise_error
+        expect { client.get_identifier_metadata(@id) }.to raise_error(Error)
       end
     end
 

data/spec/integration/identifier_spec.rb

@@ -1,5 +1,3 @@
-
-
 module Ezid
   RSpec.describe Identifier do
 
@@ -47,7 +45,7 @@ module Ezid
         subject { described_class.create(shoulder: TEST_ARK_SHOULDER, status: "reserved") }
         before { subject.delete }
         it "should delete the identifier" do
-          expect { described_class.find(subject.id) }.to raise_error
+          expect { described_class.find(subject.id) }.to raise_error(Error)
         end
       end
     end

data/spec/spec_helper.rb

@@ -15,9 +15,6 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-require 'coveralls'
-Coveralls.wear!
-
 require "ezid/test_helper"
 ezid_test_mode!
 

data/spec/unit/client_spec.rb

@@ -60,7 +60,7 @@ EOS
         let(:http_response) { double(body: "success: ark:/99999/fk4fn19h88") }
         context "and the :default_shoulder config option is set" do
           before do
-            allow(MintIdentifierRequest).to receive(:execute).with(subject, TEST_ARK_SHOULDER, nil) { stub_response } 
+            allow(MintIdentifierRequest).to receive(:execute).with(subject, TEST_ARK_SHOULDER, nil) { stub_response }
             allow(Client.config).to receive(:default_shoulder) { TEST_ARK_SHOULDER }
           end
           it "should use the default shoulder" do
@@ -71,7 +71,7 @@ EOS
         context "and the :default_shoulder config option is not set" do
           before { allow(Client.config).to receive(:default_shoulder) { nil } }
           it "should raise an exception" do
-            expect { subject.mint_identifier }.to raise_error
+            expect { subject.mint_identifier }.to raise_error(Error)
           end
         end
       end
@@ -153,7 +153,7 @@ EOS
     describe "error handling" do
       let(:http_response) { double(body: "error: bad request - no such identifier") }
       it "should raise an exception" do
-        expect { subject.get_identifier_metadata("invalid") }.to raise_error
+        expect { subject.get_identifier_metadata("invalid") }.to raise_error(Error)
       end
     end
   end

data/spec/unit/identifier_spec.rb

@@ -3,23 +3,17 @@ module Ezid
 
     describe ".create" do
       let(:attrs) { {shoulder: TEST_ARK_SHOULDER, profile: "dc", target: "http://example.com"} }
-      it "should instantiate a new Identifier and save it" do
+      it "instantiates a new Identifier and saves it" do
         expect(described_class).to receive(:new).with(attrs).and_call_original
         expect_any_instance_of(described_class).to receive(:save) { double }
         described_class.create(attrs)
       end
-      describe "when given neither an id nor a shoulder" do
-        before { allow(described_class).to receive(:defaults) {} }
-        it "should raise an exception" do
-          expect { described_class.create }.to raise_error
-        end
-      end
     end
 
     describe ".find" do
-      it "should instantiate a new identifier and reload" do
+      it "instantiates a new identifier and loads the metadata" do
         expect(described_class).to receive(:new).with(id: "id").and_call_original
-        expect_any_instance_of(described_class).to receive(:reload) { double }
+        expect_any_instance_of(described_class).to receive(:load_metadata) { double }
         described_class.find("id")
       end
     end
@@ -27,7 +21,7 @@ module Ezid
     describe ".defaults" do
       before { @original_defaults = described_class.defaults }
       after { described_class.defaults = @original_defaults }
-      it "should be settable via client config" do
+      it "can be set via client config" do
         Client.config.identifier.defaults = {status: "reserved"}
         expect(described_class.defaults).to eq({status: "reserved"})
       end
@@ -37,14 +31,14 @@ module Ezid
       describe "with metadata" do
         describe "via the :metadata argument" do
           subject { described_class.new(metadata: "_profile: dc\n_target: http://example.com") }
-          it "should set the metadata" do
+          it "sets the metadata" do
             expect(subject.profile).to eq("dc")
             expect(subject.target).to eq("http://example.com")
           end
         end
         describe "via keyword arguments" do
           subject { described_class.new(profile: "dc", target: "http://example.com") }
-          it "should set the metadata" do
+          it "sets the metadata" do
             expect(subject.profile).to eq("dc")
             expect(subject.target).to eq("http://example.com")
           end
@@ -54,13 +48,13 @@ module Ezid
         before do
           allow(described_class).to receive(:defaults) { {profile: "dc", status: "reserved"} }
         end
-        it "should set the default metadata" do
+        it "sets the default metadata" do
           expect(subject.profile).to eq("dc")
           expect(subject.status).to eq("reserved")
         end
         context "when explicit arguments override the defaults" do
           subject { described_class.new(shoulder: TEST_ARK_SHOULDER, status: "public") }
-          it "should override the defaults" do
+          it "overrides the defaults" do
             expect(subject.profile).to eq("dc")
             expect(subject.status).to eq("public")
           end
@@ -71,7 +65,7 @@ module Ezid
     describe "#update" do
       let(:metadata) { {"status" => "unavailable"} }
       subject { described_class.new(id: "id") }
-      it "should update the metadata and save" do
+      it "updates the metadata and saves" do
         expect(subject).to receive(:update_metadata).with(metadata)
         expect(subject).to receive(:save) { double }
         subject.update(metadata)
@@ -79,25 +73,25 @@ module Ezid
     end
 
     describe "#update_metadata" do
-      it "should update the metadata" do
+      it "updates the metadata" do
         subject.update_metadata(:status => "public", _target: "localhost", "dc.creator" => "Me")
         expect(subject.metadata.to_h).to eq({"_status"=>"public", "_target"=>"localhost", "dc.creator"=>"Me"})
       end
     end
 
-    describe "#reload" do
+    describe "#load_metadata" do
       let(:metadata) { "_profile: erc" }
       before { allow(subject).to receive(:id) { "id" } }
-      it "should reinitialize the metadata from EZID" do
+      it "initializes the metadata from EZID" do
         expect(subject.client).to receive(:get_identifier_metadata).with("id") { double(id: "id", metadata: metadata) }
         expect(Metadata).to receive(:new).with(metadata)
-        subject.reload
+        subject.load_metadata
       end
     end
 
     describe "#reset" do
       before { subject.metadata = Metadata.new(status: "public") }
-      it "should clear the local metadata" do
+      it "clears the local metadata" do
         expect { subject.reset }.to change { subject.metadata.empty? }.from(false).to(true)
       end
     end
@@ -108,16 +102,16 @@ module Ezid
       end
       describe "when saving an unpersisted object" do
         before { allow(subject).to receive(:create_or_mint) { nil } }
-        it "should mark it as persisted" do
+        it "marks it as persisted" do
           expect { subject.save }.to change(subject, :persisted?).from(false).to(true)
         end
       end
       describe "when saving a persisted object" do
         before do
           allow(subject).to receive(:persisted?) { true }
-          allow(subject).to receive(:modify) { nil } 
+          allow(subject).to receive(:modify) { nil }
         end
-        it "should not change the persisted status" do
+        it "does not change the persisted status" do
           expect { subject.save }.not_to change(subject, :persisted?)
         end
       end
@@ -128,23 +122,23 @@ module Ezid
         subject { described_class.new(id: "id", status: Identifier::RESERVED) }
         context "and is persisted" do
           before { allow(subject).to receive(:persisted?) { true } }
-          it "should delete the identifier" do
+          it "deletes the identifier" do
             expect(subject.client).to receive(:delete_identifier).with("id") { double(id: "id") }
             subject.delete
             expect(subject).to be_deleted
-          end          
+          end
         end
         context "and is not persisted" do
           before { allow(subject).to receive(:persisted?) { false } }
-          it "should raise an exception" do
-            expect { subject.delete }.to raise_error
+          it "raises an exception" do
+            expect { subject.delete }.to raise_error(Error)
           end
         end
       end
       context "when identifier is not reserved" do
         subject { described_class.new(id: "id", status: Identifier::PUBLIC) }
-        it "should raise an exception" do
-          expect { subject.delete }.to raise_error
+        it "raises an exception" do
+          expect { subject.delete }.to raise_error(Error)
         end
       end
     end
@@ -157,7 +151,7 @@ module Ezid
           allow(subject).to receive(:persisted?) { true }
           allow(subject).to receive(:metadata) { metadata }
         end
-        it "should modify the identifier" do
+        it "modifies the identifier" do
           expect(subject.client).to receive(:modify_identifier).with("id", metadata) { double(id: "id") }
           subject.save
         end
@@ -168,7 +162,7 @@ module Ezid
         end
         context "and `id' is present" do
           before { allow(subject).to receive(:id) { "id" } }
-          it "should create the identifier" do
+          it "creates the identifier" do
             expect(subject.client).to receive(:create_identifier).with("id", subject.metadata) { double(id: "id") }
             subject.save
           end
@@ -176,15 +170,15 @@ module Ezid
         context "and `id' is not present" do
           context "and `shoulder' is present" do
             before { allow(subject).to receive(:shoulder) { TEST_ARK_SHOULDER } }
-            it "should mint the identifier" do
+            it "mints the identifier" do
               expect(subject.client).to receive(:mint_identifier).with(TEST_ARK_SHOULDER, subject.metadata) { double(id: "id") }
               subject.save
             end
           end
           context "and `shoulder' is not present" do
             before { allow(Client.config).to receive(:default_shoulder) { nil } }
-            it "should raise an exception" do
-              expect { subject.save }.to raise_error
+            it "raises an exception" do
+              expect { subject.save }.to raise_error(Error)
             end
           end
         end
@@ -221,31 +215,57 @@ module Ezid
     end
 
     describe "status-changing methods" do
+      subject { described_class.new(id: "id", status: status) }
       describe "#unavailable!" do
-        context "when the identifier is reserved" do
-          subject { described_class.new(id: "id", status: Identifier::RESERVED) }
+        context "when the status is \"unavailable\"" do
+          let(:status) { "#{Identifier::UNAVAILABLE} | whatever" }
+          context "and no reason is given" do
+            it "logs a warning" do
+              pending "https://github.com/duke-libraries/ezid-client/issues/46"
+              allow_message_expectations_on_nil
+              expect(subject.logger).to receive(:warn)
+              subject.unavailable!
+            end
+            it "does not change the status" do
+              expect { subject.unavailable! }.not_to change(subject, :status)
+            end
+          end
+          context "and a reason is given" do
+            it "logs a warning" do
+              pending "https://github.com/duke-libraries/ezid-client/issues/46"
+              allow_message_expectations_on_nil
+              expect(subject.logger).to receive(:warn)
+              subject.unavailable!("because")
+            end
+            it "should change the status" do
+              expect { subject.unavailable!("because") }.to change(subject, :status).from(status).to("#{Identifier::UNAVAILABLE} | because")
+            end
+          end
+        end
+        context "when the status is \"reserved\"" do
+          let(:status) { Identifier::RESERVED }
           context "and persisted" do
             before { allow(subject).to receive(:persisted?) { true } }
-            it "should raise an exception" do
-              expect { subject.unavailable! }.to raise_error
+            it "raises an exception" do
+              expect { subject.unavailable! }.to raise_error(Error)
             end
           end
           context "and not persisted" do
             before { allow(subject).to receive(:persisted?) { false } }
-            it "should changed the status" do
+            it "changes the status" do
               expect { subject.unavailable! }.to change(subject, :status).from(Identifier::RESERVED).to(Identifier::UNAVAILABLE)
             end
           end
         end
-        context "when the identifier is public" do
-          subject { described_class.new(id: "id", status: Identifier::PUBLIC) }
+        context "when the status is \"public\"" do
+          let(:status) { Identifier::PUBLIC }
           context "and no reason is given" do
-            it "should change the status" do
+            it "changes the status" do
               expect { subject.unavailable! }.to change(subject, :status).from(Identifier::PUBLIC).to(Identifier::UNAVAILABLE)
             end
           end
           context "and a reason is given" do
-            it "should change the status and append the reason" do
+            it "changes the status and appends the reason" do
               expect { subject.unavailable!("withdrawn") }.to change(subject, :status).from(Identifier::PUBLIC).to("#{Identifier::UNAVAILABLE} | withdrawn")
             end
           end
@@ -253,7 +273,7 @@ module Ezid
       end
       describe "#public!" do
         subject { described_class.new(id: "id", status: Identifier::UNAVAILABLE) }
-        it "should change the status" do
+        it "changes the status" do
           expect { subject.public! }.to change(subject, :status).from(Identifier::UNAVAILABLE).to(Identifier::PUBLIC)
         end
       end

data/spec/unit/metadata_spec.rb

@@ -8,14 +8,14 @@ module Ezid
           expect(subject[writer.to_s]).to eq("value")
         end
       end
-      
+
       shared_examples "a metadata reader" do |reader|
         it "reads the \"#{reader}\" element" do
           subject[reader.to_s] = "value"
           expect(subject.send(reader)).to eq("value")
         end
       end
-      
+
       shared_examples "a metadata reader with an alias" do |reader, aliased_as|
         it_behaves_like "a metadata reader", reader
         it "has a reader alias \"#{aliased_as}\"" do
@@ -23,7 +23,7 @@ module Ezid
           expect(subject.send(aliased_as)).to eq("value")
         end
       end
-      
+
       shared_examples "a metadata writer with an alias" do |writer, aliased_as|
         it_behaves_like "a metadata writer", writer
         it "has a writer alias \"#{aliased_as}\"" do
@@ -52,7 +52,7 @@ module Ezid
       shared_examples "a metadata profile accessor with an alias" do |profile, accessor|
         it_behaves_like "a metadata accessor with an alias", [profile, accessor].join("."), [profile, accessor].join("_")
       end
-      
+
       describe "_owner" do
         it_behaves_like "a metadata reader with an alias", :_owner, :owner
       end
@@ -68,7 +68,7 @@ module Ezid
       describe "_datacenter" do
         it_behaves_like "a metadata reader with an alias", :_datacenter, :datacenter
       end
-      
+
       describe "_coowners" do
         it_behaves_like "a metadata accessor with an alias", :_coowners, :coowners
       end
@@ -84,7 +84,7 @@ module Ezid
       describe "_export" do
         it_behaves_like "a metadata accessor with an alias", :_export, :export
       end
-      
+
       describe "_created" do
         it_behaves_like "a metadata reader", :_created
         it_behaves_like "a time reader alias", :_created, :created
@@ -93,7 +93,7 @@ module Ezid
         it_behaves_like "a metadata reader", :_updated
         it_behaves_like "a time reader alias", :_updated, :updated
       end
-      
+
       describe "erc" do
         it_behaves_like "a metadata accessor", :erc
       end
@@ -106,7 +106,7 @@ module Ezid
       describe "crossref" do
         it_behaves_like "a metadata accessor", :crossref
       end
-      
+
       describe "dc.creator" do
         it_behaves_like "a metadata profile accessor with an alias", :dc, :creator
       end
@@ -122,7 +122,7 @@ module Ezid
       describe "dc.type" do
         it_behaves_like "a metadata profile accessor with an alias", :dc, :type
       end
-      
+
       describe "datacite.creator" do
         it_behaves_like "a metadata profile accessor with an alias", :datacite, :creator
       end
@@ -138,7 +138,7 @@ module Ezid
       describe "datacite.resourcetype" do
         it_behaves_like "a metadata profile accessor with an alias", :datacite, :resourcetype
       end
-      
+
       describe "erc.who" do
         it_behaves_like "a metadata profile accessor with an alias", :erc, :who
       end
@@ -194,8 +194,8 @@ _created: 1416507086
 _status: public
 EOS
         end
-        it "should treat the string as an ANVL document, splitting into keys and values and unescaping" do
-          expect(subject.elements).to eq({ "_updated" => "1416507086",
+        it "treats the string as an ANVL document, splitting into keys and values and unescaping" do
+          expect(subject).to eq({ "_updated" => "1416507086",
                                            "_target" => "http://example.com/path%20with%20spaces",
                                            "_profile" => "erc",
                                            "_erc" => "who: Proust, Marcel\nwhat: Remembrance of Things Past",
@@ -219,14 +219,14 @@ EOS
         end
         context "which is a normal Hash" do
           let(:data) { hsh }
-          it "should set the metadata elements to the hash" do
-            expect(subject.elements).to eq(hsh)
+          it "sets the metadata elements to the hash" do
+            expect(subject).to eq(hsh)
           end
         end
         context "which is a Metadata instance" do
           let(:data) { Metadata.new(hsh) }
-          it "should set the metadata elements to the hash" do
-            expect(subject.elements).to eq(hsh)
+          it "sets the metadata elements to the hash" do
+            expect(subject).to eq(hsh)
           end
         end
       end

data/spec/unit/proxy_identifier_spec.rb

@@ -0,0 +1,26 @@
+require 'ezid/proxy_identifier'
+
+module Ezid
+  RSpec.describe ProxyIdentifier do
+
+    describe "initialization" do
+      it "should not load the real identifier" do
+        expect(Identifier).not_to receive(:find)
+        described_class.new("ark:/99999/fk4fn19h88")
+      end
+    end
+
+    describe "lazy loading" do
+      subject { described_class.new(id) }
+
+      let(:id) { "ark:/99999/fk4fn19h88" }
+      let(:real) { double(id: id, target: "http://ezid.cdlib.org/id/#{id}") }
+
+      it "should load the real identifier when calling a missing method" do
+        expect(Identifier).to receive(:find).with(id) { real }
+        expect(subject.target).to eq(real.target)
+      end
+    end
+
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ezid-client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - David Chandek-Stark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +88,7 @@ files:
 - lib/ezid/error.rb
 - lib/ezid/identifier.rb
 - lib/ezid/metadata.rb
+- lib/ezid/proxy_identifier.rb
 - lib/ezid/requests/batch_download_request.rb
 - lib/ezid/requests/create_identifier_request.rb
 - lib/ezid/requests/delete_identifier_request.rb
@@ -107,6 +122,7 @@ files:
 - spec/unit/client_spec.rb
 - spec/unit/identifier_spec.rb
 - spec/unit/metadata_spec.rb
+- spec/unit/proxy_identifier_spec.rb
 homepage: https://github.com/duke-libraries/ezid-client
 licenses:
 - BSD-3-Clause
@@ -127,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby client for EZID API Version 2
@@ -139,3 +155,4 @@ test_files:
 - spec/unit/client_spec.rb
 - spec/unit/identifier_spec.rb
 - spec/unit/metadata_spec.rb
+- spec/unit/proxy_identifier_spec.rb