rdf 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 310f7614fec8b30d87c0325fd5bceaa0e0dd6a5165ddf863a2d0460982f5be67
-  data.tar.gz: dca8aa6de3cd44cd1bcb09e57f1b4c1cc8a3413cd0ce08c39466b566dcb27fc3
+  metadata.gz: cbddc1758793b9251e0f2e6570a5a222bf32aa39fcc2e73d1d454b84af90062a
+  data.tar.gz: 4ad7cca943663997855d26d6a741138c0bad7ad3258d8a8fa081e701d5657785
 SHA512:
-  metadata.gz: cb9ceb047dac566de6d389194c5ee875b624021cada5a3b29e7bd0c5f2b1ce87820441b9f137e754ee86505877fe63699cf4a5eac5cb93168d17c3d838e732b1
-  data.tar.gz: 5deb0de70b72a4c00e637e50555c80364e0721f6f968481b7db463131f84f38176686b7a36556d17bd936a34c09ef16ec4429651d229ba70edc3bf9e6ddc7018
+  metadata.gz: 587ff46cfde46b088a9b5994a350bffffc189c96e26a6c9c426ae204b731872858c6b80379a36b3b17c69192b47b81f67b005bd728fd858a0db385f44e70e09e
+  data.tar.gz: 0a048848ce6db55add239882c35a2e0df981ec9ea0afbd3070f1cde536168382d00177a6d2467e196d69ee14a816367c29133263d39c921b5876af63b4dd1d19

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/rdf/cli.rb

@@ -92,6 +92,10 @@ module RDF
       # @return [String]
       attr_reader :description
 
+      # Default value for this option
+      # @return [Object]
+      attr_reader :default
+
       # Potential values (for select or radio) or Ruby datatype
       # @return  [Class, Array<String>]
       attr_reader :datatype
@@ -110,6 +114,7 @@ module RDF
       # @param [Symbol] symbol
       # @param [Array<String>] on
       # @param [String] datatype
+      # @param [Object] default
       # @param [String] control
       # @param [String] description
       # @param [[:optional, :disabled, :removed, :required]] use
@@ -118,10 +123,10 @@ module RDF
       # @yieldparam [OptionParser] options (nil) optional OptionParser
       # @yieldreturn [Object] a possibly modified input value
       def initialize(symbol: nil, on: nil, datatype: nil, control: nil,
-                     description: nil, use: :optional, **options, &block)
+                     description: nil, use: :optional, default: nil, **options, &block)
         raise ArgumentError, "symbol is a required argument" unless symbol
         raise ArgumentError, "on is a required argument" unless on
-        @symbol, @on, @datatype, @control, @description, @use, @callback = symbol.to_sym, Array(on), datatype, control, description, use, block
+        @symbol, @on, @datatype, @control, @description, @use, @default, @callback = symbol.to_sym, Array(on), datatype, control, description, use, default, block
       end
 
       def call(arg, options = {})
@@ -142,6 +147,7 @@ module RDF
         {
           symbol:       symbol,
           datatype:     (datatype.is_a?(Class) ? datatype.name : datatype),
+          default:      default,
           control:      control,
           description:  description,
           use:          use

data/lib/rdf/model/literal.rb

@@ -170,8 +170,7 @@ module RDF
       @language = language.to_s.downcase.to_sym if language
       @datatype = RDF::URI(datatype).freeze if datatype
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)
-      @datatype ||= @language ? RDF.langString : RDF::XSD.string
-      raise ArgumentError, "datatype of rdf:langString requires a language" if !@language && @datatype == RDF::langString
+      @datatype ||= @language ? RDF.langString : RDF::URI("http://www.w3.org/2001/XMLSchema#string")
     end
 
     ##
@@ -226,8 +225,8 @@ module RDF
       # * The arguments are plain literals with identical language tags
       # * The first argument is a plain literal with language tag and the second argument is a simple literal or literal typed as xsd:string
       has_language? ?
-        (language == other.language || other.datatype == RDF::XSD.string) :
-        other.datatype == RDF::XSD.string
+        (language == other.language || other.datatype == RDF::URI("http://www.w3.org/2001/XMLSchema#string")) :
+        other.datatype == RDF::URI("http://www.w3.org/2001/XMLSchema#string")
     end
 
     ##
@@ -317,7 +316,7 @@ module RDF
     # @return [Boolean] `true` or `false`
     # @see http://www.w3.org/TR/rdf-concepts/#dfn-plain-literal
     def plain?
-      [RDF.langString, RDF::XSD.string].include?(datatype)
+      [RDF.langString, RDF::URI("http://www.w3.org/2001/XMLSchema#string")].include?(datatype)
     end
 
     ##
@@ -327,7 +326,7 @@ module RDF
     # @return [Boolean] `true` or `false`
     # @see http://www.w3.org/TR/sparql11-query/#simple_literal
     def simple?
-      datatype == RDF::XSD.string
+      datatype == RDF::URI("http://www.w3.org/2001/XMLSchema#string")
     end
 
     ##
@@ -361,6 +360,8 @@ module RDF
     # @return [Boolean] `true` or `false`
     # @since  0.2.1
     def valid?
+      return false if language? && language.to_s !~ /^[a-zA-Z]+(-[a-zA-Z0-9]+)*$/
+      return false if datatype? && datatype.invalid?
       grammar = self.class.const_get(:GRAMMAR) rescue nil
       grammar.nil? || !!(value =~ grammar)
     end
@@ -487,7 +488,7 @@ module RDF
     def method_missing(name, *args)
       case name
       when :to_str
-        return to_s if @datatype == RDF.langString || @datatype == RDF::XSD.string
+        return to_s if @datatype == RDF.langString || @datatype == RDF::URI("http://www.w3.org/2001/XMLSchema#string")
       end
       super
     end
@@ -495,7 +496,7 @@ module RDF
     def respond_to_missing?(name, include_private = false)
       case name
       when :to_str
-        return true if @datatype == RDF.langString || @datatype == RDF::XSD.string
+        return true if @datatype == RDF.langString || @datatype == RDF::URI("http://www.w3.org/2001/XMLSchema#string")
       end
       super
     end

data/lib/rdf/model/literal/boolean.rb

@@ -5,7 +5,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#boolean
   # @since 0.2.1
   class Boolean < Literal
-    DATATYPE = RDF::XSD.boolean
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#boolean")
     GRAMMAR  = /^(true|false|1|0)$/.freeze
     TRUES    = %w(true  1).freeze
     FALSES   = %w(false 0).freeze

data/lib/rdf/model/literal/date.rb

@@ -5,7 +5,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#date
   # @since 0.2.1
   class Date < Literal
-    DATATYPE = RDF::XSD.date
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#date")
     GRAMMAR  = %r(\A(-?\d{4}-\d{2}-\d{2})((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
     FORMAT   = '%Y-%m-%d'.freeze
 

data/lib/rdf/model/literal/datetime.rb

@@ -5,7 +5,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#dateTime#boolean
   # @since 0.2.1
   class DateTime < Literal
-    DATATYPE = RDF::XSD.dateTime
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#dateTime")
     GRAMMAR  = %r(\A(-?\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
     FORMAT   = '%Y-%m-%dT%H:%M:%S%:z'.freeze
 
@@ -57,14 +57,14 @@ module RDF; class Literal
     # @return [RDF::Literal]
     def timezone
       if tz == 'Z'
-        RDF::Literal("PT0S", datatype: RDF::XSD.dayTimeDuration)
+        RDF::Literal("PT0S", datatype: RDF::URI("http://www.w3.org/2001/XMLSchema#dayTimeDuration"))
       elsif md = tz.to_s.match(/^([+-])?(\d+):(\d+)?$/)
         plus_minus, hour, min = md[1,3]
         plus_minus = nil unless plus_minus == "-"
         hour = hour.to_i
         min = min.to_i
         res = "#{plus_minus}PT#{hour}H#{"#{min}M" if min > 0}"
-        RDF::Literal(res, datatype: RDF::XSD.dayTimeDuration)
+        RDF::Literal(res, datatype: RDF::URI("http://www.w3.org/2001/XMLSchema#dayTimeDuration"))
       end
     end
 

data/lib/rdf/model/literal/decimal.rb

@@ -11,7 +11,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#decimal
   # @since 0.2.1
   class Decimal < Numeric
-    DATATYPE = RDF::XSD.decimal
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#decimal")
     GRAMMAR  = /^[\+\-]?\d+(\.\d*)?$/.freeze
 
     ##

data/lib/rdf/model/literal/double.rb

@@ -11,7 +11,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#double
   # @since 0.2.1
   class Double < Numeric
-    DATATYPE = RDF::XSD.double
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#double")
     GRAMMAR  = /^(?:NaN|\-?INF|[+\-]?(?:\d+(:?\.\d*)?|\.\d+)(?:[eE][\+\-]?\d+)?)$/.freeze
 
     ##

data/lib/rdf/model/literal/integer.rb

@@ -12,7 +12,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#integer
   # @since 0.2.1
   class Integer < Decimal
-    DATATYPE = RDF::XSD.integer
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#integer")
     GRAMMAR  = /^[\+\-]?\d+$/.freeze
 
     ##

data/lib/rdf/model/literal/time.rb

@@ -10,7 +10,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#time
   # @since 0.2.1
   class Time < Literal
-    DATATYPE = RDF::XSD.time
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#time")
     GRAMMAR  = %r(\A(\d{2}:\d{2}:\d{2}(?:\.\d+)?)((?:[\+\-]\d{2}:\d{2})|UTC|GMT|Z)?\Z).freeze
     FORMAT   = '%H:%M:%S%:z'.freeze
 

data/lib/rdf/model/literal/token.rb

@@ -5,7 +5,7 @@ module RDF; class Literal
   # @see   http://www.w3.org/TR/xmlschema11-2/#token
   # @since 0.2.3
   class Token < Literal
-    DATATYPE = RDF::XSD.token
+    DATATYPE = RDF::URI("http://www.w3.org/2001/XMLSchema#token")
     GRAMMAR  = /\A[^\x0D\x0A\x09]+\z/i.freeze # FIXME
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -297,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.