active-triples 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ff972e1b4c29224d95c3b805194625adb62bd2e0b2f8e6bc10dce62fb048d0
-  data.tar.gz: b53c8cc0662587141709428bd6bb4aa522ddd24387d1b10807202c23a1e66554
+  metadata.gz: 6c0e9d67f468229ed99433d744dde2215e21e5571e19b081bcb0a8edd5f42380
+  data.tar.gz: 4a33d1eeedc668e14402e1dbe5507b914427b3eef9b651d72226e53652465a9f
 SHA512:
-  metadata.gz: 1cb53a7845d93423d84bdac4fa82b6470f28867ee5cf8c4bc04f8ba5a3046cc3b6c6f34f8ef2a04aa211c880a7c55700e68cbfc3a73729382a5e4409933b4dd6
-  data.tar.gz: 279c0e2236bf9ad69aefc7e8e3e41e697431b8b103e548cc75b0985eeac1237e598f5fe89da71f9e4d86bad92bec84d4ab94b51c1a0798eb149021b0068d350f
+  metadata.gz: c54cf20963fc02882da7848b480653392fe5051ada1311bf04572556507978c7eda8ce4b2102a035faf315b399d3708ba6cfcd02eafedcccccf470aed2c65ef3
+  data.tar.gz: 278a128edabab0162e5dea4df901b7ecfd83bbf3c62820f8b65d447304edcc662ab93115cb1f2b9527fa64377708e00c6c3f0e8accc7dd79a361e8a937136db0

data/.gitlab-ci.yml

@@ -36,6 +36,26 @@ ruby-2-7:
   extends: .rspec
   stage: test
 
+ruby-3-0:
+  image: ruby:3.0
+  extends: .rspec
+  stage: test
+  before_script:
+    - ruby -v
+    - gem install bundler
+    - gem update --system
+    - bundle install --jobs $(nproc)  "${FLAGS[@]}"
+
+ruby-3-1:
+  image: ruby:3.1
+  extends: .rspec
+  stage: test
+
+ruby-3-2:
+  image: ruby:3.2
+  extends: .rspec
+  stage: test
+
 ruby-latest:
   image: ruby:latest
   extends: .rspec

data/CHANGES.md

@@ -1,3 +1,9 @@
+1.2.0
+----
+  - Add support for Ruby 3.0, 3.1 and 3.2.
+  - Implemented `RDFSource#term?` for compatibility with current
+  `RDF::Enumerable` behavior.
+
 1.1.1
 ----
   - Major performance improvements due to a minor change in how

data/Gemfile

@@ -5,7 +5,6 @@ gemspec
 gem 'pry-byebug' unless ENV["CI"]
 
 group :test do
-  gem 'rdf-spec', github: 'ruby-rdf/rdf-spec', branch: 'develop'
   gem 'simplecov', require: false
 end
 

data/active-triples.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |s|
   s.name        = "active-triples"
   s.version     = ActiveTriples::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Tom Johnson", "Trey Terrell"]
+  s.authors     = ["Tamsin Johnson", "Trey Pendragon"]
   s.homepage    = 'https://gitlab.com/no_reply/ActiveTriples'
-  s.email       = 'tom@curationexperts.com'
+  s.email       = 'tomjohnson@ucsb.edu'
   s.summary     = %q{RDF graphs in ActiveModel wrappers.}
   s.description = %q{ActiveTriples provides tools for modeling RDF as discrete resources.}
   s.license     = 'Apache-2.0'

data/lib/active_triples/configuration.rb

@@ -11,10 +11,11 @@ module ActiveTriples
 
     ##
     # @param item_factory [ItemFactory]
-    # @param [Hash] options the configuration options.
-    def initialize(item_factory: ItemFactory.new, **options)
+    # @param [Hash] options the configuration options. (Ruby 3+)
+    # @param [Hash] options2 the configuration options. (Ruby 2.x)
+    def initialize(options = {}, item_factory: ItemFactory.new, **options2)
       @item_factory = item_factory
-      @inner_hash   = Hash[options.to_a]
+      @inner_hash   = Hash[options.to_a + options2.to_a]
     end
 
     ##
@@ -26,7 +27,7 @@ module ActiveTriples
     #   result of merging.
     def merge(options)
       options    = options.to_h
-      new_config = self.class.new(**options)
+      new_config = self.class.new(options)
 
       new_config.items.each do |property, item|
         build_configuration_item(property).set item.value

data/lib/active_triples/persistence_strategies/repository_strategy.rb

@@ -52,7 +52,7 @@ module ActiveTriples
     #
     # @return [Boolean]
     def reload
-      source << repository.query(subject: source)
+      source << repository.query([source, nil, nil])
       @persisted = true unless source.empty?
       true
     end

data/lib/active_triples/properties.rb

@@ -66,7 +66,7 @@ module ActiveTriples
         registered_preds   = registered_predicates << RDF.type
         unregistered_preds = []
 
-        query(subject: rdf_subject) do |stmt|
+        query([rdf_subject, nil, nil]) do |stmt|
           unregistered_preds << stmt.predicate unless
             registered_preds.include? stmt.predicate
         end

data/lib/active_triples/rdf_source.rb

@@ -92,11 +92,9 @@ module ActiveTriples
     ##
     # @!method to_base
     #   @return (see RDF::Term#to_base)
-    # @!method term?
-    #   @return (see RDF::Term#term?)
     # @!method escape
     #   @return (see RDF::Term#escape)
-    delegate :to_base, :term?, :escape, to: :to_term
+    delegate :to_base, :escape, to: :to_term
 
     ##
     # Initialize an instance of this resource class. Defaults to a
@@ -110,7 +108,7 @@ module ActiveTriples
     # @see RDF::Graph
     # @todo move this logic out to a Builder?
     def initialize(*args, &block)
-      @observers   = Set.new
+      @observers = Set.new
 
       resource_uri = args.shift unless args.first.is_a?(Hash)
       @rdf_subject = get_uri(resource_uri) if resource_uri
@@ -122,7 +120,12 @@ module ActiveTriples
         persistence_strategy.parent = args.shift
       end
 
-      persistence_strategy.graph = RDF::Graph.new(*args, &block)
+      graph_params = if args.empty? || args.first.nil?
+                       {}
+                     else
+                       args.shift
+                     end
+      persistence_strategy.graph = RDF::Graph.new(**graph_params, &block)
       reload
 
       # Append type to graph if necessary.
@@ -398,9 +401,9 @@ module ActiveTriples
     # @yieldparam [ActiveTriples::RDFSource] resource  self
     #
     # @return [ActiveTriples::RDFSource] self
-    def fetch(*args, &_block)
+    def fetch(**args, &_block)
       begin
-        load(rdf_subject, *args)
+        load(rdf_subject, **args)
       rescue => e
         if block_given?
           yield(self)
@@ -575,6 +578,26 @@ module ActiveTriples
       !persisted?
     end
 
+    ##
+    # @overload term?
+    #   Returns `false` indicating this is not an RDF::Statemenet.
+    #   @see RDF::Value#statement?
+    #   @return [Boolean]
+    # @overload term?(value)
+    #   Returns `true` if `self` contains the given RDF subject term.
+    #
+    #   @param  [RDF::Resource] value
+    #   @return [Boolean]
+    #
+    # See RDF::Enumerable#term?
+    def term?(*args)
+      case args.length
+      when 0 then to_term.term?
+      when 1 then args.first && graph.term?(args.first)
+      else raise ArgumentError("wrong number of arguments (given #{args.length}, expected 0 or 1)")
+      end
+    end
+
     def mark_for_destruction
       @marked_for_destruction = true
     end
@@ -641,7 +664,7 @@ module ActiveTriples
     # @param [RDF::Term] new_subject
     # @return [void]
     def rewrite_statement_uris(old_subject, new_subject)
-      graph.query(subject: old_subject).each do |st|
+      graph.query([old_subject, nil, nil]).each do |st|
         graph.delete(st)
 
         st.subject = new_subject
@@ -649,7 +672,7 @@ module ActiveTriples
         graph.insert(st)
       end
 
-      graph.query(object: old_subject).each do |st|
+      graph.query([nil, nil, old_subject]).each do |st|
         graph.delete(st)
 
         st.object = new_subject

data/lib/active_triples/relation.rb

@@ -481,7 +481,7 @@ module ActiveTriples
       ##
       # @private
       def objects(&block)
-        solutions = parent.query(subject: rdf_subject, predicate: predicate)
+        solutions = parent.query([rdf_subject, predicate, nil])
         solutions.extend(RDF::Enumerable) unless solutions.respond_to?(:each_object)
         
         solutions.each_object(&block)

data/lib/active_triples/util/extended_bounded_description.rb

@@ -55,7 +55,7 @@ module ActiveTriples
       ancestors = @ancestors.dup
 
       if block_given?
-        statements = source_graph.query(subject: starting_node).each
+        statements = source_graph.query([starting_node, nil, nil]).each
         statements.each_statement { |st| yield st }
         
         ancestors << starting_node

data/lib/active_triples/version.rb

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

data/spec/active_triples/rdf_source_spec.rb

@@ -743,7 +743,7 @@ describe ActiveTriples::RDFSource do
 
           it 'has errors' do
             expect { subject.valid? }
-              .to change { subject.errors.messages }
+              .to change { subject.errors.messages.transform_values { |v| v.map(&:to_s) } }
               .from({})
               .to(include(base: ['The underlying graph must be valid']))
           end

data/spec/active_triples/resource_spec.rb

@@ -470,7 +470,7 @@ describe ActiveTriples::Resource do
   describe '#set_value' do
     it 'should set a value in the graph' do
       subject.set_value(RDF::Vocab::DC.title, 'Comet in Moominland')
-      subject.query(:subject => subject.rdf_subject, :predicate => RDF::Vocab::DC.title).each_statement do |s|
+      subject.query([subject.rdf_subject, nil, RDF::Vocab::DC.title]).each_statement do |s|
         expect(s.object.to_s).to eq 'Comet in Moominland'
       end
     end
@@ -522,14 +522,14 @@ describe ActiveTriples::Resource do
 
     it "should be able to accept a subject" do
       expect{subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::Vocab::DC.title, 'Comet in Moominland')}.not_to raise_error
-      expect(subject.query(:subject => RDF::URI("http://opaquenamespace.org/jokes"), :predicate => RDF::Vocab::DC.title).statements.to_a.length).to eq 1
+      expect(subject.query([RDF::URI("http://opaquenamespace.org/jokes"), RDF::Vocab::DC.title, nil]).statements.to_a.length).to eq 1
     end
   end
 
   describe '#[]=' do
     it 'should set a value in the graph' do
       subject[RDF::Vocab::DC.title] = 'Comet in Moominland'
-      subject.query(:subject => subject.rdf_subject, :predicate => RDF::Vocab::DC.title).each_statement do |s|
+      subject.query([subject.rdf_subject, nil, RDF::Vocab::DC.title]).each_statement do |s|
         expect(s.object.to_s).to eq 'Comet in Moominland'
       end
     end
@@ -616,7 +616,7 @@ describe ActiveTriples::Resource do
     end
 
     it 'should be the type in the graph' do
-      subject.query(:subject => subject.rdf_subject, :predicate => RDF.type).statements do |s|
+      subject.query([subject.rdf_subject, nil, RDF.type]).statements do |s|
         expect(s.object).to eq RDF::URI('http://example.org/AnotherClass')
       end
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
-- Tom Johnson
-- Trey Terrell
+- Tamsin Johnson
+- Trey Pendragon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -252,7 +252,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 description: ActiveTriples provides tools for modeling RDF as discrete resources.
-email: tom@curationexperts.com
+email: tomjohnson@ucsb.edu
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: RDF graphs in ActiveModel wrappers.