rdf 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 523f47ae54751bebd787e2c6e89a873c9840a864
-  data.tar.gz: 983597fbc20f6f76112c305fc1381cd121f0460a
+  metadata.gz: 3b35c022bb44e2984bddf19489cd1f4735c03b75
+  data.tar.gz: 720f825d01d2c76aca6e27e0b1ad2101beebc362
 SHA512:
-  metadata.gz: 5a2ac12b5cf718284a678b37c1fab90b2d8e169f719dfc24af2ec1a4a2094672008d69bf3c8c8af3e4d4c67083a1e86966b237d9f68a13aa663f9e867dfae54b
-  data.tar.gz: a9791dc9db755abdb52811f0a238c1294e830fe3d4f4fe0f7451e3bdc6734bca379a384e300fe0ee77c059749b55506dce5ae6be033c2de1cfbfb13a3f0f6550
+  metadata.gz: fab5abcd8aa2c90c9ab0a4ddd8fe33c25bd83cb0a5e2451fb64e7e0b00c19354aff75f8aa51fa228ebdf3c8522d3b1e19ff02bad2be809e302532a38d11ebb80
+  data.tar.gz: e73edad908ae432613d5f4cfd2e712fa933fb0b75f185acf8731a9948de8bd8c9e1679a39faefbb5457a55a5c0ee0d16717ec84363d2ca518cfe0538c8afc331

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/bin/rdf

@@ -26,4 +26,5 @@ end
 
 abort options.banner if ARGV.empty? && !options.options[:evaluate]
 
-RDF::CLI.exec(ARGV, options.options)
+# Add option_parser to parsed options to enable help
+RDF::CLI.exec(ARGV, options.options.merge(option_parser: options))

data/lib/rdf/cli.rb

@@ -8,7 +8,7 @@ begin
   require 'linkeddata'
 rescue LoadError
   # Silently load without linkeddata, but try some others
-  %w(reasoner rdfa rdfxml turtle json/ld ld/patch).each do |ser|
+  %w(reasoner rdfa rdfxml turtle vocab json/ld ld/patch).each do |ser|
     begin
       require ser.include?('/') ? ser : "rdf/#{ser}"
     rescue LoadError
@@ -345,16 +345,16 @@ module RDF
       cmds, args = args.partition {|e| commands.include?(e.to_s)}
 
       if cmds.empty?
-        usage(options)
+        usage(options.fetch(:option_parser, self.options))
         abort "No command given"
       end
 
       if cmds.first == 'help'
         on_cmd = cmds[1]
         if on_cmd && COMMANDS.fetch(on_cmd.to_sym, {})[:help]
-          usage(self.options, banner: "Usage: #{self.basename.split('/').last} #{COMMANDS[on_cmd.to_sym][:help]}")
+          usage(options.fetch(:option_parser, self.options), banner: "Usage: #{self.basename.split('/').last} #{COMMANDS[on_cmd.to_sym][:help]}")
         else
-          usage(self.options)
+          usage(options.fetch(:option_parser, self.options))
         end
         return
       end

data/lib/rdf/model/list.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 module RDF
   ##
   # An RDF list.
@@ -344,12 +345,7 @@ module RDF
     # @see    http://ruby-doc.org/core-2.2.2/Array.html#method-i-unshift
     #
     def unshift(value)
-      value = case value
-        when nil         then RDF.nil
-        when RDF::Term   then value
-        when Array       then RDF::List.new(subject: nil, graph: graph, values: value)
-        else value
-      end
+      value = normalize_value(value)
 
       new_subject, old_subject = RDF::Node.new, subject
 
@@ -407,12 +403,7 @@ module RDF
     # @return [RDF::List]
     # @see    http://ruby-doc.org/core-2.2.2/Array.html#method-i-3C-3C
     def <<(value)
-      value = case value
-        when nil         then RDF.nil
-        when RDF::Value  then value
-        when Array       then RDF::List.new(subject: nil, graph: graph, values: value)
-        else value
-      end
+      value = normalize_value(value)
 
       if empty?
         @subject = new_subject = RDF::Node.new
@@ -547,12 +538,11 @@ module RDF
     #   RDF::List[1, 2, 3].fetch(4, nil)        #=> nil
     #   RDF::List[1, 2, 3].fetch(4) { |n| n*n } #=> 16
     #
-    # @return [RDF::Term]
+    # @return [RDF::Term, nil]
     # @see    http://ruby-doc.org/core-1.9/classes/Array.html#M000420
     def fetch(index, default = UNSET)
-      each.with_index do |v, i|
-        return v if i == index
-      end
+      val = at(index)
+      return val unless val.nil?
 
       case
         when block_given?         then yield index
@@ -568,12 +558,10 @@ module RDF
     #   RDF::List[1, 2, 3].at(0)                #=> 1
     #   RDF::List[1, 2, 3].at(4)                #=> nil
     #
-    # @return [RDF::Term]
+    # @return [RDF::Term, nil]
     # @see    http://ruby-doc.org/core-2.2.2/Array.html#method-i-at
     def at(index)
-      each.with_index do |v, i|
-        return v if i == index
-      end
+      each.with_index { |v, i| return v if i == index }
       return nil
     end
 
@@ -943,5 +931,21 @@ module RDF
         sprintf("#<%s:%#0x(%s)>", self.class.name, __id__, join(', '))
       end
     end
+
+    private
+
+    ##
+    # Normalizes `Array` to `RDF::List` and `nil` to `RDF.nil`.
+    #
+    # @param value [Object]
+    # @return [RDF::Value, Object] normalized value
+    def normalize_value(value)
+      case value
+        when nil         then RDF.nil
+        when RDF::Value  then value
+        when Array       then RDF::List.new(subject: nil, graph: graph, values: value)
+        else value
+      end
+    end
   end
 end

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

@@ -12,7 +12,7 @@ module RDF; class Literal
   # @since 0.2.1
   class Double < Numeric
     DATATYPE = RDF::XSD.double
-    GRAMMAR  = /^NaN|(?:[\+\-]?(?:INF|(?:\d+(\.\d*)?([eE][\+\-]?\d+)?)))$/.freeze
+    GRAMMAR  = /^(?:NaN|(?:[\+\-]?(?:INF|(?:\d+(\.\d*)?([eE][\+\-]?\d+)?))))$/.freeze
 
     ##
     # @param  [Float, #to_f] value

data/lib/rdf/model/uri.rb

@@ -1235,7 +1235,7 @@ module RDF
 
       value = value.to_hash if value.respond_to?(:to_hash)
       self.query = case value
-      when Array
+      when Array, Hash
         value.map do |(k,v)|
           k = normalize_segment(k.to_s, UNRESERVED)
           if v.nil?
@@ -1250,21 +1250,6 @@ module RDF
             end.join("&")
           end
         end
-      when Hash
-        value.map do |k, v|
-          k = normalize_segment(k.to_s, UNRESERVED)
-          if v.nil?
-            k
-          else
-            Array(v).map do |vv|
-              if vv === TrueClass
-                k
-              else
-                "#{k}=#{normalize_segment(vv.to_s, UNRESERVED)}"
-              end
-            end.join("&")
-          end
-        end
       else
         raise TypeError,
           "Can't convert #{value.class} into Hash."

data/lib/rdf/transaction.rb

@@ -113,26 +113,6 @@ module RDF
     # @since  2.0.0
     attr_reader :changes
 
-    ##
-    # RDF statements to delete when executed.
-    #
-    # @deprecated
-    # @return [RDF::Enumerable]
-    def deletes
-      warn "[DEPRECATION] Transaction#deletes now uses keyword arguments. Called from #{Gem.location_of_caller.join(':')}"
-      self.changes.deletes
-    end
-
-    ##
-    # RDF statements to insert when executed.
-    #
-    # @deprecated
-    # @return [RDF::Enumerable]
-    def inserts
-      warn "[DEPRECATION] Transaction#inserts now uses keyword arguments. Called from #{Gem.location_of_caller.join(':')}"
-      self.changes.inserts
-    end
-
     ##
     # Any additional options for this transaction.
     #

data/lib/rdf/vocab/rdfv.rb

@@ -13,37 +13,37 @@ module RDF
     term :Alt,
       comment: %(The class of containers of alternatives.).freeze,
       label: "Alt".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       subClassOf: "rdfs:Container".freeze,
       type: "rdfs:Class".freeze
     term :Bag,
       comment: %(The class of unordered containers.).freeze,
       label: "Bag".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       subClassOf: "rdfs:Container".freeze,
       type: "rdfs:Class".freeze
     term :List,
       comment: %(The class of RDF Lists.).freeze,
       label: "List".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       subClassOf: "rdfs:Resource".freeze,
       type: "rdfs:Class".freeze
     term :Property,
       comment: %(The class of RDF properties.).freeze,
       label: "Property".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       subClassOf: "rdfs:Resource".freeze,
       type: "rdfs:Class".freeze
     term :Seq,
       comment: %(The class of ordered containers.).freeze,
       label: "Seq".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       subClassOf: "rdfs:Container".freeze,
       type: "rdfs:Class".freeze
     term :Statement,
       comment: %(The class of RDF statements.).freeze,
       label: "Statement".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       subClassOf: "rdfs:Resource".freeze,
       type: "rdfs:Class".freeze
 
@@ -53,84 +53,84 @@ module RDF
       domain: "rdf:List".freeze,
       label: "first".freeze,
       range: "rdfs:Resource".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:Property".freeze
     property :object,
       comment: %(The object of the subject RDF statement.).freeze,
       domain: "rdf:Statement".freeze,
       label: "object".freeze,
       range: "rdfs:Resource".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:Property".freeze
     property :predicate,
       comment: %(The predicate of the subject RDF statement.).freeze,
       domain: "rdf:Statement".freeze,
       label: "predicate".freeze,
       range: "rdfs:Resource".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:Property".freeze
     property :rest,
       comment: %(The rest of the subject RDF list after the first item.).freeze,
       domain: "rdf:List".freeze,
       label: "rest".freeze,
       range: "rdf:List".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:Property".freeze
     property :subject,
       comment: %(The subject of the subject RDF statement.).freeze,
       domain: "rdf:Statement".freeze,
       label: "subject".freeze,
       range: "rdfs:Resource".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:Property".freeze
     property :type,
       comment: %(The subject is an instance of a class.).freeze,
       domain: "rdfs:Resource".freeze,
       label: "type".freeze,
       range: "rdfs:Class".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:Property".freeze
     property :value,
       comment: %(Idiomatic property used for structured values.).freeze,
       domain: "rdfs:Resource".freeze,
       label: "value".freeze,
       range: "rdfs:Resource".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:Property".freeze
 
     # Datatype definitions
     term :HTML,
       comment: %(The datatype of RDF literals storing fragments of HTML content).freeze,
       label: "HTML".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
-      "rdfs:seeAlso" => %(http://www.w3.org/TR/rdf11-concepts/#section-html).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:seeAlso" => %(http://www.w3.org/TR/rdf11-concepts/#section-html).freeze,
       subClassOf: "rdfs:Literal".freeze,
       type: "rdfs:Datatype".freeze
     term :PlainLiteral,
       comment: %(The class of plain \(i.e. untyped\) literal values, as used in RIF and OWL 2).freeze,
       label: "PlainLiteral".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
-      "rdfs:seeAlso" => %(http://www.w3.org/TR/rdf-plain-literal/).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:seeAlso" => %(http://www.w3.org/TR/rdf-plain-literal/).freeze,
       subClassOf: "rdfs:Literal".freeze,
       type: "rdfs:Datatype".freeze
     term :XMLLiteral,
       comment: %(The datatype of XML literal values.).freeze,
       label: "XMLLiteral".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       subClassOf: "rdfs:Literal".freeze,
       type: "rdfs:Datatype".freeze
     term :langString,
       comment: %(The datatype of language-tagged string values).freeze,
       label: "langString".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
-      "rdfs:seeAlso" => %(http://www.w3.org/TR/rdf11-concepts/#section-Graph-Literal).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:seeAlso" => %(http://www.w3.org/TR/rdf11-concepts/#section-Graph-Literal).freeze,
       subClassOf: "rdfs:Literal".freeze,
       type: "rdfs:Datatype".freeze
 
     # Extra definitions
     term :"",
-      "dc11:description" => %(This is the RDF Schema for the RDF vocabulary terms in the RDF Namespace, defined in RDF 1.1 Concepts.).freeze,
-      "dc11:title" => %(The RDF Concepts Vocabulary \(RDF\)).freeze,
+      :"dc11:description" => %(This is the RDF Schema for the RDF vocabulary terms in the RDF Namespace, defined in RDF 1.1 Concepts.).freeze,
+      :"dc11:title" => %(The RDF Concepts Vocabulary \(RDF\)).freeze,
       type: "owl:Ontology".freeze
     term :Description,
       comment: %(RDF/XML node element).freeze,
@@ -150,7 +150,7 @@ module RDF
     term :nil,
       comment: %(The empty list, with no items in it. If the rest of a list is nil then the list has no more items in it.).freeze,
       label: "nil".freeze,
-      "rdfs:isDefinedBy" => %(rdf:).freeze,
+      :"rdfs:isDefinedBy" => %(rdf:).freeze,
       type: "rdf:List".freeze
     term :nodeID,
       comment: %(RDF/XML Blank Node identifier).freeze,

data/lib/rdf/vocabulary.rb

@@ -262,39 +262,6 @@ module RDF
         @@uris.has_key?(self) ? @@uris[self].to_s : super
       end
 
-      ##
-      # Load an RDFS vocabulary, optionally from a separate location.
-      #
-      # @param [URI, #to_s] url
-      # @param [String] class_name
-      #   The class_name associated with the vocabulary, used for creating the class name of the vocabulary. This will create a new class named with a top-level constant based on `class_name`.
-      # @param [RDF::Queryable, URI, #to_s] location
-      #   Location from which to load the vocabulary, or Queryable containing already loaded vocabulary triples, if not from `uri`.
-      # @param [Array<Symbol>, Hash{Symbol => Hash}] extra
-      #   Extra terms to add to the vocabulary. In the first form, it is an array of symbols, for which terms are created. In the second, it is a Hash mapping symbols to property attributes, as described in {RDF::Vocabulary.property}.
-      # @param [String] patch
-      #   A patch to run on the graph after loading. Requires the `ld-patch` gem to be available.
-      # @return [RDF::Vocabulary] the loaded vocabulary
-      # @deprecated Use Vocabulary.from_graph
-      def load(url, class_name: nil, location: nil, extra: nil, patch: nil)
-        warn "[DEPRECATION] Vocabulary.load is deprecated, use Vocabulary.from_graph instead. Called from #{Gem.location_of_caller.join(':')}"
-        source = location || url
-
-        graph = source.is_a?(RDF::Queryable) ? source : RDF::Repository.load(source)
-
-        if patch
-          begin
-            require 'ld/patch'
-            operator = LD::Patch.parse(patch)
-            graph.query(operator)
-          rescue LoadError
-            raise ArgumentError, "patching vocabulary requires the ld-patch gem"
-          end
-        end
-
-        from_graph(graph, url: url, class_name: nil, extra: extra)
-      end
-
       ##
       # Create a vocabulary from a graph or enumerable
       #
@@ -560,7 +527,13 @@ module RDF
       #     Attributes of this vocabulary term, used for finding `label` and `comment` and to serialize the term back to RDF
       def initialize(*args, **options)
         @attributes = options.fetch(:attributes)
-        super
+        if RUBY_ENGINE == "rbx"
+          # FIXME: Somehow, this gets messed up in Rubinius
+          args << options
+          super(*args)
+        else
+          super
+        end
       end
 
       ##
@@ -652,14 +625,30 @@ module RDF
                 prop = RDF::URI("http://schema.org/rangeIncludes")
                 value = RDF::Vocabulary.expand_pname(value)
               when :label
-                prop = RDFS.label
+                prop = RDF::RDFS.label
               when :comment
-                prop = RDFS.comment
+                prop = RDF::RDFS.comment
               else
                 prop = RDF::Vocabulary.expand_pname(prop.to_s)
                 next unless prop
-                v = RDF::Vocabulary.expand_pname(value.to_s)
-                value = v.valid? ? v : RDF::Literal(value.to_s)
+
+                v = value.to_s
+                value = RDF::Vocabulary.expand_pname(v)
+                unless value && value.valid?
+                  # Use as most appropriate literal
+                  value = [
+                    RDF::Literal::Date,
+                    RDF::Literal::DateTime,
+                    RDF::Literal::Integer,
+                    RDF::Literal::Decimal,
+                    RDF::Literal::Double,
+                    RDF::Literal::Boolean,
+                    RDF::Literal
+                  ].inject(nil) do |memo, klass|
+                    l = klass.new(v)
+                    memo || (l if l.valid?)
+                  end
+                end
               end
               yield RDF::Statement(self, prop, value)
             rescue KeyError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.