active-fedora 6.0.0.rc3 → 6.0.0.rc4

data/History.txt

@@ -4,6 +4,8 @@ Added support for RDF lists
 RDF does not index terms by default
 count is now a scoped query.
 ActiveFedora::Base.reindex_everything
+RDF terms can store empty string
+Access properties by using hash notation.
 
 5.6.1
 Fixed delegating enumerable methods (join, [], each_with_index, to_a, etc) on an RdfNode::TermProxy

data/active-fedora.gemspec

@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency("jettywrapper", ">=1.2.0")
   s.add_development_dependency("rspec", ">= 2.9.0")
   s.add_development_dependency("equivalent-xml")
+  s.add_development_dependency("rest-client")
+  s.add_development_dependency("webmock")
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/active_fedora/delegating.rb

@@ -2,18 +2,38 @@ module ActiveFedora
   module Delegating
     extend ActiveSupport::Concern
 
-    included do
-      class_attribute  :delegate_registry
-      self.delegate_registry = []
-    end
-
     # Calling inspect may trigger a bunch of loads, but it's mainly for debugging, so no worries.
     def inspect
-      values = delegate_registry.map {|r| "#{r}:#{send(r).inspect}"}
+      values = self.class.delegate_registry.map {|r| "#{r}:#{send(r).inspect}"}
       "#<#{self.class} pid:\"#{pretty_pid}\", #{values.join(', ')}>"
     end
 
+    def [](key)
+      array_reader(key)
+    end
+
+    def []=(key, value)
+      array_setter(key, value)
+    end
+
+    private
+    def array_reader(field)
+      instance_exec(&self.class.delegates[field][:reader])
+    end
+
+    def array_setter(field, args)
+      instance_exec(args, &self.class.delegates[field][:setter])
+    end
+
     module ClassMethods
+      def delegates
+        @delegates ||= {}
+      end
+
+      def delegates= val
+        @delegates = val
+      end
+
       # Provides a delegate class method to expose methods in metadata streams
       # as member of the base object. Pass the target datastream via the
       # <tt>:to</tt> argument. If you want to return a unique result, (e.g. string
@@ -34,10 +54,13 @@ module ActiveFedora
       #   foo.field2                 # => NoMethodError: undefined method `field2' for #<Foo:0x1af30c>
 
       def delegate(field, args ={})
-        create_delegate_accessor(field, args)
+        create_delegate_reader(field, args)
         create_delegate_setter(field, args)
       end
 
+      def delegate_registry
+        self.delegates.keys
+      end
 
       # Allows you to delegate multiple terminologies to the same datastream, instead
       # having to call the method each time for each term.  The target datastream is the
@@ -60,28 +83,34 @@ module ActiveFedora
       def delegate_to(datastream,fields,args={})
         fields.each do |f|
           args.merge!({:to=>datastream})
-          create_delegate_accessor(f, args)
+          create_delegate_reader(f, args)
           create_delegate_setter(f, args)
         end
       end
 
       private
-      def create_delegate_accessor(field, args)
-        self.delegate_registry += [field]
-        define_method field do
+      def create_delegate_reader(field, args)
+        self.delegates[field] ||= {}
+        self.delegates[field][:reader] = lambda do
           ds = self.send(args[:to])
-          val = if ds.kind_of?(ActiveFedora::RDFDatastream)
-                  ds.send(field)
-                else
-                  terminology = args[:at] || [field]
-                  ds.send(:term_values, *terminology)
-                end
+          if ds.kind_of?(ActiveFedora::RDFDatastream)
+            ds.send(field)
+          else
+            terminology = args[:at] || [field]
+            ds.send(:term_values, *terminology)
+          end
+        end
+
+        define_method field do
+          val = self[field]
           args[:unique] ? val.first : val
         end
       end
 
+
       def create_delegate_setter(field, args)
-        define_method "#{field}=".to_sym do |v|
+        self.delegates[field] ||= {}
+        self.delegates[field][:setter] = lambda do |v|
           ds = self.send(args[:to])
           if ds.kind_of?(ActiveFedora::RDFDatastream)
             ds.send("#{field}=", v)
@@ -90,7 +119,11 @@ module ActiveFedora
             ds.send(:update_indexed_attributes, {terminology => v})
           end
         end
+        define_method "#{field}=".to_sym do |v|
+          self[field]=v
+        end
       end
+
     end
   end
 end

data/lib/active_fedora/rdf_node.rb

@@ -54,7 +54,6 @@ module ActiveFedora
           graph.insert([subject, predicate, arg.rdf_subject ])
         else
           arg = arg.to_s if arg.kind_of? RDF::Literal
-          next if arg.kind_of?(String) && arg.empty?
 
           graph.insert([subject, predicate, arg])
         end

data/lib/active_fedora/rspec_matchers.rb

@@ -0,0 +1,8 @@
+module ActiveFedora
+  # in ./spec/spec_helper.rb
+  # ``` require 'active_fedora/rspec_matchers' ```
+  module RspecMatchers
+  end
+end
+pattern = Dir.glob(File.join(File.dirname(__FILE__), 'rspec_matchers/*_matcher.rb'))
+pattern.each { |f| require f }

data/lib/active_fedora/rspec_matchers/belong_to_associated_active_fedora_object_matcher.rb

@@ -0,0 +1,33 @@
+# RSpec matcher to spec delegations.
+RSpec::Matchers.define :belong_to_associated_active_fedora_object do |association_name|
+  match do |subject|
+    @association_name = association_name
+    if @association_name.nil? || @expected_object.nil?
+      raise(
+        ArgumentError,
+        "subject.should belong_to_associated_active_fedora_object(<association_name>).with_object(<object>)"
+      )
+    end
+
+    @subject = subject.class.find(subject.pid)
+    @actual_object = @subject.send(@association_name)
+
+    @expected_object == @actual_object
+  end
+
+  chain(:with_object) { |object| @expected_object = object }
+
+
+  description do
+    "#{@subject.class} PID=#{@subject.pid} association: #{@association_name.inspect} matches ActiveFedora"
+  end
+
+  failure_message_for_should do |text|
+    "expected #{@subject.class} PID=#{@subject.pid} association: #{@association_name.inspect} to match"
+  end
+
+  failure_message_for_should_not do |text|
+    "expected #{@subject.class} PID=#{@subject.pid} association: #{@association_name.inspect} to NOT match"
+  end
+
+end

data/lib/active_fedora/rspec_matchers/have_many_associated_active_fedora_objects_matcher.rb

@@ -0,0 +1,45 @@
+# RSpec matcher to spec delegations.
+
+RSpec::Matchers.define :have_many_associated_active_fedora_objects do |association_name|
+  match do |subject|
+    @association_name = association_name
+    if @association_name.nil? || !@expected_objects.respond_to?(:count)
+      raise(
+        ArgumentError,
+        "subject.should have_many_associated_active_fedora_objects(<association_name>).with_objects(<objects[]>)"
+      )
+    end
+
+    @subject = subject.class.find(subject.pid)
+    @actual_objects = @subject.send(@association_name)
+
+    if @expected_objects
+      actual_count = @actual_objects.count
+      expected_count = @expected_objects.count
+      if actual_count != expected_count
+        raise(
+          RSpec::Expectations::ExpectationNotMetError,
+          "#{@subject.class} PID=#{@subject.pid} relationship: #{@association_name.inspect} count <Expected Count: #{expected_count}> <Actual: #{actual_count}>"
+        )
+      end
+      intersection = @actual_objects & @expected_objects
+      intersection.count == @expected_objects.count
+    end
+  end
+
+  chain(:with_objects) { |objects| @expected_objects = objects }
+
+
+  description do
+    "#{@subject.class} PID=#{@subject.pid} association: #{@association_name.inspect} matches ActiveFedora"
+  end
+
+  failure_message_for_should do |text|
+    "expected #{@subject.class} PID=#{@subject.pid} association: #{@association_name.inspect} to match"
+  end
+
+  failure_message_for_should_not do |text|
+    "expected #{@subject.class} PID=#{@subject.pid} association: #{@association_name.inspect} to NOT match"
+  end
+
+end

data/lib/active_fedora/rspec_matchers/have_predicate_matcher.rb

@@ -0,0 +1,47 @@
+# RSpec matcher to spec delegations.
+
+RSpec::Matchers.define :have_predicate do |predicate|
+  match do |subject|
+    @predicate = predicate
+    if @predicate.nil? || !@expected_objects.respond_to?(:count)
+      raise(
+        ArgumentError,
+        "subject.should have_predicate(<predicate>).with_objects(<objects[]>)"
+      )
+    end
+    @subject = subject.class.find(subject.pid)
+    @actual_objects = @subject.relationships(predicate)
+
+    if @expected_objects
+      actual_count = @actual_objects.count
+      expected_count = @expected_objects.count
+      if actual_count != expected_count
+        raise(
+          RSpec::Expectations::ExpectationNotMetError,
+          "#{@subject.class} PID=#{@subject.pid} relationship: #{@predicate.inspect} count <Expected Count: #{expected_count}> <Actual: #{actual_count}>"
+        )
+      end
+      intersection = @actual_objects.collect do |ao|
+        internal_uri = ao.respond_to?(:internal_uri) ? ao.internal_uri : ao
+      end & @expected_objects
+
+      intersection.count == @expected_objects.count
+    end
+  end
+
+  chain(:with_objects) { |objects| @expected_objects = objects }
+
+
+  description do
+    "#{@subject.class} PID=#{@subject.pid} relationship: #{@predicate.inspect} matches Fedora"
+  end
+
+  failure_message_for_should do |text|
+    "expected #{@subject.class} PID=#{@subject.pid} relationship: #{@predicate.inspect} to match"
+  end
+
+  failure_message_for_should_not do |text|
+    "expected #{@subject.class} PID=#{@subject.pid} relationship: #{@predicate.inspect} to NOT match"
+  end
+
+end

data/lib/active_fedora/rspec_matchers/match_fedora_datastream_matcher.rb

@@ -0,0 +1,41 @@
+# RSpec matcher to spec delegations.
+
+RSpec::Matchers.define :match_fedora_datastream do |method|
+  match do |object|
+    @method = method
+    @object = object
+    if @expected_xml.nil?
+      raise(
+        ArgumentError,
+        "match_fedora_datastream(<datastream_name>).with(<expected_xml>)"
+      )
+    end
+    expected = Nokogiri::XML(@expected_xml)
+
+    base_url = ActiveFedora.config.credentials[:url]
+    @fedora_datastream_url = File.join(
+      base_url, 'objects', @object.pid.to_s,'datastreams', @method, 'content'
+    )
+
+    response = RestClient.get(@fedora_datastream_url)
+
+    actual = Nokogiri::XML(response.body)
+
+    EquivalentXml.equivalent?(expected, actual, :normalize_whitespace => true)
+  end
+
+  chain(:with) { |expected_xml| @expected_xml = expected_xml }
+
+  description do
+    "#{@object.class} PID=#{@object.pid} datastream: #{@method.inspect} matches Fedora"
+  end
+
+  failure_message_for_should do |text|
+    "expected #{@object.class} PID=#{@object.pid} datastream: #{@method.inspect} to match Fedora"
+  end
+
+  failure_message_for_should_not do |text|
+    "expected #{@object.class} PID=#{@object.pid} datastream: #{@method.inspect} to NOT match Fedora"
+  end
+
+end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.rc3"
+  VERSION = "6.0.0.rc4"
 end

data/spec/integration/ntriples_datastream_spec.rb

@@ -117,13 +117,6 @@ describe ActiveFedora::NtriplesRDFDatastream do
     @subject.part << "thing 2"
     @subject.part.should == ["thing 1", "thing 2"]
   end
-  it "should delete a value" do
-    @subject.title = "Hamlet"
-    @subject.save
-    @subject.title = ""
-    @subject.save
-    @subject.title.should be_nil
-  end
 
   it "should be able to save a blank document" do
     @subject.title = ""
@@ -170,13 +163,17 @@ describe ActiveFedora::NtriplesRDFDatastream do
     @subject.title = "Hamlet"
     @subject.related_url = "http://psu.edu/"
     @subject.related_url << "http://projecthydra.org/"
-    @subject.save
+
     @subject.title.should == "Hamlet"
     @subject.related_url.should include("http://psu.edu/")
     @subject.related_url.should include("http://projecthydra.org/")
-    @subject.title = ""
+
+    @subject.title = "" #empty string can be meaningful, don't assume delete.
+    @subject.title.should == ''
+
+    @subject.title = nil
     @subject.related_url.delete("http://projecthydra.org/")
-    @subject.save
+
     @subject.title.should be_nil
     @subject.related_url.should == ["http://psu.edu/"]
   end

data/spec/unit/base_delegate_spec.rb

@@ -50,6 +50,7 @@ describe ActiveFedora::Base do
     before :each do
       @n = BarHistory2.new()
     end
+
     it "should save a delegated property uniquely" do
       @n.fubar="Quack"
       @n.fubar.should == "Quack"
@@ -69,6 +70,10 @@ describe ActiveFedora::Base do
       @n.duck.should == ["Quack", "Peep"]
     end
 
+    it "should accept the array getters and setters" do
+      @n[:duck]= ["Cluck", "Gobble"]
+      @n[:duck].should == ["Cluck", "Gobble"]
+    end
   end
 end
 

data/spec/unit/rdf_datastream_spec.rb

@@ -29,5 +29,10 @@ describe ActiveFedora::RDFDatastream do
       @obj.inner_object.repository.should_not_receive(:datastream_dissemination).with(hash_including(:dsid=>'descMetadata'))
       subject.should_not be_content_changed
     end
+
+    it "should allow asserting an empty string" do
+      @obj.descMetadata.title = ['']
+      @obj.descMetadata.title.should == ['']
+    end
   end
 end

data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb

@@ -0,0 +1,41 @@
+require "spec_helper"
+require 'ostruct'
+require "active_fedora/rspec_matchers/belong_to_associated_active_fedora_object_matcher"
+
+describe RSpec::Matchers, "belong_to_associated_active_fedora_object_matcher" do
+  subject { OpenStruct.new(:pid => pid )}
+  let(:pid) { 123 }
+  let(:object1) { Object.new }
+  let(:object2) { Object.new }
+  let(:association) { :association }
+
+  it 'should match when association is properly stored in fedora' do
+    subject.class.should_receive(:find).with(pid).and_return(subject)
+    subject.should_receive(association).and_return(object1)
+    subject.should belong_to_associated_active_fedora_object(association).with_object(object1)
+  end
+
+  it 'should not match when association is different' do
+    subject.class.should_receive(:find).with(pid).and_return(subject)
+    subject.should_receive(association).and_return(object1)
+    lambda {
+      subject.should belong_to_associated_active_fedora_object(association).with_object(object2)
+    }.should (
+      raise_error(
+        RSpec::Expectations::ExpectationNotMetError,
+        /expected #{subject.class} PID=#{pid} association: #{association.inspect}/
+      )
+    )
+  end
+
+  it 'should require :with_object option' do
+    lambda {
+      subject.should belong_to_associated_active_fedora_object(association)
+    }.should(
+      raise_error(
+        ArgumentError,
+        "subject.should belong_to_associated_active_fedora_object(<association_name>).with_object(<object>)"
+      )
+    )
+  end
+end

data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+require 'ostruct'
+require "active_fedora/rspec_matchers/have_many_associated_active_fedora_objects_matcher"
+
+describe RSpec::Matchers, "have_many_associated_active_fedora_objects_matcher" do
+  subject { OpenStruct.new(:pid => pid )}
+  let(:pid) { 123 }
+  let(:object1) { Object.new }
+  let(:object2) { Object.new }
+  let(:object3) { Object.new }
+  let(:association) { :association }
+
+  it 'should match when association is properly stored in fedora' do
+    subject.class.should_receive(:find).with(pid).and_return(subject)
+    subject.should_receive(association).and_return([object1,object2])
+    subject.should have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
+  end
+
+  it 'should not match when association is different' do
+    subject.class.should_receive(:find).with(pid).and_return(subject)
+    subject.should_receive(association).and_return([object1,object3])
+    lambda {
+      subject.should have_many_associated_active_fedora_objects(association).with_objects([object1, object2])
+    }.should (
+      raise_error(
+        RSpec::Expectations::ExpectationNotMetError,
+        /expected #{subject.class} PID=#{pid} association: #{association.inspect}/
+      )
+    )
+  end
+
+  it 'should require :with_objects option' do
+    lambda {
+      subject.should have_many_associated_active_fedora_objects(association)
+    }.should(
+      raise_error(
+        ArgumentError,
+        "subject.should have_many_associated_active_fedora_objects(<association_name>).with_objects(<objects[]>)"
+      )
+    )
+  end
+end

data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+require 'ostruct'
+require "active_fedora/rspec_matchers/have_predicate_matcher"
+
+describe RSpec::Matchers, "have_predicate_matcher" do
+  subject { OpenStruct.new(:pid => pid )}
+  let(:pid) { 123 }
+  let(:object1) { Object.new }
+  let(:object2) { Object.new }
+  let(:object3) { Object.new }
+  let(:predicate) { :predicate }
+
+  it 'should match when relationship is "what we have in Fedora"' do
+    subject.class.should_receive(:find).with(pid).and_return(subject)
+    subject.should_receive(:relationships).with(predicate).and_return([object1,object2])
+    subject.should have_predicate(predicate).with_objects([object1, object2])
+  end
+
+  it 'should not match when relationship is different' do
+    subject.class.should_receive(:find).with(pid).and_return(subject)
+    subject.should_receive(:relationships).with(predicate).and_return([object1,object3])
+    lambda {
+      subject.should have_predicate(predicate).with_objects([object1, object2])
+    }.should (
+      raise_error(
+        RSpec::Expectations::ExpectationNotMetError,
+        /expected #{subject.class} PID=#{pid} relationship: #{predicate.inspect}/
+      )
+    )
+  end
+
+  it 'should require :with_objects option' do
+    lambda {
+      subject.should have_predicate(predicate)
+    }.should(
+      raise_error(
+        ArgumentError,
+        "subject.should have_predicate(<predicate>).with_objects(<objects[]>)"
+      )
+    )
+  end
+end

data/spec/unit/rspec_matchers/match_fedora_datastream_matcher_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+require 'ostruct'
+require 'webmock/rspec'
+WebMock.allow_net_connect!
+require "active_fedora/rspec_matchers/match_fedora_datastream_matcher"
+
+describe RSpec::Matchers, "match_fedora_datastream" do
+  let(:pid) { 123 }
+  let(:expected_xml) { '<xml><node>Value</node></xml>' }
+  let(:datastream_name) { 'metadata' }
+  let(:datastream_url) {
+    File.join(ActiveFedora.config.credentials[:url], 'objects', pid.to_s,'datastreams', datastream_name, 'content')
+  }
+  subject { OpenStruct.new(:pid => pid )}
+
+  it 'should match based on request' do
+    stub_request(:get, datastream_url).to_return(:body => expected_xml, :status => 200)
+    subject.should match_fedora_datastream(datastream_name).with(expected_xml)
+  end
+
+  it 'should handle non-matching requests' do
+    stub_request(:get, datastream_url).to_return(:body => "<parent>#{expected_xml}</parent>", :status => 200)
+    lambda {
+      subject.should match_fedora_datastream(datastream_name).with(expected_xml)
+    }.should(
+      raise_error(
+        RSpec::Expectations::ExpectationNotMetError,
+        /expected #{subject.class} PID=#{pid} datastream: #{datastream_name.inspect} to match Fedora/
+      )
+    )
+  end
+
+  it 'should require :with option' do
+    stub_request(:get, datastream_url).to_return(:body => "<parent>#{expected_xml}</parent>", :status => 200)
+    lambda {
+      subject.should match_fedora_datastream(datastream_name)
+    }.should(
+      raise_error(
+        ArgumentError,
+        "match_fedora_datastream(<datastream_name>).with(<expected_xml>)"
+      )
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc3
+  version: 6.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -317,6 +317,38 @@ dependencies:
     - - ! '>='
       - !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
   Repository Architecture.
 email:
@@ -392,6 +424,11 @@ files:
 - lib/active_fedora/relation.rb
 - lib/active_fedora/relationship_graph.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
+- lib/active_fedora/rspec_matchers/have_many_associated_active_fedora_objects_matcher.rb
+- lib/active_fedora/rspec_matchers/have_predicate_matcher.rb
+- lib/active_fedora/rspec_matchers/match_fedora_datastream_matcher.rb
 - lib/active_fedora/rubydora_connection.rb
 - lib/active_fedora/semantic_node.rb
 - lib/active_fedora/service_definitions.rb
@@ -546,6 +583,10 @@ files:
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_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
+- spec/unit/rspec_matchers/have_predicate_matcher_spec.rb
+- spec/unit/rspec_matchers/match_fedora_datastream_matcher_spec.rb
 - spec/unit/rubydora_connection_spec.rb
 - spec/unit/semantic_node_spec.rb
 - spec/unit/serializers_spec.rb
@@ -703,6 +744,10 @@ test_files:
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_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
+- spec/unit/rspec_matchers/have_predicate_matcher_spec.rb
+- spec/unit/rspec_matchers/match_fedora_datastream_matcher_spec.rb
 - spec/unit/rubydora_connection_spec.rb
 - spec/unit/semantic_node_spec.rb
 - spec/unit/serializers_spec.rb