rdf 1.1.15 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de76661c91cfe6934a56ffc4843225db1982f01e
-  data.tar.gz: 15dbc5ff81961081d5e9c91b95ac222e37bc4ada
+  metadata.gz: 77ce3d3b10cb665cefd9178982c13fb9c3decbe5
+  data.tar.gz: 82650e838b4fb35e2ab30120e9c145f8ec768b06
 SHA512:
-  metadata.gz: bbc0759e1e4031c5bd43344a19eba2b65d13850ec5af6a0dba61f54578d2f50abe97bcc0bbccf98f0df9b07426b07abd4339457b1985bbbbce2a08da871258f2
-  data.tar.gz: 0fc669f56a1aa53d6fae0df894014b862525a4e5620dd61c06e59224959ddedcbb3c293f156f6ba4d014f7127646d64493e9b24203c010136b412f2be8a465f8
+  metadata.gz: 527b93531091c0c8d6605d562d307f3c420e69929b444d2a7ef1cc2fb76f274a2a7ccda2b66ead35e4e41610e99e040e628c44b865186bb082691a4ffa5838ed
+  data.tar.gz: 879bab9f4f71c5ed926549d8d9418ba41cd07e9321b74e7f71c7eb253b2c5f507c42200ca7e261ee65f24700e9becb69c4d04c98842d07996518e1bf14137a2a

data/VERSION

@@ -1 +1 @@
-1.1.15
+1.1.16

data/lib/rdf/model/uri.rb

@@ -162,7 +162,7 @@ module RDF
     ##
     # Resolve paths to their simplest form.
     #
-    # TODO: This process is correct, but overly iterative. It could be better done with a single regexp which handled most of the segment collapses all at once. Parent segments would still require iteration.
+    # @todo This process is correct, but overly iterative. It could be better done with a single regexp which handled most of the segment collapses all at once. Parent segments would still require iteration.
     #
     # @param [String] path
     # @return [String] normalized path
@@ -196,7 +196,7 @@ module RDF
         end
       end
 
-      output.sub(/\/+/, '/').force_encoding(Encoding::UTF_8)
+      output.force_encoding(Encoding::UTF_8)
     end
 
     ##
@@ -379,7 +379,7 @@ module RDF
       @object = {
         :scheme => normalized_scheme,
         :authority => normalized_authority,
-        :path => normalized_path,
+        :path => normalized_path.sub(/\/+/, '/'),
         :query => normalized_query,
         :fragment => normalized_fragment
       }
@@ -432,10 +432,8 @@ module RDF
           joined_parts[:path] = self.class.normalize_path(uri.path)
           joined_parts[:query] = uri.query
         else
-          base_path = self.class.normalize_path(path.to_s)
-
           # Merge path segments from section 5.2.3
-          base_path.sub!(/\/[^\/]*$/, '/')
+          base_path = path.to_s.sub(/\/[^\/]*$/, '/')
           joined_parts[:path] = self.class.normalize_path(base_path + uri.path)
           joined_parts[:query] = uri.query
         end
@@ -860,7 +858,6 @@ module RDF
       parts = {}
       if matchdata = value.to_s.match(IRI_PARTS)
         scheme, authority, path, query, fragment = matchdata.to_a[1..-1]
-        authority = nil if authority.to_s.empty?
         userinfo, hostport = authority.to_s.split('@', 2)
         hostport, userinfo = userinfo, nil unless hostport
         user, password = userinfo.to_s.split(':', 2)
@@ -1137,7 +1134,7 @@ module RDF
     def normalized_authority
       if authority
         (userinfo ? "#{normalized_userinfo}@" : "") +
-        normalized_host +
+        normalized_host.to_s +
         (normalized_port ? ":#{normalized_port}" : "")
       end
     end

data/lib/rdf/ntriples/writer.rb

@@ -41,7 +41,7 @@ module RDF::NTriples
     format RDF::NTriples::Format
 
     # @see http://www.w3.org/TR/rdf-testcases/#ntrip_strings
-    ESCAPE_PLAIN = /\A[\x20-\x21\x23-\x5B\x5D-\x7E]*\z/m.freeze
+    ESCAPE_PLAIN = /\A[\x20-\x21\x23-#{Regexp.escape '['}#{Regexp.escape ']'}-\x7E]*\z/m.freeze
     ESCAPE_ASCII = /\A[\x00-\x7F]*\z/m.freeze
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf
 version: !ruby/object:Gem::Version
-  version: 1.1.15
+  version: 1.1.16
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,200 +10,200 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: link_header
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.13
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 description: RDF.rb is a pure-Ruby library for working with Resource Description Framework
@@ -222,9 +222,8 @@ files:
 - bin/rdf
 - etc/doap.nt
 - lib/df.rb
-- lib/rdf.rb
-- lib/rdf/cli.rb
 - lib/rdf/cli/vocab-loader.rb
+- lib/rdf/cli.rb
 - lib/rdf/format.rb
 - lib/rdf/mixin/countable.rb
 - lib/rdf/mixin/durable.rb
@@ -238,7 +237,6 @@ files:
 - lib/rdf/mixin/writable.rb
 - lib/rdf/model/graph.rb
 - lib/rdf/model/list.rb
-- lib/rdf/model/literal.rb
 - lib/rdf/model/literal/boolean.rb
 - lib/rdf/model/literal/date.rb
 - lib/rdf/model/literal/datetime.rb
@@ -248,6 +246,7 @@ files:
 - lib/rdf/model/literal/numeric.rb
 - lib/rdf/model/literal/time.rb
 - lib/rdf/model/literal/token.rb
+- lib/rdf/model/literal.rb
 - lib/rdf/model/node.rb
 - lib/rdf/model/resource.rb
 - lib/rdf/model/statement.rb
@@ -255,24 +254,24 @@ files:
 - lib/rdf/model/uri.rb
 - lib/rdf/model/value.rb
 - lib/rdf/nquads.rb
-- lib/rdf/ntriples.rb
 - lib/rdf/ntriples/format.rb
 - lib/rdf/ntriples/reader.rb
 - lib/rdf/ntriples/writer.rb
-- lib/rdf/query.rb
+- lib/rdf/ntriples.rb
 - lib/rdf/query/hash_pattern_normalizer.rb
 - lib/rdf/query/pattern.rb
 - lib/rdf/query/solution.rb
 - lib/rdf/query/solutions.rb
 - lib/rdf/query/variable.rb
+- lib/rdf/query.rb
 - lib/rdf/reader.rb
 - lib/rdf/repository.rb
 - lib/rdf/transaction.rb
-- lib/rdf/util.rb
 - lib/rdf/util/aliasing.rb
 - lib/rdf/util/cache.rb
 - lib/rdf/util/file.rb
 - lib/rdf/util/uuid.rb
+- lib/rdf/util.rb
 - lib/rdf/version.rb
 - lib/rdf/vocab/cc.rb
 - lib/rdf/vocab/cert.rb
@@ -312,6 +311,7 @@ files:
 - lib/rdf/vocab/xsd.rb
 - lib/rdf/vocabulary.rb
 - lib/rdf/writer.rb
+- lib/rdf.rb
 homepage: http://ruby-rdf.github.com/
 licenses:
 - Public Domain
@@ -322,17 +322,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.4.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Ruby library for working with Resource Description Framework (RDF) data.