Finish 0.2.0

Author: gkellogg

.github/workflows/ci.yml

@@ -23,7 +23,8 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
-          #- ruby-head # Eventualy
+          - 3.0
+          - ruby-head # Eventualy
           - jruby
     steps:
       - name: Clone repository

.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .idea/
+/.byebug_history

Gemfile

@@ -1,4 +1,11 @@
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in rdf-virtuoso.gemspec
-gemspec
+gemspec
+
+gem "rdf",      github: "ruby-rdf/rdf",      branch: "develop"
+gem "rdf-spec", github: "ruby-rdf/rdf-spec", branch: "develop"
+
+group :debug do
+  gem "byebug", platforms: :mri
+end

LICENSE

@@ -7,8 +7,8 @@ The intent of this class is to act as an abstraction for clients wishing to conn
 [![Gitter chat](https://badges.gitter.im/ruby-rdf/rdf.png)](https://gitter.im/ruby-rdf/rdf)
 
 ## How?
-RDF::Virtuoso::Repository subclasses RDF::Repository built on RDF.rb and is the main connection class built on top of APISmith to establish the read and write methods to a Virtuoso store SPARQL endpoint.
-RDF::Virtuoso::Query subclasses RDF::Query and adds SPARQL 1.1. update methods (insert, delete, aggregates, etc.).
+`RDF::Virtuoso::Repository` subclasses `RDF::Repository` built on [RDF.rb][] and is the main connection class built on top of APISmith to establish the read and write methods to a Virtuoso store SPARQL endpoint.
+`RDF::Virtuoso::Query` subclasses `RDF::Query` and adds SPARQL 1.1. update methods (insert, delete, aggregates, etc.).
 
 For examples on use, please read:
      ./spec/repository_spec.rb 
@@ -69,3 +69,30 @@ or you can dynamically add RDF::Vocabulary objects
 Results will be an array of RDF::Query::Solution that can be accessed by bindings or iterated
 
     count = result.first[:count].to_i
+
+## Contributing
+
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
+
+* Do your best to adhere to the existing coding conventions and idioms.
+* Don't use hard tabs, and don't leave trailing whitespace on any line.
+  Before committing, run `git diff --check` to make sure of this.
+* Do document every method you add using [YARD][] annotations. Read the
+  [tutorial][YARD-GS] or just look at the existing code for examples.
+* Don't touch the `.gemspec` or `VERSION` files. If you need to change them,
+  do so on your private branch only.
+* Do note that in order for us to merge any non-trivial changes (as a rule
+  of thumb, additions larger than about 15 lines of code), we need an
+  explicit [public domain dedication][PDD] on record from you,
+  which you will be asked to agree to on the first commit to a repo within the organization.
+  Note that the agreement applies to all repos in the [Ruby RDF](https://github.com/ruby-rdf/) organization.
+
+## License
+
+This is free and unencumbered public domain software. For more information,
+see <https://unlicense.org/> or the accompanying {file:LICENSE} file.
+
+[PDD]:              https://unlicense.org/#unlicensing-contributions
+[YARD]:             https://yardoc.org/
+[YARD-GS]:          https://rubydoc.info/docs/yard/file/docs/GettingStarted.md
+[RDF.rb]:       https://rubydoc.info/github/ruby-rdf/rdf

README.md

@@ -1 +1 @@
-0.1.7
+0.2.0

VERSION

@@ -8,7 +8,7 @@
 <> a doap:Project ;
   doap:name          "RDF::Virtuoso" ;
   doap:homepage      <https://github.com/ruby-rdf/rdf-vituoso> ;
-  doap:license       <https://www.gnu.org/licenses/gpl-3.0> ;
+  doap:license       <https://unlicense.org/1.0/> ;
   doap:shortdesc     "An RDF.rb extension library for interacting with a Virtuoso rdf store."@en ;
   doap:description   "An RDF.rb extension library for interacting with a Virtuoso rdf store.\nSupports SPARQL 1.1 UPDATE extensions and some Virtuoso specific commands."@en ;
   doap:created       "2007-10-23" ;

etc/doap.ttl

@@ -29,8 +29,8 @@ class Query < RDF::Query
     # @param  [Hash{Symbol => Object}] options
     # @return [Query]
     # @see    http://www.w3.org/TR/rdf-sparql-query/#ask
-    def self.ask(options = {})
-      self.new(:ask, options)
+    def self.ask(**options)
+      self.new(:ask, **options)
     end
 
     ##
@@ -40,9 +40,8 @@ def self.ask(options = {})
     # @param  [Hash{Symbol => Object}] options
     # @return [Query]
     # @see    http://www.w3.org/TR/rdf-sparql-query/#select
-    def self.select(*variables)
-      options = variables.last.is_a?(Hash) ? variables.pop : {}
-      self.new(:select, options).select(*variables)
+    def self.select(*variables, **options)
+      self.new(:select, **options).select(*variables)
     end
 
     ##
@@ -52,9 +51,8 @@ def self.select(*variables)
     # @param  [Hash{Symbol => Object}]  options
     # @return [Query]
     # @see    http://www.w3.org/TR/rdf-sparql-query/#describe
-    def self.describe(*variables)
-      options = variables.last.is_a?(Hash) ? variables.pop : {}
-      self.new(:describe, options).describe(*variables)
+    def self.describe(*variables, **options)
+      self.new(:describe, **options).describe(*variables)
     end
 
     ##
@@ -64,9 +62,8 @@ def self.describe(*variables)
     # @param  [Hash{Symbol => Object}]            options
     # @return [Query]
     # @see    http://www.w3.org/TR/rdf-sparql-query/#construct
-    def self.construct(*patterns)
-      options = patterns.last.is_a?(Hash) ? patterns.pop : {}
-      self.new(:construct, options).construct(*patterns) # FIXME
+    def self.construct(*patterns, **options)
+      self.new(:construct, **options).construct(*patterns) # FIXME
     end
 
     ##
@@ -76,50 +73,42 @@ def self.construct(*patterns)
     # @param  [Hash{Symbol => Object}]            options
     # @return [Query]
     # @see    http://www.w3.org/Submission/SPARQL-Update/
-    def self.insert_data(*patterns)
-      # options = variables.last.is_a?(Hash) ? variables.pop : {}
-      options = patterns.last.is_a?(Hash) ? patterns.pop : {}
-      self.new(:insert_data, options).insert_data(*patterns) 
+    def self.insert_data(*patterns, **options)
+      self.new(:insert_data, **options).insert_data(*patterns) 
     end
 
-    def self.insert(*patterns)
-      options = patterns.last.is_a?(Hash) ? patterns.pop : {}
-      self.new(:insert, options).insert(*patterns) 
+    def self.insert(*patterns, **options)
+      self.new(:insert, **options).insert(*patterns) 
     end
 
-    def self.delete_data(*patterns)
-      options = patterns.last.is_a?(Hash) ? patterns.pop : {}
-      self.new(:delete_data, options).delete_data(*patterns)
+    def self.delete_data(*patterns, **options)
+      self.new(:delete_data, **options).delete_data(*patterns)
     end
 
-    def self.delete(*patterns)
-      options = patterns.last.is_a?(Hash) ? patterns.pop : {}
-      self.new(:delete, options).delete(*patterns) 
+    def self.delete(*patterns, **options)
+      self.new(:delete, **options).delete(*patterns) 
     end
 
-    def self.create(*variables)
-      options = variables.last.is_a?(Hash) ? variables.pop : {}
-      self.new(:create, options).create(variables.first)
+    def self.create(*variables, **options)
+      self.new(:create, **options).create(variables.first)
     end
 
-    def self.drop(*variables)
-      options = variables.last.is_a?(Hash) ? variables.pop : {}
-      self.new(:drop, options).drop(variables.first)
+    def self.drop(*variables, **options)
+      self.new(:drop, **options).drop(variables.first)
     end
 
-    def self.clear(*variables)
-      options = variables.last.is_a?(Hash) ? variables.pop : {}
-      self.new(:clear, options).clear(variables.first)
+    def self.clear(*variables, **options)
+      self.new(:clear, **options).clear(variables.first)
     end
 
     ##
     # @param  [Symbol, #to_s]          form
     # @param  [Hash{Symbol => Object}] options
     # @yield  [query]
     # @yieldparam [Query]
-    def initialize(form = :ask, options = {}, &block)
+    def initialize(form = :ask, **options, &block)
       @form = form.respond_to?(:to_sym) ? form.to_sym : form.to_s.to_sym
-      super([], options, &block)
+      super([], **options, &block)
     end
 
     ##

lib/rdf/virtuoso/query.rb

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/ruby-rdf/rdf-virtuoso'
   s.summary     = %q{An RDF.rb extension library for interacting with a Virtuoso rdf store}
   s.description = %q{An RDF.rb extension library for interacting with a Virtuoso rdf store.\nSupports SPARQL 1.1 UPDATE extensions and some Virtuoso specific commands.}
-  s.licenses    = ['GPL-3.0']
+  s.license     = 'Unlicense'
 
   s.files         = %w(README.md LICENSE VERSION) + Dir.glob('lib/**/*.rb')
   s.require_paths = ['lib']