active-triples 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c81332a8a8d648a2ee9e0452b03365379513735
-  data.tar.gz: 025e5a4b382f9afc0f585d0f1131134ac9c873af
+  metadata.gz: 81641abcbc05748cde5355e096ae5707b933247d
+  data.tar.gz: 8700dd892403ce3907494e0ed4ab88375b914ccc
 SHA512:
-  metadata.gz: 5db5e244b3a74c98e2d2e420889db1524d94752f0bc91d4f0e3306f3e96b110a19508a61845329b2e066d48b5b016d4f2fd1b9d2415ea4fd867b414a648113e4
-  data.tar.gz: a696ec00b77357e264e452709dfef2f33eec1bf212792e349f9ba5b185246c0003261a38b22ce36310588be7d2493c2005e124046214f230d74e9cedbd076927
+  metadata.gz: 210be0186ab5dc6e88714b1be1b789662f83246333289cfd3408ae831ad17b3032a037ba13b1068453fdca0eddb110d73fe61d4babf0fb1e76480c4d7670ea2c
+  data.tar.gz: 7ed12d5c4348d46c6e3f70874e3067292e7ddda3edd63be388ab94b0a9c2abf6ce2e1a1c211dfbafdb598bd3e4a9a7c00aed109020d5a174186c685acbef3048

data/CHANGES.md

@@ -1,3 +1,12 @@
+0.10.2
+----
+  - Backports several performance optimizations from the upcoming 0.11.x
+  release series.
+    - Uses `#query` to find unregistered predicates, avoiding iterating through
+    all statements.
+    - Uses a transaction to batch commit changes when calling `#set_subject!`
+  - Removes the `deprecation` gem as a runtime dependency
+
 0.10.1
 ----
   - Remove dependency on the `linkeddata` metagem

data/active-triples.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'rdf',           '~> 2.0', '>= 2.0.2'
   s.add_dependency 'rdf-vocab'
   s.add_dependency 'activemodel',   '>= 3.0.0'
-  s.add_dependency 'deprecation',   '~> 1.0'
   s.add_dependency 'activesupport', '>= 3.0.0'
 
   s.add_development_dependency 'rdoc'

data/lib/active_triples/configurable.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'deprecation'
 require 'active_support/core_ext/array/wrap'
 
 module ActiveTriples
@@ -15,7 +14,6 @@ module ActiveTriples
   #
   # Available properties are base_uri, rdf_label, type, and repository
   module Configurable
-    extend Deprecation
     def base_uri
       configuration[:base_uri]
     end

data/lib/active_triples/persistence_strategies/persistence_strategy.rb

@@ -25,12 +25,6 @@ module ActiveTriples
     def destroy(&block)
       yield if block_given?
       
-      # Provide a warning for strategies relying on #destroy to clear the resource
-      if defined? obj
-        warn "DEPRECATION WARNING: #destroy implementations must now explicitly call 'source.clear'"
-        obj.clear
-      end
-      
       persist!
       @destroyed = true
     end

data/lib/active_triples/rdf_source.rb

@@ -92,14 +92,15 @@ module ActiveTriples
     def initialize(*args, &block)
       resource_uri = args.shift unless args.first.is_a?(Hash)
       @rdf_subject = get_uri(resource_uri) if resource_uri
+
       unless args.first.is_a?(Hash) || args.empty?
         set_persistence_strategy(ParentStrategy)
         persistence_strategy.parent = args.shift
       else
         set_persistence_strategy(RepositoryStrategy)
       end
-      @graph = RDF::Graph.new(*args, &block)
 
+      @graph = RDF::Graph.new(*args, &block)
       reload
 
       # Append type to graph if necessary.
@@ -496,32 +497,28 @@ module ActiveTriples
     ##
     # Set a new rdf_subject for the resource.
     #
-    # This raises an error if the current subject is not a blank node,
-    # and returns false if it can't figure out how to make a URI from
-    # the param. Otherwise it creates a URI for the resource and
-    # rebuilds the graph with the updated URI.
-    #
     # Will try to build a uri as an extension of the class's base_uri
     # if appropriate.
     #
-    # @param [#to_uri, #to_s] uri_or_str the uri or string to use
+    # @param  [#to_uri, #to_s] uri_or_str the uri or string to use
+    # @return [void]
+    #
+    # @raise if the current subject is not a blank node,
+    #   and returns false if it can't figure out how to make a URI from
+    #   the param. Otherwise it creates a URI for the resource and
+    #   rebuilds the graph with the updated URI.
     def set_subject!(uri_or_str)
-      raise "Refusing update URI when one is already assigned!" unless node? or rdf_subject == RDF::URI(nil)
-      # Refusing set uri to an empty string.
-      return false if uri_or_str.nil? or (uri_or_str.to_s.empty? and not uri_or_str.kind_of? RDF::URI)
-      # raise "Refusing update URI! This object is persisted to a datastream." if persisted?
-      old_subject = rdf_subject
-      @rdf_subject = get_uri(uri_or_str)
-
-      each_statement do |statement|
-        if statement.subject == old_subject
-          delete(statement)
-          self << RDF::Statement.new(rdf_subject, statement.predicate, statement.object)
-        elsif statement.object == old_subject
-          delete(statement)
-          self << RDF::Statement.new(statement.subject, statement.predicate, rdf_subject)
-        end
-      end
+      raise "Refusing update URI when one is already assigned!" unless 
+        node? || rdf_subject == RDF::URI(nil)
+        
+      return false if uri_or_str.nil? || 
+                      (uri_or_str.to_s.empty? &&
+                       !uri_or_str.kind_of?(RDF::URI))
+      
+      new_subject = get_uri(uri_or_str)
+      rewrite_statement_uris(rdf_subject, new_subject)
+
+      @rdf_subject = new_subject
     end
 
     ##
@@ -589,7 +586,12 @@ module ActiveTriples
         registered_preds = registered_predicates
         registered_preds << RDF.type
         unregistered_preds = []
-        each_statement { |s,p,o| unregistered_preds << p unless (s != rdf_subject) || (registered_preds.include? p) }
+        
+        query(subject: rdf_subject) do |stmt| 
+          unregistered_preds << stmt.predicate unless
+            registered_preds.include? stmt.predicate
+        end
+
         unregistered_preds
       end
 
@@ -601,6 +603,33 @@ module ActiveTriples
          RDF::Vocab::SKOS.hiddenLabel]
       end
 
+      ##
+      # Rewrites the subject and object of each statement containing 
+      # `old_subject` in either position. Used when setting the subject to
+      # remove the placeholder blank node subjects.
+      #
+      # @param [RDF::Term] old_subject
+      # @param [RDF::Term] new_subject
+      # @return [void]
+      def rewrite_statement_uris(old_subject, new_subject)
+        graph.transaction(mutable: true) do |tx|
+          tx.query(subject: old_subject).each do |st|
+            tx.delete(st)
+
+            st.subject = new_subject
+            st.object  = new_subject if st.object == old_subject
+            tx.insert(st)
+          end
+          
+          tx.query(object: old_subject).each do |st|
+            tx.delete(st)
+            
+            st.object = new_subject
+            tx.insert(st)
+          end
+        end
+      end
+
       ##
       # Takes a URI or String and aggressively tries to convert it into
       # an RDF term. If a String is given, first tries to interpret it

data/lib/active_triples/resource.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'deprecation'
-
 module ActiveTriples
   ##
   # Defines a generic RDF `Resource` as an `ActiveTriples::Entity`. This

data/lib/active_triples/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveTriples
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.10.2'.freeze
 end

data/spec/active_triples/undefined_property_error_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe ActiveTriples::UndefinedPropertyError do
+  subject { described_class.new(property, klass) }
+  
+  let(:property) { :a_property }
+  let(:klass)    { :a_class }
+
+  it { expect(subject.message).to  be_a String }
+  
+  it { expect(subject.property).to eq property }
+  it { expect(subject.klass).to    eq klass }
+end
+  

data/spec/active_triples/value_error_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe ActiveTriples::Relation::ValueError do
+  subject { described_class.new(value) }
+  
+  let(:value) { :a_value }
+
+  it { expect(subject.message).to  be_a String }
+  it { expect(subject.value).to    eq   value  }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Tom Johnson
@@ -59,20 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: deprecation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -292,6 +278,8 @@ files:
 - spec/active_triples/repositories_spec.rb
 - spec/active_triples/resource_spec.rb
 - spec/active_triples/schema_spec.rb
+- spec/active_triples/undefined_property_error_spec.rb
+- spec/active_triples/value_error_spec.rb
 - spec/active_triples_spec.rb
 - spec/integration/dummies/dummy_resource_a.rb
 - spec/integration/dummies/dummy_resource_b.rb