active-fedora 7.0.0.rc2 → 7.0.0.rc3

data/spec/unit/rdfxml_rdf_datastream_spec.rb

@@ -4,9 +4,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
   describe "a new instance" do
     before(:each) do
       class MyRdfxmlDatastream < ActiveFedora::RdfxmlRDFDatastream
-        map_predicates do |map|
-          map.publisher(:in => RDF::DC)
-        end
+        property :publisher, :predicate => RDF::DC.publisher
       end
       @subject = MyRdfxmlDatastream.new(@inner_object, 'mixed_rdf')
       @subject.stub(:pid => 'test:1')
@@ -21,7 +19,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
   end
 
   describe "a complex data model" do
-    before do 
+    before do
       class DAMS < RDF::Vocabulary("http://library.ucsd.edu/ontology/dams#")
         property :title
         property :relatedTitle
@@ -46,16 +44,14 @@ describe ActiveFedora::RdfxmlRDFDatastream do
 
       module RDF
         # This enables RDF to respond_to? :value
-        def self.value 
+        def self.value
           self[:value]
         end
       end
 
       class MyDatastream < ActiveFedora::RdfxmlRDFDatastream
-        map_predicates do |map|
-          map.resource_type(:in => DAMS, :to => 'typeOfResource')
-          map.title(:in => DAMS, :class_name => 'Description')
-        end
+        property :resource_type, :predicate => DAMS.typeOfResource
+        property :title, :predicate => DAMS.title, :class_name => 'Description'
 
         rdf_subject { |ds| RDF::URI.new(ds.about) }
 
@@ -66,22 +62,10 @@ describe ActiveFedora::RdfxmlRDFDatastream do
           super
         end
 
-        after_initialize :type_resource
-        def type_resource
-          graph.insert([RDF::URI.new(about), RDF.type, DAMS.Object])
-        end
-
-        def content=(content)
-          super
-          @about = graph.statements.first.subject
-        end
-        class Description
-          include ActiveFedora::RdfObject
-          map_predicates do |map|
-            rdf_type DAMS.Description
-            map.value(:in=> RDF) do |index|
+        class Description < ActiveFedora::Rdf::Resource
+          configure :type => DAMS.Description
+          property :value, :predicate => RDF.value do |index|
               index.as :searchable
-            end
           end
         end
       end
@@ -97,12 +81,12 @@ describe ActiveFedora::RdfxmlRDFDatastream do
       it "should have a subject" do
         subject.rdf_subject.to_s.should == "http://library.ucsd.edu/ark:/20775/"
       end
-      
+
     end
 
     describe "an instance with content" do
       subject do
-        subject = MyDatastream.new(double('inner object', :pid=>'test:1', :new_record? =>true), 'descMetadata')
+        subject = MyDatastream.new(double('inner object', :pid=>'test:1', :new_record? =>true), 'descMetadata', about:"http://library.ucsd.edu/ark:/20775/")
         subject.content = File.new('spec/fixtures/damsObjectModel.xml').read
         subject
       end

data/spec/unit/reload_on_save_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe ActiveFedora::ReloadOnSave do
+  let(:file) {  ActiveFedora::Base.new  }
+
+  it 'defaults to call not reload' do
+    file.should_not_receive(:reload)
+    file.save
+  end
+
+  it 'reload can be turned on' do
+    file.reload_on_save = true
+    file.should_receive(:reload)
+    file.save
+  end
+
+  it 'allows reload to be turned off and on' do
+    file.reload_on_save = true
+    file.should_receive(:reload).once
+    file.save
+    file.reload_on_save = false
+    file.save
+  end
+end

data/spec/unit/solr_service_spec.rb

@@ -56,7 +56,7 @@ describe ActiveFedora::SolrService do
       end
       it "should use .load_instance_from_solr when called with :load_from_solr option" do
         AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID1_", @sample_solr_hits.first)
-        ActiveFedora::SolrService.should_not receive(:query)
+        ActiveFedora::SolrService.should_not_receive(:query)
         ActiveFedora::SolrService.reify_solr_result(@sample_solr_hits.first, load_from_solr: true)
       end
     end
@@ -71,7 +71,7 @@ describe ActiveFedora::SolrService do
         AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID1_", @sample_solr_hits[0])
         AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID2_", @sample_solr_hits[1])
         AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID3_", @sample_solr_hits[2])
-        ActiveFedora::SolrService.should_not receive(:query)
+        ActiveFedora::SolrService.should_not_receive(:query)
         ActiveFedora::SolrService.reify_solr_results(@sample_solr_hits, load_from_solr: true)
       end
     end
@@ -86,7 +86,7 @@ describe ActiveFedora::SolrService do
         AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID1_", @sample_solr_hits[0])
         AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID2_", @sample_solr_hits[1])
         AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID3_", @sample_solr_hits[2])
-        ActiveFedora::SolrService.should_not receive(:query)
+        ActiveFedora::SolrService.should_not_receive(:query)
         ActiveFedora::SolrService.lazy_reify_solr_results(@sample_solr_hits, load_from_solr: true).each {|r| r}
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc2
+  version: 7.0.0.rc3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -88,16 +88,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.4
 - !ruby/object:Gem::Dependency
-  name: rdf
+  name: linkeddata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -250,6 +250,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -280,6 +294,7 @@ files:
 - config/solr_mappings_af_0.1.yml
 - config/solr_mappings_bl_2.4.yml
 - gemfiles/rails3.gemfile
+- gemfiles/rails4.1.gemfile
 - gemfiles/rails4.gemfile
 - lib/active-fedora.rb
 - lib/active_fedora.rb
@@ -324,7 +339,6 @@ files:
 - lib/active_fedora/model.rb
 - lib/active_fedora/nested_attributes.rb
 - lib/active_fedora/nom_datastream.rb
-- lib/active_fedora/ntriples_rdf_datastream.rb
 - lib/active_fedora/null_relation.rb
 - lib/active_fedora/om_datastream.rb
 - lib/active_fedora/persistence.rb
@@ -334,16 +348,21 @@ files:
 - lib/active_fedora/querying.rb
 - lib/active_fedora/railtie.rb
 - lib/active_fedora/rdf.rb
+- lib/active_fedora/rdf/configurable.rb
+- lib/active_fedora/rdf/identifiable.rb
 - lib/active_fedora/rdf/indexing.rb
+- lib/active_fedora/rdf/list.rb
 - lib/active_fedora/rdf/nested_attributes.rb
 - lib/active_fedora/rdf/node_config.rb
-- lib/active_fedora/rdf_datastream.rb
-- lib/active_fedora/rdf_list.rb
-- lib/active_fedora/rdf_node.rb
-- lib/active_fedora/rdf_node/term_proxy.rb
-- lib/active_fedora/rdf_object.rb
+- lib/active_fedora/rdf/ntriples_rdf_datastream.rb
+- lib/active_fedora/rdf/object_resource.rb
+- lib/active_fedora/rdf/properties.rb
+- lib/active_fedora/rdf/rdf_datastream.rb
+- lib/active_fedora/rdf/rdfxml_rdf_datastream.rb
+- lib/active_fedora/rdf/repositories.rb
+- lib/active_fedora/rdf/resource.rb
+- lib/active_fedora/rdf/term.rb
 - lib/active_fedora/rdf_xml_writer.rb
-- lib/active_fedora/rdfxml_rdf_datastream.rb
 - lib/active_fedora/reflection.rb
 - lib/active_fedora/relation.rb
 - lib/active_fedora/relation/calculations.rb
@@ -353,6 +372,7 @@ files:
 - lib/active_fedora/relation/query_methods.rb
 - lib/active_fedora/relation/spawn_methods.rb
 - lib/active_fedora/relationship_graph.rb
+- lib/active_fedora/reload_on_save.rb
 - lib/active_fedora/rels_ext_datastream.rb
 - lib/active_fedora/rspec_matchers.rb
 - lib/active_fedora/rspec_matchers/belong_to_associated_active_fedora_object_matcher.rb
@@ -375,7 +395,6 @@ files:
 - lib/active_fedora/unsaved_digital_object.rb
 - lib/active_fedora/validations.rb
 - lib/active_fedora/version.rb
-- lib/active_fedora/yaml_adaptor.rb
 - lib/generators/active_fedora/config/USAGE
 - lib/generators/active_fedora/config/config_generator.rb
 - lib/generators/active_fedora/config/fedora/fedora_generator.rb
@@ -496,13 +515,18 @@ files:
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_spec.rb
+- spec/unit/rdf_configurable_spec.rb
 - spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_list_nested_attributes_spec.rb
 - spec/unit/rdf_list_spec.rb
-- spec/unit/rdf_node_spec.rb
+- spec/unit/rdf_properties_spec.rb
+- spec/unit/rdf_repositories_spec.rb
+- spec/unit/rdf_resource_datastream_spec.rb
+- spec/unit/rdf_resource_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
+- spec/unit/reload_on_save_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
 - spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb
 - spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb
@@ -538,7 +562,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
@@ -640,13 +664,18 @@ test_files:
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_spec.rb
+- spec/unit/rdf_configurable_spec.rb
 - spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_list_nested_attributes_spec.rb
 - spec/unit/rdf_list_spec.rb
-- spec/unit/rdf_node_spec.rb
+- spec/unit/rdf_properties_spec.rb
+- spec/unit/rdf_repositories_spec.rb
+- spec/unit/rdf_resource_datastream_spec.rb
+- spec/unit/rdf_resource_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
+- spec/unit/reload_on_save_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
 - spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb
 - spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb

data/lib/active_fedora/rdf_datastream.rb

@@ -1,113 +0,0 @@
-module ActiveFedora
-  class RDFDatastream < Datastream
-
-    before_save do
-      if content.blank?
-        logger.warn "Cowardly refusing to save a datastream with empty content: #{self.inspect}"
-        false
-      end
-    end
-    include RdfNode
-    include Rdf::Indexing
-    
-    class << self 
-      ##
-      # Register a ruby block that evaluates to the subject of the graph
-      # By default, the block returns the current object's pid
-      # @yield [ds] 'ds' is the datastream instance
-      # This should override the method in RdfObject, which just creates a b-node by default
-      def rdf_subject &block
-        if block_given?
-           return @subject_block = block
-        end
-
-        @subject_block ||= lambda { |ds| RDF::URI.new("info:fedora/#{ds.pid}") }
-      end
-    end
-
-    def freeze
-      @graph.freeze
-    end
-
-    def metadata?
-      true
-    end
-
-    # Overriding so that one can call ds.content on an unsaved datastream and they will see the serialized format
-    def content
-      serialize
-    end
-
-    def content=(content)
-      reset_child_cache!
-      @graph = deserialize(content)
-    end
-
-    def content_changed?
-      # we haven't touched the graph, so it isn't changed (avoid a force load)
-      return false unless instance_variable_defined? :@graph
-      @content = serialize
-      super
-    end
-    # Populate a RDFDatastream object based on the "datastream" content 
-    # Assumes that the datastream contains RDF content
-    # @param [String] data the "rdf" node 
-    def deserialize(data = nil)
-      repository = RDF::Repository.new
-      return repository if new? and data.nil?
-
-      data ||= datastream_content
-      data.force_encoding('utf-8')
-      RDF::Reader.for(serialization_format).new(data) do |reader|
-        reader.each_statement do |statement|
-          repository << statement
-        end
-      end
-
-      repository
-    end
-
-    def graph
-      @graph ||= begin
-        deserialize
-      end      
-    end
-
-    def serialization_format
-      raise "you must override the `serialization_format' method in a subclass"
-    end
-
-    # Creates a RDF datastream for insertion into a Fedora Object
-    # Note: This method is implemented on SemanticNode instead of RelsExtDatastream because SemanticNode contains the relationships array
-    def serialize
-      update_subjects_to_use_a_real_pid!
-
-      RDF::Writer.for(serialization_format).dump(graph)
-    end
-
-    
-    private 
-
-    def update_subjects_to_use_a_real_pid!
-      return unless new?
-
-      bad_subject = rdf_subject
-      reset_rdf_subject!
-      reset_child_cache!
-      new_subject = rdf_subject
-
-      new_repository = RDF::Repository.new
-
-      graph.each_statement do |statement|
-          subject = statement.subject
-
-          subject &&= new_subject if subject == bad_subject
-          new_repository << [subject, statement.predicate, statement.object]
-      end
-
-      @graph = new_repository
-    end
-
-  end
-end
-

data/lib/active_fedora/rdf_list.rb

@@ -1,162 +0,0 @@
-module ActiveFedora
-  module RdfList
-    extend ActiveSupport::Concern
-    include ActiveFedora::RdfNode
-    
-    attr_reader :graph, :subject
-    
-    # RdfList is a node of a linked list structure.
-    # The RDF.first predicate points to the contained object
-    # The RDF.rest predicate points to the next node in the list or 
-    #   RDF.nil if this is the final node.
-    # @see http://www.w3.org/TR/rdf-schema/#ch_list
-    def initialize(graph, subject)
-      @graph = graph
-      @subject = subject
-      first = graph.query([subject, RDF.first, nil]).first
-      last = graph.query([subject, RDF.rest, nil]).first
-      graph.insert([subject, RDF.first, RDF.nil]) unless first
-      graph.insert([subject, RDF.rest, RDF.nil]) unless last
-    end
-
-    UNASSIGNABLE_KEYS = %w(_destroy )
-
-    # Override assign_nested_attributes
-    def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
-      options = self.nested_attributes_options[association_name]
-    
-      # TODO
-      #check_record_limit!(options[:limit], attributes_collection)
-    
-      if attributes_collection.is_a?(Hash)
-        attributes_collection = attributes_collection.values
-      end
-    
-      association = self.send(association_name)
-      
-      original_length_of_list = self.size
-      attributes_collection.each_with_index do |attributes, index|
-        attributes = attributes.with_indifferent_access
-        minted_node = association.mint_node(attributes.except(*UNASSIGNABLE_KEYS))
-        self[original_length_of_list+index] = minted_node
-      end
-    end
-
-
-    # Override the method from RdfNode, enabling us to insert into the list.
-    def insert_child(predicate, node)
-      self[size] = node
-    end
-
-    def rdf_subject
-      subject
-    end
-
-    def first
-      self[0] 
-    end
-
-    def [](idx)
-      idx == 0 ?  head.value : tail[idx-1]
-    end
-
-    def []=(idx, value)
-      idx == 0 ?  head.value=value : tail_or_create(idx-1).value=value
-    end
-
-    def clear(first_element=true)
-      # Remove the pointed at element
-      v = graph.query([subject, RDF.first, nil]).first
-      # TODO - Recursive delete
-      graph.delete([v.object, nil, nil])
-      
-      # Remove the tail
-      tail.clear(false) if tail
-      # clear the cache
-      @tail = nil
-      graph.delete([subject, nil, nil])
-      if first_element
-        # Re-add first/rest predicates if its the first node
-        graph.insert([subject, RDF.first, RDF.nil])
-        graph.insert([subject, RDF.rest, RDF.nil])
-      end
-    end
-
-    def each &block
-      yield(head.value)
-      tail.each(&block) if tail
-    end
-
-    def to_ary
-      if empty?
-        []
-      elsif tail
-        [head.value] + tail.to_ary
-      else
-        [head.value]
-      end
-    end
-
-    def empty?
-      !tail && graph.query([subject, RDF.first, RDF.nil]).first
-    end 
-
-    def size
-      if empty?
-        0
-      elsif tail
-        tail.size + 1
-      else
-        1
-      end
-    end
-
-    def inspect
-      "[ #{value ? value.inspect : 'nil'}, #{tail.inspect}]"
-    end
-
-    def value
-      v = graph.query([subject, RDF.first, nil]).first
-      if v.object.uri?
-        return v.object == RDF.nil ? nil : v.object
-      end
-      if v.object.resource?
-        type = graph.query([v.object, RDF.type, nil]).first
-        return ActiveFedora::RdfNode.rdf_registry[type.object].new(graph, v.object)
-      end
-      v
-    end
-
-    def value=(obj)
-      graph.delete([subject, RDF.first, RDF.nil])
-      if obj.respond_to? :rdf_subject
-        graph.insert([subject, RDF.first, obj.rdf_subject]) # an ActiveFedora::RdfObject
-      else
-        graph.insert([subject, RDF.first, obj])
-      end
-    end
-
-    def head
-      @head ||= self.class.new(graph, subject)
-    end
-
-    def tail
-      return @tail if @tail
-      rest = graph.query([subject, RDF.rest, nil]).first
-      return if rest.object == RDF.nil
-      @tail = self.class.new(graph, rest.object)
-    end
-
-    def tail_or_create(idx)
-      unless tail
-        #add a tail
-        graph.delete([subject, RDF.rest, RDF.nil])
-        tail_node = RDF::Node.new
-        graph.insert([subject, RDF.rest, tail_node])
-        @tail = self.class.new(graph, tail_node)
-      end
-
-      idx == 0 ? @tail : @tail.tail_or_create(idx-1)
-    end
-  end
-end