activefedora-aggregation 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d1dbe9ac23451faae6cff0a8249099b3f0a16fc
-  data.tar.gz: 898c460e4a8a953f275af28566c31c81aaabc45e
+  metadata.gz: 811e1635bee37a6543927d878abe1969dfb06944
+  data.tar.gz: cc9024906ec0485aaf9d720a48f748321e5c0bd1
 SHA512:
-  metadata.gz: 16db6ed94d16e66e200b6b50df6a828fcf939e85263bb7ac87acbd5831fb5324953b488c085a949c0235e2e29d59c1a21add23c2fb8eddf2ed766639b95c8f40
-  data.tar.gz: 50dd60edc92c86eb29ff2a3cf1187637f8e0fcff844d0a6c7e56f0c96e8fe261f4fac63a6d4e406a11180fb6b718acfee48e978a2273b6b1e2092b5e277cd99f
+  metadata.gz: 45cddf68bddf30d69eabc7c871dabd88e04985d88668985dcfafd3e05d818b345f9b8a94302ec9cd5a4a767aeb9e1849dfebccbcdb1d092ca417c7918a9b67c7
+  data.tar.gz: 8d3f76cb84ae5bda149e458cdc00b306c4167e1638706d6c61f8783daee0472124c310e58c770981ecdbd9aa123e3a7b314799013cfca8460f937ef94d766771

data/lib/active_fedora/aggregation/list_source.rb

@@ -4,7 +4,7 @@ module ActiveFedora
       delegate :order_will_change!, to: :ordered_self
       property :head, predicate: ::RDF::Vocab::IANA['first'], multiple: false
       property :tail, predicate: ::RDF::Vocab::IANA.last, multiple: false
-      property :nodes, predicate: ::RDF::DC::hasPart
+      property :nodes, predicate: ::RDF::Vocab::DC::hasPart
 
       def save(*args)
         return true if has_unpersisted_proxy_for? || !changed?

data/lib/active_fedora/aggregation/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Aggregation
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/active_fedora/orders/association.rb

@@ -82,6 +82,12 @@ module ActiveFedora::Orders
       target.delete_at(loc)
     end
 
+    # Delete all occurences of the specified target
+    # @param obj object to delete
+    def delete_target(obj)
+      target.delete_target(obj)
+    end
+
     # Delete multiple list nodes.
     # @param [Array<ActiveFedora::Orders::ListNode>] records
     def delete_records(records, _method=nil)

data/lib/active_fedora/orders/list_node.rb

@@ -41,7 +41,7 @@ module ActiveFedora::Orders
     # @return [ActiveFedora::Orders::ListNode::Resource]
     def to_graph
       g = Resource.new(rdf_subject)
-      g.proxy_for = ActiveFedora::Base.id_to_uri(target_id)
+      g.proxy_for = target_uri
       g.proxy_in = proxy_in.try(:uri)
       g.next = self.next.try(:rdf_subject)
       g.prev = self.prev.try(:rdf_subject)
@@ -51,7 +51,7 @@ module ActiveFedora::Orders
     # Object representation of proxyFor
     # @return [ActiveFedora::Base]
     def target
-      @target ||= 
+      @target ||=
         if proxy_for.present?
           node_cache.fetch(proxy_for) do
             ActiveFedora::Base.from_uri(proxy_for, nil)
@@ -59,6 +59,12 @@ module ActiveFedora::Orders
         end
     end
 
+    def target_uri
+      if target_id
+        ActiveFedora::Base.id_to_uri(target_id)
+      end
+    end
+
     def target_id
       MaybeID.new(@target.try(:id) || proxy_for).value
     end

data/lib/active_fedora/orders/ordered_list.rb

@@ -30,7 +30,7 @@ module ActiveFedora
       # @return [TailSentinel] Sentinel for the bottom of the list. If not
       #   empty, tail.prev is the first element.
       def tail
-        @tail ||= 
+        @tail ||=
           begin
             if tail_subject
               TailSentinel.new(self, prev_node: build_node(tail_subject))
@@ -71,7 +71,7 @@ module ActiveFedora
       end
 
       # @param [ActiveFedora::Base] target Target to append to list.
-      # @option [::RDF::URI, ActiveFedora::Base] :proxy_in Proxy in to 
+      # @option [::RDF::URI, ActiveFedora::Base] :proxy_in Proxy in to
       #   assert on the created node.
       def append_target(target, proxy_in: nil)
         node = build_node(new_node_subject)
@@ -132,6 +132,13 @@ module ActiveFedora
         end
       end
 
+      # @param obj target of node to delete.
+      def delete_target(obj)
+        nodes_to_remove = ordered_reader.select { |list_node| obj.id == list_node.target_id }
+        nodes_to_remove.each { |list_node| delete_node(list_node) }
+        nodes_to_remove.last.try(:target)
+      end
+
       # @return [Boolean] Whether this list was changed since instantiation.
       def changed?
         @changed

data/lib/active_fedora/orders/target_proxy.rb

@@ -24,6 +24,8 @@ module ActiveFedora
         self
       end
 
+      # Deletes the element at the specified index, returning that element, or nil if
+      # the index is out of range.
       def delete_at(loc)
         result = association.delete_at(loc)
         if result
@@ -31,6 +33,13 @@ module ActiveFedora
         end
       end
 
+      # Deletes all items from self that are equal to obj.
+      # @param obj the object to remove from the list
+      # @return the last deleted item, or nil if no matching item is found
+      def delete(obj)
+        association.delete_target(obj)
+      end
+
       def clear
         while to_ary.present?
           association.delete_at(0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefedora-aggregation
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport