rdf-n3 1.1.3.1 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f90a40d1295cdc1e4de034f134f2388e6640d51f
-  data.tar.gz: 973bc08de4dd4400a2c096bd31c8a82909ff2257
+  metadata.gz: b9b52d4f54d09368875b654dad895204b3fe645c
+  data.tar.gz: ab49163f1b25a7deb4982273c7ef698504624d4f
 SHA512:
-  metadata.gz: f58d2803df2299a01e2b6ae942442be7f017fd990b0d200bd99d5e21077c306725b2381bd25be8647f7508af4ecbdcc0c4b20ee72767ab580ff4b04075c82f2d
-  data.tar.gz: 5b5aa33dbe098af88cffd4495a5be3138325b3f8a6442179d55c4707e7469ac91d5132badb8a9d260eeaa5e836359587a144a57192b36ba645dcf57fb6ea951c
+  metadata.gz: 8308ad1b87c6905d0e6ab9551adc67f851c689d0a21713e22da310fddf66c241ca46752c0468de1778fe5a27235d8dc826c6172894db21a149155451c3842a7a
+  data.tar.gz: bed77496be0b312dbaa8ac1a63a2647bfefbd4c0e542ff64fe3389a84eb15d31be45c4e8653626a6ce129a43f2129319809e4addd492216dd4825aabb139729f

data/README.md

@@ -41,7 +41,7 @@ Write a graph to a file:
     end
 
 ### Formulae
-N3 Formulae are introduced with the { statement-list } syntax. A given formula is assigned an RDF::Node instance, which is also used as the context for RDF::Statement instances provided to RDF::N3::Reader#each_statement. For example, the following N3 generates the associated statements:
+N3 Formulae are introduced with the { statement-list } syntax. A given formula is assigned an RDF::Node instance, which is also used as the graph_name for RDF::Statement instances provided to RDF::N3::Reader#each_statement. For example, the following N3 generates the associated statements:
 
     { [ x:firstname  "Ora" ] dc:wrote [ dc:title  "Moby Dick" ] } a n3:falsehood .
   
@@ -51,9 +51,9 @@ results in
     s = RDF::Node.new
     o = RDF::Node.new
     RDF::Statement(f, rdf:type n3:falsehood)
-    RDF::Statement(s, x:firstname, "Ora", :context => f)
-    RDF::Statement(s, dc:wrote, o, :context => f)
-    RDF::Statement(o, dc:title, "Moby Dick", :context => f)
+    RDF::Statement(s, x:firstname, "Ora", graph_name: f)
+    RDF::Statement(s, dc:wrote, o, graph_name: f)
+    RDF::Statement(o, dc:title, "Moby Dick", graph_name: f)
 
 ### Variables
 N3 Variables are introduced with @forAll, @forEach, or ?x. Variables reference URIs described in formulae, typically defined in the default vocabulary (e.g., ":x"). Existential variables are replaced with an allocated RDF::Node instance. Universal variables are replaced with a RDF::Query::Variable instance. For example, the following N3 generates the associated statements:
@@ -100,8 +100,8 @@ Full documentation available on [RubyDoc.info](http://rubydoc.info/github/ruby-r
 * {RDF::REI}
 
 ### Patches
-* {Array}
-* {RDF::List}
+* `Array`
+* `RDF::List`
 
 ## Resources
 * [RDF.rb][RDF.rb]

data/VERSION

@@ -1 +1 @@
-1.1.3.1
+1.99.0

data/lib/rdf/n3/format.rb

@@ -5,19 +5,19 @@ module RDF::N3
   # @example Obtaining an Notation3 format class
   #     RDF::Format.for(:n3)            #=> RDF::N3::Format
   #     RDF::Format.for("etc/foaf.n3")
-  #     RDF::Format.for(:file_name      => "etc/foaf.n3")
-  #     RDF::Format.for(:file_extension => "n3")
-  #     RDF::Format.for(:content_type   => "text/n3")
+  #     RDF::Format.for(file_name:      "etc/foaf.n3")
+  #     RDF::Format.for(file_extension: "n3")
+  #     RDF::Format.for(content_type:   "text/n3")
   #
   # @example Obtaining serialization format MIME types
   #     RDF::Format.content_types      #=> {"text/n3")" => [RDF::N3::Format]}
   #
   # @example Obtaining serialization format file extension mappings
-  #     RDF::Format.file_extensions    #=> {:n3 => "text/n3"}
+  #     RDF::Format.file_extensions    #=> {n3: "text/n3"}
   #
   # @see http://www.w3.org/TR/rdf-testcases/#ntriples
   class Format < RDF::Format
-    content_type     'text/n3',             :extension => :n3, :aliases => %w(text/rdf+n3 application/rdf+n3)
+    content_type     'text/n3',             extension: :n3, aliases: %w(text/rdf+n3 application/rdf+n3)
     content_encoding 'utf-8'
 
     reader { RDF::N3::Reader }
@@ -33,7 +33,7 @@ module RDF::N3
   #     RDF::Format.for(:ttl).reader  #=> RDF::N3::Reader
   #     RDF::Format.for(:ttl).writer  #=> RDF::N3::Writer
   class Notation3 < RDF::Format
-    content_type     'text/n3',             :extension => :n3
+    content_type     'text/n3',             extension: :n3
     content_encoding 'utf-8'
 
     reader { RDF::N3::Reader }

data/lib/rdf/n3/patches/array_hacks.rb

@@ -37,7 +37,7 @@ class Array
     end
 
 #    options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)
-    options = {:words_connector => default_words_connector, :two_words_connector => default_two_words_connector, :last_word_connector => default_last_word_connector}.merge(options)
+    options = {words_connector: default_words_connector, two_words_connector: default_two_words_connector, last_word_connector: default_last_word_connector}.merge(options)
 
     case length
       when 0

data/lib/rdf/n3/reader.rb

@@ -147,7 +147,7 @@ module RDF::N3
     end
     
     def booleanToken(prod, tok)
-      lit = RDF::Literal.new(tok.delete("@"), :datatype => RDF::XSD.boolean, :validate => validate?, :canonicalize => canonicalize?)
+      lit = RDF::Literal.new(tok.delete("@"), datatype: RDF::XSD.boolean, validate: validate?, canonicalize: canonicalize?)
       add_prod_data(:literal, lit)
     end
     
@@ -223,7 +223,7 @@ module RDF::N3
       pd = @prod_data.pop
       forSome = Array(pd[:symbol])
       forSome.each do |term|
-        @variables[term.to_s] = {:formula => @formulae.last, :var => RDF::Node.new(term.to_s.split(/[\/#]/).last)}
+        @variables[term.to_s] = {formula: @formulae.last, var: RDF::Node.new(term.to_s.split(/[\/#]/).last)}
       end
     end
     
@@ -269,7 +269,7 @@ module RDF::N3
       language = language.downcase if language && canonicalize?
       datatype = lit[:symbol]
       
-      lit = RDF::Literal.new(content, :language => language, :datatype => datatype, :validate => validate?, :canonicalize => canonicalize?)
+      lit = RDF::Literal.new(content, language: language, datatype: datatype, validate: validate?, canonicalize: canonicalize?)
       add_prod_data(:literal, lit)
     end
     
@@ -300,16 +300,16 @@ module RDF::N3
         else RDF::XSD.integer
         end
         
-        lit = RDF::Literal.new(nl, :datatype => datatype, :validate => validate?, :canonicalize => canonicalize?)
+        lit = RDF::Literal.new(nl, datatype: datatype, validate: validate?, canonicalize: canonicalize?)
         add_prod_data(:literal, lit)
       when "quickvariable"
         # There is a also a shorthand syntax ?x which is the same as :x except that it implies that x is
         # universally quantified not in the formula but in its parent formula
         uri = process_qname(tok.sub('?', ':'))
-        @variables[uri.to_s] = { :formula => @formulae[-2], :var => univar(uri) }
+        @variables[uri.to_s] = { formula: @formulae[-2], var: univar(uri) }
         add_prod_data(:symbol, uri)
       when "boolean"
-        lit = RDF::Literal.new(tok.delete("@"), :datatype => RDF::XSD.boolean, :validate => validate?, :canonicalize => canonicalize?)
+        lit = RDF::Literal.new(tok.delete("@"), datatype: RDF::XSD.boolean, validate: validate?, canonicalize: canonicalize?)
         add_prod_data(:literal, lit)
       when "[", "("
         # Push on state for content of blank node
@@ -347,7 +347,7 @@ module RDF::N3
     end
     
     def pathlistStart(prod)
-      @prod_data << {:pathlist => []}
+      @prod_data << {pathlist: []}
     end
     
     def pathlistFinish
@@ -359,7 +359,7 @@ module RDF::N3
     end
     
     def pathtailStart(prod)
-      @prod_data << {:pathtail => []}
+      @prod_data << {pathtail: []}
     end
     
     def pathtailToken(prod, tok)
@@ -456,7 +456,7 @@ module RDF::N3
       pd = @prod_data.pop
       forAll = Array(pd[:symbol])
       forAll.each do |term|
-        @variables[term.to_s] = { :formula => @formulae.last, :var => univar(term) }
+        @variables[term.to_s] = { formula: @formulae.last, var: univar(term) }
       end
     end
 
@@ -573,7 +573,7 @@ module RDF::N3
         # Access Working Group. Note that no existing documents will have used a naked true or false word, without a
         # @keyword statement which would make it clear that they were not to be treated as keywords. Furthermore any
         # old parser encountering true or false naked or in a @keywords
-        return RDF::Literal.new(tok, :datatype => RDF::XSD.boolean)
+        return RDF::Literal.new(tok, datatype: RDF::XSD.boolean)
       else
         error("Set user @keywords to use barenames.")
       end
@@ -621,7 +621,7 @@ module RDF::N3
 
     # Add debug event to debug array, if specified
     #
-    # @param [any] node string for showing context
+    # @param [any] node string for showing graph_name
     # @param [String] message
     # @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     def add_debug(node, message = "")
@@ -633,16 +633,16 @@ module RDF::N3
 
     # add a statement, object can be literal or URI or bnode
     #
-    # @param [any] node string for showing context
+    # @param [any] node string for showing graph_name
     # @param [URI, Node] subject the subject of the statement
     # @param [URI] predicate the predicate of the statement
     # @param [URI, Node, Literal] object the object of the statement
     # @return [Statement] Added statement
     # @raise [RDF::ReaderError] Checks parameter types and raises if they are incorrect if parsing mode is _validate_.
     def add_triple(node, subject, predicate, object)
-      context_opts = @formulae.last ? {:context => @formulae.last} : {}
+      graph_name_opts = @formulae.last ? {graph_name: @formulae.last} : {}
       
-      statement = RDF::Statement.new(subject, predicate, object, context_opts)
+      statement = RDF::Statement.new(subject, predicate, object, graph_name_opts)
       add_debug(node) {statement.to_s}
       @callback.call(statement)
     end

data/lib/rdf/n3/reader/parser.rb

@@ -13,7 +13,7 @@ module RDF::N3
     end
     
     def parse(prod)
-      todo_stack = [{:prod => prod, :terms => nil}]
+      todo_stack = [{prod: prod, terms: nil}]
       while !todo_stack.empty?
         pushed = false
         if todo_stack.last[:terms].nil?
@@ -81,7 +81,7 @@ module RDF::N3
             end
           else
             puts "parse term(push): #{term}" if $verbose
-            todo_stack << {:prod => term, :terms => nil}
+            todo_stack << {prod: term, terms: nil}
             pushed = true
             break
           end

data/lib/rdf/n3/writer.rb

@@ -10,11 +10,11 @@ module RDF::N3
   #   RDF::Writer.for(:n3)         #=> RDF::N3::Writer
   #   RDF::Writer.for("etc/test.n3")
   #   RDF::Writer.for("etc/test.ttl")
-  #   RDF::Writer.for(:file_name      => "etc/test.n3")
-  #   RDF::Writer.for(:file_name      => "etc/test.ttl")
-  #   RDF::Writer.for(:file_extension => "n3")
-  #   RDF::Writer.for(:file_extension => "ttl")
-  #   RDF::Writer.for(:content_type   => "text/n3")
+  #   RDF::Writer.for(file_name:      "etc/test.n3")
+  #   RDF::Writer.for(file_name:      "etc/test.ttl")
+  #   RDF::Writer.for(file_extension: "n3")
+  #   RDF::Writer.for(file_extension: "ttl")
+  #   RDF::Writer.for(content_type:   "text/n3")
   #
   # @example Serializing RDF graph into an Turtle file
   #   RDF::N3::Writer.open("etc/test.n3") do |writer|
@@ -38,9 +38,9 @@ module RDF::N3
   # The writer will add prefix definitions, and use them for creating @prefix definitions, and minting QNames
   #
   # @example Creating @base and @prefix definitions in output
-  #   RDF::N3::Writer.buffer(:base_uri => "http://example.com/", :prefixes => {
+  #   RDF::N3::Writer.buffer(base_uri: "http://example.com/", prefixes: {
   #       nil => "http://example.com/ns#",
-  #       :foaf => "http://xmlns.com/foaf/0.1/"}
+  #       foaf: "http://xmlns.com/foaf/0.1/"}
   #   ) do |writer|
   #     graph.each_statement do |statement|
   #       writer << statement
@@ -294,7 +294,7 @@ module RDF::N3
     # Defines order of predicates to to emit at begninning of a resource description. Defaults to
     # [rdf:type, rdfs:label, dc:title]
     # @return [Array<URI>]
-    def predicate_order; [RDF.type, RDF::RDFS.label, RDF::DC.title]; end
+    def predicate_order; [RDF.type, RDF::RDFS.label, RDF::URI("http://purl.org/dc/terms/title")]; end
     
     # Order subjects for output. Override this to output subjects in another order.
     #
@@ -313,7 +313,7 @@ module RDF::N3
       
       # Add distinguished classes
       top_classes.each do |class_uri|
-        graph.query(:predicate => RDF.type, :object => class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
+        graph.query(predicate: RDF.type, object: class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
           add_debug {"order_subjects: #{subject.inspect}"}
           subjects << subject
           seen[subject] = true
@@ -468,7 +468,7 @@ module RDF::N3
     
     def p_default(node, position)
       #add_debug {"p_default: #{node.inspect}, #{position}"}
-      l = (position == :subject ? "" : " ") + format_value(node, options)
+      l = (position == :subject ? "" : " ") + format_term(node, options)
       @output.write(l)
     end
     
@@ -504,7 +504,7 @@ module RDF::N3
     
     def predicate_list(subject)
       properties = {}
-      @graph.query(:subject => subject) do |st|
+      @graph.query(subject: subject) do |st|
         properties[st.predicate.to_s] ||= []
         properties[st.predicate.to_s] << st.object
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-n3
 version: !ruby/object:Gem::Version
-  version: 1.1.3.1
+  version: 1.99.0
 platform: ruby
 authors:
 - Gregg
@@ -9,19 +9,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.17
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :runtime
@@ -29,12 +23,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.17
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
@@ -62,9 +50,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :development
@@ -72,9 +57,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
@@ -83,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -110,9 +92,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
   type: :development
@@ -120,9 +99,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.99'
 - !ruby/object:Gem::Dependency
@@ -132,9 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -142,9 +115,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
@@ -152,9 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -162,9 +129,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="