ld4l-ore_rdf 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b767899d53f0b995cbc7dfb1c017e17e8db0cea8
-  data.tar.gz: 69ec1e7b6134d0f41459400927bf1d2af6b6466d
+  metadata.gz: 1314057adc8534d80d0ce5eb7916deec18a98afa
+  data.tar.gz: 466427737650c339d24ab57cbb3245f5056a836c
 SHA512:
-  metadata.gz: 247d008f6559131ad4615b9ab285bcce83bedfb20af60753d148697a2ae6f7917519020fb2dbf7aa7fb70c3dd9495a1a17b5aa2d70cee439c423d06512b802eb
-  data.tar.gz: ac62ce6175d28fbf0a49c159e93e5641812ed4f46e31341c7c413eb1c2e634b5323efa637649a498d8f2ea5e8e15a7df5b6edf2f70f4428dc0f0933763b86dcb
+  metadata.gz: 5ad2757c009676508fb003cc30eb1b7aca2af85bdcf18c49df2578c41ab5b622df02db02c3b11123b2d09dafc59de290e70e57f3e7cd9ca0c756032524ca49bd
+  data.tar.gz: 5b4ed442b085221dee72b7228b5f226a77ebc4c03cbc01fd3150b73a73249b0eb6b3de272aeaea8bb888030aadc20b291e2856001b6aa950a2ae3cbb3d9d1b92

data/README.md

@@ -50,7 +50,7 @@ p = LD4L::FoafRDF::Person.new('p4')
 agg10 = LD4L::OreRDF::CreateAggregation.call( :id=>'agg10', :title=>'My Resources', :description=>'Resources that I like', :owner=>p )
 
 LD4L::OreRDF::AddAggregatedResource.call( agg10,'http://exmple.org/resource_1')
-LD4L::OreRDF::AddAggregatedResource.call( agg10'http://exmple.org/resource_2')
+LD4L::OreRDF::AddAggregatedResource.call( agg10,'http://exmple.org/resource_2')
 LD4L::OreRDF::AddAggregatedResource.call( agg10,'http://exmple.org/resource_3')
 
 LD4L::OreRDF::PersistAggregation.call(agg10)

data/lib/ld4l/ore_rdf/models/aggregation.rb

@@ -3,6 +3,38 @@ module LD4L
   module OreRDF
     class Aggregation < DoublyLinkedList
 
+      @@clear_first_callback  = lambda { |aggregation| aggregation.first_proxy = [] }
+      @@clear_last_callback   = lambda { |aggregation| aggregation.last_proxy  = [] }
+      @@update_first_callback = lambda { |aggregation, proxies| aggregation.first_proxy = proxies.first }
+      @@update_last_callback  = lambda { |aggregation, proxies| aggregation.last_proxy  = proxies.last }
+
+      @@clear_next_callback   = lambda { |proxies, idx| proxies[idx].next_proxy = [] }
+      @@clear_prev_callback   = lambda { |proxies, idx| proxies[idx].prev_proxy = [] }
+      @@update_next_callback  = lambda { |proxies, idx| proxies[idx].next_proxy = proxies[idx+1] }
+      @@update_prev_callback  = lambda { |proxies, idx| proxies[idx].prev_proxy = proxies[idx-1] }
+
+      @@find_first_callback   = lambda do |aggregation, proxies|
+        first_proxy = aggregation.first_proxy
+        return first_proxy.first   if first_proxy && !first_proxy.empty?
+
+        # if first isn't set, try to figure out first by looking for an item with prev_proxy == nil
+        # NOTE: If multiple items have prev_proxy == nil, it will return the first one it finds.
+        first_idx = proxies.index { |proxy| proxy.prev_proxy == [] }
+        first_idx ? proxies[first_idx] : nil
+      end
+      @@find_last_callback    = lambda do |aggregation, proxies|
+        last_proxy = aggregation.last_proxy
+        return last_proxy.first   if last_proxy && !last_proxy.empty?
+
+        # if last isn't set, try to figure out last by looking for an item with next_proxy == nil
+        # NOTE: If multiple items have next_proxy == nil, it will return the first one it finds.
+        last_idx = proxies.index { |proxy| proxy.next_proxy == [] }
+        last_idx ? proxies[last_idx] : nil
+      end
+      @@find_next_callback    = lambda { |proxies, current_proxy| current_proxy.next_proxy.first }
+      @@find_prev_callback    = lambda { |proxies, current_proxy| current_proxy.prev_proxy.first }
+
+
       def self.initialize
         super
       end
@@ -15,6 +47,24 @@ module LD4L
           new_args.delete(:proxy_resources)
           new_args.delete(:aggregation_resource)
         end
+        new_args = {}  if args.empty?
+
+        # set callbacks
+        new_args[:clear_first_callback]  = @@clear_first_callback
+        new_args[:clear_last_callback]   = @@clear_last_callback
+        new_args[:update_first_callback] = @@update_first_callback
+        new_args[:update_last_callback]  = @@update_last_callback
+
+        new_args[:clear_next_callback]   = @@clear_next_callback
+        new_args[:clear_prev_callback]   = @@clear_prev_callback
+        new_args[:update_next_callback]  = @@update_next_callback
+        new_args[:update_prev_callback]  = @@update_prev_callback
+
+        new_args[:find_first_callback]   = @@find_first_callback
+        new_args[:find_last_callback]    = @@find_last_callback
+        new_args[:find_next_callback]    = @@find_next_callback
+        new_args[:find_prev_callback]    = @@find_prev_callback
+
         super(new_args)
       end
 

data/lib/ld4l/ore_rdf/models/aggregation_resource.rb

@@ -26,7 +26,7 @@ module LD4L
       property :owner,       :predicate => RDFVocabularies::DCTERMS.creator, :class_name => LD4L::FoafRDF::Person
 
       # properties from ORE.Aggregation
-      property :aggregates,   :predicate => RDFVocabularies::ORE.aggregates   # multiple values
+      property :aggregates,   :predicate => RDFVocabularies::ORE.aggregates, :cast => false  # multiple values
       property :first_proxy,  :predicate => RDFVocabularies::IANA.first,     :class_name => LD4L::OreRDF::ProxyResource
       property :last_proxy,   :predicate => RDFVocabularies::IANA.last,      :class_name => LD4L::OreRDF::ProxyResource
 

data/lib/ld4l/ore_rdf/models/proxy_resource.rb

@@ -8,7 +8,7 @@ module LD4L
       # configure :base_uri => LD4L::OreRDF.configuration.base_uri, repository => :default
       configure :type => RDFVocabularies::ORE.Proxy, :base_uri => LD4L::OreRDF.configuration.base_uri, :repository => :default
 
-      property :proxy_for,     :predicate => RDFVocabularies::ORE.proxyFor
+      property :proxy_for,     :predicate => RDFVocabularies::ORE.proxyFor,  :cast => false
       property :proxy_in,      :predicate => RDFVocabularies::ORE.proxyIn,   :class_name => LD4L::OreRDF::AggregationResource
       property :next_proxy,    :predicate => RDFVocabularies::IANA.next,     :class_name => LD4L::OreRDF::ProxyResource
       property :prev_proxy,    :predicate => RDFVocabularies::IANA.prev,     :class_name => LD4L::OreRDF::ProxyResource

data/lib/ld4l/ore_rdf/services/aggregation/add_aggregated_resource.rb

@@ -13,7 +13,7 @@ module LD4L
       # appends to the end if position is not specified.  Creates a proxy object for the resource.
       #
       # @param [LD4L::OreRDF::Aggregation] :aggregation to which to add resource
-      # @param [RDF::URI] :resource - URI for the resources to be aggregated
+      # @param [String] :resource - URI for the resources to be aggregated
       # @param [insert_position] :position from beginning of the list of proxies when positive; position from the
       #    end of the list of proxies when negative
       #
@@ -22,7 +22,8 @@ module LD4L
         raise ArgumentError, "resource must be either a string representation of an URI or an instance of RDF::URI" unless
             resource.kind_of?(String) || resource.kind_of?(RDF::URI)
 
-        resource = RDF::URI(resource)  unless  resource.kind_of?(RDF::URI)
+        # make sure resource is a String - HANGING ERROR will occur if set as RDF::URI
+        resource = resource.to_s         if      resource.kind_of?(RDF::URI)
 
         # validate aggregation is of correct type
         raise ArgumentError, "aggregation is not LD4L::OreRDF::Aggregation" unless

data/lib/ld4l/ore_rdf/services/aggregation/add_aggregated_resources.rb

@@ -8,7 +8,7 @@ module LD4L
       # resource.
       #
       # @param [LD4L::OreRDF::Aggregation] :aggregation to which to add resource
-      # @param [Array<RDF::URI>] resources - array of URIs for the resources to be aggregated
+      # @param [Array<String>] resources - array of URIs for the resources to be aggregated
       # @param [insert_position] :position from beginning of the list of proxies when positive; position from the
       #    end of the list of proxies when negative
       #

data/lib/ld4l/ore_rdf/services/proxy/create.rb

@@ -6,7 +6,7 @@ module LD4L
       # Create an ore proxy in one step passing in the required information.
       #
       # @param [Hash] options the options to use while generating the proxy
-      # @option options [LD4L::OreRDF::AggregationResource] :aggregation - aggregation to which the resource is being added (required)
+      # @option options [LD4L::OreRDF::Aggregation] :aggregation - abstract aggregation to which the resource is being added (required)
       # @option options [String, RDF::URI] :resource - resource uri for the resource being added to the aggregation (required)
       # @option options [String, RDF::URI] :id - uri or localname to use for the rdf_subject of the new proxy (optional)(default - mint)
       #                - full URI   - [String, RDF::URI] used as passed in
@@ -29,8 +29,8 @@ module LD4L
         raise ArgumentError, "resource must be either a string representation of an URI or an instance of RDF::URI" unless
             resource.kind_of?(String) || resource.kind_of?(RDF::URI)
 
-        # make sure resource is an RDF::URI
-        resource = RDF::URI(resource)  unless  resource.kind_of?(RDF::URI)
+        # make sure resource is a String - HANGING ERROR will occur if set as RDF::URI
+        resource = resource.to_s  if  resource.kind_of?(RDF::URI)
 
         # mint an id if needed
         id  = options[:id] ||

data/lib/ld4l/ore_rdf/version.rb

@@ -1,5 +1,5 @@
 module LD4L
   module OreRDF
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/ld4l/ore_rdf/models/aggregation_resource_spec.rb

@@ -122,44 +122,44 @@ describe 'LD4L::OreRDF::AggregationResource' do
     end
 
     it "should be set to a URI producing an ActiveTriple::Resource" do
-      subject.aggregates = RDF::URI("http://example.org/individual/b1")
-      expect(subject.aggregates.first).to be_a ActiveTriples::Resource
+      subject.aggregates = "http://example.org/individual/b1"
+      expect(subject.aggregates.first).to be_a String
+      expect(subject.aggregates.first).to eq "http://example.org/individual/b1"
     end
 
     it "should be settable" do
-      subject.aggregates = RDF::URI("http://example.org/individual/b1")
-      expect(subject.aggregates.first.rdf_subject).to eq RDF::URI("http://example.org/individual/b1")
-      ['id']
+      subject.aggregates = "http://example.org/individual/b1"
+      expect(subject.aggregates.first).to eq "http://example.org/individual/b1"
     end
 
     it "should be settable to multiple values" do
-      bib1 = RDF::URI("http://example.org/individual/b1")
-      bib2 = RDF::URI("http://example.org/individual/b2")
-      bib3 = RDF::URI("http://example.org/individual/b3")
+      bib1 = "http://example.org/individual/b1"
+      bib2 = "http://example.org/individual/b2"
+      bib3 = "http://example.org/individual/b3"
       subject.aggregates = bib1
       subject.aggregates << bib2
       subject.aggregates << bib3
-      expect(subject.aggregates[0].rdf_subject).to eq bib1
-      expect(subject.aggregates[1].rdf_subject).to eq bib2
-      expect(subject.aggregates[2].rdf_subject).to eq bib3
+      expect(subject.aggregates[0]).to eq bib1
+      expect(subject.aggregates[1]).to eq bib2
+      expect(subject.aggregates[2]).to eq bib3
     end
 
     it "should be changeable" do
-      orig_bib = RDF::URI("http://example.org/individual/b1")
-      new_bib  = RDF::URI("http://example.org/individual/b1_NEW")
+      orig_bib = "http://example.org/individual/b1"
+      new_bib  = "http://example.org/individual/b1_NEW"
       subject.aggregates = orig_bib
       subject.aggregates = new_bib
-      expect(subject.aggregates.first.rdf_subject).to eq new_bib
+      expect(subject.aggregates.first).to eq new_bib
     end
 
     it "should be changeable for multiple values" do
-      orig_bib1 = RDF::URI("http://example.org/individual/b1")
-      orig_bib2 = RDF::URI("http://example.org/individual/b2")
-      orig_bib3 = RDF::URI("http://example.org/individual/b3")
+      orig_bib1 = "http://example.org/individual/b1"
+      orig_bib2 = "http://example.org/individual/b2"
+      orig_bib3 = "http://example.org/individual/b3"
 
-      new_bib1 = RDF::URI("http://example.org/individual/b1_NEW")
-      new_bib2 = RDF::URI("http://example.org/individual/b2_NEW")
-      new_bib3 = RDF::URI("http://example.org/individual/b3_NEW")
+      new_bib1 = "http://example.org/individual/b1_NEW"
+      new_bib2 = "http://example.org/individual/b2_NEW"
+      new_bib3 = "http://example.org/individual/b3_NEW"
 
       subject.aggregates = orig_bib1
       subject.aggregates << orig_bib2
@@ -171,20 +171,20 @@ describe 'LD4L::OreRDF::AggregationResource' do
       aggregates[2] = new_bib3
       subject.aggregates = aggregates
 
-      expect(subject.aggregates[0].rdf_subject).to eq new_bib1
-      # expect(subject.aggregates[1].rdf_subject).to eq new_bib2
-      expect(subject.aggregates[1].rdf_subject).to eq orig_bib2
-      expect(subject.aggregates[2].rdf_subject).to eq new_bib3
+      expect(subject.aggregates[0]).to eq new_bib1
+      # expect(subject.aggregates[1]).to eq new_bib2
+      expect(subject.aggregates[1]).to eq orig_bib2
+      expect(subject.aggregates[2]).to eq new_bib3
     end
 
     it "should be directly changeable for multiple values" do
-      orig_bib1 = RDF::URI("http://example.org/individual/b1")
-      orig_bib2 = RDF::URI("http://example.org/individual/b2")
-      orig_bib3 = RDF::URI("http://example.org/individual/b3")
+      orig_bib1 = "http://example.org/individual/b1"
+      orig_bib2 = "http://example.org/individual/b2"
+      orig_bib3 = "http://example.org/individual/b3"
 
-      new_bib1 = RDF::URI("http://example.org/individual/b1_NEW")
-      new_bib2 = RDF::URI("http://example.org/individual/b2_NEW")
-      new_bib3 = RDF::URI("http://example.org/individual/b3_NEW")
+      new_bib1 = "http://example.org/individual/b1_NEW"
+      new_bib2 = "http://example.org/individual/b2_NEW"
+      new_bib3 = "http://example.org/individual/b3_NEW"
 
       subject.aggregates = orig_bib1
       subject.aggregates << orig_bib2
@@ -194,10 +194,10 @@ describe 'LD4L::OreRDF::AggregationResource' do
       # subject.aggregates[1] = new_bib2
       subject.aggregates[2] = new_bib3
 
-      expect(subject.aggregates[0].rdf_subject).to eq new_bib1
-      # expect(subject.aggregates[1].rdf_subject).to eq new_bib2
-      expect(subject.aggregates[1].rdf_subject).to eq orig_bib2
-      expect(subject.aggregates[2].rdf_subject).to eq new_bib3
+      expect(subject.aggregates[0]).to eq new_bib1
+      # expect(subject.aggregates[1]).to eq new_bib2
+      expect(subject.aggregates[1]).to eq orig_bib2
+      expect(subject.aggregates[2]).to eq new_bib3
     end
   end
 
@@ -381,9 +381,9 @@ describe 'LD4L::OreRDF::AggregationResource' do
           end
           results = []
           vci_array.each { |vci| results << vci.proxy_for.first }
-          expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b1"))
-          expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b2"))
-          expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b3"))
+          expect(results).to include "http://example.org/individual/b1"
+          expect(results).to include "http://example.org/individual/b2"
+          expect(results).to include "http://example.org/individual/b3"
           expect(vci_array.size).to eq(3)
         end
 

data/spec/ld4l/ore_rdf/models/proxy_resource_spec.rb

@@ -68,16 +68,16 @@ describe 'LD4L::OreRDF::ProxyResource' do
     end
 
     it "should be settable" do
-      subject.proxy_for = RDF::URI("http://example.org/b1")
-      expect(subject.proxy_for.first.rdf_subject).to eq RDF::URI("http://example.org/b1")
+      subject.proxy_for = "http://example.org/b1"
+      expect(subject.proxy_for.first).to eq "http://example.org/b1"
     end
 
     it "should be changeable" do
-      orig_proxy_for = RDF::URI("http://example.org/b1")
-      new_proxy_for  = RDF::URI("http://example.org/b1_NEW")
+      orig_proxy_for = "http://example.org/b1"
+      new_proxy_for  = "http://example.org/b1_NEW"
       subject.proxy_for = orig_proxy_for
       subject.proxy_for = new_proxy_for
-      expect(subject.proxy_for.first.rdf_subject).to eq new_proxy_for
+      expect(subject.proxy_for.first).to eq new_proxy_for
     end
   end
 
@@ -289,9 +289,9 @@ describe 'LD4L::OreRDF::ProxyResource' do
           end
           results = []
           vci_array.each { |vci| results << vci.proxy_for.first }
-          expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b1"))
-          expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b2"))
-          expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b3"))
+          expect(results).to include "http://example.org/individual/b1"
+          expect(results).to include "http://example.org/individual/b2"
+          expect(results).to include "http://example.org/individual/b3"
           expect(vci_array.size).to eq(3)
         end
 
@@ -390,7 +390,7 @@ describe 'LD4L::OreRDF::ProxyResource' do
           subject.contributor = "John Smith"
           an_aggregation = LD4L::OreRDF::AggregationResource.new('1')
           subject.proxy_in = an_aggregation
-          subject.proxy_for = RDF::URI("http://example.org/b1")
+          subject.proxy_for = "http://example.org/b1"
           subject.persist!
         end
 

data/spec/ld4l/ore_rdf/services/aggregation/add_aggregated_resource_spec.rb

@@ -16,19 +16,19 @@ describe 'LD4L::OreRDF::AggregationResource::AddAggregatedResource' do
     it "should add a single resource to an empty set" do
       subject.aggregates = []
       LD4L::OreRDF::AddAggregatedResource.call( subject, RDF::URI("http://example.org/individual/b1") )
-      expect(subject.aggregates.first.rdf_subject).to eq RDF::URI("http://example.org/individual/b1")
+      expect(subject.aggregates.first).to eq "http://example.org/individual/b1"
     end
 
     it "should add a single resource to an existing set" do
-      subject.aggregates = RDF::URI("http://example.org/individual/b1" )
+      subject.aggregates = "http://example.org/individual/b1"
       LD4L::OreRDF::AddAggregatedResource.call( subject, RDF::URI("http://example.org/individual/b2") )
-      expect(subject.aggregates[0].rdf_subject).to eq RDF::URI("http://example.org/individual/b1")
-      expect(subject.aggregates[1].rdf_subject).to eq RDF::URI("http://example.org/individual/b2")
+      expect(subject.aggregates[0]).to eq "http://example.org/individual/b1"
+      expect(subject.aggregates[1]).to eq "http://example.org/individual/b2"
     end
 
     it "should generate the resource instance for a single resource" do
       proxy = LD4L::OreRDF::AddAggregatedResource.call( subject, RDF::URI("http://example.org/individual/b1" ))
-      expect(proxy.proxy_for.first.rdf_subject).to eq RDF::URI("http://example.org/individual/b1")
+      expect(proxy.proxy_for.first).to eq "http://example.org/individual/b1"
       expect(proxy.proxy_in.first).to eq subject.aggregation_resource
     end
   end

data/spec/ld4l/ore_rdf/services/aggregation/add_aggregated_resources_spec.rb

@@ -36,9 +36,9 @@ describe 'LD4L::OreRDF::AddAggregatedResources' do
            RDF::URI("http://example.org/individual/b2"),
            RDF::URI("http://example.org/individual/b3")])
       aggregates = subject.aggregates
-      expect(aggregates).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b1"))
-      expect(aggregates).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b2"))
-      expect(aggregates).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b3"))
+      expect(aggregates).to include "http://example.org/individual/b1"
+      expect(aggregates).to include "http://example.org/individual/b2"
+      expect(aggregates).to include "http://example.org/individual/b3"
     end
 
     it "should add multiple resources to an existing set" do
@@ -49,10 +49,10 @@ describe 'LD4L::OreRDF::AddAggregatedResources' do
            RDF::URI("http://example.org/individual/b3"),
            RDF::URI("http://example.org/individual/b4")])
       aggregates = subject.aggregates
-      expect(aggregates).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b1"))
-      expect(aggregates).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b2"))
-      expect(aggregates).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b3"))
-      expect(aggregates).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b4"))
+      expect(aggregates).to include "http://example.org/individual/b1"
+      expect(aggregates).to include "http://example.org/individual/b2"
+      expect(aggregates).to include "http://example.org/individual/b3"
+      expect(aggregates).to include "http://example.org/individual/b4"
     end
 
     it "should return an array of resource instances for each of the multiple resources" do
@@ -69,9 +69,9 @@ describe 'LD4L::OreRDF::AddAggregatedResources' do
       proxy_array.each do |proxy|
         results << proxy.proxy_for.first
       end
-      expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b1"))
-      expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b2"))
-      expect(results).to include ActiveTriples::Resource.new(RDF::URI("http://example.org/individual/b3"))
+      expect(results).to include "http://example.org/individual/b1"
+      expect(results).to include "http://example.org/individual/b2"
+      expect(results).to include "http://example.org/individual/b3"
     end
   end
 

data/spec/ld4l/ore_rdf/services/aggregation/find_spec.rb

@@ -109,7 +109,7 @@ describe 'LD4L::OreRDF::FindAggregations' do
 
       it "should find aggregation by rdf uri criteria (aka aggregates)" do
         aggregations = LD4L::OreRDF::FindAggregations.call(
-            :criteria => { RDFVocabularies::ORE.aggregates => RDF::URI("http://example.org/individual/b32")})
+            :criteria => { RDFVocabularies::ORE.aggregates => "http://example.org/individual/b32"})
         expect(aggregations).not_to include "http::/example.org/ag1"
         expect(aggregations).not_to include "http::/example.org/ag2"
         expect(aggregations).to include "http::/example.org/ag3"

data/spec/ld4l/ore_rdf/services/proxy/create_spec.rb

@@ -30,7 +30,7 @@ describe 'LD4L::OreRDF::CreateProxy' do
         proxy = LD4L::OreRDF::CreateProxy.call(
             resource:    RDF::URI("http://example.org/individual/b1"),
             aggregation: aggregation)
-        expect(proxy.proxy_for.first.rdf_subject.to_s).to eq "http://example.org/individual/b1"
+        expect(proxy.proxy_for.first).to eq "http://example.org/individual/b1"
         expect(proxy.proxy_in.first).to eq aggregation.aggregation_resource
         expect(proxy.next_proxy).to eq []
         expect(proxy.prev_proxy).to eq []
@@ -58,7 +58,7 @@ describe 'LD4L::OreRDF::CreateProxy' do
             id:          "123",
             resource:    RDF::URI("http://example.org/individual/b1"),
             aggregation: aggregation)
-        expect(proxy.proxy_for.first.rdf_subject.to_s).to eq "http://example.org/individual/b1"
+        expect(proxy.proxy_for.first).to eq "http://example.org/individual/b1"
         expect(proxy.proxy_in.first).to eq aggregation.aggregation_resource
         expect(proxy.next_proxy).to eq []
         expect(proxy.prev_proxy).to eq []
@@ -86,7 +86,7 @@ describe 'LD4L::OreRDF::CreateProxy' do
             id:          "http://example.org/individual/ag123",
             resource:    RDF::URI("http://example.org/individual/b1"),
             aggregation: aggregation)
-        expect(proxy.proxy_for.first.rdf_subject.to_s).to eq "http://example.org/individual/b1"
+        expect(proxy.proxy_for.first).to eq "http://example.org/individual/b1"
         expect(proxy.proxy_in.first).to eq aggregation.aggregation_resource
         expect(proxy.next_proxy).to eq []
         expect(proxy.prev_proxy).to eq []

data/spec/ld4l/ore_rdf/services/proxy/find_spec.rb

@@ -40,8 +40,8 @@ describe 'LD4L::OreRDF::FindProxies' do
         expect(proxies.size).to eq 1
         expect(proxies.first).to be_a_kind_of RDF::URI
         pr = LD4L::OreRDF::ProxyResource.new(proxies.first)
-        expect(pr.proxy_in.first.rdf_subject).to eq RDF::URI("http::/example.org/ag1")
-        expect(pr.proxy_for.first.rdf_subject).to eq RDF::URI("http://example.org/individual/b11")
+        expect(pr.proxy_in.first.rdf_subject.to_s).to eq "http::/example.org/ag1"
+        expect(pr.proxy_for.first).to eq "http://example.org/individual/b11"
       end
     end
 
@@ -108,11 +108,11 @@ describe 'LD4L::OreRDF::FindProxies' do
       it "should find proxies by criteria (aka proxy_for)" do
         proxies = LD4L::OreRDF::FindProxies.call(
             :aggregation => 'http::/example.org/ag2',
-            :criteria => { RDFVocabularies::ORE.proxyFor => RDF::URI("http://example.org/individual/b22") } )
+            :criteria => { RDFVocabularies::ORE.proxyFor => "http://example.org/individual/b22" } )
         expect(proxies.size).to eq 1
         expect(proxies.first).to be_a_kind_of RDF::URI
         pr = LD4L::OreRDF::ProxyResource.new(proxies.first)
-        expect(pr.proxy_for.first.rdf_subject).to eq RDF::URI("http://example.org/individual/b22")
+        expect(pr.proxy_for.first).to eq "http://example.org/individual/b22"
         expect(pr.proxy_in.first.rdf_subject).to eq RDF::URI("http::/example.org/ag2")
       end
 
@@ -124,12 +124,12 @@ describe 'LD4L::OreRDF::FindProxies' do
         proxies.each do |p|
           expect(p).to be_a_kind_of RDF::URI
           pr = LD4L::OreRDF::ProxyResource.new(p)
-          proxy_for << pr.proxy_for.first.rdf_subject
+          proxy_for << pr.proxy_for.first
           expect(pr.proxy_in.first.rdf_subject).to eq RDF::URI("http::/example.org/ag3")
         end
-        expect(proxy_for).to include RDF::URI("http://example.org/individual/b31")
-        expect(proxy_for).to include RDF::URI("http://example.org/individual/b32")
-        expect(proxy_for).to include RDF::URI("http://example.org/individual/b33")
+        expect(proxy_for).to include "http://example.org/individual/b31"
+        expect(proxy_for).to include "http://example.org/individual/b32"
+        expect(proxy_for).to include "http://example.org/individual/b33"
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ld4l-ore_rdf
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ORE RDF models.