activefedora-aggregation 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e412a6567468dcb49dab1daa8bc699ea2205812
-  data.tar.gz: e41e914e33fc66e39fcb2b64fdd528d41364a8ee
+  metadata.gz: e4f1b581036f16e61c0a2ad437f0a9f056510eec
+  data.tar.gz: 53f99afd97226cc78543ca0c3836b5976fdd4cd7
 SHA512:
-  metadata.gz: 52481ea56a4dec434bd0da1affc85137d9212db3832fcce27cfaf24ac300393ff31fdb26eb0f0385d0c7f52fe044df2fff3e26f1d6e12458e77a1e66e122c0e9
-  data.tar.gz: 429d9ec648f2391f8a013bb3a459c5e78f3cdcd972d0ed85fe15f71c1ee1f14bf2d959476085545c7980854f11f712150df7b99c2bb2ccce5173f10aee88b247
+  metadata.gz: 3b962fe055c52589673ad661b50097650316df71052c2389da488e63a9850932c2c227a947e71e2ee5710b5e5dd375f138ea2791e3c451fc72395d6aa2b12d7d
+  data.tar.gz: e4e3da14538596e0616aefbc63aac94950df533de810ab915b11398d17626676482b381960e1ba1687bc4ac7138076ab33c3b26605bf895cc4d4dfff5e29b804

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /jetty
+logfile.log

data/activefedora-aggregation.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'active-fedora', '~> 9.5'
   spec.add_dependency 'rdf-vocab', '~> 0.8.1'
-  # Lock to RDF 1.1.16 because 1.1.17 causes a bug from ruby 2.2
+  # Avoid RDF 1.1.17 because of a bug from ruby 2.2
   # https://github.com/ruby-rdf/rdf/pull/213
-  spec.add_dependency 'rdf', '~>1.1.16.0'
+  spec.add_dependency 'rdf', '~> 1.1', '>= 1.1.17.1'
 
   spec.add_development_dependency "bundler", "~> 1.8"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/active_fedora/aggregation/list_source.rb

@@ -11,11 +11,18 @@ module ActiveFedora
         super
       end
 
+      # Overriding so that we don't track previously_changed, which was
+      # rather expensive.
+      def clear_changed_attributes
+        @changed_attributes.clear
+      end
+
       def changed?
         super || ordered_self.changed?
       end
 
       # Ordered list representation of proxies in graph.
+      # @return [Array<ListNode>]
       def ordered_self
         @ordered_self ||= ordered_list_factory.new(resource, head_subject, tail_subject)
       end
@@ -32,10 +39,7 @@ module ActiveFedora
       # @note This method is used by ActiveFedora::Base upstream for indexing,
       #   at https://github.com/projecthydra/active_fedora/blob/master/lib/active_fedora/profile_indexing_service.rb.
       def serializable_hash(options=nil)
-        options ||= {}
-        options[:except] ||= []
-        options[:except] += [:head, :tail, :nodes]
-        super
+        {}
       end
 
       def to_solr(solr_doc={})
@@ -45,13 +49,29 @@ module ActiveFedora
         })
       end
 
+      # Not useful and slows down indexing.
+      def create_date
+        nil
+      end
+
+      # Not useful, slows down indexing.
+      def modified_date
+        nil
+      end
+
+      # Not useful, slows down indexing.
+      def has_model
+        ["ActiveFedora::Aggregation::ListSource"]
+      end
+
       private
 
       def persist_ordered_self
         nodes_will_change!
         # Delete old statements
-        ordered_list_factory.new(resource, head_subject, tail_subject).to_graph.statements.each do |s|
-          resource.delete s
+        subj = resource.subjects.to_a.select{|x| x.to_s.split("/").last.to_s.include?("#g")}
+        subj.each do |s|
+          resource.delete [s, nil, nil]
         end
         # Assert head and tail
         self.head = ordered_self.head.next.rdf_subject
@@ -67,7 +87,7 @@ module ActiveFedora
       end
 
       def has_unpersisted_proxy_for?
-        ordered_self.flat_map(&:target).compact.select(&:new_record?).find{|x| x.respond_to?(:uri)}
+        ordered_self.select(&:new_record?).map(&:target).find{|x| x.respond_to?(:uri)}
       end
 
       def head_subject

data/lib/active_fedora/aggregation/version.rb

@@ -1,5 +1,5 @@
 module ActiveFedora
   module Aggregation
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/active_fedora/orders/association.rb

@@ -6,6 +6,10 @@ module ActiveFedora::Orders
       @target = find_target
     end
 
+    def inspect
+      "#<ActiveFedora::Orders::Association:#{object_id}>"
+    end
+
     def reader(*args)
       @proxy ||= ActiveFedora::Orders::CollectionProxy.new(self)
       super

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 = target.try(:uri)
+      g.proxy_for = ActiveFedora::Base.id_to_uri(target_id)
       g.proxy_in = proxy_in.try(:uri)
       g.next = self.next.try(:rdf_subject)
       g.prev = self.prev.try(:rdf_subject)

data/lib/active_fedora/orders/ordered_list.rb

@@ -101,18 +101,20 @@ module ActiveFedora
           node.prev.next = next_node
           node.next.prev = prev_node
           @changed = true
+          node
+        else
+          nil
         end
-        self
       end
 
       # @param [Integer] loc Index of node to delete.
       def delete_at(loc)
-        return self if loc == nil
+        return nil if loc == nil
         arr = ordered_reader.take(loc+1)
         if arr.length == loc+1
           delete_node(arr.last)
         else
-          self
+          nil
         end
       end
 

data/lib/active_fedora/orders/target_proxy.rb

@@ -19,6 +19,18 @@ module ActiveFedora
         self
       end
 
+      def insert_at(loc, record)
+        association.insert_target_at(loc, record)
+        self
+      end
+
+      def delete_at(loc)
+        result = association.delete_at(loc)
+        if result
+          result.target
+        end
+      end
+
       def clear
         while to_ary.present?
           association.delete_at(0)

data/script/load_test.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+puts "Loading environment..."
+lib = File.expand_path('../../lib',  __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'active_fedora/aggregation'
+require 'byebug'
+puts "Ready"
+ActiveFedora::Base.logger = Logger.new('logfile.log')
+
+# When the log level is set to debug, log all LDP HTTP API traffic
+class LogSubscriber < ActiveSupport::LogSubscriber
+  def initialize
+    super
+    @odd = false
+  end
+
+  def http(event)
+    return unless logger.debug?
+
+    payload = event.payload
+
+    name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
+    url   = payload[:url] || "[no url]"
+
+    if odd?
+      name = color(name, CYAN, true)
+      url  = color(url, nil, true)
+    else
+      name = color(name, MAGENTA, true)
+    end
+
+    debug "  #{name} #{url} Service: #{payload[:ldp_client]}"
+  end
+
+  def odd?
+    @odd = !@odd
+  end
+
+  def logger
+    ActiveFedora::Base.logger
+  end
+end
+
+LogSubscriber.attach_to :ldp
+
+
+class Foo < ActiveFedora::Base
+  ordered_aggregation :members,
+                    has_member_relation: ::RDF::DC.hasPart,
+                    class_name: 'ActiveFedora::Base',
+                    through: :list_source
+end
+class Bar < ActiveFedora::Base
+end
+
+i = Foo.create!
+
+iterations = 30
+require 'benchmark'
+
+iterations.times do |n|
+  time = Benchmark.measure do |x|
+    # byebug if n > 10
+    image = Foo.find(i.id)
+    fs = Bar.create!
+    image.ordered_members << fs
+    image.save!
+  end
+
+  puts "#{n} - #{time.real}"
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefedora-aggregation
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,14 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.16.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.16.0
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.17.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +195,7 @@ files:
 - lib/active_fedora/orders/ordered_list.rb
 - lib/active_fedora/orders/reflection.rb
 - lib/active_fedora/orders/target_proxy.rb
+- script/load_test.rb
 homepage: http://github.org/curationexperts/activefedora-aggregation
 licenses:
 - APACHE2