active-fedora 9.1.1 → 9.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d27733036fa2ceffef04a07c51f6287e1a29345
-  data.tar.gz: 45c6e01a1d0508a3a316771973183cc48a7f08eb
+  metadata.gz: da18bdd03d130d9d80945cd2c2ce0cbbe6056831
+  data.tar.gz: 7709031721c4ccb85bf411d49d61731b097de430
 SHA512:
-  metadata.gz: 921a3c46c4485ec83789512be1fe9caf1d16445f18121d68944a3a3f742b64a1010a7db5bbcf05b77e1d8c094d36ef2e7ea8f506ee8a0f5c046fe16a0788c5f0
-  data.tar.gz: c491773b0438275c4d75e998e54eae06940a4a6137b92630fee5530eafa16e77dc1e56ca003114ccabe9604bf686f443492b40e4ff0581bb856dfc5c39d8aef3
+  metadata.gz: 3e685a07394f367818b44898dba0c8d059dfec46702534f915840cae1dabda372f50ebe60eb68962295186e588b76dced9624861b545e3611bb83fa89e60737c
+  data.tar.gz: 048eb130c747e5e96be4593b25c4ab51ccf7fee443df5aa8c67c91108f839f50b01dc8455c86a07cef1417a238e54385d4d2f092138abb17e1797a7a292b359c

data/History.txt

@@ -1,3 +1,20 @@
+v9.1.2
+  2015-06-11: Remove unnecessary dependency on rdf-vocab [Justin Coyne]
+
+  2015-05-05: Track type as a changed attribute in MetadataNode [Justin Coyne]
+
+  2015-05-05: Don't try to save the metadata node if the file is unsaved [Justin
+  Coyne]
+
+  2015-05-05: File#save should return true if there is nothing to save Fixes #784
+  This parallels how ActiveRecord objects behave if there are no changes, e.g.:
+  [Justin Coyne]
+
+  2015-05-04: CollectionAssociation should generate a solr query lazily When a
+  CollectionAssociation is loaded before the owing object is saved the solr query
+  is produced without the id of the owner, so all the objects of the correct type
+  are returned. Ref #781 [Justin Coyne]
+
 v9.1.0
   2015-04-16: Use delegate_to instead of datastream in the options for property
   Trying to reduce/elimnate the useage of "datastream" especially in the public

data/active-fedora.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.3.0'
-  s.add_dependency "rdf-ldp"
 
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"

data/lib/active_fedora.rb

@@ -8,7 +8,6 @@ require 'active_support/core_ext/object'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/except'
 require 'active_triples'
-require 'rdf/ldp'
 
 SOLR_DOCUMENT_ID = Solrizer.default_field_mapper.id_field unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)

data/lib/active_fedora/associations/collection_association.rb

@@ -3,11 +3,6 @@ module ActiveFedora
     class CollectionAssociation < Association #:nodoc:
       attr_reader :proxy
 
-      def initialize(owner, reflection)
-        super
-        construct_query
-      end
-
       # Implements the reader method, e.g. foo.items for Foo.has_many :items
       # @param opts [Boolean, Hash] if true, force a reload
       # @option opts [Symbol] :response_format can be ':solr' to return a solr result.
@@ -233,7 +228,7 @@ module ActiveFedora
       # Count all records using solr. Construct options and pass them with
       # scope to the target class's +count+.
       def count(options = {})
-        @reflection.klass.count(:conditions => @counter_query)
+        @reflection.klass.count(conditions: construct_query)
       end
 
       # Sets the target of this proxy to <tt>\target</tt>, and the \loaded flag to +true+.
@@ -291,10 +286,11 @@ module ActiveFedora
 
       # @param opts [Hash] Options that will be passed through to ActiveFedora::SolrService.query.
       def load_from_solr(opts = Hash.new)
-        return [] if @finder_query.empty?
+        finder_query = construct_query
+        return [] if finder_query.empty?
         rows = opts.delete(:rows) { count }
         return [] if rows == 0
-        SolrService.query(@finder_query, {rows: rows}.merge(opts))
+        SolrService.query(finder_query, { rows: rows }.merge(opts))
       end
 
       def add_to_target(record, skip_callbacks = false)
@@ -330,11 +326,12 @@ module ActiveFedora
         end
 
         def construct_query
-
-          #TODO use primary_key instead of id
-          clauses = { find_reflection => @owner.id }
-          clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base'
-          @counter_query = @finder_query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(clauses)
+          @solr_query ||= begin
+            #TODO use primary_key instead of id
+            clauses = { find_reflection => @owner.id }
+            clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base'
+            ActiveFedora::SolrQueryBuilder.construct_query_for_rel(clauses)
+          end
         end
 
 

data/lib/active_fedora/associations/has_many_association.rb

@@ -17,7 +17,7 @@ module ActiveFedora
         count = if loaded?
           @target.size
         else
-          @reflection.klass.count(:conditions => @counter_query)
+          @reflection.klass.count(conditions: construct_query)
         end
 
         # If there's nothing in the database and @target has no new records

data/lib/active_fedora/change_set.rb

@@ -17,6 +17,7 @@ module ActiveFedora
       changes.empty?
     end
 
+    # @return [Hash<RDF::URI, RDF::Queryable::Enumerator>] hash of predicate uris to statements
     def changes
       @changes ||= changed_attributes.each_with_object({}) do |key, result|
         if object.respond_to?(:association) && object.association(key.to_sym).present?
@@ -25,6 +26,10 @@ module ActiveFedora
         elsif object.class.properties.keys.include?(key)
           predicate = graph.reflections.reflect_on_property(key).predicate
           result[predicate] = graph.query(predicate: predicate)
+        elsif key == 'type'.freeze
+          # working around https://github.com/ActiveTriples/ActiveTriples/issues/122
+          predicate = ::RDF.type
+          result[predicate] = graph.query(predicate: predicate)
         elsif object.local_attributes.include?(key)
           raise "Unable to find a graph predicate corresponding to the attribute: \"#{key}\""
         end

data/lib/active_fedora/file.rb

@@ -235,7 +235,7 @@ module ActiveFedora
       end
 
       def save(*)
-        return unless content_changed?
+        return true unless content_changed?
         headers = { 'Content-Type'.freeze => mime_type, 'Content-Length'.freeze => content.size.to_s }
         headers['Content-Disposition'.freeze] = "attachment; filename=\"#{URI.encode(@original_name)}\"" if @original_name
 

data/lib/active_fedora/indexing.rb

@@ -98,7 +98,7 @@ module ActiveFedora
         # GET could be slow if it's a big resource, we're using HEAD to avoid this problem,
         # but this causes more requests to Fedora.
         return [] unless Ldp::Response.rdf_source?(resource.head)
-        immediate_descendant_uris = resource.graph.query(predicate: ::RDF::LDP.contains).map { |descendant| descendant.object.to_s }
+        immediate_descendant_uris = resource.graph.query(predicate: ::RDF::Vocab::LDP.contains).map { |descendant| descendant.object.to_s }
         all_descendants_uris = [uri]
         immediate_descendant_uris.each do |descendant_uri|
           all_descendants_uris += descendant_uris(descendant_uri)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.1.1"
+  VERSION = "9.1.2"
 end

data/lib/active_fedora/with_metadata.rb

@@ -10,7 +10,7 @@ module ActiveFedora
     end
 
     def save(*)
-      if super
+      if super && !new_record?
         metadata_node.metadata_uri = described_by # TODO only necessary if the URI was < > before
         metadata_node.save # TODO if changed?
       end

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -7,6 +7,10 @@ module ActiveFedora
       def initialize(file)
         @file = file
         super(file.uri, ldp_source.graph)
+        if self.class.type && !self.type.include?(self.class.type)
+          # Workaround for https://github.com/ActiveTriples/ActiveTriples/issues/123
+          self.get_values(:type) << self.class.type
+        end
       end
 
       def metadata_uri= uri
@@ -37,12 +41,26 @@ module ActiveFedora
 
       def save
         raise "Save the file first" if file.new_record?
-        change_set = ChangeSet.new(self, self, changed_attributes.keys)
-        SparqlInsert.new(change_set.changes, ::RDF::URI.new(file.uri)).execute(metadata_uri)
+        SparqlInsert.new(changes_for_update, ::RDF::URI.new(file.uri)).execute(metadata_uri)
         @ldp_source = nil
         true
       end
 
+      def changed_attributes
+        super.tap do |changed|
+          if type.present?
+            changed['type'] = true
+          end
+        end
+      end
+
+      private
+
+        def changes_for_update
+          ChangeSet.new(self, self, changed_attributes.keys).changes
+        end
+
+
       class << self
         def parent_class= parent
           @parent_class = parent

data/spec/integration/has_many_associations_spec.rb

@@ -25,6 +25,17 @@ describe "Collection members" do
         expect(library.books.any?).to be false
       end
     end
+
+    context "loading the association prior to a save that affects the association" do
+      let(:library) { Library.new }
+      before do
+        Book.create
+        library.books
+        library.save
+      end
+      subject { library.books.size }
+      it { is_expected.to eq 0 }
+    end
   end
 
   describe "looking up has_many" do

data/spec/integration/with_metadata_spec.rb

@@ -2,10 +2,6 @@ require 'spec_helper'
 
 describe ActiveFedora::WithMetadata do
   before do
-    class Sample < ActiveFedora::Base
-      contains :file, class_name: 'SampleFile'
-    end
-
     class SampleFile < ActiveFedora::File
       include ActiveFedora::WithMetadata
 
@@ -17,11 +13,9 @@ describe ActiveFedora::WithMetadata do
 
   after do
     Object.send(:remove_const, :SampleFile)
-    Object.send(:remove_const, :Sample)
   end
 
-  let(:base) { Sample.new }
-  let(:file) { base.file }
+  let(:file) { SampleFile.new }
 
   describe "properties" do
     before do
@@ -38,15 +32,57 @@ describe ActiveFedora::WithMetadata do
 
   describe "#save" do
     before do
-      file.content = "Hey"
       file.title = ["foo"]
-      base.save
-      base.reload
     end
 
-    it "should save the metadata too" do
-      expect(base.file.title).to eq ['foo']
+    context "if the object saves (because it has content)" do
+      before do
+        file.content = "Hey"
+        file.save
+      end
+
+      let(:reloaded) { SampleFile.new(file.uri) }
+
+      it "should save the metadata too" do
+        expect(reloaded.title).to eq ['foo']
+      end
+    end
+
+    context "if the object is a new_record (didn't save)" do
+      it "doesn't save the metadata" do
+        expect(file.metadata_node).not_to receive(:save)
+        file.save
+      end
     end
   end
 
+  context "when RDF.type is set" do
+    let(:book) { RDF::URI.new("http://example.com/ns/Book") }
+
+    before do
+      class SampleBook < ActiveFedora::File
+        include ActiveFedora::WithMetadata
+
+        metadata do
+          configure type: RDF::URI.new("http://example.com/ns/Book")
+        end
+      end
+
+      file.content = 'foo'
+      file.save
+    end
+
+    after do
+      Object.send(:remove_const, :SampleBook)
+    end
+
+    let(:file) { SampleBook.new }
+    let(:reloaded_file) { SampleBook.new(file.uri) }
+
+    it "persists the configured type" do
+      expect(reloaded_file.metadata_node.query(predicate: ::RDF.type).map(&:object)).to include book
+    end
+
+  end
+
 end

data/spec/unit/file_spec.rb

@@ -222,4 +222,14 @@ describe ActiveFedora::Datastream do
       end
     end
   end
+
+  describe "#save" do
+    let(:file) { described_class.new }
+    context "when there is nothing to save" do
+      it "should not write" do
+        expect(file.ldp_source).not_to receive(:create)
+        expect(file.save).to be true
+      end
+    end
+  end
 end

data/spec/unit/with_metadata/metadata_node_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe ActiveFedora::WithMetadata::MetadataNode do
+  let(:generated_schema) { Class.new(described_class) }
+
+  let(:file) { ActiveFedora::File.new }
+  let(:node) { generated_schema.new(file) }
+  let(:book) { RDF::URI.new('http://example.com/ns/Book') }
+
+  describe "#changed_attributes" do
+    subject { node.changed_attributes }
+
+    context "when type is not set" do
+      it { is_expected.to eq({}) }
+    end
+
+    context "when type is set" do
+      before do
+        generated_schema.configure type: book
+      end
+
+      it { is_expected.to eq('type' => true) }
+    end
+  end
+
+  describe "changes_for_update" do
+    subject { node.send(:changes_for_update) }
+
+    context "when type is not set" do
+      it { is_expected.to eq({}) }
+    end
+
+    context "when type is set" do
+      before do
+        generated_schema.configure type: book
+      end
+
+      it "is expected to have the rdf type statement" do
+        expect(subject[::RDF.type]).to be_kind_of RDF::Queryable::Enumerator
+      end
+    end
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.1.1
+  version: 9.1.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -138,20 +138,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: rdf-ldp
-  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: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -555,6 +541,7 @@ files:
 - spec/unit/solr_service_spec.rb
 - spec/unit/sparql_insert_spec.rb
 - spec/unit/validations_spec.rb
+- spec/unit/with_metadata/metadata_node_spec.rb
 homepage: https://github.com/projecthydra/active_fedora
 licenses:
 - APACHE2
@@ -575,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.