active-triples 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 550bad738fa73662ac83c8e3e352f7067f0339d2
-  data.tar.gz: 0d0fd4a1dfe4e2ef3b86ee54d8cb7b353a9d904e
+SHA256:
+  metadata.gz: 6c0e9d67f468229ed99433d744dde2215e21e5571e19b081bcb0a8edd5f42380
+  data.tar.gz: 4a33d1eeedc668e14402e1dbe5507b914427b3eef9b651d72226e53652465a9f
 SHA512:
-  metadata.gz: 8c3d54cc99e550e9ad43b87399c6193f430ab9330c790eb36bd246c5dd63c1d16fc1ce23f71db2d3b41dea494106e59e9ba7b74d827e6d05ded76b9d0a62129d
-  data.tar.gz: 0fbddfdec5678fc535816dcb47be0fb1a40bec5ef8e1e207311c9fc72a674c2e257bc0288b9e1ba53b84f570b1c6fac9a5cfd95d394c02b8db4ba1735fa4c49c
+  metadata.gz: c54cf20963fc02882da7848b480653392fe5051ada1311bf04572556507978c7eda8ce4b2102a035faf315b399d3708ba6cfcd02eafedcccccf470aed2c65ef3
+  data.tar.gz: 278a128edabab0162e5dea4df901b7ecfd83bbf3c62820f8b65d447304edcc662ab93115cb1f2b9527fa64377708e00c6c3f0e8accc7dd79a361e8a937136db0

data/.gitlab-ci.yml

@@ -0,0 +1,67 @@
+.rspec:
+  script:
+    - bundle exec rspec
+
+.jruby:
+  extends: .rspec
+  before_script:
+    - apk add git
+    - ruby -v
+    - bundle install --jobs $(nproc)  "${FLAGS[@]}"
+
+before_script:
+  - ruby -v
+  - bundle install --jobs $(nproc)  "${FLAGS[@]}"
+
+stages:
+  - test
+
+ruby-2-4:
+  image: ruby:2.4
+  extends: .rspec
+  stage: test
+
+ruby-2-5:
+  image: ruby:2.4
+  extends: .rspec
+  stage: test
+
+ruby-2-6:
+  image: ruby:2.5
+  extends: .rspec
+  stage: test
+
+ruby-2-7:
+  image: ruby:2.6
+  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
+  stage: test
+
+jruby-9:
+  image: jruby:9-alpine
+  extends: .jruby
+  stage: test

data/CHANGES.md

@@ -1,3 +1,14 @@
+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
+    properties are resolved.
+
 1.1.0
 ----
   - Add support for RDF.rb 3.0

data/Gemfile

@@ -2,5 +2,11 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'activesupport', '< 5.0.0' if RUBY_VERSION =~ /2\.1\..*/
 gem 'pry-byebug' unless ENV["CI"]
+
+group :test do
+  gem 'simplecov', require: false
+end
+
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8

data/README.md

@@ -1,8 +1,8 @@
 Description
 -----------
 
-[![Build Status](https://travis-ci.org/ActiveTriples/ActiveTriples.png?branch=develop)](https://travis-ci.org/ActiveTriples/ActiveTriples)
-[![Coverage Status](https://coveralls.io/repos/ActiveTriples/ActiveTriples/badge.svg?branch=develop)](https://coveralls.io/r/ActiveTriples/ActiveTriples?branch=develop)
+[![Pipeline Status](https://gitlab.com/no_reply/ActiveTriples/badges/develop/pipeline.svg)](https://gitlab.com/no_reply/ActiveTriples/commits/develop)
+[![Coverage Report](https://gitlab.com/no_reply/ActiveTriples/badges/develop/coverage.svg)](https://gitlab.com/no_reply/ActiveTriples/commits/develop)
 [![Gem Version](https://badge.fury.io/rb/active-triples.svg)](http://badge.fury.io/rb/active-triples)
 
 An ActiveModel-like interface for RDF data. Models graphs as RDFSources with property/attribute configuration, accessors, and other methods to support Linked Data in a Ruby/Rails enviornment. See [RDF Concepts and Abstract Syntax](http://www.w3.org/TR/2014/REC-rdf11-concepts-20140225/#change-over-time) for an informal definition of an RDF Source.
@@ -27,9 +27,9 @@ require 'rdf/vocab'
 
 class Thing
   include  ActiveTriples::RDFSource
-  
+
   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
@@ -48,10 +48,10 @@ Thing.property :creator, predicate: RDF::Vocab::DC.creator, class_name: 'Person'
 
 class Person
   include  ActiveTriples::RDFSource
-  
+
   configure type:     RDF::Vocab::FOAF.Person,
             base_uri: 'http://example.org/people#'
-            
+
   property :name, predicate: RDF::Vocab::FOAF.name
 end
 
@@ -171,7 +171,7 @@ ActiveTriples::Repositories.add_repository :people,  RDF::Repository.new
 
 class Person
   include  ActiveTriples::RDFSource
-  
+
   configure type:       RDF::Vocab::FOAF.Person,
             base_uri:   'http://example.org/people#',
             repository: :people
@@ -184,7 +184,7 @@ class Thing
   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'

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.homepage    = 'https://github.com/ActiveTriples/ActiveTriples'
-  s.email       = 'tom@curationexperts.com'
+  s.authors     = ["Tamsin Johnson", "Trey Pendragon"]
+  s.homepage    = 'https://gitlab.com/no_reply/ActiveTriples'
+  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
@@ -123,26 +123,26 @@ module ActiveTriples
       # @param [Hash]  opts for this property, must include a :predicate
       # @yield [index] index sets solr behaviors for the property
       #
-      # @return [Hash{String=>ActiveTriples::NodeConfig}] the full current 
+      # @return [Hash{String=>ActiveTriples::NodeConfig}] the full current
       #   property configuration for the class
       def property(name, opts={}, &block)
-        raise ArgumentError, "#{name} is a keyword and not an acceptable property name." if protected_property_name? name
+        raise ArgumentError, "#{name} is a keyword and not an acceptable property name." if protected_property_name?(name.to_sym)
         reflection = PropertyBuilder.build(self, name, opts, &block)
         Reflection.add_reflection self, name, reflection
       end
 
       ##
-      # Checks potential property names for conflicts with existing class 
-      # instance methods. We avoid setting properties with these names to 
+      # Checks potential property names for conflicts with existing class
+      # instance methods. We avoid setting properties with these names to
       # prevent catastrophic method overwriting.
       #
       # @param [Symblol] name  A potential property name.
-      # @return [Boolean] true if the given name matches an existing instance 
+      # @return [Boolean] true if the given name matches an existing instance
       #   method which is not an ActiveTriples property.
       def protected_property_name?(name)
-        reject = self.instance_methods.map! { |s| s.to_s.gsub(/=$/, '').to_sym }
-        reject -= properties.keys.map { |k| k.to_sym }
-        reject.include? name
+        return false if fields.include?(name)
+        return true if instance_methods.include?(name) || instance_methods.include?("#{name}=".to_sym)
+        false
       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.0'.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

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+SimpleCov.start
 
 require 'bundler/setup'
 Bundler.setup

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
-- Tom Johnson
-- Trey Terrell
-autorequire: 
+- Tamsin Johnson
+- Trey Pendragon
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-28 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:
@@ -261,6 +261,7 @@ extra_rdoc_files:
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - AUTHORS
 - CHANGES.md
@@ -328,17 +329,16 @@ files:
 - spec/integration/dummies/dummy_resource_b.rb
 - spec/integration/parent_persistence_spec.rb
 - spec/integration/reciprocal_properties_spec.rb
-- spec/pragmatic_context_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
 - spec/support/dummies/basic_persistable.rb
 - spec/support/matchers.rb
 - spec/support/shared_examples/persistence_strategy.rb
-homepage: https://github.com/ActiveTriples/ActiveTriples
+homepage: https://gitlab.com/no_reply/ActiveTriples
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -353,9 +353,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: RDF graphs in ActiveModel wrappers.
 test_files: []

data/spec/pragmatic_context_spec.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-require 'pragmatic_context'
-
-describe 'PragmaticContext integration' do
-  before do
-    class DummyLicense
-      include ActiveTriples::RDFSource
-      include PragmaticContext::Contextualizable
-      property :title, :predicate => RDF::Vocab::DC.title
-
-      contextualize :title, :as => RDF::Vocab::DC.title.to_s
-    end
-
-    class DummyResource
-      include ActiveTriples::RDFSource
-      include PragmaticContext::Contextualizable
-
-      configure :type => RDF::URI('http://example.org/SomeClass')
-      property :license, :predicate => RDF::Vocab::DC.license, 
-                         :class_name => DummyLicense
-      property :title, :predicate => RDF::Vocab::DC.title
-
-      contextualize :title, :as => RDF::Vocab::DC.title.to_s
-      contextualize :license, :as => RDF::Vocab::DC.license.to_s
-    end
-
-    license.title = 'cc'
-    subject.title = 'my resource'
-    subject.license = license
-    subject.license << RDF::Literal('Creative Commons')
-  end
-
-  after do
-    Object.send(:remove_const, "DummyResource")
-    Object.send(:remove_const, "DummyLicense")
-  end
-
-  subject { DummyResource.new('http://example.org/test') }
-  let(:license) { DummyLicense.new }
-
-  xit 'should output a valid jsonld representation of itself' do
-    g = RDF::Graph.new << JSON::LD::API.toRdf(subject.as_jsonld)
-    expect(subject == g).to be true
-  end
-
-  it 'should have contexts' do
-    expect(subject.as_jsonld['@context'].keys).to contain_exactly('license', 'title')
-  end
-
-  it 'should use context with dump' do
-    context = JSON.parse(subject.dump :jsonld)['@context']
-    subject.class.properties.keys.each do |prop|
-      expect(context).to include prop
-    end
-  end
-end