active-triples 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81641abcbc05748cde5355e096ae5707b933247d
-  data.tar.gz: 8700dd892403ce3907494e0ed4ab88375b914ccc
+  metadata.gz: b09ad8aa6210e931834cd37965ea5664d84ef2e3
+  data.tar.gz: 0a33346408aaf322d817c8cb2081a2c7542ef0da
 SHA512:
-  metadata.gz: 210be0186ab5dc6e88714b1be1b789662f83246333289cfd3408ae831ad17b3032a037ba13b1068453fdca0eddb110d73fe61d4babf0fb1e76480c4d7670ea2c
-  data.tar.gz: 7ed12d5c4348d46c6e3f70874e3067292e7ddda3edd63be388ab94b0a9c2abf6ce2e1a1c211dfbafdb598bd3e4a9a7c00aed109020d5a174186c685acbef3048
+  metadata.gz: 35628f4606ba23ab183d20d2bd6bc67ee39b1285b5c21e1d4d19bc9b3316ed7af3b55fdf2b44b8a431129a2a778f6e7c8c403c934d308dba9fb34843f7fac599
+  data.tar.gz: b8c3662e7f66c4e720e1b8db88314bd6f7b931e8a7b127f393f44e8ce8969ddcd607171abd03505f18fba25972235e6bc7288dd9943b7c2ef7bd385cc9626c73

data/.travis.yml

@@ -4,7 +4,6 @@ script: "bundle exec rspec spec"
 sudo: false
 cache: bundler
 rvm:
- - 2.1
  - 2.2.4
  - 2.3.1
  - jruby-9.0.4.0

data/CHANGES.md

@@ -1,16 +1,22 @@
-0.10.2
+0.11.0
 ----
-  - 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
+  - Reworks ParentStrategy to use an Transaction over a well defined
+  "extended bounded description".
+  - Converts Relation to an Enumerable for more efficient access to
+  property values.
+  - Cleans up .Relation equality and added `#|` & `#&` for Set style
+  comparison.
+  - Deprecates `Relation#first_or_create`.
+  - Removes dependency on the `linkeddata` gem. Users should require
+  individual RDF libraries as needed.
+  - Adds inheritance of configured types when subclassing an
+  `RDFSource`.
+  - Uses `URI#intern` to avoid repeated allocations of common URIs.
+  - Changes handling of language and datatyped Literals in
+  `Relation#each` & `#to_a`;
+    - now returns `RDF::Literal` for lanugage tagged strings and
+    for unknown datatypes.
 
-0.10.1
-----
-  - Remove dependency on the `linkeddata` metagem
-  
 0.10.0
 ----
   - Fix Identifiable for ActiveFedora [Trey Pendragon]

data/README.md

@@ -23,36 +23,47 @@ The core module of `ActiveTriples` is `ActiveTriples::RDFSource`. You can use th
 
 
 ```ruby
+require 'rdf/vocab'
+
 class Thing
   include  ActiveTriples::RDFSource
-  configure :type => RDF::OWL.Thing, :base_uri => 'http://example.org/things#'
-  property :title, :predicate => RDF::DC.title
-  property :description, :predicate => RDF::DC.description
+  
+  configure type: RDF::OWL.Thing, base_uri: 'http://example.org/things#'
+  
+  property :title,       predicate: RDF::Vocab::DC.title
+  property :description, predicate: RDF::Vocab::DC.description
 end
 
-obj = Thing.new('123')
-obj.title = 'Resource'
+obj             = Thing.new('123')
+obj.title       = 'Resource'
 obj.description = 'A resource.'
+
 obj.dump :ntriples # => "<http://example.org/things#123> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Thing> .\n<http://example.org/things#123> <http://purl.org/dc/terms/title> \"Resource\" .\n<http://example.org/things#123> <http://purl.org/dc/terms/description> \"A resource.\" .\n"
 ```
+
 URI and bnode values are built out as generic Resources when accessed. A more specific model class can be configured on individual properties.
 
 ```ruby
-Thing.property :creator, :predicate => RDF::DC.creator, :class_name => 'Person'
+Thing.property :creator, predicate: RDF::Vocab::DC.creator, class_name: 'Person'
 
 class Person
   include  ActiveTriples::RDFSource
-  configure :type => RDF::FOAF.Person, :base_uri => 'http://example.org/people#'
-  property :name, :predicate => RDF::FOAF.name
+  
+  configure type:     RDF::Vocab::FOAF.Person,
+            base_uri: 'http://example.org/people#'
+            
+  property :name, predicate: RDF::Vocab::FOAF.name
 end
 
-obj_2 = Thing.new('2')
+obj_2         = Thing.new('2')
 obj_2.creator = Person.new
+
 obj_2.creator
 # => [#<Person:0x3fbe84ac9234(default)>]
 
 obj_2.creator.first.name = 'Herman Melville'
-obj_2.dump :ntriples # => "<http://example.org/things#2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Thing> .\n<http://example.org/things#2> <http://purl.org/dc/terms/creator> _:g70263220218800 .\n_:g70263220218800 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .\n_:g70263220218800 <http://xmlns.com/foaf/0.1/name> \"Herman Melville\" .\n"
+
+obj_2.dump :ntriples # => "_:g47361345336040 <http://xmlns.com/foaf/0.1/name> \"Herman Melville\" .\n_:g47361345336040 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .\n<http://example.org/things#2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Thing> .\n<http://example.org/things#2> <http://purl.org/dc/terms/creator> _:g47361345336040 .\n"
 ```
 
 Open Model
@@ -63,23 +74,33 @@ An RDFSource lets you handle data as a graph, independent of whether it is defin
 ```ruby
 related = Thing.new
 
-related << RDF::Statement(related, RDF::DC.relation, obj)
-related << RDF::Statement(related, RDF::DC.subject, 'ActiveTriples')
+related << RDF::Statement(related, RDF::Vocab::DC.relation, obj)
+related << RDF::Statement(related, RDF::Vocab::DC.subject, 'ActiveTriples')
 
-related.query(:subject => related, :predicate => RDF::DC.relation).each_statement {|s,p,o| puts o}
-# => http://example.org/things#123
-related.query(:subject => related, :predicate => RDF::DC.subject).each_statement {|s,p,o| puts o}
+related.query(subject:   related,
+              predicate: RDF::Vocab::DC.relation).each_statement do |s,p,o|
+  puts o
+end
 # => http://example.org/things#123
+
+related.query(subject:   related,
+              predicate: RDF::Vocab::DC.subject).each_statement do |s,p,o|
+  puts o
+end
+# => 'ActiveTriples'
 ```
 
 Any operation you can run against an RDF::Graph works with RDFSources, too. Or you can use generic setters and getters with URI predicates:
 
 ```ruby
-related.set_value(RDF::DC.relation, obj)
-related.set_value(RDF::DC.subject, 'ActiveTriples')
+related.set_value(RDF::Vocab::DC.relation, obj)
+related.set_value(RDF::Vocab::DC.subject,  'ActiveTriples')
+
+related.get_values(RDF::Vocab::DC.relation)
+# => [#<Thing:0x3f949c6a2294(default)>]
 
-related.get_values(RDF::DC.relation) # => [#<Thing:0x3f949c6a2294(default)>]
-related.get_values(RDF::DC.subject) # => ["ActiveTriples"]
+related.get_values(RDF::Vocab::DC.subject)
+# => ["ActiveTriples"]
 ```
 
 Some convienience methods provide support for handling data from web sources:
@@ -89,10 +110,13 @@ Some convienience methods provide support for handling data from web sources:
 ```ruby
 require 'linkeddata' # to support various serializations
 
-osu = ActiveTriples::Resource.new 'http://dbpedia.org/resource/Oregon_State_University'
+uri = 'http://dbpedia.org/resource/Oregon_State_University'
+
+osu = ActiveTriples::Resource.new uri
 osu.fetch
 
-osu.rdf_label # => ["Oregon State University", "Oregon State University", "Université d'État de l'Oregon", "Oregon State University", "Oregon State University", "オレゴン州立大学", "Universidad Estatal de Oregón", "Oregon State University", "俄勒岡州立大學", "Universidade do Estado do Oregon"]
+osu.rdf_label
+# => ["Oregon State University", "Oregon State University", "Université d'État de l'Oregon", "Oregon State University", "Oregon State University", "オレゴン州立大学", "Universidad Estatal de Oregón", "Oregon State University", "俄勒岡州立大學", "Universidade do Estado do Oregon"]
 ```
 
 Typed Data
@@ -101,9 +125,9 @@ Typed Data
 Typed literals are handled natively through Ruby types and [RDF::Literal](https://github.com/ruby-rdf/rdf/tree/develop/lib/rdf/model/literal). There is no need to register a specific type for a property, simply pass the setter the appropriate typed data. See the examples in the RDF::Literal documentation for futher information about supported datatypes.
 
 ```ruby
-Thing.property :date, :predicate => RDF::DC.date
+Thing.property :date, predicate: RDF::Vocab::DC.date
 
-my_thing = Thing.new
+my_thing      = Thing.new
 my_thing.date = Date.today
 
 puts my_thing.dump :ntriples
@@ -143,38 +167,47 @@ Resources can persist to various databases and triplestores though integration w
 # RDF::Repository support persistence to (e.g.) triplestores & NoSQL
 # databases.
 ActiveTriples::Repositories.add_repository :default, RDF::Repository.new
-ActiveTriples::Repositories.add_repository :people, RDF::Repository.new
+ActiveTriples::Repositories.add_repository :people,  RDF::Repository.new
 
 class Person
   include  ActiveTriples::RDFSource
-  configure :type => RDF::FOAF.Person, :base_uri => 'http://example.org/people#', :repository => :people
-  property :name, :predicate => RDF::FOAF.name
+  
+  configure type:       RDF::Vocab::FOAF.Person,
+            base_uri:   'http://example.org/people#',
+            repository: :people
+  property :name, predicate: RDF::Vocab::FOAF.name
 end
 
 class Thing
   include  ActiveTriples::RDFSource
 
-  configure :type => RDF::OWL.Thing, :base_uri => 'http://example.org/things#', :repository => :default
-  property :title, :predicate => RDF::DC.title
-  property :description, :predicate => RDF::DC.description
-  property :creator, :predicate => RDF::DC.creator, :class_name => 'Person'
+  configure type:       RDF::OWL.Thing,
+            base_uri:   'http://example.org/things#',
+            repository: :default
+            
+  property :title,       predicate: RDF::Vocab::DC.title
+  property :description, predicate: RDF::Vocab::DC.description
+  property :creator,     predicate: RDF::Vocab::DC.creator, class_name: 'Person'
 end
 
-t = Thing.new('1')
-t.title = 'A Thing'
+t         = Thing.new('1')
+t.title   = 'A Thing'
 t.creator = Person.new('1')
+
 t.persisted? # => false
-t.creator.first.name = 'Tove'
-t.persist!
 
 ActiveTriples::Repositories.repositories[:default].dump :ntriples
-# => "<http://example.org/things#1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Thing> .\n<http://example.org/things#1> <http://purl.org/dc/terms/title> \"A Thing\" .\n<http://example.org/things#1> <http://purl.org/dc/terms/creator> <http://example.org/people#1> .\n"
+# => ""
 
-t.creator.first.persisted? # => false
-t.creator.first.persist!
+t.creator.first.name = 'Tove'
+t.persist!
 
-ActiveTriples::Repositories.repositories[:people].dump :ntriples
-# => "<http://example.org/people#1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .\n<http://example.org/people#1> <http://xmlns.com/foaf/0.1/name> \"Tove\" .\n"
+puts ActiveTriples::Repositories.repositories[:default].dump :ntriples
+# <http://example.org/things#1> <http://purl.org/dc/terms/title> "A Thing" .
+# <http://example.org/things#1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Thing> .
+# <http://example.org/things#1> <http://purl.org/dc/terms/creator> <http://example.org/people#1> .
+# <http://example.org/people#1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+# <http://example.org/people#1> <http://xmlns.com/foaf/0.1/name> "Tove" .
 ```
 
 Contributing

data/lib/active_triples/configurable.rb

@@ -14,6 +14,11 @@ module ActiveTriples
   #
   # Available properties are base_uri, rdf_label, type, and repository
   module Configurable
+    def inherited(child_class)
+      child_class.configure type: self.type
+      super
+    end
+
     def base_uri
       configuration[:base_uri]
     end
@@ -62,7 +67,7 @@ module ActiveTriples
 
     def transform_type(values)
       Array.wrap(values).map do |value|
-        RDF::URI.new(value).tap do |uri|
+        RDF::URI.intern(value).tap do |uri|
           RDFSource.type_registry[uri] = self
         end
       end

data/lib/active_triples/list.rb

@@ -64,10 +64,7 @@ module ActiveTriples
     # appropriate.
     def each(&block)
       return super unless block_given?
-
-      super do |value|
-        block.call(node_from_value(value))
-      end
+      super { |value| yield node_from_value(value) }
     end
 
     ##

data/lib/active_triples/nested_attributes.rb

@@ -37,15 +37,15 @@ module ActiveTriples
     #     { name: 'John' },
     #     { id: '2', _destroy: true }
     #   ])
-    def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
+    def assign_nested_attributes_for_collection_association(association_name, 
+                                                            attributes_collection)
       options = self.nested_attributes_options[association_name]
 
       # TODO
       #check_record_limit!(options[:limit], attributes_collection)
 
-      if attributes_collection.is_a?(Hash)
-        attributes_collection = attributes_collection.values
-      end
+      attributes_collection = attributes_collection.values if 
+        attributes_collection.is_a?(Hash)
 
       association = self.send(association_name)
 
@@ -53,8 +53,9 @@ module ActiveTriples
         attributes = attributes.with_indifferent_access
 
         if !call_reject_if(association_name, attributes)
-          if attributes['id'] && existing_record = association.detect { |record| record.rdf_subject.to_s == attributes['id'].to_s }
-              assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
+          if attributes['id'] && 
+             existing_record = association.detect { |record| record.rdf_subject.to_s == attributes['id'].to_s }
+            assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
           else
             association.build(attributes.except(*UNASSIGNABLE_KEYS))
           end
@@ -66,7 +67,9 @@ module ActiveTriples
     # +allow_destroy+ is +true+ and has_destroy_flag? returns +true+.
     def assign_to_or_mark_for_destruction(record, attributes, allow_destroy)
       record.attributes = attributes.except(*UNASSIGNABLE_KEYS)
-      record.mark_for_destruction if has_destroy_flag?(attributes) && allow_destroy
+
+      record.mark_for_destruction if has_destroy_flag?(attributes) && 
+                                     allow_destroy
     end
 
     def call_reject_if(association_name, attributes)

data/lib/active_triples/persistable.rb

@@ -14,6 +14,19 @@ module ActiveTriples
     include RDF::Enumerable
     include RDF::Mutable
 
+    ##
+    # This gives the {RDF::Graph} which represents the current state of this
+    # resource.
+    #
+    # @return [RDF::Graph] the underlying graph representation of the
+    #   `RDFSource`.
+    #
+    # @see http://www.w3.org/TR/2014/REC-rdf11-concepts-20140225/#change-over-time
+    #   RDF Concepts and Abstract Syntax comment on "RDF source"
+    def graph
+      persistence_strategy.graph
+    end
+
     ##
     # @see RDF::Enumerable.each
     def each(*args)

data/lib/active_triples/persistence_strategies/parent_strategy.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'active_triples/util/buffered_transaction'
+
 module ActiveTriples
   ##
   # Persistence strategy for projecting `RDFSource`s onto the graph of an owning
@@ -17,9 +19,31 @@ module ActiveTriples
     # @param source [RDFSource, RDF::Enumerable] the `RDFSource` (or other
     #   `RDF::Enumerable` to persist with the strategy.
     def initialize(source)
+      @graph  = source.graph
       @source = source
     end
 
+    ##
+    # @see PeristenceStrategy#graph=
+    def graph=(graph)
+      final_parent.insert(graph || source.to_a)
+      @graph = BufferedTransaction.begin(parent, 
+                                         mutable:   true,
+                                         subject:   source.to_term)
+    end
+
+    ##
+    # @return [ActiveTriples::BufferedTransaction] a transaction on parent with 
+    #   buffered changes, with reads projected against an "Extended Bounded 
+    #   Description" of the strategy's `#source`.
+    #
+    # @see ActiveTriples::ExtendedBoundedDescription
+    def graph
+      @graph ||= BufferedTransaction.begin(parent, 
+                                           mutable:   true,
+                                           subject:   source.to_term)
+    end
+
     ##
     # Resources using this strategy are persisted only if their parent is also 
     # persisted.
@@ -29,41 +53,23 @@ module ActiveTriples
       super && parent.persisted?
     end
 
-    ##
-    # Indicates if the resource has been loaded from the repository (used for lazy load)
-    #
-    # @return [Boolean] true if loaded; else false.
-    def loaded?
-      @loaded ||= false
-    end
-
     ##
     # Destroys the resource by removing it graph and references from the
     # parent.
     #
     # @see PersistenceStrategy#destroy
     def destroy
-      final_parent.delete(source.statements)
-
-      parent.statements.each do |statement|
-        parent.delete_statement(statement) if
-          statement.subject == source.rdf_subject || 
-          statement.object == source.rdf_subject
+      super do
+        graph.delete  [source.to_term, nil, nil]
+        parent.delete [parent, nil, source.to_term]
       end
-
-      super { source.clear }
     end
 
     ##
     # @abstract Clear out any old assertions in the datastore / repository 
-    # about this node  or statement thus preparing to receive the updated 
+    # about this node or statement thus preparing to receive the updated 
     # assertions.
-    def erase_old_resource
-      final_parent.statements.each do |statement|
-        final_parent.send(:delete_statement, statement) if
-          statement.subject == source.rdf_subject
-      end
-    end
+    def erase_old_resource; end # noop
 
     ##
     # @return [Enumerator<RDFSource>]
@@ -87,7 +93,9 @@ module ActiveTriples
     def parent=(parent)
       raise UnmutableParentError unless parent.is_a? RDF::Mutable
       raise UnmutableParentError unless parent.mutable?
+
       @parent = parent
+      reload
     end
 
     ##
@@ -95,9 +103,16 @@ module ActiveTriples
     #
     # @return [true] true if the save did not error
     def persist!
+      raise NilParentError unless parent
       return false if final_parent.frozen?
-      erase_old_resource
-      final_parent << source
+
+      graph.execute
+
+      parent.persist! if 
+        ancestors.find { |a| a.is_a?(ActiveTriples::List::ListResource) }
+
+      reload
+
       @persisted = true
     end
 
@@ -107,14 +122,12 @@ module ActiveTriples
     # @return [Boolean]
     def reload
       return false if source.frozen?
-      if loaded? || !persisted?
-        source << final_parent.query(subject: source.rdf_subject)
-      else
-        RepositoryStrategy.new(source).reload
-        source.persist!
-        @loaded=true
-      end
-      @persisted = true unless source.empty?
+
+      final_parent.persistence_strategy.class.new(source).reload
+      self.graph = source.to_a
+
+      @persisted = true unless graph.empty?
+
       true
     end
 
@@ -132,7 +145,7 @@ module ActiveTriples
       def initialize(source)
         @source = source
       end
-      
+
       ##
       # @yield [RDFSource] gives each ancestor to the block
       # @return [Enumerator<RDFSource>]