active-fedora 6.4.5 → 6.5.0

data/History.txt

@@ -1,3 +1,32 @@
+v6.5.0 (2013-08-28)
+
+An empty query value that is a string should not return all
+[Adam Hallett]
+
+Delegate relation methods to the array [Justin Coyne]
+
+Use an error message that gives a thourough explanation and a
+for a fix [Justin Coyne]
+
+Include ActiveModel::Dirty on Base, call field_will_change! on
+methods, and track changes on save [Chris Colvard]
+
+Rdf terminologies should be inheritable [Justin Coyne]
+
+Raise an error when trying to assign to a delegated attribute that
+been delegated [Justin Coyne]
+
+Added RdfNode::TermProxy.first_or_create [Justin Coyne]
+
+replace method_missing technique in rdf_node with an accessor
+[Justin Coyne]
+
+Add ActiveFedora::Relation#last.  Resolves #184 [Andrew Curley]
+
+RdfNode::TermProxy.build should use the correct class [Justin
+Coyne]
+
+
 v6.4.5 (2013-08-05)
 
 Clear rdf lists and proxies [Justin Coyne]

data/lib/active_fedora/associations/association_collection.rb

@@ -203,7 +203,7 @@ module ActiveFedora
         end
 
         def find_class_for_relation(klass, inverse_relation=@owner.class.to_s.underscore.to_sym)
-          raise "Unable to find #{klass}." if inverse_relation == :'active_fedora/base'
+          raise "Unable to lookup the :property attribute for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class} because #{klass} specifies \"class_name: 'ActiveFedora::Base'\".  Either specify a specific class_name in #{klass} or set :property in the #{@reflection.macro} declaration on #{@owner.class}" if inverse_relation == :'active_fedora/base'
           if klass.reflections.key?(inverse_relation)
             # Try it singular
             return klass.reflections[inverse_relation].options[:property]

data/lib/active_fedora/base.rb

@@ -342,6 +342,7 @@ module ActiveFedora
     include Associations
     include NestedAttributes
     include Reflection
+    include ActiveModel::Dirty
   end
 
 end

data/lib/active_fedora/delegating.rb

@@ -2,6 +2,14 @@ module ActiveFedora
   module Delegating
     extend ActiveSupport::Concern
 
+    included do
+      after_save :clear_changed_attributes
+      def clear_changed_attributes
+        @previously_changed = changes
+        @changed_attributes.clear
+      end
+    end
+
     # Calling inspect may trigger a bunch of loads, but it's mainly for debugging, so no worries.
     def inspect
       values = self.class.delegates.keys.map {|r| "#{r}:#{send(r).inspect}"}
@@ -19,6 +27,7 @@ module ActiveFedora
 
     private
     def array_reader(field, *args)
+      raise UnknownAttributeError, "#{self.class} does not have an attribute `#{field}'" unless self.class.delegates.key?(field)
       if args.present?
         instance_exec(*args, &self.class.delegates[field][:reader])
       else
@@ -27,6 +36,7 @@ module ActiveFedora
     end
 
     def array_setter(field, args)
+      raise UnknownAttributeError, "#{self.class} does not have an attribute `#{field}'" unless self.class.delegates.key?(field)
       instance_exec(args, &self.class.delegates[field][:setter])
     end
 
@@ -68,6 +78,7 @@ module ActiveFedora
           raise ArgumentError, "Target is required"
         end
         if ds_specs.has_key? to.to_s 
+          define_attribute_method fields.first
           create_delegate_reader(fields.first, options)
           create_delegate_setter(fields.first, options)
         else
@@ -95,6 +106,7 @@ module ActiveFedora
       #   foo.field3                 # => NoMethodError: undefined method `field3' for #<Foo:0x1af30c>
 
       def delegate_to(datastream,fields,args={})
+        define_attribute_methods fields
         fields.each do |f|
           args.merge!({:to=>datastream})
           create_delegate_reader(f, args)
@@ -139,6 +151,7 @@ module ActiveFedora
         self.delegates[field] ||= {}
         self.delegates[field][:setter] = lambda do |v|
           ds = self.send(args[:to])
+          self.send("#{field}_will_change!") unless v == array_reader(field)
           if ds.kind_of?(ActiveFedora::RDFDatastream)
             ds.send("#{field}=", v)
           else

data/lib/active_fedora/querying.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Querying
-    delegate :find, :first, :where, :limit, :order, :all, :delete_all, :destroy_all, :count, :to=>:relation
+    delegate :find, :first, :where, :limit, :order, :all, :delete_all, :destroy_all, :count, :last, :to=>:relation
 
     def self.extended(base)
       base.class_attribute  :solr_query_handler
@@ -138,6 +138,8 @@ module ActiveFedora
         end
         if value.is_a? Array
           value.map { |val| "#{key}:#{quote_for_solr(val)}" }
+        elsif value.is_a? String and value.empty?
+          "-#{key}:['' TO *]"
         else
           key = SOLR_DOCUMENT_ID if (key === :id || key === :pid)
           escaped_value = quote_for_solr(value)

data/lib/active_fedora/rdf/node_config.rb

@@ -1,9 +1,10 @@
 module ActiveFedora
   module Rdf
     class NodeConfig
-      attr_accessor :predicate, :class_name, :type, :behaviors, :multivalue
+      attr_accessor :predicate, :term, :class_name, :type, :behaviors, :multivalue
 
-      def initialize(predicate, args={})
+      def initialize(term, predicate, args={})
+        self.term = term
         self.predicate = predicate
         self.class_name = args.delete(:class_name)
         self.multivalue = args.delete(:multivalue) { true } 

data/lib/active_fedora/rdf_node.rb

@@ -44,16 +44,12 @@ module ActiveFedora
     # @param [Symbol] term the term to get the values for
     def get_values(subject, term)
       options = config_for_term_or_uri(term)
-      predicate = options.predicate
       @target ||= {}
-      @target[term.to_s] ||= TermProxy.new(self, subject, predicate, options)
+      @target[term.to_s] ||= TermProxy.new(self, subject, options)
     end
 
-    def target_class(predicate)
-      _, conf = self.class.config_for_predicate(predicate)
-      class_name = conf.class_name
-      return nil unless class_name
-      ActiveFedora.class_from_string(class_name, self.class)
+    def target_class(conf)
+      ActiveFedora.class_from_string(conf.class_name, self.class) if conf.class_name
     end
 
     def mark_for_destruction
@@ -94,7 +90,7 @@ module ActiveFedora
 
       @target ||= {}
       proxy = @target[term.to_s]
-      proxy ||= TermProxy.new(self, subject, predicate, options)
+      proxy ||= TermProxy.new(self, subject, options)
       proxy.reset!
       proxy
 
@@ -190,18 +186,6 @@ module ActiveFedora
       q.execute(graph, &block)
     end
 
-    def method_missing(name, *args)
-      if md = /^([^=]+)=$/.match(name.to_s)
-          set_value(rdf_subject, md[1], *args)  
-      elsif find_predicate(name)
-          get_values(rdf_subject, name)
-      else 
-        super
-      end
-    rescue ActiveFedora::UnregisteredPredicateError
-      super
-    end
-
     private
 
     def remove_existing_values(subject, predicate, values)
@@ -244,6 +228,7 @@ module ActiveFedora
     class Builder
       def initialize(parent)
         @parent = parent
+        @parent.create_node_accessor(:type)
       end
 
       def build(&block)
@@ -252,20 +237,38 @@ module ActiveFedora
 
       def method_missing(name, *args, &block)
         args = args.first if args.respond_to? :first
-        raise "mapping must specify RDF vocabulary as :in argument" unless args.has_key? :in
+        raise "mapping for '#{name}' must specify RDF vocabulary as :in argument" unless args.kind_of?(Hash) && args.has_key?(:in)
         vocab = args.delete(:in)
         field = args.delete(:to) {name}.to_sym
         raise "Vocabulary '#{vocab.inspect}' does not define property '#{field.inspect}'" unless vocab.respond_to? field
-        @parent.config[name] = Rdf::NodeConfig.new(vocab.send(field), args).tap do |config|
+        @parent.config[name] = Rdf::NodeConfig.new(name, vocab.send(field), args).tap do |config|
           config.with_index(&block) if block_given?
         end
+
+        @parent.create_node_accessor(name)
       end
 
     end
 
     module ClassMethods
+
+      def create_node_accessor(name)
+        class_eval <<-eoruby, __FILE__, __LINE__ + 1
+            def #{name}=(*args)
+              set_value(rdf_subject, :#{name}, *args)
+            end
+            def #{name}
+              get_values(rdf_subject, :#{name})
+            end
+        eoruby
+      end
+
       def config
-        @config ||= {}.with_indifferent_access
+        @config ||= if superclass.respond_to? :config
+          superclass.config.dup
+        else
+          {}.with_indifferent_access
+        end
       end
 
       # List of symbols representing the fields for this terminology.
@@ -289,7 +292,7 @@ module ActiveFedora
       def rdf_type(uri_or_string=nil)
         if uri_or_string
           uri = uri_or_string.kind_of?(RDF::URI) ? uri_or_string : RDF::URI.new(uri_or_string) 
-          self.config[:type] = Rdf::NodeConfig.new(RDF.type)
+          self.config[:type] = Rdf::NodeConfig.new(:type, RDF.type)
           @rdf_type = uri
           logger.warn "Duplicate RDF Class. Trying to register #{self} for #{uri} but it is already registered for #{ActiveFedora::RdfNode.rdf_registry[uri]}" if ActiveFedora::RdfNode.rdf_registry.key? uri
           ActiveFedora::RdfNode.rdf_registry[uri] = self

data/lib/active_fedora/rdf_node/term_proxy.rb

@@ -2,24 +2,23 @@ module ActiveFedora
   module RdfNode
     class TermProxy
 
-      attr_reader :parent, :subject, :predicate, :options
+      attr_reader :parent, :subject, :options
       delegate *(Array.public_instance_methods - [:__send__, :__id__, :class, :object_id] + [:as_json]), :to => :target
       
 
       # @param parent RdfNode
       # @param subject RDF::URI
       # @param options Hash
-      def initialize(parent, subject, predicate, options)
+      def initialize(parent, subject, options)
         @parent = parent
         @subject = subject
-        @predicate = predicate
         @options = options
       end
 
 
       def build(attributes={})
         node = mint_node(attributes)
-        parent.insert_child(predicate, node)
+        parent.insert_child(options.predicate, node)
         reset!
         new_node = target.find { |n| n.rdf_subject == node.rdf_subject}
         new_node = node unless new_node #if it's a list, the find doesn't work, just use the new node
@@ -27,9 +26,13 @@ module ActiveFedora
         new_node
       end
 
+      def first_or_create(attributes={})
+        first || build(attributes)
+      end
+
       # Remove all matching nodes from the graph
       def clear
-        parent.query(subject, predicate).each do |solution|
+        parent.query(subject, options.predicate).each do |solution|
           # TODO - Recursive delete
           # Delete everythign we're pointing at.
           parent.graph.delete([solution.value, nil, nil]) if solution.value.uri?
@@ -47,20 +50,20 @@ module ActiveFedora
       # @option attributes id the rdf subject to use for the node, if omitted the new node will be a b-node
       def mint_node(attributes)
         new_subject = attributes.key?('id') ? RDF::URI.new(attributes.delete('id')) : RDF::Node.new
-        return parent.target_class(predicate).new(parent.graph, new_subject).tap do |node|
+        return parent.target_class(options).new(parent.graph, new_subject).tap do |node|
           node.attributes = attributes if attributes
         end
       end
 
       def <<(*values)
-        values.each { |value| parent.append(subject, predicate, value) }
+        values.each { |value| parent.append(subject, options.predicate, value) }
         reset!
         values
       end
 
       def delete(*values)
         values.each do |value| 
-          parent.delete_predicate(subject, predicate, value)
+          parent.delete_predicate(subject, options.predicate, value)
         end
 
         values
@@ -74,7 +77,7 @@ module ActiveFedora
       def load_values
         values = []
 
-        parent.query(subject, predicate).each do |solution|
+        parent.query(subject, options.predicate).each do |solution|
           v = solution.value
           v = v.to_s if v.is_a? RDF::Literal
           if options.type == :date
@@ -100,7 +103,7 @@ module ActiveFedora
       private 
 
       def target_class
-        parent.target_class(predicate)
+        parent.target_class(options)
       end
 
       # Look for a RDF.type assertion on this node to see if an RDF class is specified.
@@ -108,7 +111,7 @@ module ActiveFedora
       # If no RDF.type assertion is found, fall back to using target_class
       def class_from_rdf_type(subject)
         unless subject.kind_of?(RDF::Node) || subject.kind_of?(RDF::URI)
-          raise ArgumentError, "Expected the value of #{predicate} to be an RDF object but it is a #{subject.class} #{subject.inspect}"
+          raise ArgumentError, "Expected the value of #{options.predicate} to be an RDF object but it is a #{subject.class} #{subject.inspect}"
         end
         q = RDF::Query.new do
           pattern [subject, RDF.type, :value]

data/lib/active_fedora/relation.rb

@@ -1,6 +1,8 @@
 module ActiveFedora
   class Relation
 
+    delegate :map, :each, :collect, :all?, :include?, :to => :to_a
+
     attr_reader :loaded
     alias :loaded? :loaded
 
@@ -33,6 +35,20 @@ module ActiveFedora
       end
     end
 
+    # Returns the last record sorted by id.  ID was chosen because this mimics
+    # how ActiveRecord would achieve the same behavior.
+    #
+    # @example
+    #  Person.where(name_t: 'Jones').last
+    #    => #<Person @id="foo:123" @name='Jones' ... >
+    def last
+      if loaded?
+        @records.last
+      else
+        @last ||= order('id desc').limit(1).to_a[0]
+      end
+    end
+
     # Limits the number of returned records to the value specified
     #
     # @option [Integer] value the number of records to return

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.4.5"
+  VERSION = "6.5.0"
 end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -107,13 +107,34 @@ END
       ds.parts.first.label.should == ['Wheel bearing']
     end
 
+    it "should not create a child node when hitting the accessor" do
+      ds.parts
+      ds.parts.first.should be_nil
+      ds.serialize.should == ''
+    end
+
     it "should build complex objects when a parent node exists" do
-      ds.parts  #this creates a parts node, but it shouldn't
       part = ds.parts.build
       part.should be_kind_of SpecDatastream::Component
       part.label = "Wheel bearing"
       ds.parts.first.label.should == ['Wheel bearing']
     end
+
+    describe "#first_or_create" do
+      it "should return a result if the predicate exists" do
+        part1 = ds.parts.build
+        part2 = ds.parts.build
+        ds.parts.first_or_create.should == part1
+      end
+
+      it "should create a new result if the predicate doesn't exist" do
+        ds.parts.should == []
+        part = ds.parts.first_or_create(label: 'Front control arm bushing')
+        part.label.should == ['Front control arm bushing']
+        ds.parts.should == [part]
+      end
+
+    end
   end
 
 
@@ -229,6 +250,10 @@ END
         ds.series.first.type.first.to_s.should == 'http://www.ebu.ch/metadata/ontologies/ebucore#Series' 
       end
 
+      it "should create an object of the correct type" do
+        ds.program.build.should be_kind_of SpecDatastream::Program
+        ds.series.build.should be_kind_of SpecDatastream::Series
+      end
     end
   end
 end

data/spec/integration/delegating_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "delegating objects" do
+  before :all do
+    class TitledObject < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"foo" do |m|
+        m.field "title", :string
+      end
+      delegate :title, :to=>'foo', :unique=>true
+    end
+  end
+  after :all do
+    Object.send(:remove_const, :TitledObject)
+  end
+
+  describe "save" do
+    subject do
+      obj = TitledObject.create 
+      obj.title = "Hydra for Dummies"
+      obj.save
+      obj
+    end
+    it "should keep a list of changes after a successful save" do
+      subject.previous_changes.should_not be_empty
+      subject.previous_changes.keys.should include("title")
+    end
+    it "should clean out changes" do
+      subject.title_changed?.should be_false
+      subject.changes.should be_empty
+    end
+  end
+end

data/spec/integration/relation_delegation_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe ActiveFedora::Model do
+  
+  before(:all) do 
+    module ModelIntegrationSpec
+      class Basic < ActiveFedora::Base
+        has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
+          m.field "foo", :string
+          m.field "bar", :string
+          m.field "baz", :string
+        end
+
+        delegate_to :properties, [:foo, :bar, :baz]
+
+        def to_solr(doc = {})
+          doc = super
+          doc[ActiveFedora::SolrService.solr_name('foo', :sortable)] = doc[ActiveFedora::SolrService.solr_name('foo', type: :string)]
+          doc
+        end
+      
+      end
+    end
+
+  end
+  
+  after(:all) do
+    Object.send(:remove_const, :ModelIntegrationSpec)
+  end
+
+
+  describe "with multiple objects" do
+    let!(:instance1){ ModelIntegrationSpec::Basic.create!(:foo=>'Beta', :bar=>'Chips')}
+    let!(:instance2){ ModelIntegrationSpec::Basic.create!(:foo=>'Alpha', :bar=>'Peanuts')}
+    let!(:instance3){ ModelIntegrationSpec::Basic.create!(:foo=>'Sigma', :bar=>'Peanuts')}
+
+    after { ModelIntegrationSpec::Basic.delete_all }
+
+    subject { ModelIntegrationSpec::Basic.where(bar: 'Peanuts') }
+
+    it "should map" do
+      subject.map(&:id).should == [instance2.id, instance3.id]
+    end
+
+    it "should collect" do
+      subject.collect(&:id).should == [instance2.id, instance3.id]
+    end
+
+    it "should have each" do
+      t = double
+      t.should_receive(:foo).twice
+      subject.each { t.foo }
+    end
+
+    it "should have all?" do
+      expect(subject.all? { |t| t.foo == ['Alpha']}).to be_false
+      expect(subject.all? { |t| t.bar == ['Peanuts']}).to be_true
+    end
+
+    it "should have include?" do
+      expect(subject.include?(instance1)).to be_false
+      expect(subject.include?(instance2)).to be_true
+    end
+  end
+end
+
+

data/spec/unit/base_delegate_spec.rb

@@ -58,9 +58,7 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :BarHistory2)
     end
 
-    before :each do
-      @n = BarHistory2.new()
-    end
+    subject { BarHistory2.new() }
 
     it "should reveal the unique properties" do
       BarHistory2.unique?(:fubar).should be_true
@@ -68,40 +66,54 @@ describe ActiveFedora::Base do
     end
 
     it "should save a delegated property uniquely" do
-      @n.fubar="Quack"
-      @n.fubar.should == "Quack"
-      @n.withText.get_values(:fubar).first.should == 'Quack'
-      @n.donkey="Bray"
-      @n.donkey.should == "Bray"
-      @n.xmlish.term_values(:donkey).first.should == 'Bray'
+      subject.fubar="Quack"
+      subject.fubar.should == "Quack"
+      subject.withText.get_values(:fubar).first.should == 'Quack'
+      subject.donkey="Bray"
+      subject.donkey.should == "Bray"
+      subject.xmlish.term_values(:donkey).first.should == 'Bray'
     end
 
     it "should allow passing parameters to the delegate accessor" do
-      @n.cow=["one", "two"]
-      @n.cow(1).should == ['two']
+      subject.cow=["one", "two"]
+      subject.cow(1).should == ['two']
     end
 
 
     it "should return an array if not marked as unique" do
       ### Metadata datastream does not appear to support multiple value setting
-      @n.cow=["one", "two"]
-      @n.cow.should == ["one", "two"]
+      subject.cow=["one", "two"]
+      subject.cow.should == ["one", "two"]
     end
 
     it "should be able to delegate deeply into the terminology" do
-      @n.duck=["Quack", "Peep"]
-      @n.duck.should == ["Quack", "Peep"]
+      subject.duck=["Quack", "Peep"]
+      subject.duck.should == ["Quack", "Peep"]
+    end
+
+    it "should be able to track change status" do
+      subject.fubar_changed?.should be_false
+      subject.fubar = "Meow"
+      subject.fubar_changed?.should be_true
     end
 
     describe "array getters and setters" do
       it "should accept symbol keys" do
-        @n[:duck]= ["Cluck", "Gobble"]
-        @n[:duck].should == ["Cluck", "Gobble"]
+        subject[:duck]= ["Cluck", "Gobble"]
+        subject[:duck].should == ["Cluck", "Gobble"]
       end
 
       it "should accept string keys" do
-        @n['duck']= ["Cluck", "Gobble"]
-        @n['duck'].should == ["Cluck", "Gobble"]
+        subject['duck']= ["Cluck", "Gobble"]
+        subject['duck'].should == ["Cluck", "Gobble"]
+      end
+
+      it "should raise an error on the reader when the field isn't delegated" do
+        expect {subject['goose'] }.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
+      end
+
+      it "should raise an error on the setter when the field isn't delegated" do
+        expect {subject['goose']="honk" }.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
       end
     end
 
@@ -128,7 +140,50 @@ describe ActiveFedora::Base do
       subject.donkey=["Bray", "Hee-haw"]
       subject.donkey.should == ["Bray", "Hee-haw"]
     end
+
+    it "should be able to track change status" do
+      subject.cow_changed?.should be_false
+      subject.cow = ["Moo"]
+      subject.cow_changed?.should be_true
+    end 
   end
+
+  describe "with a RDF datastream" do
+    before :all do
+      class BarRdfDatastream < ActiveFedora::NtriplesRDFDatastream
+        map_predicates do |map|
+          map.title(in: RDF::DC)
+          map.description(in: RDF::DC, multivalue: false)
+        end
+      end
+      class BarHistory4 < ActiveFedora::Base
+        has_metadata 'rdfish', :type=>BarRdfDatastream
+        delegate_to 'rdfish', [:title, :description]
+      end
+    end
+
+    after :all do
+      Object.send(:remove_const, :BarHistory4)
+      Object.send(:remove_const, :BarRdfDatastream)
+    end
+
+    subject { BarHistory4.new }
+
+    describe "with a multivalued field" do
+      it "should be able to track change status" do
+        subject.title_changed?.should be_false
+        subject.title = ["Title1", "Title2"]
+        subject.title_changed?.should be_true
+      end
+    end
+    describe "with a single-valued field" do
+      it "should be able to track change status" do
+        subject.description_changed?.should be_false
+        subject.description = "A brief description"
+        subject.description_changed?.should be_true
+      end
+    end
+  end 
 end
 
 

data/spec/unit/base_delegate_to_spec.rb

@@ -63,6 +63,12 @@ describe ActiveFedora::Base do
       @n.duck.should == ["Quack", "Peep"]
     end
 
+    it "should be able to track change status" do
+      @n.chicken_changed?.should be_false
+      @n.chicken = ["Cheep"]
+      @n.chicken_changed?.should be_true
+    end 
+
   end
 end
 

data/spec/unit/query_spec.rb

@@ -82,6 +82,10 @@ describe ActiveFedora::Base do
         SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']}).should == ["Fake Object1", "Fake Object2"]
       end
 
+      it "should correctly query for empty strings" do
+        SpecModel::Basic.find( :active_fedora_model_ssi => '').count.should == 0
+      end
+
       it "should add options" do
         SpecModel::Basic.should_receive(:find_one).with("changeme:30", nil).and_return("Fake Object1")
         SpecModel::Basic.should_receive(:find_one).with("changeme:22", nil).and_return("Fake Object2")
@@ -188,6 +192,48 @@ describe ActiveFedora::Base do
       ActiveFedora::Base.count(:conditions=>'foo:bar').should == 7 
     end
   end
+
+  describe '#last' do
+    describe 'with multiple objects' do
+      before(:all) do
+        (@a, @b, @c) = 3.times {SpecModel::Basic.create!}
+      end
+      it 'should return one object' do
+        SpecModel::Basic.class == SpecModel::Basic
+      end
+      it 'should return the last object sorted by pid' do
+        SpecModel::Basic.last == @c
+        SpecModel::Basic.last != @a 
+      end
+    end
+    describe 'with one object' do 
+      it 'should equal the first object when there is only one' do
+        a = SpecModel::Basic.create!
+        SpecModel::Basic.first == SpecModel::Basic.last
+      end
+    end
+  end
+
+  describe '#first' do
+    describe 'with multiple objects' do
+      before(:all) do
+        (@a, @b, @c) = 3.times {SpecModel::Basic.create!}
+      end
+      it 'should return one object' do
+        SpecModel::Basic.class == SpecModel::Basic
+      end
+      it 'should return the last object sorted by pid' do
+        SpecModel::Basic.first == @a
+        SpecModel::Basic.first != @c 
+      end
+    end
+    describe 'with one object' do 
+      it 'should equal the first object when there is only one' do
+        a = SpecModel::Basic.create!
+        SpecModel::Basic.first == SpecModel::Basic.last
+      end
+    end
+  end
   
   describe '#find_with_conditions' do
     it "should make a query to solr and return the results" do

data/spec/unit/rdf_node_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe ActiveFedora::RdfNode do
+  describe "inheritance" do
+    before do
+      class Parent
+        include ActiveFedora::RdfObject
+        map_predicates do |map|
+          map.title(in: RDF::DC)
+        end
+      end
+
+      class Child < Parent
+        map_predicates do |map|
+          map.description(in: RDF::DC)
+        end
+      end
+
+    end
+    after do
+      Object.send(:remove_const, :Child)
+      Object.send(:remove_const, :Parent)
+    end
+
+    describe "child class" do
+      it "should inherit the terms" do
+        Child.config.keys.should == ['title', 'description']
+      end
+    end
+    describe "parent class" do
+      it "should not be infected with the child terms" do
+        Parent.config.keys.should == ['title']
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.4.5
+  version: 6.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,25 +11,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -36,6 +40,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,82 +48,93 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nom-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mediashelf-loggable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -126,6 +142,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -133,141 +150,161 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveFedora provides for creating and managing objects in the Fedora
@@ -420,6 +457,7 @@ files:
 - spec/integration/datastream_collections_spec.rb
 - spec/integration/datastream_spec.rb
 - spec/integration/datastreams_spec.rb
+- spec/integration/delegating_spec.rb
 - spec/integration/delete_all_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/has_many_associations_spec.rb
@@ -429,6 +467,7 @@ files:
 - spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
 - spec/integration/rdf_nested_attributes_spec.rb
+- spec/integration/relation_delegation_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/scoped_query_spec.rb
 - spec/integration/solr_instance_loader_spec.rb
@@ -513,6 +552,7 @@ files:
 - 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_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
@@ -534,26 +574,30 @@ files:
 homepage: https://github.com/projecthydra/active_fedora
 licenses:
 - APACHE2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4121996905287829806
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files:
 - spec/config_helper.rb
@@ -581,6 +625,7 @@ test_files:
 - spec/integration/datastream_collections_spec.rb
 - spec/integration/datastream_spec.rb
 - spec/integration/datastreams_spec.rb
+- spec/integration/delegating_spec.rb
 - spec/integration/delete_all_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/has_many_associations_spec.rb
@@ -590,6 +635,7 @@ test_files:
 - spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
 - spec/integration/rdf_nested_attributes_spec.rb
+- spec/integration/relation_delegation_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/scoped_query_spec.rb
 - spec/integration/solr_instance_loader_spec.rb
@@ -674,6 +720,7 @@ test_files:
 - 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_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5c3b9301740101d4e6c50bd6d5ce3f8e6bdf5d48
-  data.tar.gz: 84fed4e80fc0a7d1f5d2123836867f804427f797
-SHA512:
-  metadata.gz: 70b1bcb60f130c770e54866396de53f876d3529b0befce9bcfc180fe6b2540630c7b4df492057fe7dd4e2406b3cd35ecb9cd1a675af3f3ff0591be4716d752ba
-  data.tar.gz: d66329975f4374c0a46102235195760b1ac72ef7bddba684f9bbe6af16d2b2fc65cec3f7c526bed7870b0b38cb4a38569d480fce812b35b02e146306e5ec1543