rdf-rdfxml 1.0.1 → 1.0.2

data/{README.markdown → README.md}

@@ -1,7 +1,10 @@
-# RDF::RDFXML reader/writer  [![Build Status](https://secure.travis-ci.org/ruby-rdf/rdf-rdfxml.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-rdfxml)
+# RDF::RDFXML reader/writer 
 
 [RDF/XML][RDF/XML] parser for [RDF.rb][RDF.rb].
 
+[![Gem Version](https://badge.fury.io/rb/rdf-rdfxml.png)](http://badge.fury.io/rb/rdf-rdfxml)
+[![Build Status](https://secure.travis-ci.org/ruby-rdf/rdf-rdfxml.png?branch=master)](http://travis-ci.org/ruby-rdf/rdf-rdfxml)
+
 ## DESCRIPTION
 
 RDF::RDFXML is an [RDF/XML][RDF/XML] reader/writer for Ruby using the [RDF.rb][RDF.rb] library suite.
@@ -24,7 +27,7 @@ Instantiate a parser and parse source, specifying type and base-URL
 
 ## Dependencies
 * [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.0)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.9)
 * Does not run properly on jRuby due to [Nokogiri][] issues.
 
 ## Documentation
@@ -41,7 +44,7 @@ Full documentation available on [RubyForge](http://rubydoc.info/github/ruby-rdf/
 
 ### Patches
 * {Array}
-* {RDF::Graph}
+* {RDF::Queryable}
 * {Nokogiri::XML::Node}
 
 ## TODO

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

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

@@ -1,5 +1,5 @@
 module RDF
-  class Graph
+  module Queryable
     # Resource properties
     #
     # Properties arranged as a hash with the predicate Term as index to an array of resources or literals

data/lib/rdf/rdfxml/reader.rb

@@ -142,7 +142,6 @@ module RDF::RDFXML
     def initialize(input = $stdin, options = {}, &block)
       super do
         @debug = options[:debug]
-        @base_uri = uri(options[:base_uri]) if options[:base_uri]
             
         @library = case options[:library]
           when nil
@@ -188,13 +187,13 @@ module RDF::RDFXML
 
       raise "root must be a proxy not a #{root.class}" unless root.is_a?(@implementation::NodeProxy)
 
-      add_debug(root, "base_uri: #{@base_uri.inspect}")
+      add_debug(root, "base_uri: #{base_uri.inspect}")
       
       rdf_nodes = root.xpath("//rdf:RDF", "rdf" => RDF.to_uri.to_s)
       if rdf_nodes.length == 0
         # If none found, root element may be processed as an RDF Node
 
-        ec = EvaluationContext.new(@base_uri, root, @graph) do |prefix, value|
+        ec = EvaluationContext.new(base_uri, root, @graph) do |prefix, value|
           prefix(prefix, value)
         end
         
@@ -205,7 +204,7 @@ module RDF::RDFXML
           # XXX Skip this element if it's contained within another rdf:RDF element
 
           # Extract base, lang and namespaces from parents to create proper evaluation context
-          ec = EvaluationContext.new(@base_uri, nil, @graph) do |prefix, value|
+          ec = EvaluationContext.new(base_uri, nil, @graph) do |prefix, value|
             prefix(prefix, value)
           end
           ec.extract_from_ancestors(node)
@@ -257,7 +256,7 @@ module RDF::RDFXML
       return unless ::RDF::RDFXML.debug? || @debug
       message = message + yield if block_given?
       puts "#{node_path(node)}: #{message}" if ::RDF::RDFXML::debug?
-      @debug << "#{node_path(node)}: #{message}" if @debug.is_a?(Array)
+      @debug << "#{node_path(node)}: #{message}".force_encoding("utf-8") if @debug.is_a?(Array)
     end
 
     # add a statement, object can be literal or URI or bnode

data/lib/rdf/rdfxml/writer.rb

@@ -87,7 +87,7 @@ module RDF::RDFXML
     # @yieldparam [RDF::Writer] writer
     def initialize(output = $stdout, options = {}, &block)
       super do
-        @graph = RDF::Graph.new
+        @graph = RDF::Repository.new
         @uri_to_qname = {}
         @uri_to_prefix = {}
         block.call(self) if block_given?
@@ -352,7 +352,7 @@ module RDF::RDFXML
         elsif rest.empty?
           properties.delete(RDF.type.to_s)
         else
-          properties[RDF.type.to_s] = [rest].flatten.compact
+          properties[RDF.type.to_s] = Array(rest)
         end
         prop_list = order_properties(properties)
         add_debug {"=> property order: #{prop_list.to_sentence}"}
@@ -425,8 +425,9 @@ module RDF::RDFXML
       
       o_props = @graph.properties(object)
 
-      col = RDF::List.new(object, @graph).to_a
-      conformant_list = col.all? {|item| !item.literal?} && o_props[RDF.first.to_s]
+      list = RDF::List.new(object, @graph)
+      col = list.to_a
+      conformant_list = list.valid? && col.none?(&:literal?)
       args = xml_args(object)
       attrs = args.pop
 
@@ -506,7 +507,7 @@ module RDF::RDFXML
       [:untyped, :typed].include?(@attributes) && (
         prop == RDF.type ||
         [:typed].include?(@attributes) && object.literal? && object.typed? ||
-        (object.literal? && object.plain? || @lang && object.language.to_s == @lang.to_s)
+        (object.literal? && object.simple? || @lang && object.language.to_s == @lang.to_s)
       )
     end
     
@@ -540,7 +541,7 @@ module RDF::RDFXML
     def xml_args(object)
       case object
       when RDF::Literal
-        if object.plain?
+        if object.simple?
           [object.value, {}]
         elsif object.has_language?
           [object.value, {"xml:lang" => object.language}]
@@ -567,7 +568,7 @@ module RDF::RDFXML
       message = message + yield if block_given?
       msg = "#{'  ' * @depth}#{message}"
       STDERR.puts msg if ::RDF::RDFXML.debug?
-      @debug << msg if @debug.is_a?(Array)
+      @debug << msg.force_encoding("utf-8") if @debug.is_a?(Array)
     end
   end
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfxml
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
+  prerelease: 
 platform: ruby
 authors:
 - Gregg
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -42,20 +47,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spira
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -91,13 +103,15 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.12
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json-ld
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -105,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,6 +127,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,6 +135,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,6 +143,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,20 +151,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdf-n3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -154,6 +159,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -161,6 +167,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -168,39 +175,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.5
 description: RDF::RDFXML is an RDF/XML reader and writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.markdown
-- History.markdown
+- README.md
+- History.md
 - AUTHORS
 - CONTRIBUTORS
 - VERSION
@@ -219,26 +230,27 @@ files:
 homepage: http://ruby-rdf.github.com/rdf-rdfxml
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.1
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfxml
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RDF/XML reader/writer for RDF.rb.
 test_files: []
 has_rdoc: false

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzgyZDI3YzU1ZWM1MDc2YWQxNGYwNWMxZDQ1Mzk2ZDZiZDA1ZDI4Ng==
-  data.tar.gz: !binary |-
-    YmJlMzIwNjIxOTEwMzQxMGYxYWZkOWYwMjNlYTkwNDU3MjhiMzg2OQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OWQwMjljYmExMzE3MDljNTk1YTI1MDJmZTc4MTk2NmU1ZDI3MzRjNzdmNzIz
-    MDFmODI2NjhmZjc1NWIwMmM4OTE1OGRkZTU3NDg1YWY4YmIyNmRiOWViNTIy
-    ZjkyNWVhYjU1NDJiODJkNjE1ZmZhMjE5Y2I0NDY1NGQwYzdjNDE=
-  data.tar.gz: !binary |-
-    MmUzNmQ4NjA1MGMwNmRkZGEyMWZjZTNmYTM2YmIxN2VlNDA0YjZlOTc4ODAw
-    M2U5NmUzYzZkMmU0NGZjM2NmYTExMDJjYmI2YzBhOGEwNjE4YWRhMjcxOWQ1
-    ZTAxNjQ2NDYzYTE4YmM4Y2U3MGQzMThhZTczNWVjZTMwYWNkMDE=