[rebased] Upgrading the Gem dependencies for rdf and reformatting the code base using the latest release of bixby

Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
 
 gemspec
 

Guardfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec, cmd: "bundle exec rspec" do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 end

Rakefile

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
+
 require 'rake/clean'
 require 'bundler'
 
 Bundler::GemHelper.install_tasks
-

active-triples.gemspec

@@ -1,41 +1,43 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "active_triples/version"
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'active_triples/version'
 
 Gem::Specification.new do |s|
-  s.name        = "active-triples"
+  s.name        = 'active-triples'
   s.version     = ActiveTriples::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Tamsin Johnson", "Trey Pendragon"]
-  s.homepage    = 'https://gitlab.com/no_reply/ActiveTriples'
+  s.authors     = ['Tamsin Johnson', 'Trey Pendragon']
+  s.homepage    = 'https://github.com/ActiveTriples/ActiveTriples'
   s.email       = '[email protected]'
   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'
-  s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'rdf',           '>= 2.0.2', '< 4.0'
-  s.add_dependency 'rdf-vocab',     '>= 2.0',   '< 4.0'
-  s.add_dependency 'activemodel',   '>= 3.0.0'
+  s.add_dependency 'activemodel', '>= 3.0.0'
   s.add_dependency 'activesupport', '>= 3.0.0'
+  s.add_dependency 'rdf', '~> 3.2', '< 4.0'
+  s.add_dependency 'rdf-vocab', '~> 3.2', '< 4.0'
 
-  s.add_development_dependency 'yard',        '~> 0.9'
-  s.add_development_dependency 'rspec',       '~> 3.6'
-  s.add_development_dependency 'guard-rspec', '~> 4.7'
-  s.add_development_dependency 'rdf-spec',    '~> 3.0'
-  s.add_development_dependency 'rdf-rdfxml',  '>= 2.0', '< 4.0'
-  s.add_development_dependency 'rdf-turtle',  '>= 2.0', '< 4.0'
-  s.add_development_dependency 'json-ld',     '>= 2.0', '< 4.0'
+  s.add_development_dependency 'bixby'
   s.add_development_dependency 'coveralls',   '~> 0.8'
-  s.add_development_dependency 'webmock',     '~> 3.0'
+  s.add_development_dependency 'guard-rspec', '~> 4.7'
+  s.add_development_dependency 'json-ld', '~> 3.2', '< 4.0'
   s.add_development_dependency 'nokogiri',    '~> 1.8'
   s.add_development_dependency 'pragmatic_context', '~> 0.1.2'
+  s.add_development_dependency 'pry-byebug'
+  s.add_development_dependency 'rdf-rdfxml', '~> 3.2', '< 4.0'
+  s.add_development_dependency 'rdf-spec', '~> 3.2', '< 4.0'
+  s.add_development_dependency 'rdf-turtle', '~> 3.2', '< 4.0'
+  s.add_development_dependency 'rspec',       '~> 3.6'
+  s.add_development_dependency 'webmock',     '~> 3.0'
+  s.add_development_dependency 'yard',        '~> 0.9'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
   s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
+    'LICENSE',
+    'README.md'
   ]
 end

lib/active/triples.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require 'active_triples'

lib/active_triples.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
-require 'rdf'
-require 'active_triples/version'
+
 require 'active_support'
+require 'active_triples/version'
+require 'rdf'
 
 ##
-# An ActiveModel compliant ObjectGraphMapper for RDF data. 
-# 
-# Models graphs as `RDFSources` with property/attribute configuration, 
-# accessors, and other methods to support Linked Data in a Ruby enviornment. 
+# An ActiveModel compliant ObjectGraphMapper for RDF data.
+#
+# Models graphs as `RDFSources` with property/attribute configuration,
+# accessors, and other methods to support Linked Data in a Ruby enviornment.
 #
 # @example modeling a simple resource
 #   class Thing
@@ -20,11 +21,11 @@
 #   obj = Thing.new('123')
 #   obj.title = 'Resource'
 #   obj.description = 'A resource.'
-#   obj.dump :ntriples 
+#   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"
 #
-# @see http://www.w3.org/TR/2014/REC-rdf11-concepts-20140225/#change-over-time 
-#   RDF Concepts and Abstract Syntax for an informal definition of an RDF 
+# @see http://www.w3.org/TR/2014/REC-rdf11-concepts-20140225/#change-over-time
+#   RDF Concepts and Abstract Syntax for an informal definition of an RDF
 #   Source.
 module ActiveTriples
   extend ActiveSupport::Autoload
@@ -58,7 +59,7 @@ module ActiveTriples
     # error classes
     autoload :UndefinedPropertyError
   end
-  
+
   ##
   # Raised when a declared repository doesn't have a definition
   class RepositoryNotFoundError < StandardError
@@ -72,18 +73,18 @@ class RepositoryNotFoundError < StandardError
   #    ActiveTriples.class_from_string('MyClass') # => MyClass
   #
   # @example finding a class in a module
-  #    ActiveTriples.class_from_string('MyClass', MyModule) 
+  #    ActiveTriples.class_from_string('MyClass', MyModule)
   #    # => MyModule::MyClass
   #
   # @example when a class exists above the module, but not in it
-  #    ActiveTriples.class_from_string('Object', MyModule) 
+  #    ActiveTriples.class_from_string('Object', MyModule)
   #    # => Object
   #
   # @param class_name [String]
   # @param container_class
   #
   # @return [Class]
-  def self.class_from_string(class_name, container_class=Kernel)
+  def self.class_from_string(class_name, container_class = Kernel)
     container_class = container_class.name if container_class.is_a? Module
     container_parts = container_class.split('::')
     (container_parts + class_name.split('::'))
@@ -114,7 +115,7 @@ def self.ActiveTripels
             / \\
         ,---------.
 
-eos
-"Yum"
+    eos
+    'Yum'
   end
 end

lib/active_triples/configurable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/array/wrap'
 
 module ActiveTriples
@@ -15,7 +16,7 @@ module ActiveTriples
   # Available properties are base_uri, rdf_label, type, and repository
   module Configurable
     def inherited(child_class)
-      child_class.configure type: self.type
+      child_class.configure type: type
       super
     end
 
@@ -57,9 +58,7 @@ def repository
     # @param options [Hash]
     def configure(options = {})
       options = options.map do |key, value|
-        if self.respond_to?("transform_#{key}")
-          value = self.__send__("transform_#{key}", value)
-        end
+        value = __send__("transform_#{key}", value) if respond_to?("transform_#{key}")
         [key, value]
       end
       @configuration = configuration.merge(options)

lib/active_triples/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveTriples
   require_relative 'configuration/item'
   require_relative 'configuration/merge_item'
@@ -10,8 +11,8 @@ class Configuration
     attr_accessor :inner_hash
 
     ##
-    # @param item_factory [ItemFactory]
     # @param [Hash] options the configuration options. (Ruby 3+)
+    # @param item_factory [ItemFactory]
     # @param [Hash] options2 the configuration options. (Ruby 2.x)
     def initialize(options = {}, item_factory: ItemFactory.new, **options2)
       @item_factory = item_factory
@@ -73,9 +74,9 @@ def build_configuration_item(key)
     end
 
     private
-    
-    CONFIG_OPTIONS = [:base_uri, :rdf_label, :type, :repository].freeze
-    
+
+    CONFIG_OPTIONS = %i[base_uri rdf_label type repository].freeze
+
     attr_reader :item_factory
 
     def valid_config_options

lib/active_triples/configuration/item.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveTriples
   class Configuration
     # Basic configuration item which overrides the value for a key on the object.

lib/active_triples/configuration/item_factory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveTriples
   class Configuration
     ## Returns a configuration item appropriate for a given configuration property.

lib/active_triples/configuration/merge_item.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support/core_ext/array/wrap'
 
 module ActiveTriples

lib/active_triples/extension_strategy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActiveTriples
   ##
   # Default property applying strategy which just copies all configured properties

lib/active_triples/identifiable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext/module/delegation'
 
@@ -11,7 +12,7 @@ module ActiveTriples::Identifiable
   # @return [ActiveTriples::Resource] a resource that contains this object's
   # graph.
   def resource
-   @resource ||= resource_class.new(to_uri)
+    @resource ||= resource_class.new(to_uri)
   end
 
   def parent
@@ -25,27 +26,26 @@ def parent=(val)
   ##
   # @return [String] a uri or slug
   def to_uri
-    return id if respond_to? :id and !resource_class.base_uri.nil?
+    return id if respond_to?(:id) && !resource_class.base_uri.nil?
+
     raise NotImplementedError
   end
 
   private
-    def resource_class
-      self.class.resource_class
-    end
-
-  public
 
-    module ClassMethods
+  def resource_class
+    self.class.resource_class
+  end
 
-      delegate :configure, :property, :properties, to: :resource_class
+  module ClassMethods
+    delegate :configure, :property, :properties, to: :resource_class
 
-      def resource_class
-        @resource_class ||= self.const_set(:GeneratedResourceSchema, Class.new(ActiveTriples::Resource))
-      end
+    def resource_class
+      @resource_class ||= const_set(:GeneratedResourceSchema, Class.new(ActiveTriples::Resource))
+    end
 
-      def from_uri(uri, *args)
-        raise NotImplementedError
-      end
+    def from_uri(uri, *args)
+      raise NotImplementedError
     end
+  end
 end