active_fedora-noid 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3010e0172967f37af1602afec2ac7f6a789eadd2
-  data.tar.gz: e1b488cf669990c9b90a50a1519854c720501837
+  metadata.gz: b77c4228633cc511a2c5b40bcf7846c5bdb6072a
+  data.tar.gz: 9c55bcce4630ec410ee377aaa3ad850b879a31a4
 SHA512:
-  metadata.gz: 80a447788391b889081c905994d7470f75f55fc1f26be78c3d3f08292e271c8fd4793b8425b2f858c0b7814a06294cc6890ffcea1c039f33b7e9fe7e0edccc80
-  data.tar.gz: 638ce50e9d8c6258bdf1365848f46cb11dfb70c556e559eebc66d48160aafc380f8464a251d05d98d1948e21aebabe93595e2159d6574e506b19da4333ad7c99
+  metadata.gz: bc8379b41b735e0ba4836b006d6f53ef7f000c4f186ff2d949042784b7cf2cba4e77cd1c62bc9de7452c5dc306d9ae4cc8ad347a6b4313fa29e3a1aa9d017df0
+  data.tar.gz: e5c79c8c42dab66dffa09ff5f01418177e7d7ec58d73b587434f7add3397f26dc167c38301010223618f7fac9dca3487b3257b1d652f4813c3348b9201ffe56c

data/README.md

@@ -63,26 +63,14 @@ noid_service.valid? 'xyz123foobar'
 
 ## ActiveFedora integration
 
-To get ActiveFedora to automatically call your Noid service whenever a new ActiveFedora object is saved, create a method on your model called `assign_id` and have it talk to your Noid service, e.g.:
+To get ActiveFedora to automatically call your Noid service whenever a new ActiveFedora object is saved, include the `ActiveFedora::Noid::Model`, e.g.:
 
 ```ruby
 # app/models/my_object.rb
 require 'active_fedora/noid'
 
 class MyObject < ActiveFedora::Base
-  # ...
-
-  def assign_id
-    noid_service.mint
-  end
-
-  # ...
-
-  private
-
-    def noid_service
-      @noid_service ||= ActiveFedora::Noid::Service.new
-    end
+  include ActiveFedora::Noid::Model
 end
 ```
 

data/lib/active_fedora/noid.rb

@@ -4,6 +4,7 @@ require 'active_fedora/noid/config'
 require 'active_fedora/noid/engine'
 require 'active_fedora/noid/service'
 require 'active_fedora/noid/minter'
+require 'active_fedora/noid/model'
 
 module ActiveFedora
   module Noid

data/lib/active_fedora/noid/model.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ActiveFedora
+  module Noid
+    # Mix this class into an ActiveFedora:Base model in order to have you new objects
+    # created with a noid id.
+    module Model
+      ## This overrides the default behavior, which is to ask Fedora for an id
+      # @see ActiveFedora::Persistence.assign_id
+      def assign_id
+        service.mint
+      end
+
+      private
+
+      def service
+        @service ||= ActiveFedora::Noid::Service.new
+      end
+    end
+  end
+end

data/lib/active_fedora/noid/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveFedora
   module Noid
-    VERSION = '2.1.0'
+    VERSION = '2.2.0'
   end
 end

data/spec/models/active_fedora/noid/model_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Noid::Model do
+  let(:sample_class) do
+    Class.new(ActiveFedora::Base) do
+      include ActiveFedora::Noid::Model
+    end
+  end
+  let(:instance) { sample_class.new }
+  let(:service) { instance_double(ActiveFedora::Noid::Service, mint: '1234') }
+
+  before do
+    allow(ActiveFedora::Noid::Service).to receive(:new).and_return(service)
+  end
+
+  describe '#assign_id' do
+    it 'returns the id from the noid service' do
+      expect(instance.assign_id).to eq '1234'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_fedora-noid
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Michael J. Giarlo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-18 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -190,12 +190,14 @@ files:
 - lib/active_fedora/noid/minter/base.rb
 - lib/active_fedora/noid/minter/db.rb
 - lib/active_fedora/noid/minter/file.rb
+- lib/active_fedora/noid/model.rb
 - lib/active_fedora/noid/rspec.rb
 - lib/active_fedora/noid/service.rb
 - lib/active_fedora/noid/version.rb
 - lib/generators/active_fedora/noid/install_generator.rb
 - lib/generators/active_fedora/noid/seed_generator.rb
 - lib/tasks/noid_tasks.rake
+- spec/models/active_fedora/noid/model_spec.rb
 - spec/models/minter_state_spec.rb
 - spec/spec_helper.rb
 - spec/support/minterstate_table.rb
@@ -232,6 +234,7 @@ signing_key:
 specification_version: 4
 summary: Noid identifier services for ActiveFedora-based applications
 test_files:
+- spec/models/active_fedora/noid/model_spec.rb
 - spec/models/minter_state_spec.rb
 - spec/spec_helper.rb
 - spec/support/minterstate_table.rb