rdf-rdfxml 0.2.1 → 0.2.2

data/spec/writer_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'rdf/spec/writer'
 autoload :CGI, 'cgi'
 
 class FOO < RDF::Vocabulary("http://foo/"); end
@@ -6,8 +7,11 @@ class FOO < RDF::Vocabulary("http://foo/"); end
 describe "RDF::RDFXML::Writer" do
   before(:each) do
     @graph = RDF::Graph.new
+    @writer = RDF::RDFXML::Writer
   end
   
+  it_should_behave_like RDF_Writer
+  
   describe "with types" do
     it "should serialize resource without type" do
       @graph << [RDF::URI.new("http://release/"), RDF::DC.title, "foo"]
@@ -290,7 +294,6 @@ describe "RDF::RDFXML::Writer" do
     end
   end
 
-  # FIXME
   describe "with default namespace" do
     it "should serialize with default namespace" do
       @graph << [RDF::URI.new("http://release/"), RDF.type, FOO.Release]
@@ -381,7 +384,7 @@ describe "RDF::RDFXML::Writer" do
   # Serialize ntstr to a string and compare against regexps
   def serialize(options = {})
     @debug = []
-    result = RDF::RDFXML::Writer.buffer(options.merge(:debug => @debug)) do |writer|
+    result = @writer.buffer(options.merge(:debug => @debug)) do |writer|
       writer << @graph
     end
     puts @debug.join("\n") if $DEBUG

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -14,30 +15,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 -07:00
+date: 2010-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdf
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
@@ -49,9 +54,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,23 +68,27 @@ dependencies:
   name: rdf-spec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rdf-isomorphic
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -87,9 +98,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -115,6 +128,8 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- etc/doap.nt
+- etc/doap.xml
 - example.rb
 - lib/rdf/rdfxml.rb
 - lib/rdf/rdfxml/format.rb
@@ -123,7 +138,6 @@ files:
 - lib/rdf/rdfxml/patches/literal_hacks.rb
 - lib/rdf/rdfxml/patches/nokogiri_hacks.rb
 - lib/rdf/rdfxml/patches/qname_hacks.rb
-- lib/rdf/rdfxml/patches/rdf_escape.rb
 - lib/rdf/rdfxml/patches/seq.rb
 - lib/rdf/rdfxml/patches/uri_hacks.rb
 - lib/rdf/rdfxml/reader.rb
@@ -132,11 +146,11 @@ files:
 - lib/rdf/rdfxml/writer.rb
 - rdf-rdfxml.gemspec
 - script/console
+- script/parse
 - spec/format_spec.rb
 - spec/graph_spec.rb
 - spec/literal_spec.rb
 - spec/matchers.rb
-- spec/rdf_escape_spec.rb
 - spec/rdf_helper.rb
 - spec/rdf_tests/cc197bad-dc9c-440d-a5b5-d52ba2e14234.nt
 - spec/rdf_tests/cc197bad-dc9c-440d-a5b5-d52ba2e14234.rdf
@@ -502,6 +516,7 @@ files:
 - spec/spec_helper.rb
 - spec/uri_spec.rb
 - spec/writer_spec.rb
+- spec/rdf-iso-falure.rb
 has_rdoc: true
 homepage: http://github.com/gkellogg/rdf-rdfxml
 licenses: []
@@ -512,23 +527,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RDF/XML reader/writer for RDF.rb.
@@ -537,7 +556,7 @@ test_files:
 - spec/graph_spec.rb
 - spec/literal_spec.rb
 - spec/matchers.rb
-- spec/rdf_escape_spec.rb
+- spec/rdf-iso-falure.rb
 - spec/rdf_helper.rb
 - spec/reader_spec.rb
 - spec/spec_helper.rb

data/lib/rdf/rdfxml/patches/rdf_escape.rb

@@ -1,131 +0,0 @@
-# coding: utf-8
-require 'iconv'
-
-class String
-  #private
-  # "Borrowed" from JSON utf8_to_json
-  RDF_MAP = {
-    "\x0" => '\u0000',
-    "\x1" => '\u0001',
-    "\x2" => '\u0002',
-    "\x3" => '\u0003',
-    "\x4" => '\u0004',
-    "\x5" => '\u0005',
-    "\x6" => '\u0006',
-    "\x7" => '\u0007',
-    "\b"  =>  '\b',
-    "\t"  =>  '\t',
-    "\n"  =>  '\n',
-    "\xb" => '\u000B',
-    "\f"  =>  '\f',
-    "\r"  =>  '\r',
-    "\xe" => '\u000E',
-    "\xf" => '\u000F',
-    "\x10" => '\u0010',
-    "\x11" => '\u0011',
-    "\x12" => '\u0012',
-    "\x13" => '\u0013',
-    "\x14" => '\u0014',
-    "\x15" => '\u0015',
-    "\x16" => '\u0016',
-    "\x17" => '\u0017',
-    "\x18" => '\u0018',
-    "\x19" => '\u0019',
-    "\x1a" => '\u001A',
-    "\x1b" => '\u001B',
-    "\x1c" => '\u001C',
-    "\x1d" => '\u001D',
-    "\x1e" => '\u001E',
-    "\x1f" => '\u001F',
-    '"'   =>  '\"',
-    '\\'  =>  '\\\\',
-    '/'   =>  '/',
-  } # :nodoc:
-
-  if defined?(::Encoding)
-    # Funky way to define constant, but if parsed in 1.8 it generates an 'invalid regular expression' error otherwise
-    eval %(ESCAPE_RE = %r([\u{80}-\u{10ffff}]))
-  else
-    ESCAPE_RE = %r(
-                    [\xc2-\xdf][\x80-\xbf]    |
-                    [\xe0-\xef][\x80-\xbf]{2} |
-                    [\xf0-\xf4][\x80-\xbf]{3}
-                  )nx
-  end
-  
-  # Convert a UTF8 encoded Ruby string _string_ to an escaped string, encoded with
-  # UTF16 big endian characters as \U????, and return it.
-  #
-  # \\:: Backslash
-  # \':: Single quote
-  # \":: Double quot
-  # \n:: ASCII Linefeed
-  # \r:: ASCII Carriage Return
-  # \t:: ASCCII Horizontal Tab
-  # \uhhhh:: character in BMP with Unicode value U+hhhh
-  # \U00hhhhhh:: character in plane 1-16 with Unicode value U+hhhhhh
-  def rdf_escape
-    string = self + '' # XXX workaround: avoid buffer sharing
-    string.gsub!(/["\\\/\x0-\x1f]/) { RDF_MAP[$&] }
-    if defined?(::Encoding)
-      string.force_encoding(Encoding::UTF_8)
-      string.gsub!(ESCAPE_RE) { |c|
-                      s = c.dump.sub(/\"\\u\{(.+)\}\"/, '\1').upcase
-                      (s.length <= 4 ? "\\u0000"[0,6-s.length] : "\\U00000000"[0,10-s.length]) + s
-                    }
-      string.force_encoding(Encoding::ASCII_8BIT)
-    else
-      string.gsub!(ESCAPE_RE) { |c|
-                      s = Iconv.new('utf-16be', 'utf-8').iconv(c).unpack('H*').first.upcase
-                      "\\u" + s
-                    }
-    end
-    string
-  end
-  
-  # Unescape characters in strings.
-  RDF_UNESCAPE_MAP = Hash.new { |h, k| h[k] = k.chr }
-  RDF_UNESCAPE_MAP.update({
-    ?"  => '"',
-    ?\\ => '\\',
-    ?/  => '/',
-    ?b  => "\b",
-    ?f  => "\f",
-    ?n  => "\n",
-    ?r  => "\r",
-    ?t  => "\t",
-    ?u  => nil, 
-  })
-
-  if defined?(::Encoding)
-    UNESCAPE_RE = %r(
-      (?:\\[\\bfnrt"/])   # Escaped control characters, " and /
-      |(?:\\U00\h{6})     # 6 byte escaped Unicode
-      |(?:\\u\h{4})       # 4 byte escaped Unicode
-    )x
-  else
-    UNESCAPE_RE = %r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n
-  end
-  
-  # Reverse operation of escape
-  # From JSON parser
-  def rdf_unescape
-    return '' if self.empty?
-    string = self.gsub(UNESCAPE_RE) do |c|
-      case c[1,1]
-      when 'U'
-        raise RDF::ReaderError, "Long Unicode escapes no supported in Ruby 1.8" unless defined?(::Encoding)
-        eval(c.sub(/\\U00(\h+)/, '"\u{\1}"'))
-      when 'u'
-        bytes = [c[2, 2].to_i(16), c[4, 2].to_i(16)]
-        Iconv.new('utf-8', 'utf-16').iconv(bytes.pack("C*"))
-      else
-        RDF_UNESCAPE_MAP[c[1]]
-      end
-    end
-    string.force_encoding(Encoding::UTF_8) if defined?(::Encoding)
-    string
-  rescue Iconv::Failure => e
-    raise RDF::ReaderError, "Caught #{e.class}: #{e}"
-  end
-end unless String.method_defined?(:rdf_escape)

data/spec/rdf_escape_spec.rb

@@ -1,36 +0,0 @@
-# coding: utf-8
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe "String RDF encoding" do
-  {
-    "Gregg" => 'Gregg',
-    "Dürst" => 'D\u00FCrst',
-    "simple literal"  => 'simple literal',
-    "backslash:\\" => 'backslash:\\\\',
-    "dquote:\"" => 'dquote:\\"',
-    "newline:\n" => 'newline:\\n',
-    "return:\r" => 'return:\\r',
-    "tab:\t" => 'tab:\\t',
-  }.each_pair do |raw, encoded|
-    specify "'#{raw}' should escape to '#{encoded}'" do
-      raw.rdf_escape.should == encoded
-    end
-
-    specify "'#{encoded}' should unescape to '#{raw}'" do
-      encoded.rdf_unescape.should == raw
-    end
-  end
-  
-  # 16-bit string encodings
-  {
-    "16-bit:\u{15678}another" => '16-bit:\\U00015678another',
-  }.each_pair do |raw, encoded|
-    specify "'#{raw}' should escape to '#{encoded}'" do
-      raw.rdf_escape.should == encoded
-    end
-
-    specify "'#{encoded}' should unescape to '#{raw}'" do
-      encoded.rdf_unescape.should == raw
-    end
-  end if defined?(::Encoding)
-end