active-fedora 9.0.1 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcb26f9bfdb6735d9ce9a9b0b296c002960d10f4
-  data.tar.gz: b41e2e83f13386a5b2c64c4e37c53319920cfdec
+  metadata.gz: d965581bccc2e324f6336a4f7c5efb78efad4fcc
+  data.tar.gz: 72afbee2a1034a97575d0bfbfb74fed1e3d1ca14
 SHA512:
-  metadata.gz: 2e374f17c791d3ad5284cff49c624e9c922f2a459bb163bcd649f3c3f5abcfdab72875d750bb923a80f03887fbe844440e1545a11ac9af9da3cdb77bf998c17a
-  data.tar.gz: 7d4c6d6c3d2267244ac337ad0d4b5e1f5543e4e161665c302ea6989db0dc3bc1295678efcc9c1481e81679cea138033e3b4bb0c58d58d681ac7b30476eb5831d
+  metadata.gz: e72f35a6d6effd301066113a82479a9924e67b6f137e97db989cef3e9d7ac48790835d074fb617f222a07d7b9641ca49aac0bba4ec6e778da23340eff3edf857
+  data.tar.gz: 0689886286c8acc0aea9f4a19b70fac85b7da7d011ecdfcf13c140ab5e5479f900063d5ca5d88e94a315a83d88d72ccdd26b268240a6615596a481542f16c89b

data/lib/active_fedora/associations/builder/contains.rb

@@ -19,7 +19,11 @@ module ActiveFedora::Associations::Builder
       mixin.send(:define_method, name) do |*params|
         association(name).reader(*params).tap do |file|
           set_uri = uri.kind_of?(RDF::URI) ? uri.value.present? : uri.present?
-          file.uri = "#{uri}/#{name}" if set_uri
+          if set_uri
+            file_uri = "#{uri}/#{name}"
+            file.uri = file_uri
+            file.exists! if contains_assertions.include?(file_uri)
+          end
         end
       end
     end

data/lib/active_fedora/fedora.rb

@@ -13,8 +13,16 @@ module ActiveFedora
       @config[:base_path] || '/'
     end
 
+    def user
+      @config[:user]
+    end
+
+    def password
+      @config[:password]
+    end
+
     def connection
-      @connection ||= CachingConnection.new(host)
+      @connection ||= CachingConnection.new(authorized_connection)
     end
 
     def ldp_resource_service
@@ -41,5 +49,11 @@ module ActiveFedora
       @root_resource_path ||= base_path.sub(SLASH, BLANK)
     end
 
+    def authorized_connection
+      connection = Faraday.new(host)
+      connection.basic_auth(user, password)
+      connection
+    end
+
   end
 end

data/lib/active_fedora/file.rb

@@ -58,14 +58,21 @@ module ActiveFedora
       ldp_source.subject
     end
 
+    # If this file have a parent with ldp#contains, we know it is not new.
+    # By tracking exists we prevent an unnecessary HEAD request.
     def new_record?
-      ldp_source.new?
+      !@exists && ldp_source.new?
     end
 
     def uri= uri
       @ldp_source = Ldp::Resource::BinarySource.new(ldp_connection, uri, '', ActiveFedora.fedora.host + ActiveFedora.fedora.base_path)
     end
 
+    # If we know the record to exist (parent has LDP:contains), we can avoid unnecessary HEAD requests
+    def exists!
+      @exists = true
+    end
+
     # When restoring from previous versions, we need to reload certain attributes from Fedora
     def reload
       return if new_record?
@@ -248,11 +255,11 @@ module ActiveFedora
         ldp_source.content = content
         if new_record?
           ldp_source.create do |req|
-            req.headers = headers
+            req.headers.merge!(headers)
           end
         else
           ldp_source.update do |req|
-            req.headers = headers
+            req.headers.merge!(headers)
           end
         end
         reset
@@ -293,9 +300,21 @@ module ActiveFedora
       # @returns [Stream] an object that responds to each
       def stream(range = nil)
         uri = URI.parse(self.uri)
-        headers = {}
-        headers['Range'] = range if range
-        FileBody.new(uri, headers)
+        FileBody.new(uri, headers(range, authorization_key))
+      end
+
+      # @returns current authorization token from Ldp::Client
+      def authorization_key
+        self.ldp_source.client.http.headers.fetch("Authorization", nil)
+      end
+
+      # @param range [String] from #stream
+      # @param key [String] from #authorization_key
+      # @returns [Hash]
+      def headers(range, key, result = Hash.new)
+        result["Range"] = range if range
+        result["Authorization"] = key if key
+        result
       end
 
       class FileBody

data/lib/active_fedora/loadable_from_json.rb

@@ -62,6 +62,10 @@ module ActiveFedora
           @values.map {|v| FakeStatement.new(v) }
         end
 
+        def objects
+          @values
+        end
+
         class FakeStatement
           def initialize(value)
             @value = value
@@ -89,7 +93,7 @@ module ActiveFedora
       end
 
       def reflection(predicate)
-        @model.outgoing_reflections.find { |key, reflection| reflection.predicate == predicate }.first
+        Array(@model.outgoing_reflections.find { |key, reflection| reflection.predicate == predicate }).first
       end
     end
 

data/lib/active_fedora/persistence.rb

@@ -39,9 +39,10 @@ module ActiveFedora
 
     alias update_attributes update
 
-    #Deletes a Base object, also deletes the info indexed in Solr, and
-    #the underlying inner_object.  If this object is held in any relationships (ie inbound relationships
-    #outside of this object it will remove it from those items rels-ext as well
+    # Deletes an object from Fedora and deletes the indexed record from Solr.
+    # Delete does not run any callbacks, so consider using _destroy_ instead.
+    # @param [Hash] opts
+    # @option opts [Boolean] :eradicate if passed in, eradicate the tombstone from Fedora
     def delete(opts = {})
       return self if new_record?
 
@@ -68,6 +69,9 @@ module ActiveFedora
       freeze
     end
 
+    # Delete the object from Fedora and Solr. Run any before/after/around callbacks for destroy
+    # @param [Hash] opts
+    # @option opts [Boolean] :eradicate if passed in, eradicate the tombstone from Fedora
     def destroy(*args)
       raise ReadOnlyRecord if readonly?
       delete(*args)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.1"
+  VERSION = "9.0.2"
 end

data/spec/integration/attached_files_spec.rb

@@ -1,6 +1,30 @@
 require 'spec_helper'
 
 describe ActiveFedora::AttachedFiles do
+  describe "#contains" do
+    before do
+      class FooHistory < ActiveFedora::Base
+         contains 'child'
+      end
+    end
+    after do
+      Object.send(:remove_const, :FooHistory)
+    end
+
+    context "when the object exists" do
+      let!(:o) { FooHistory.create }
+      before do
+        o.child.content = "HMMM"
+        o.save
+      end
+
+      it "should not need to do a head on the children" do
+        f = FooHistory.find(o.id)
+        expect(f.ldp_source.client).not_to receive(:head)
+        f.child.content
+      end
+    end
+  end
   describe "serializing datastreams" do
     before do
       class TestingMetadataSerializing < ActiveFedora::Base

data/spec/unit/active_fedora_spec.rb

@@ -19,16 +19,18 @@ describe ActiveFedora do
 
     let(:good_url) { ActiveFedora.fedora_config.credentials[:url] }
     let(:bad_url) { good_url.gsub('/rest', '/') }
+    let(:user) { ActiveFedora.fedora_config.credentials[:user] }
+    let(:password) { ActiveFedora.fedora_config.credentials[:password] }
 
     it "should connect OK" do 
       expect(ActiveFedora::Base.logger).to_not receive(:warn)
-      ActiveFedora::Fedora.new(url: good_url, base_path: '/test')
+      ActiveFedora::Fedora.new(url: good_url, base_path: '/test', user: user, password: password)
     end
 
     it "should not connect and warn" do 
       expect(ActiveFedora::Base.logger).to receive(:warn)
       expect {
-        ActiveFedora::Fedora.new(url: bad_url, base_path: '/test')
+        ActiveFedora::Fedora.new(url: bad_url, base_path: '/test', user: user, password: password)
       }.to raise_error Ldp::HttpError 
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.0.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -560,7 +560,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.