rdf-rdfxml 0.0.3 → 0.2.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.0
+* Updates for RDF 0.2.0
+  * Use URI#intern instead of URI#new
+  * Change use of Graph#predicates and Graph#objects to use as enumberables
+
 === 0.0.3
 * Added patches for the following:
   * RDF::Graph#properties

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gemspec.email = "gregg@kellogg-assoc.com"
     gemspec.homepage = "http://github.com/gkellogg/rdf-rdfxml"
     gemspec.authors = ["Gregg Kellogg"]
-    gemspec.add_dependency('rdf', '>= 0.1.6')
+    gemspec.add_dependency('rdf', '>= 0.2.0')
     gemspec.add_dependency('nokogiri', '>= 1.3.3')
     gemspec.add_development_dependency('rspec')
     gemspec.add_development_dependency('rdf-spec')

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.2.0

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

@@ -3,6 +3,6 @@ class Nokogiri::XML::Node
   # URI of namespace + node_name
   def uri
     ns = self.namespace ? self.namespace.href : RDF::XML.to_s
-    RDF::URI.new(ns + self.node_name)
+    RDF::URI.intern(ns + self.node_name)
   end
 end unless Nokogiri::XML::Node.method_defined?(:uri)

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

@@ -31,7 +31,7 @@ module RDF
     def self.[](property)
       @prop_uri ||= {}
       @prop_uri[property] ||= begin
-        uri = RDF::URI.new([to_s, property.to_s].join(''))
+        uri = RDF::URI.intern([to_s, property.to_s].join(''))
         uri.vocab = self
         uri
       end
@@ -40,7 +40,7 @@ module RDF
     def [](property)
       @prop_uri ||= {}
       @prop_uri[property] ||= begin
-        uri = RDF::URI.new([to_s, property.to_s].join(''))
+        uri = RDF::URI.intern([to_s, property.to_s].join(''))
         uri.vocab = self
         uri
       end
@@ -48,7 +48,7 @@ module RDF
     
     def to_uri
       @uri ||= begin
-        uri = RDF::URI.new(to_s)
+        uri = RDF::URI.intern(to_s)
         uri.vocab = self
         uri
       end

data/lib/rdf/rdfxml/reader.rb

@@ -35,7 +35,7 @@ module RDF::RDFXML
 
       def initialize(base, element, graph)
         # Initialize the evaluation context, [5.1]
-        self.base = RDF::URI.new(base)
+        self.base = RDF::URI.intern(base)
         @uri_mappings = {}
         @language = nil
         @graph = graph
@@ -99,7 +99,7 @@ module RDF::RDFXML
 
       # Set XML base. Ignore any fragment
       def base=(b)
-        @base = RDF::URI.new(b)
+        @base = RDF::URI.intern(b)
         @base.fragment = nil
       end
 
@@ -125,7 +125,7 @@ module RDF::RDFXML
       super do
         @debug = options[:debug]
         @strict = options[:strict]
-        @base_uri = RDF::URI.new(options[:base_uri])
+        @base_uri = RDF::URI.intern(options[:base_uri])
             
         @id_mapping = Hash.new
 

data/lib/rdf/rdfxml/version.rb

@@ -1,7 +1,7 @@
 module RDF::RDFXML::VERSION
   MAJOR = 0
-  MINOR = 0
-  TINY  = 2
+  MINOR = 2
+  TINY  = 0
   EXTRA = nil
 
   STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/rdf/rdfxml/writer.rb

@@ -18,7 +18,7 @@ module RDF::RDFXML
   #
   # @example Serializing RDF graph into an RDF/XML file
   #   RDF::RDFXML::Write.open("etc/test.rdf") do |writer|
-  #     writer.write_graph(graph)
+  #     writer << graph
   #   end
   #
   # @example Serializing RDF statements into an RDF/XML file
@@ -70,14 +70,14 @@ module RDF::RDFXML
     ##
     # @param  [Graph] graph
     # @return [void]
-    def write_graph(graph)
+    def insert_graph(graph)
       @graph = graph
     end
 
     ##
     # @param  [Statement] statement
     # @return [void]
-    def write_statement(statement)
+    def insert_statement(statement)
       @graph << statement
     end
 
@@ -89,7 +89,7 @@ module RDF::RDFXML
     # @param  [RDF::Value]    object
     # @return [void]
     # @see    #write_epilogue
-    def write_triple(subject, predicate, object)
+    def insert_triple(subject, predicate, object)
       @graph << RDF::Statement.new(subject, predicate, object)
     end
 
@@ -112,19 +112,13 @@ module RDF::RDFXML
 
       doc = Nokogiri::XML::Document.new
 
-      add_debug "\nserialize: graph namespaces: #{@namespaces.inspect}"
       add_debug "\nserialize: graph: #{@graph.size}"
 
       preprocess
 
-      predicates = @graph.predicates.uniq
-      add_debug "\nserialize: predicates #{predicates.inspect}"
-      possible = predicates + @graph.objects.uniq
-      namespaces = {}
-      required_namespaces = {}
-      possible.each do |res|
-        get_qname(res)
-      end
+      # Get QNames and necessary namespaces from predicates and objects
+      @graph.predicates.each {|pred| add_debug("serialize pred: #{pred.inspect}"); get_qname(pred)}
+      @graph.objects.each {|obj| add_debug("serialize obj: #{obj.inspect}"); get_qname(obj)}
       add_namespace(:rdf, RDF_NS)
       add_namespace(:xml, RDF::XML) if @base_uri || @lang
       
@@ -134,6 +128,8 @@ module RDF::RDFXML
         add_debug("def_namespace: #{@default_namespace}, prefix: #{@default_namespace_prefix}")
       end
       
+      add_debug "\nserialize: graph namespaces: #{@namespaces.inspect}"
+      
       doc.root = Nokogiri::XML::Element.new("rdf:RDF", doc)
       @namespaces.each_pair do |p, uri|
         if p.to_s.empty?
@@ -188,7 +184,7 @@ module RDF::RDFXML
         end
 
         prop_list.each do |prop|
-          prop_ref = RDF::URI.new(prop)
+          prop_ref = RDF::URI.intern(prop)
           
           properties[prop].each do |object|
             @depth += 1
@@ -211,7 +207,7 @@ module RDF::RDFXML
     # If _is_unique_ is true, this predicate may be able to be serialized as an attribute
     def predicate(prop, object, node, is_unique)
       qname = get_qname(prop)
-      raise RdfException, "No qname generated for <#{prop}>" unless qname
+      raise RDF::WriterError, "No qname generated for <#{prop}>" unless qname
 
       # See if we can serialize as attribute.
       # * untyped attributes that aren't duplicated where xml:lang == @lang
@@ -422,6 +418,7 @@ module RDF::RDFXML
     end
     
     def add_namespace(prefix, ns)
+      add_debug "add_namespace: '#{prefix}', <#{ns}>"
       @namespaces[prefix.to_sym] = ns.to_s
     end
 

data/rdf-rdfxml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rdf-rdfxml}
-  s.version = "0.0.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gregg Kellogg"]
-  s.date = %q{2010-06-12}
+  s.date = %q{2010-06-17}
   s.description = %q{    RDF::RDFXML is an RDF/XML reader and writer for Ruby using the RDF.rb library suite.
 }
   s.email = %q{gregg@kellogg-assoc.com}
@@ -438,20 +438,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rdf>, [">= 0.1.6"])
+      s.add_runtime_dependency(%q<rdf>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdf-spec>, [">= 0"])
       s.add_development_dependency(%q<activesupport>, [">= 2.3.0"])
     else
-      s.add_dependency(%q<rdf>, [">= 0.1.6"])
+      s.add_dependency(%q<rdf>, [">= 0.2.0"])
       s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdf-spec>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.0"])
     end
   else
-    s.add_dependency(%q<rdf>, [">= 0.1.6"])
+    s.add_dependency(%q<rdf>, [">= 0.2.0"])
     s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdf-spec>, [">= 0"])

data/spec/writer_spec.rb

@@ -382,7 +382,7 @@ describe "RDF::RDFXML::Writer" do
   def serialize(options = {})
     @debug = []
     result = RDF::RDFXML::Writer.buffer(options.merge(:debug => @debug)) do |writer|
-      writer.write_graph(@graph)
+      writer << @graph
     end
     puts @debug.join("\n") if $DEBUG
     result

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
+  - 2
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gregg Kellogg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 -04:00
+date: 2010-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,9 @@ dependencies:
         hash: 23
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency