spira 2.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 60a2f2001ee3ca4803b5c0f10dd0ee95be394583
-  data.tar.gz: 4fd45e81ca7128e36b97a08701ee2dacbec31f82
+SHA256:
+  metadata.gz: 97fddc3a248df0d23723ea8967034dab05e28d23ccced070f1e87b910896adcf
+  data.tar.gz: e0828af26e91756329cbf511785d005dc528d0971683f992547fe2dde76f03cb
 SHA512:
-  metadata.gz: 74b6ff7e40373eb2e704f64ff1e3602b60f17ea5042b27189199052f5a47989aa0a894075de4a4d6b4bb35fcd8b7ec0b5631213694058778ba3f3a67482bd326
-  data.tar.gz: 0664e654b6331a8003cc676e7b026ca31d8b3a39159ed6a010eebf776324cec9a07e79aaee61185f2575f323b1d5fe7459747aa08507ad9fed92ed337d5fa6a7
+  metadata.gz: 5c146fef9d47e59add48611de4e460c290f60a410efbefeadf9f64e76e5b56be97a3d5ad1257640c657dcbfe805035edd435f697651f037214971faebc41c139
+  data.tar.gz: 5c69eca5680a622992a4bd7ab0647b6308fe2daaf5c9c651cd14207f870c4d79efcc227768cc974dde9e04f859a33cc1240dafba694eed7dc45b241ba67f5f97

data/README.md

@@ -1,4 +1,9 @@
-# Spira [![Build Status](https://travis-ci.org/ruby-rdf/spira.png?branch=develop)](http://travis-ci.org/ruby-rdf/spira) [![Coverage Status](https://coveralls.io/repos/ruby-rdf/spira/badge.png?branch=develop)](https://coveralls.io/r/ruby-rdf/spira) [![Code Climate](https://codeclimate.com/github/ruby-rdf/spira.png)](https://codeclimate.com/github/ruby-rdf/spira) [![Dependency Status](https://gemnasium.com/ruby-rdf/spira.png)](https://gemnasium.com/ruby-rdf/spira)
+# Spira
+
+[![Gem Version](https://badge.fury.io/rb/spira.png)](https://badge.fury.io/rb/spira)
+[![Build Status](https://github.com/ruby-rdf/spira/workflows/CI/badge.svg?branch=develop)](https://github.com/ruby-rdf/spira/actions?query=workflow%3ACI)
+[![Coverage Status](https://coveralls.io/repos/ruby-rdf/spira/badge.png?branch=develop)](https://coveralls.io/r/ruby-rdf/spira)
+[![Code Climate](https://codeclimate.com/github/ruby-rdf/spira.png)](https://codeclimate.com/github/ruby-rdf/spira)
 
 It's time to breathe life into your linked data.
 
@@ -13,19 +18,18 @@ losing access to statement-oriented nature of linked data, if you so choose.
 It can be used either to access existing RDF data in a resource-oriented way,
 or to create a new store of RDF data based on simple defaults.
 
-An introductory blog post is at <http://blog.datagraph.org/2010/05/spira>
-
-A changelog is available in the {file:CHANGES.md} file.
-
 ### Example
 
 ```ruby
+require 'spira'
+require 'rdf/vocab'
+
 class Person < Spira::Base
 
-  configure :base_uri => "http://example.org/example/people"
+  configure base_uri: "http://example.org/example/people"
 
-  property :name, :predicate => RDF::Vocab::FOAF.name, :type => String
-  property :age,  :predicate => RDF::Vocab::FOAF.age,  :type => Integer
+  property :name, predicate: RDF::Vocab::FOAF.name, type: String
+  property :age,  predicate: RDF::Vocab::FOAF.age,  type: Integer
 
 end
 
@@ -100,7 +104,7 @@ The easiest way to work with Spira is to install it via Rubygems:
 
     $ sudo gem install spira
 
-Downloads will be available on the github project page, as well as on Rubyforge.
+Downloads will be available on the github project page.
 
 ## Defining Model Classes
 
@@ -110,17 +114,18 @@ without the `RDF::` prefix.  For example:
 
 ```ruby
 require 'spira'
+require 'rdf/vocab'
     
 class CD < Spira::Base
-  configure :base_uri => 'http://example.org/cds'
-  property :name,   :predicate => RDF::Vocab::DC.title,   :type => XSD.string
-  property :artist, :predicate => URI.new('http://example.org/vocab/artist'), :type => :artist
+  configure base_uri: 'http://example.org/cds'
+  property :name,   predicate: RDF::Vocab::DC.title,   type: XSD.string
+  property :artist, predicate: RDF::URI.new('http://example.org/vocab/artist'), type: :artist
 end
 
 class Artist < Spira::Base
-  configure :base_uri => 'http://example.org/artists'
-  property :name, :predicate => RDF::Vocab::DC.title, :type => XSD.string
-  has_many :cds,  :predicate => URI.new('http://example.org/vocab/published_cd'), :type => XSD.string
+  configure base_uri: 'http://example.org/artists'
+  property :name, predicate: RDF::Vocab::DC.title, type: XSD.string
+  has_many :cds,  predicate: RDF::URI.new('http://example.org/vocab/published_cd'), type: XSD.string
 end
 ```
 
@@ -210,15 +215,18 @@ CD.for RDF::URI.new('http://example.org/cds/queens-greatest-hits')
 A class with a `type` set is assigned an `RDF.type` on creation and saving.
 
 ```ruby
+require 'spira'
+require 'rdf/vocab'
+
 class Album < Spira::Base
-  type URI.new('http://example.org/types/album')
-  property :name,   :predicate => RDF::Vocab::DC.title
+  type RDF::URI.new('http://example.org/types/album')
+  property :name,   predicate: RDF::Vocab::DC.title
 end
 
 Spira.repository = RDF::Repository.new
 
 rolling_stones = Album.for RDF::URI.new('http://example.org/cds/rolling-stones-hits')
-# See RDF.rb at http://rdf.rubyforge.org/RDF/Enumerable.html for more information about #has_predicate?
+# See RDF.rb at https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Enumerable.html for more information about #has_predicate?
 rolling_stones.has_predicate?(RDF.type) #=> true
 Album.type #=> RDF::URI('http://example.org/types/album')
 ```
@@ -263,10 +271,10 @@ A class with a `default_vocabulary` set will transparently create predicates for
 
 ```ruby
 class Song < Spira::Base
-  configure :default_vocabulary => URI.new('http://example.org/vocab'),
-            :base_uri => 'http://example.org/songs'
+  configure default_vocabulary: RDF::URI.new('http://example.org/vocab'),
+            base_uri: 'http://example.org/songs'
   property :title
-  property :author, :type => :artist
+  property :author, type: :artist
 end
 
 Spira.repository = RDF::Repository.new
@@ -288,8 +296,8 @@ will always return a list, including an empty list for no value.  All options
 for `property` work for `has_many`.
 
 ```ruby
-property :artist, :type => :artist    #=> cd.artist returns a single value
-has_many :cds,    :type => :cd        #=> artist.cds returns an array
+property :artist, type: :artist    #=> cd.artist returns a single value
+has_many :cds,    type: :cd        #=> artist.cds returns an array
 ```
 
 Property always takes a symbol name as a name, and a variable list of options.  The supported options are:
@@ -308,7 +316,7 @@ properties having a single item, ie defined with `property`.
 
 ```ruby
 class Article < Spira::Base
-  property :label, :localized => true
+  property :label, localized: true
 end
 
 Spira.repository = RDF::Repository.new
@@ -368,8 +376,8 @@ Classes can now use this particular type like so:
 
 ```ruby
 class Test < Spira::Base
-  property :test1, :type => Integer
-  property :test2, :type => RDF::XSD.integer
+  property :test1, type: Integer
+  property :test2, type: RDF::XSD.integer
 end
 ```
 
@@ -384,7 +392,7 @@ are implemented:
 
 The default type for a Spira property is `Spira::Types::Any`, which uses
 `RDF::Literal`'s automatic boxing/unboxing of XSD types as best it can.
-See [`RDF::Literal`](http://rdf.rubyforge.org/RDF/Literal.html) for more information.
+See [`RDF::Literal`](https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html) for more information.
 
 You can implement your own types as well.  Your class' serialize method should
 turn an RDF::Value into a ruby object, and vice versa.
@@ -404,7 +412,7 @@ module MyModule
 end
 
 class MyClass < Spira::Base
-  property :property1, :type => MyModule::MyType
+  property :property1, type: MyModule::MyType
 end
 ```
 
@@ -467,6 +475,10 @@ All model objects are fully-functional as `RDF::Enumerable`, `RDF::Queryable`,
 and `RDF::Mutable`.  This lets you manipulate objects on the RDF statement
 level.  You can also access attributes that are not defined as properties.
 
+## Documentation
+
+<https://www.rubydoc.info/github/ruby-rdf/spira>
+
 ## Support
 
 There are a number of ways to ask for help.  In declining order of preference:
@@ -493,7 +505,10 @@ This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange develo
   list in the the `README`. Alphabetical order applies.
 * 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.
+  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.
 
-[public-rdf-ruby w3c mailing list]:         http://lists.w3.org/Archives/Public/public-rdf-ruby/
-[RDF.rb]:          http://rubygems.org/gems/rdf
+[public-rdf-ruby w3c mailing list]:         https://lists.w3.org/Archives/Public/public-rdf-ruby/
+[RDF.rb]:          https://rubygems.org/gems/rdf
+[PDD]:              https://unlicense.org/#unlicensing-contributions

data/UNLICENSE

@@ -21,4 +21,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <http://unlicense.org/>
+For more information, please refer to <https:///unlicense.org/>

data/VERSION

@@ -1 +1 @@
-2.1.0
+3.2.0

data/lib/spira/base.rb

@@ -32,8 +32,6 @@ module Spira
     # @return [RDF::URI]
     attr_reader :subject
 
-    attr_accessor :attributes
-
     class << self
       attr_reader :reflections, :properties
 
@@ -95,7 +93,7 @@ module Spira
       end
 
       def instantiate_record(subj)
-        new(:_subject => id_for(subj))
+        new(_subject: id_for(subj))
       end
 
     end # class methods
@@ -109,31 +107,40 @@ module Spira
     # Initialize a new Spira::Base instance of this resource class using
     # a new blank node subject.  Accepts a hash of arguments for initial
     # attributes.  To use a URI or existing blank node as a subject, use
-    # {Spira.for} instead.
+    # the `.for` method on the subclass instead.
+    #
+    # @example
+    #   class Person < Spira::Base; end
+    #   bob = Person.for("bob")
     #
     # @param [Hash{Symbol => Any}] props Default attributes for this instance
     # @yield [self] Executes a given block
     # @yieldparam [self] self The newly created instance
-    # @see Spira.for
+    # @see Spira::Persistence::ClassMethods#for
     # @see RDF::URI#as
     # @see RDF::Node#as
     def initialize(props = {}, options = {})
       @subject = props.delete(:_subject) || RDF::Node.new
+      @attrs = {}
 
-      @attributes = {}
       reload props
 
       yield self if block_given?
     end
 
+    # Returns the attributes
+    def attributes
+      @attrs
+    end
+
     # Freeze the attributes hash such that associations are still accessible, even on destroyed records.
     def freeze
-      @attributes.freeze; self
+      @attrs.freeze; self
     end
 
     # Returns +true+ if the attributes hash has been frozen.
     def frozen?
-      @attributes.frozen?
+      @attrs.frozen?
     end
 
     ##
@@ -185,7 +192,7 @@ module Spira
     # an RDF level, and will work across subclasses as long as the attributes
     # are the same.
     #
-    # @see http://rdf.rubyforge.org/isomorphic/
+    # @see https://rubygems.org/gems/rdf-isomorphic/
     def ==(other)
       # TODO: define behavior for equality on subclasses.
       # TODO: should we compare attributes here?
@@ -257,7 +264,7 @@ module Spira
     # @param [RDF::Resource] new_subject
     # @return [Spira::Base] copy
     def copy(new_subject)
-      self.class.new(attributes.merge(:_subject => new_subject))
+      self.class.new(@attrs.merge(_subject: new_subject))
     end
 
     ##
@@ -284,20 +291,19 @@ module Spira
     private
 
     def reset_changes
-      @previously_changed = changes
-      @changed_attributes.clear
+      clear_changes_information
     end
 
     def write_attribute(name, value)
       name = name.to_s
       if self.class.properties[name]
-        if attributes[name].is_a?(Promise)
-          changed_attributes[name] = attributes[name] unless changed_attributes.include?(name)
-          attributes[name] = value
+        if @attrs[name].is_a?(Promise)
+          changed_attributes[name] = @attrs[name] unless changed_attributes.include?(name)
+          @attrs[name] = value
         else
           if value != read_attribute(name)
             attribute_will_change!(name)
-            attributes[name] = value
+            @attrs[name] = value
           end
         end
       else
@@ -309,7 +315,7 @@ module Spira
     # Get the current value for the given attribute
     #
     def read_attribute(name)
-      value = attributes[name.to_s]
+      value = @attrs[name.to_s]
 
       refl = self.class.reflections[name]
       if refl && !value
@@ -334,7 +340,7 @@ module Spira
     end
 
     def serialize_localized_property(value, locale)
-      RDF::Literal.new(value, :language => locale)
+      RDF::Literal.new(value, language: locale)
     end
 
     def unserialize_localized_properties(values, locale)
@@ -350,7 +356,7 @@ module Spira
     end
 
     def serialize_hash_localized_properties(values)
-      values.map { |lang, property| RDF::Literal.new(property, :language => lang) }
+      values.map { |lang, property| RDF::Literal.new(property, language: lang) }
     end
 
     # Build a Ruby value from an RDF value.

data/lib/spira/persistence.rb

@@ -20,7 +20,7 @@ module Spira
       # @param [Hash] args
       #   args can contain:
       #     :conditions - Hash of properties and values
-      #     :limit      - Fixnum, limiting the amount of returned records
+      #     :limit      - Integer, limiting the amount of returned records
       # @return [Spira::Base, Array]
       def find(scope, *args)
         case scope
@@ -73,7 +73,7 @@ module Spira
           #       cannot handle such patterns, we iterate across types "manually"
           types.each do |tp|
             break if limit.zero?
-            q = conditions_to_query(conditions.merge(:type => tp))
+            q = conditions_to_query(conditions.merge(type: tp))
             repository.query(q) do |solution|
               break if limit.zero?
               if offset.zero?
@@ -112,24 +112,24 @@ module Spira
       #
       # ==== Examples
       #   # Create a single new object
-      #   User.create(:first_name => 'Jamie')
+      #   User.create(first_name: 'Jamie')
       #
       #   # Create a single new object using the :admin mass-assignment security role
-      #   User.create({ :first_name => 'Jamie', :is_admin => true }, :as => :admin)
+      #   User.create({ first_name: 'Jamie', is_admin: true }, as: :admin)
       #
       #   # Create a single new object bypassing mass-assignment security
-      #   User.create({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
+      #   User.create({ first_name: 'Jamie', is_admin: true }, without_protection: true)
       #
       #   # Create an Array of new objects
-      #   User.create([{ :first_name => 'Jamie' }, { :first_name => 'Jeremy' }])
+      #   User.create([{ first_name: 'Jamie' }, { first_name: 'Jeremy' }])
       #
       #   # Create a single object and pass it into a block to set other attributes.
-      #   User.create(:first_name => 'Jamie') do |u|
+      #   User.create(first_name: 'Jamie') do |u|
       #     u.is_admin = false
       #   end
       #
       #   # Creating an Array of new objects using a block, where the block is executed for each object:
-      #   User.create([{ :first_name => 'Jamie' }, { :first_name => 'Jeremy' }]) do |u|
+      #   User.create([{ first_name: 'Jamie' }, { first_name: 'Jeremy' }]) do |u|
       #     u.is_admin = false
       #   end
       def create(attributes = nil, options = {}, &block)
@@ -171,7 +171,7 @@ module Spira
       # @yield [self] Executes a given block and calls `#save!`
       # @yieldparam [self] self The newly created instance
       # @return  [Spira::Base] The newly created instance
-      # @see http://rdf.rubyforge.org/RDF/URI.html
+      # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/URI.html
       def for(identifier, attributes = {}, &block)
         self.project(id_for(identifier), attributes, &block)
       end
@@ -192,7 +192,7 @@ module Spira
       # @param [Hash{Symbol => Any}] attributes Initial attributes
       # @return [Spira::Base] the newly created instance
       def project(subject, attributes = {}, &block)
-        new(attributes.merge(:_subject => subject), &block)
+        new(attributes.merge(_subject: subject), &block)
       end
 
       ##
@@ -205,7 +205,7 @@ module Spira
       # @param  [Any] identifier
       # @return [RDF::URI, RDF::Node]
       # @raise  [ArgumentError] If this class cannot create an identifier from the given argument
-      # @see http://rdf.rubyforge.org/RDF/URI.html
+      # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/URI.html
       # @see Spira.base_uri
       # @see Spira.for
       def id_for(identifier)
@@ -303,10 +303,10 @@ module Spira
     ##
     # Enumerate each RDF statement that makes up this projection.  This makes
     # each instance an `RDF::Enumerable`, with all of the nifty benefits
-    # thereof.  See <http://rdf.rubyforge.org/RDF/Enumerable.html> for
+    # thereof.  See <https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Enumerable.html> for
     # information on arguments.
     #
-    # @see http://rdf.rubyforge.org/RDF/Enumerable.html
+    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Enumerable.html
     def each
       if block_given?
         self.class.properties.each do |name, property|
@@ -333,7 +333,7 @@ module Spira
     ##
     # The number of RDF::Statements this projection has.
     #
-    # @see http://rdf.rubyforge.org/RDF/Enumerable.html#count
+    # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Enumerable.html#count
     def count
       each.count
     end
@@ -342,7 +342,7 @@ module Spira
     # Update multiple attributes of this repository.
     #
     # @example Update multiple attributes
-    #     person.update_attributes(:name => 'test', :age => 10)
+    #     person.update_attributes(name: 'test', age: 10)
     #     #=> person
     #     person.name
     #     #=> 'test'
@@ -366,7 +366,7 @@ module Spira
     # NB: "props" argument is ignored, it is handled in Base
     #
     def reload(props = {})
-      sts = self.class.repository.query(:subject => subject)
+      sts = self.class.repository.query({subject: subject})
       self.class.properties.each do |name, options|
         name = name.to_s
         if sts

data/lib/spira/resource.rb

@@ -15,8 +15,8 @@ module Spira
     #
     def configure(options = {})
       singleton_class.class_eval do
-        { :base_uri => options[:base_uri],
-          :default_vocabulary => options[:default_vocabulary]
+        { base_uri: options[:base_uri],
+          default_vocabulary: options[:default_vocabulary]
         }.each do |name, value|
           # redefine reader methods only when required,
           # otherwise, use the ancestor methods
@@ -61,11 +61,11 @@ module Spira
     # represents an RDF predicate.
     #
     # @example A simple string property
-    #     property :name, :predicate => RDF::Vocab::FOAF.name, :type => String
+    #     property :name, predicate: RDF::Vocab::FOAF.name, type: String
     # @example A property which defaults to {Spira::Types::Any}
-    #     property :name, :predicate => RDF::Vocab::FOAF.name
+    #     property :name, predicate: RDF::Vocab::FOAF.name
     # @example An integer property
-    #     property :age,  :predicate => RDF::Vocab::FOAF.age, :type => Integer
+    #     property :age,  predicate: RDF::Vocab::FOAF.age, type: Integer
     # @param  [Symbol] name The name of this property
     # @param  [Hash{Symbol => Any}] opts property options
     # @option opts [RDF::URI]            :predicate The RDF predicate which will refer to this property
@@ -81,12 +81,12 @@ module Spira
       if opts.delete(:localized)
         raise 'Only Spira::Types::Any properties can accept the :localized option' unless type_for(opts[:type]) == Spira::Types::Any
         define_localized_property_methods(name, opts)
-        has_many "#{name}_native", opts.merge(:type => Spira::Types::Native)
+        has_many "#{name}_native", opts.merge(type: Spira::Types::Native)
       else
         unset_has_many(name)
         predicate = predicate_for(opts[:predicate], name)
         type = type_for(opts[:type])
-        properties[name] = HashWithIndifferentAccess.new(:predicate => predicate, :type => type)
+        properties[name] = HashWithIndifferentAccess.new(predicate: predicate, type: type)
 
         define_attribute_method name
         define_method "#{name}=" do |arg|

data/lib/spira/type.rb

@@ -26,13 +26,13 @@ module Spira
   # Spira by default.  It allows either of the following forms to declare an
   # integer property on a Spira resource:
   #
-  #     property :age, :predicate => RDF::Vocab::FOAF.age, :type => Integer
-  #     property :age, :predicate => RDF::Vocab::FOAF.age, :type => RDF::XSD.integer
+  #     property :age, predicate: RDF::Vocab::FOAF.age, type: Integer
+  #     property :age, predicate: RDF::Vocab::FOAF.age, type: RDF::XSD.integer
   #
   # `Spira::Type`s include the RDF namespace and thus have all of the base RDF
   # vocabularies available to them without the `RDF::` prefix.
   #
-  # @see http://rdf.rubyforge.org/RDF/Value.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Value.html
   # @see Spira::Resource
   module Type
 

data/lib/spira/types/any.rb

@@ -6,7 +6,7 @@ module Spira::Types
   # Its behavior is defined as 'What `RDF::Literal` does' for a given value.
   #
   # @see Spira::Type
-  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html
   class Any
 
     include Spira::Type

data/lib/spira/types/anyURI.rb

@@ -8,7 +8,7 @@ module Spira::Types
   # `Spira::Types::AnyURI`, `AnyURI`, or `XSD.anyURI`.
   #
   # @see Spira::Type
-  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html
   class AnyURI
 
     include Spira::Type
@@ -18,10 +18,10 @@ module Spira::Types
     end
 
     def self.serialize(value)
-      RDF::Literal.new(value, :datatype => XSD.anyURI)
+      RDF::Literal.new(value, datatype: XSD.anyURI)
     end
 
-    register_alias XSD.anyURI
+    register_alias RDF::XSD.anyURI
 
   end
 end

data/lib/spira/types/boolean.rb

@@ -8,7 +8,7 @@ module Spira::Types
   # `Spira::Types::Boolean`, `Boolean`, or `XSD.boolean`.
   #
   # @see Spira::Type
-  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html
   class Boolean
 
     include Spira::Type
@@ -19,9 +19,9 @@ module Spira::Types
 
     def self.serialize(value)
       if value
-        RDF::Literal.new(true, :datatype => RDF::XSD.boolean)
+        RDF::Literal.new(true, datatype: RDF::XSD.boolean)
       else 
-        RDF::Literal.new(false, :datatype => RDF::XSD.boolean)
+        RDF::Literal.new(false, datatype: RDF::XSD.boolean)
       end
     end
 

data/lib/spira/types/date.rb

@@ -8,7 +8,7 @@ module Spira::Types
   # `Spira::Types::Date`, `Date`, or `XSD.date`.
   #
   # @see Spira::Type
-  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html
   class Date
     include Spira::Type
 
@@ -17,10 +17,10 @@ module Spira::Types
     end
 
     def self.serialize(value)
-      RDF::Literal.new(value, :datatype => XSD.date)
+      RDF::Literal.new(value, datatype: XSD.date)
     end
 
-    register_alias XSD.date
+    register_alias RDF::XSD.date
 
   end
 end

data/lib/spira/types/dateTime.rb

@@ -8,7 +8,7 @@ module Spira::Types
   # `Spira::Types::DateTime`, `DateTime`, or `XSD.dateTime`.
   #
   # @see Spira::Type
-  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html
   class DateTime
     include Spira::Type
 
@@ -17,10 +17,10 @@ module Spira::Types
     end
 
     def self.serialize(value)
-      RDF::Literal.new(value, :datatype => XSD.dateTime)
+      RDF::Literal.new(value, datatype: XSD.dateTime)
     end
 
-    register_alias XSD.dateTime
+    register_alias RDF::XSD.dateTime
 
   end
 end

data/lib/spira/types/decimal.rb

@@ -10,7 +10,7 @@ module Spira::Types
   # `Spira::Types::Integer`, `Integer`, or `XSD.integer`.
   #
   # @see Spira::Type
-  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html
   class Decimal
     include Spira::Type
 
@@ -20,7 +20,7 @@ module Spira::Types
     end
 
     def self.serialize(value)
-      RDF::Literal.new(value.is_a?(BigDecimal) ? value.to_s('F') : value.to_s, :datatype => RDF::XSD.decimal)
+      RDF::Literal.new(value.is_a?(BigDecimal) ? value.to_s('F') : value.to_s, datatype: RDF::XSD.decimal)
     end
 
     register_alias RDF::XSD.decimal

data/lib/spira/types/double.rb

@@ -8,7 +8,7 @@ module Spira::Types
   # `Spira::Types::Double`, `Double`, or `XSD.double`.
   #
   # @see Spira::Type
-  # @see http://rdf.rubyforge.org/RDF/Literal.html
+  # @see https://www.rubydoc.info/github/ruby-rdf/rdf/RDF/Literal.html
   class Double
 
     include Spira::Type
@@ -18,7 +18,7 @@ module Spira::Types
     end
 
     def self.serialize(value)
-      RDF::Literal.new(value.to_f, :datatype => RDF::XSD.double)
+      RDF::Literal.new(value.to_f, datatype: RDF::XSD.double)
     end
 
     register_alias RDF::XSD.double