rdf-rdfa 1.0.3 → 1.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGNkNDNjNTFhOGVmMTM1ZjY0OTgxNzVlOGU2NmJiOTU0ZTU2ZTkyMw==
-  data.tar.gz: !binary |-
-    YzEzZGE3MThjNDhkZDE2NWY4MGRlN2MxY2I5NGQ0YWQ0ZWExYjk3ZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZjE0YjkwNTI4ZGFkOWVmZjkyY2Y1ODBkYjQ3OWRmYTUyOTI3MzdjMTg4M2Ey
-    ZjY0NDg0ZTEyNTU3YTQyYjZkOWEzY2VmMjY5ZDI4YWFkODI5NTlkZTE5OGRm
-    MGY4YWI4ZjNjNmNiYWUzZDcwMzhlZmEyNDAwM2I5YTRhMWYzODg=
-  data.tar.gz: !binary |-
-    YjUyNmVjMTZkNTY0MjA3ZWQ1YTVmZGUyZjgxYWZlYWM3ZGEyZTcxZjA2ZmJh
-    YjMwMWEyY2YyOTE4YjFmZjI2NTBhMDNjZDY5ZjI1OTdlMDQwMTRkOGU1MzA1
-    OTM5YTc5OTYwNjcwOTAyMjI2OGFkNTY3OTIwYmMxYjAyY2NkZWE=
+SHA1:
+  metadata.gz: 25263c074d89ac953e6d510f14cfc79decf2488d
+  data.tar.gz: 82285470e7f772da635a4def20ef9b088150d6b4
+SHA512:
+  metadata.gz: ea526b09ce230b681d1240e50516d0a30687f2192f98d8b850350648746c35f320dd41c7593d7af34ce6551299d9485d143396de3facf61c941ace1fa648b27d
+  data.tar.gz: c0358eb529b5401e229315a7168636912f49b8522b78773ece8f72360043e1d445d227a986048c13c06567c45fc1579c1cf6f1689963bb4975ad86ad94a206c5

data/README

@@ -1,3 +1,4 @@
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
 # RDF::RDFa reader/writer
 
 [RDFa][RDFa 1.1 Core] parser for RDF.rb.
@@ -387,8 +388,8 @@ The template hash defines four Haml templates:
     }
 
 ## Dependencies
-* [Ruby](http://ruby-lang.org/) (>= 1.9) or (>= 1.8.7 with [Backports][])
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
+* [Ruby](http://ruby-lang.org/) (>= 1.9.3)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
 * [Haml](https://rubygems.org/gems/haml) (>= 4.0)
 * [HTMLEntities](https://rubygems.org/gems/htmlentities) ('>= 4.3.1')
 * Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.5.9)
@@ -414,7 +415,6 @@ Full documentation available on [Rubydoc.info][RDFa doc]
 ### Additional vocabularies
 * {RDF::PTR}
 * {RDF::RDFA}
-* {RDF::XHV}
 * {RDF::XML}
 * {RDF::XSI}
 
@@ -438,6 +438,7 @@ Full documentation available on [Rubydoc.info][RDFa doc]
 * [Nicholas Humfrey](http://github.com/njh) - <http://njh.me/>
 
 ## Contributing
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
 
 * Do your best to adhere to the existing coding conventions and idioms.
 * Don't use hard tabs, and don't leave trailing whitespace on any line.
@@ -458,7 +459,7 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 
 ## FEEDBACK
 
-* gregg@kellogg-assoc.com
+* gregg@greggkellogg.net
 * <http://rubygems.org/rdf-rdfa>
 * <http://github.com/ruby-rdf/rdf-rdfa>
 * <http://lists.w3.org/Archives/Public/public-rdf-ruby/>

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

data/lib/rdf/rdfa/context.rb

@@ -92,7 +92,7 @@ module RDF::RDFa
         context.parse(repository.query(:context => uri))
       end
     rescue Exception => e
-      raise ContextError, "Context #{uri}: #{e.message}"
+      raise ContextError, "Context #{uri}: #{e.message}", e.backtrace
     end
 
     # Load context into repository

data/lib/rdf/rdfa/reader.rb

@@ -1,5 +1,4 @@
 begin
-  raise LoadError, "not with java" if RUBY_PLATFORM == "java"
   require 'nokogiri'
 rescue LoadError => e
   :rexml
@@ -290,7 +289,7 @@ module RDF::RDFa
         @library = case options[:library]
           when nil
             # Use Nokogiri when available, and REXML otherwise:
-            (defined?(::Nokogiri) && RUBY_PLATFORM != 'java') ? :nokogiri : :rexml
+            defined?(::Nokogiri) ? :nokogiri : :rexml
           when :nokogiri, :rexml
             options[:library]
           else
@@ -404,7 +403,7 @@ module RDF::RDFa
             require 'rdf/microdata'
             add_debug(@doc, "process microdata")
             @repository << RDF::Microdata::Reader.new(@doc, options)
-          rescue
+          rescue LoadError
             add_debug(@doc, "microdata detected, not processed")
           end
         end
@@ -566,15 +565,23 @@ module RDF::RDFa
         each do |uri|
           # Don't try to open ourselves!
           if base_uri == uri
-            add_debug(root) {"load_initial_contexts: skip recursive context <#{uri}>"}
+            add_debug(root) {"load_initial_contexts: skip recursive context #{uri.to_base}"}
             next
           end
 
           old_debug = RDF::RDFa.debug?
           begin
-            add_info(root, "load_initial_contexts: load <#{uri}>")
+            add_info(root, "load_initial_contexts: load #{uri.to_base}")
             RDF::RDFa.debug = false
             context = Context.find(uri)
+
+            # Add URI Mappings to prefixes
+            context.prefixes.each_pair do |prefix, value|
+              prefix(prefix, value)
+            end
+            yield :uri_mappings, context.prefixes unless context.prefixes.empty?
+            yield :term_mappings, context.terms unless context.terms.empty?
+            yield :default_vocabulary, context.vocabulary if context.vocabulary
           rescue Exception => e
             RDF::RDFa.debug = old_debug
             add_error(root, e.message)
@@ -582,14 +589,6 @@ module RDF::RDFa
           ensure
             RDF::RDFa.debug = old_debug
           end
-
-          # Add URI Mappings to prefixes
-          context.prefixes.each_pair do |prefix, value|
-            prefix(prefix, value)
-          end
-          yield :uri_mappings, context.prefixes unless context.prefixes.empty?
-          yield :term_mappings, context.terms unless context.terms.empty?
-          yield :default_vocabulary, context.vocabulary if context.vocabulary
         end
     end
 
@@ -614,13 +613,14 @@ module RDF::RDFa
           next unless attr =~ /^xmlns(?:\:(.+))?/
           prefix = $1
           add_debug("extract_mappings") { "ns(attr): #{prefix}: #{href}"}
-          ns_defs[prefix] = href.to_s
+          ns_defs[prefix] = href
         end
       end
 
       ns_defs.each do |prefix, href|
         # A Conforming RDFa Processor must ignore any definition of a mapping for the '_' prefix.
         next if prefix == "_"
+        href = uri(base_uri, href).to_s
 
         # Downcase prefix for RDFa 1.1
         pfx_lc = (@version == :"rdfa1.0" || prefix.nil?) ? prefix : prefix.downcase
@@ -644,17 +644,18 @@ module RDF::RDFa
       mappings = element.attribute("prefix").to_s.strip.split(/\s+/)
       while mappings.length > 0 do
         prefix, uri = mappings.shift.downcase, mappings.shift
-        #puts "uri_mappings prefix #{prefix} <#{uri}>"
+        #puts "uri_mappings prefix #{prefix} #{uri.to_base}"
         next unless prefix.match(/:$/)
         prefix.chop!
 
-        unless prefix.match(NC_REGEXP)
+        unless prefix.empty? || prefix.match(NC_REGEXP)
           add_error(element, "extract_mappings: Prefix #{prefix.inspect} does not match NCName production")
           next
         end
 
         # A Conforming RDFa Processor must ignore any definition of a mapping for the '_' prefix.
         next if prefix == "_"
+        uri = uri(base_uri, uri).to_s
 
         pfx_index = prefix.to_s.empty? ? nil : prefix.to_s.to_sym
         if uri_mappings.fetch(pfx_index, uri) != uri
@@ -1090,7 +1091,7 @@ module RDF::RDFa
           when datatype && ![RDF.XMLLiteral, RDF.HTML].include?(datatype)
             # typed literal
             add_debug(element, "[Step 11] typed literal (#{datatype})")
-            RDF::Literal.new(attrs[:datetime] || attrs[:content] || element.inner_text.to_s, :datatype => datatype, :validate => validate?, :canonicalize => canonicalize?)
+            RDF::Literal.new(attrs[:content] || attrs[:datetime] || element.inner_text.to_s, :datatype => datatype, :validate => validate?, :canonicalize => canonicalize?)
           when @version == :"rdfa1.1"
             case
             when datatype == RDF.XMLLiteral
@@ -1144,7 +1145,7 @@ module RDF::RDFa
             when element.name == 'time'
               # HTML5 support
               # Lexically scan value and assign appropriate type, otherwise, leave untyped
-              v = (attrs[:datetime] || element.inner_text).to_s
+              v = (attrs[:content] || attrs[:datetime] || element.inner_text).to_s
               datatype = %w(Date Time DateTime Year YearMonth Duration).map {|t| RDF::Literal.const_get(t)}.detect do |dt|
                 v.match(dt::GRAMMAR)
               end || RDF::Literal
@@ -1334,7 +1335,7 @@ module RDF::RDFa
         # value must be ignored.
         uri = curie_to_resource_or_bnode(element, $1, options[:uri_mappings], evaluation_context.parent_subject, restrictions)
         if uri
-          add_debug(element) {"process_uri: #{value} => safeCURIE => <#{uri}>"}
+          add_debug(element) {"process_uri: #{value} => safeCURIE => #{uri.to_base}"}
         else
           add_warning(element, "#{value} not matched as a safeCURIE", RDF::RDFA.UnresolvedCURIE)
         end
@@ -1344,7 +1345,7 @@ module RDF::RDFa
         # If the value is an NCName, then it is evaluated as a term according to General Use of Terms in
         # Attributes. Note that this step may mean that the value is to be ignored.
         uri = process_term(element, value.to_s, options)
-        add_debug(element) {"process_uri: #{value} => term => <#{uri}>"}
+        add_debug(element) {"process_uri: #{value} => term => #{uri ? uri.to_base : 'nil'}"}
         uri
       else
         # SafeCURIEorCURIEorIRI or TERMorCURIEorAbsIRI
@@ -1352,35 +1353,33 @@ module RDF::RDFa
         # If it is a valid CURIE, the resulting URI is used; otherwise, the value will be processed as a URI.
         uri = curie_to_resource_or_bnode(element, value, options[:uri_mappings], evaluation_context.parent_subject, restrictions)
         if uri
-          add_debug(element) {"process_uri: #{value} => CURIE => <#{uri}>"}
+          add_debug(element) {"process_uri: #{value} => CURIE => #{uri.to_base}"}
         elsif @version == :"rdfa1.0" && value.to_s.match(/^xml/i)
           # Special case to not allow anything starting with XML to be treated as a URI
         elsif restrictions.include?(:absuri) || restrictions.include?(:uri)
-          begin
-            # AbsURI does not use xml:base
-            if restrictions.include?(:absuri)
-              uri = uri(value)
-              unless uri.absolute?
-                uri = nil
-                add_warning(element, "Malformed IRI #{uri.inspect}")
-              end
-            else
-              uri = uri(base, value)
-            end
-          rescue ArgumentError => e
-            add_warning(element, "Malformed IRI #{value}")
-          rescue RDF::ReaderError => e
-            add_debug(element, e.message)
-            if value.to_s =~ /^\(^\w\):/
-              add_warning(element, "Undefined prefix #{$1}")
-            else
-              add_warning(element, "Relative URI #{value}")
+          # AbsURI does not use xml:base
+          if restrictions.include?(:absuri)
+            uri = uri(value)
+            unless uri.absolute?
+              uri = nil
+              add_warning(element, "Malformed IRI #{uri.inspect}")
             end
+          else
+            uri = uri(base, value)
           end
-          add_debug(element) {"process_uri: #{value} => URI => <#{uri}>"}
+          add_debug(element) {"process_uri: #{value} => URI => #{uri ? uri.to_base : nil}"}
         end
         uri
       end
+    rescue ArgumentError => e
+      add_warning(element, "Malformed IRI #{value}")
+    rescue RDF::ReaderError => e
+      add_debug(element, e.message)
+      if value.to_s =~ /^\(^\w\):/
+        add_warning(element, "Undefined prefix #{$1}")
+      else
+        add_warning(element, "Relative URI #{value}")
+      end
     end
     
     # [7.4.3] General Use of Terms in Attributes
@@ -1409,9 +1408,10 @@ module RDF::RDFa
       prefix, reference = curie.to_s.split(":", 2)
 
       # consider the bnode situation
-      if prefix == "_" && restrictions.include?(:bnode)
+      if prefix == "_"
         # we force a non-nil name, otherwise it generates a new name
         # As a special case, _: is also a valid reference for one specific bnode.
+        raise ArgumentError, "BNode not allowed in this position" unless restrictions.include?(:bnode)
         bnode(reference)
       elsif curie.to_s.match(/^:/)
         # Default prefix

data/lib/rdf/rdfa/vocab.rb

@@ -1,7 +1,6 @@
 module RDF
   class PTR < Vocabulary("http://www.w3.org/2009/pointers#"); end
   class RDFA < Vocabulary("http://www.w3.org/ns/rdfa#"); end
-  class XHV < Vocabulary("http://www.w3.org/1999/xhtml/vocab#"); end
   class XML < Vocabulary("http://www.w3.org/XML/1998/namespace"); end
   class XSI < Vocabulary("http://www.w3.org/2001/XMLSchema-instance"); end
 end

data/lib/rdf/rdfa/writer.rb

@@ -84,6 +84,8 @@ module RDF::RDFa
     #   the prefix mappings to use
     # @option options [#to_s]    :base_uri     (nil)
     #   the base URI to use when constructing relative URIs, set as html>head>base.href
+    # @option options [Boolean]  :validate (false)
+    #   whether to validate terms when serializing
     # @option options [#to_s]   :lang   (nil)
     #   Output as root @lang attribute, and avoid generation _@lang_ where possible
     # @option options [Boolean]  :standard_prefixes   (false)
@@ -135,7 +137,9 @@ module RDF::RDFa
     # Addes a statement to be serialized
     # @param  [RDF::Statement] statement
     # @return [void]
+    # @raise [RDF::WriterError] if validating and attempting to write an invalid {RDF::Term}.
     def write_statement(statement)
+      raise RDF::WriterError, "Statement #{statement.inspect} is invalid" if validate? && statement.invalid?
       @graph.insert(statement)
     end
 
@@ -147,8 +151,9 @@ module RDF::RDFa
     # @return [void]
     # @raise  [NotImplementedError] unless implemented in subclass
     # @abstract
+    # @raise [RDF::WriterError] if validating and attempting to write an invalid {RDF::Term}.
     def write_triple(subject, predicate, object)
-      @graph.insert(Statement.new(subject, predicate, object))
+      write_statement Statement.new(subject, predicate, object)
     end
 
     ##
@@ -290,18 +295,19 @@ module RDF::RDFa
     # @param [Array<RDF::Resource>] objects
     #   List of objects to render. If the list contains only a single element, the :property_value template will be used. Otherwise, the :property_values template is used.
     # @param [Hash{Symbol => Object}] options Rendering options passed to Haml render.
-    # @option options [String] haml (haml_template[:property_value], haml_template[:property_values])
+    # @option options [String] :haml (haml_template[:property_value], haml_template[:property_values])
     #   Haml template to render. Otherwise, uses `haml_template[:property_value] or haml_template[:property_values]`
     #   depending on the cardinality of objects.
-    # @yield [object]
-    #   Yields object.
+    # @yield object, inlist
+    #   Yields object and if it is contained in a list.
     # @yieldparam [RDF::Resource] object
+    # @yieldparam [Boolean] inlist
     # @yieldreturn [String, nil]
     #   The block should only return a string for recursive object definitions.
     # @return String
     #   The rendered document is returned as a string
     def render_property(predicate, objects, options = {}, &block)
-      add_debug {"render_property(#{predicate}): #{objects.inspect}"}
+      add_debug {"render_property(#{predicate}): #{objects.inspect}, #{options.inspect}"}
       # If there are multiple objects, and no :property_values is defined, call recursively with
       # each object
 
@@ -309,25 +315,32 @@ module RDF::RDFa
       template ||= objects.length > 1 ? haml_template[:property_values] : haml_template[:property_value]
 
       # Separate out the objects which are lists and render separately
-      list_objects = objects.select {|o| o != RDF.nil && RDF::List.new(o, @graph).valid?}
+      list_objects = objects.reject do |o|
+        o == RDF.nil ||
+        (l = RDF::List.new(o, @graph)).invalid?
+      end
       unless list_objects.empty?
         # Render non-list objects
-        add_debug {"properties with lists: non-lists: #{objects - list_objects} lists: #{list_objects}"}
-        nl = render_property(predicate, objects - list_objects, options, &block) unless objects == list_objects
+        add_debug {"properties with lists: #{list_objects} non-lists: #{objects - list_objects}"}
+        nl = depth {render_property(predicate, objects - list_objects, options, &block)} unless objects == list_objects
         return nl.to_s + list_objects.map do |object|
           # Render each list as multiple properties and set :inlist to true
           list = RDF::List.new(object, @graph)
           list.each_statement {|st| subject_done(st.subject)}
 
           add_debug {"list: #{list.inspect} #{list.to_a}"}
-          render_property(predicate, list.to_a, options.merge(:inlist => "true"), &block)
+          depth do
+            render_property(predicate, list.to_a, options.merge(:inlist => "true")) do |object|
+              yield(object, true) if block_given?
+            end
+          end
         end.join(" ")
       end
 
       if objects.length > 1 && template.nil?
-        # Uf there is no property_values template, render each property using property_value template
+        # If there is no property_values template, render each property using property_value template
         objects.map do |object|
-          render_property(predicate, [object], options, &block)
+          depth {render_property(predicate, [object], options, &block)}
         end.join(" ")
       else
         raise RDF::WriterError, "Missing property template" if template.nil?
@@ -345,9 +358,7 @@ module RDF::RDFa
           :rel        => get_curie(predicate),
           :inlist     => nil,
         }.merge(options)
-        hamlify(template, options) do |object|
-          yield(object) if block_given?
-        end
+        hamlify(template, options, &block)
       end
     end
 
@@ -360,7 +371,7 @@ module RDF::RDFa
       [XML_RDFA_CONTEXT, HTML_RDFA_CONTEXT].each do |uri|
         ctx = Context.find(uri)
         ctx.prefixes.each_pair do |k, v|
-          @uri_to_prefix[v] = k
+          @uri_to_prefix[v] = k unless k.to_s == "dcterms"
         end
 
         ctx.terms.each_pair do |k, v|
@@ -444,8 +455,8 @@ module RDF::RDFa
     # @return [ignored]
     def preprocess_statement(statement)
       #add_debug {"preprocess: #{statement.inspect}"}
-      references = ref_count(statement.object) + 1
-      @references[statement.object] = references
+      bump_reference(statement.subject)
+      bump_reference(statement.object)
       @subjects[statement.subject] = true
       get_curie(statement.subject)
       get_curie(statement.predicate)
@@ -482,50 +493,76 @@ module RDF::RDFa
     #   Serialize using &lt;li&gt; rather than template default element
     # @option options [RDF::Resource] :rel (nil)
     #   Optional @rel property
-    # @return [Nokogiri::XML::Element, {Namespace}]
+    # @return [String]
     def subject(subject, options = {})
       return if is_done?(subject)
 
       subject_done(subject)
 
+      properties = properties_for_subject(subject)
+      typeof = type_of(properties.delete(RDF.type.to_s), subject)
+      prop_list = order_properties(properties)
+
+      add_debug {"props: #{prop_list.inspect}"}
+
+      render_opts = {:typeof => typeof, :property_values => properties}.merge(options)
+
+      render_subject_template(subject, prop_list, render_opts)
+    end
+
+    # @param [RDF::Resource] subject
+    # @return [Hash{String => Object}]
+    def properties_for_subject(subject)
       properties = {}
       @graph.query(:subject => subject) do |st|
-        properties[st.predicate.to_s] ||= []
-        properties[st.predicate.to_s] << st.object
+        key = st.predicate.to_s.freeze
+        properties[key] ||= []
+        properties[key] << st.object
       end
-      prop_list = order_properties(properties)
+      properties
+    end
 
+    # @param [Array,NilClass] type
+    # @param [RDF::Resource] subject
+    # @return [String] string representation of the specific RDF.type uri
+    def type_of(type, subject)
       # Find appropriate template
-      curie ||= case
+      curie = case
       when subject.node?
-        subject.to_s if ref_count(subject) >= (@depth == 0 ? 0 : 1)
+        subject.to_s if ref_count(subject) > 1
       else
         get_curie(subject)
       end
 
-      # See if there's a template based on the sorted concatenation of all types of this subject
-      # or any type of this subject
-      tmpl = find_template(subject)
-
-      typeof = Array(properties.delete(RDF.type.to_s)).map {|r| get_curie(r)}.join(" ")
+      typeof = Array(type).map {|r| get_curie(r)}.join(" ")
       typeof = nil if typeof.empty?
 
       # Nodes without a curie need a blank @typeof to generate a subject
       typeof ||= "" unless curie
-      prop_list -= [RDF.type.to_s]
 
+      add_debug {"subject: #{curie.inspect}, typeof: #{typeof.inspect}" }
+
+      typeof.freeze
+    end
+
+    # @param [RDF::Resource] subject
+    # @param [Array] prop_list
+    # @param [Hash] render_opts
+    # @return [String]
+    def render_subject_template(subject, prop_list, render_opts)
+      # See if there's a template based on the sorted concatenation of all types of this subject
+      # or any type of this subject
+      tmpl = find_template(subject)
       add_debug {"subject: found template #{tmpl[:identifier] || tmpl.inspect}"} if tmpl
-      add_debug {"subject: #{curie.inspect}, typeof: #{typeof.inspect}, props: #{prop_list.inspect}"}
 
       # Render this subject
       # If :rel is specified and :typeof is nil, use @resource instead of @about.
       # Pass other options from calling context
-      render_opts = {:typeof => typeof}.merge(options)
       with_template(tmpl) do
         render_subject(subject, prop_list, render_opts) do |pred|
           depth do
             pred = RDF::URI(pred) if pred.is_a?(String)
-            values = properties[pred.to_s]
+            values = render_opts[:property_values][pred.to_s]
             add_debug {"subject: #{get_curie(subject)}, pred: #{get_curie(pred)}, values: #{values.inspect}"}
             predicate(pred, values)
           end
@@ -547,10 +584,10 @@ module RDF::RDFa
       return if objects.to_a.empty?
 
       add_debug {"predicate: #{get_curie(predicate)}"}
-      render_property(predicate, objects) do |o|
+      render_property(predicate, objects) do |o, inlist=nil|
         # Yields each object, for potential recursive definition.
         # If nil is returned, a leaf is produced
-        depth {subject(o, :rel => get_curie(predicate), :element => (:li if objects.length > 1))} if !is_done?(o) && @subjects.include?(o)
+        depth {subject(o, :rel => get_curie(predicate), :inlist => inlist, :element => (:li if objects.length > 1 || inlist))} if !is_done?(o) && @subjects.include?(o)
       end
     end
 
@@ -567,11 +604,11 @@ module RDF::RDFa
     # Haml rendering helper. Return language for plain literal, if there is no language, or it is the same as the document, return nil
     #
     # @param [RDF::Literal] literal
-    # @return [String, nil]
+    # @return [Symbol, nil]
     # @raise [RDF::WriterError]
     def get_lang(literal)
       raise RDF::WriterError, "Getting datatype CURIE for #{literal.inspect}, which must be a literal" unless literal.is_a?(RDF::Literal)
-      literal.language if literal.literal? && literal.language && literal.language != @lang
+      literal.language if literal.literal? && literal.language && literal.language.to_s != @lang.to_s
     end
 
     # Haml rendering helper. Data to be added to a @content value
@@ -658,7 +695,7 @@ module RDF::RDFa
       #add_debug {"get_curie(#{resource}) => #{curie}"}
 
       @uri_to_term_or_curie[uri] = curie
-    rescue Argument => e
+    rescue ArgumentError => e
       raise RDF::WriterError, "Invalid URI #{uri.inspect}: #{e.message}"
     end
     private
@@ -676,6 +713,10 @@ module RDF::RDFa
     end
 
     # Increase depth around a method invocation
+    # @yield
+    #   Yields with no arguments
+    # @yieldreturn [Object] returns the result of yielding
+    # @return [Object]
     def depth
       @depth += 1
       ret = yield
@@ -684,6 +725,11 @@ module RDF::RDFa
     end
 
     # Set the template to use within block
+    # @param [Hash{Symbol => String}] templ template to use for block evaluation; merged in with the existing template.
+    # @yield
+    #   Yields with no arguments
+    # @yieldreturn [Object] returns the result of yielding
+    # @return [Object]
     def with_template(templ)
       if templ
         new_template = @options[:haml].
@@ -734,15 +780,29 @@ module RDF::RDFa
     def find_template(subject); end
 
     # Mark a subject as done.
+    # @param [RDF::Resource] subject
+    # @return [Boolean]
     def subject_done(subject)
       @serialized[subject] = true
     end
 
+    # Determine if the subject has been completed
+    # @param [RDF::Resource] subject
+    # @return [Boolean]
     def is_done?(subject)
       @serialized.include?(subject)
     end
 
+    # Increase the reference count of this resource
+    # @param [RDF::Resource] resource
+    # @return [Integer] resulting reference count
+    def bump_reference(resource)
+      @references[resource] = ref_count(resource) + 1
+    end
+
     # Return the number of times this node has been referenced in the object position
+    # @param [RDF::Node] node
+    # @return [Boolean]
     def ref_count(node)
       @references.fetch(node, 0)
     end
@@ -756,7 +816,7 @@ module RDF::RDFa
       message = message + yield if block_given?
       msg = "#{'  ' * @depth}#{message}"
       STDERR.puts msg if ::RDF::RDFa.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,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Gregg
@@ -9,230 +9,230 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rdf-microdata
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
 description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
@@ -281,17 +281,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-rdfa
-rubygems_version: 2.0.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: RDFa reader/writer for RDF.rb.