active-fedora 9.2.0.rc1 → 9.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8342f8e77df84a1256f26396de99577f34010d2a
-  data.tar.gz: 87203d5509bac4250d9a8c02082b31a310de971f
+  metadata.gz: bada647c029b7bff0f7068d8226fe256996f091a
+  data.tar.gz: 1c240deeaff193cdca424a8ec0d9c01ab2aefd13
 SHA512:
-  metadata.gz: 407aab67f7584c962bc16c24b0a9f8fc8c25b7d25c7c5d92dd83ee7dbad9cc75b4800fdb7c267790ea4c0879fccc03bcc52da344601e3596b3e4f3214e462dd2
-  data.tar.gz: c23c707171608bc46666cfa2c45b45313cf7fdfedc4e656b3b50458565888b35625fd3e3acc5efc77b80fa6b19aa72226d2c2a62870a6343325b89b2bbb929e5
+  metadata.gz: e402d06c32089846dc47542963fccdcf38e512e10c203fb27220e6a7df1e770c805a9aa8435f50729abec853fea9fc83263c20ae885530132236a96cd9024376
+  data.tar.gz: ef787677ed7601618bdf0c989f2298fff0bf43da788a01f5ac94031f296e1f7e1ee2bb8bf0c3b436a37c30d4e169cce19474520529a1957179a33610510c8cf3

data/History.txt

@@ -1,3 +1,6 @@
+v9.2.0.rc2
+  2015-06-30: Allow the FixityService to accept an RDF::URI [Justin Coyne]
+
 v9.2.0.rc1
   2015-06-30: Refactor CollectionAssociation#reset [Justin Coyne]
 

data/lib/active_fedora/fixity_service.rb

@@ -4,10 +4,10 @@ module ActiveFedora
 
     attr_accessor :target, :response
 
-    # Accepts an Fedora resource such as File.ldp_resource.subject
+    # @param [String, RDF::URI] target url for a Fedora resource
     def initialize target
       raise ArgumentError, 'You must provide a uri' unless target
-      @target = target
+      @target = target.to_s
     end
 
     # Executes a fixity check on Fedora and saves the Faraday::Response.
@@ -23,23 +23,23 @@ module ActiveFedora
 
     private
 
-    def get_fixity_response_from_fedora
-      uri = target + "/fcr:fixity"
-      ActiveFedora.fedora.connection.get(encoded_url(uri))
-    end
-
-    def fixity_graph
-      ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
-    end
+      def get_fixity_response_from_fedora
+        uri = target + "/fcr:fixity"
+        ActiveFedora.fedora.connection.get(encoded_url(uri))
+      end
 
-    # See https://jira.duraspace.org/browse/FCREPO-1247
-    def encoded_url uri
-      if uri.match("fcr:versions")
-        uri.gsub(/fcr:versions/,"fcr%3aversions")
-      else
-        uri
+      def fixity_graph
+        ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
       end
-    end
 
+      # See https://jira.duraspace.org/browse/FCREPO-1247
+      # @param [String] uri
+      def encoded_url uri
+        if uri.match("fcr:versions")
+          uri.gsub(/fcr:versions/,"fcr%3aversions")
+        else
+          uri
+        end
+      end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.2.0.rc1"
+  VERSION = "9.2.0.rc2"
 end

data/spec/unit/fixity_service_spec.rb

@@ -2,32 +2,44 @@ require 'spec_helper'
 
 describe ActiveFedora::FixityService do
 
-  subject { ActiveFedora::FixityService.new("http://path/to/resource") }
+  let(:service) { described_class.new(uri) }
+  let(:uri) { RDF::URI("http://path/to/resource") }
 
-  it { is_expected.to respond_to(:target) }
-  it { is_expected.to respond_to(:response) }
+  describe "the instance" do
+    subject { described_class.new(uri) }
+    it { is_expected.to respond_to(:response) }
+  end
+
+  describe "initialize" do
+    context "with a string" do
+      let(:uri) { 'http://path/to/resource' }
+      subject { service.target }
+      it { is_expected.to eq 'http://path/to/resource' }
+    end
+
+    context "with an RDF::URI" do
+      subject { service.target }
+      it { is_expected.to eq 'http://path/to/resource' }
+    end
+  end
 
   describe "#check" do
     before do
-      expect(subject).to receive(:get_fixity_response_from_fedora).and_return(response)
+      allow(service).to receive(:get_fixity_response_from_fedora).and_return(response)
     end
+    subject { service.check }
     context "with a passing result" do
       let(:response) do
         instance_double("Response", body: '<subject> <http://fedora.info/definitions/v4/repository#status> "SUCCESS"^^<http://www.w3.org/2001/XMLSchema#string> .')
       end
-      specify "returns true" do
-        expect(subject.check).to be true
-      end
-
+      it { is_expected.to be true }
     end
 
     context "with a failing result" do
       let(:response) do
         instance_double("Response", body: '<subject> <http://fedora.info/definitions/v4/repository#status> "BAD_CHECKSUM"^^<http://www.w3.org/2001/XMLSchema#string> .')
       end
-      specify "returns false" do
-        expect(subject.check).to be false
-      end
+      it { is_expected.to be false }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.2.0.rc1
+  version: 9.2.0.rc2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr