rdf-rdfa 0.3.16 → 0.3.17

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/lib/rdf/rdfa/context.rb

@@ -9,19 +9,19 @@ module RDF::RDFa
   # or to load into, if no such graph exists
   class Context
     # Prefix mappings defined in this context
-    # @return [Hash{Symbol => RDF::URI}]
+    # @attr_reader [Hash{Symbol => RDF::URI}]
     attr_reader :prefixes
 
     # Term mappings defined in this context
-    # @return [Hash{Symbol => RDF::URI}]
+    # @attr_reader [Hash{Symbol => RDF::URI}]
     attr_reader :terms
     
     # Default URI defined for this vocabulary
-    # @return [RDF::URI]
+    # @attr_reader [RDF::URI]
     attr_reader :vocabulary
 
     # URI defining this context
-    # @return [RDF::URI]
+    # @attr_reader [RDF::URI]
     attr_reader :uri
     
     ##

data/lib/rdf/rdfa/expansion.rb

@@ -89,13 +89,13 @@ module RDF::RDFa
     # Takes a list of antecedent patterns used to find solutions against a queryable
     # object. Yields each consequent with bindings from the solution
     class Rule
-      # @attr [Array<RDF::Query::Pattern>]
+      # @attr_reader [Array<RDF::Query::Pattern>]
       attr_reader :antecedents
 
-      # @attr [Array<RDF::Query::Pattern>]
+      # @attr_reader [Array<RDF::Query::Pattern>]
       attr_reader :consequents
 
-      # @attr [String] name
+      # @attr_reader [String] name
       attr_reader :name
 
       ##

data/lib/rdf/rdfa/reader.rb

@@ -80,11 +80,11 @@ module RDF::RDFa
       Regexp::EXTENDED)
 
     # Host language
-    # @attr [:xml, :xhtml1, :xhtml5, :html4, :html5, :svg]
+    # @attr_reader [:xml, :xhtml1, :xhtml5, :html4, :html5, :svg]
     attr_reader :host_language
     
     # Version
-    # @attr [:"rdfa1.0", :"rdfa1.1"]
+    # @attr_reader [:"rdfa1.0", :"rdfa1.1"]
     attr_reader :version
     
     # The Recursive Baggage
@@ -98,8 +98,8 @@ module RDF::RDFa
       # such as the (X)HTML base element. The important thing is that it establishes
       # a URL against which relative paths can be resolved.
       #
-      # @attr [RDF::URI]
-      attr :base, true
+      # @attr_accessor [RDF::URI]
+      attr_accessor :base
 
       ##
       # The parent subject.
@@ -107,8 +107,8 @@ module RDF::RDFa
       # The initial value will be the same as the initial value of base,
       # but it will usually change during the course of processing.
       #
-      # @attr [RDF::URI]
-      attr :parent_subject, true
+      # @attr_accessor [RDF::URI]
+      attr_accessor :parent_subject
       
       ##
       # The parent object.
@@ -120,21 +120,21 @@ module RDF::RDFa
       # This means that the bnode must be set in the containing statement and passed down,
       # and this property is used to convey this value.
       #
-      # @attr [RDF::URI]
-      attr :parent_object, true
+      # @attr_accessor [RDF::URI]
+      attr_accessor :parent_object
       
       ##
       # A list of current, in-scope URI mappings.
       #
-      # @attr [Hash{Symbol => String}]
-      attr :uri_mappings, true
+      # @attr_accessor [Hash{Symbol => String}]
+      attr_accessor :uri_mappings
       
       ##
       # A list of current, in-scope Namespaces. This is the subset of uri_mappings
       # which are defined using xmlns.
       #
-      # @attr [Hash{String => Namespace}]
-      attr :namespaces, true
+      # @attr_accessor [Hash{String => Namespace}]
+      attr_accessor :namespaces
       
       ##
       # A list of incomplete triples.
@@ -144,14 +144,14 @@ module RDF::RDFa
       # The triples can be completed when a resource becomes available,
       # which will be when the next subject is specified (part of the process called chaining).
       #
-      # @attr [Array<Array<RDF::URI, RDF::Resource>>]
-      attr :incomplete_triples, true
+      # @attr_accessor [Array<Array<RDF::URI, RDF::Resource>>]
+      attr_accessor :incomplete_triples
       
       ##
       # The language. Note that there is no default language.
       #
-      # @attr [Symbol]
-      attr :language, true
+      # @attr_accessor [Symbol]
+      attr_accessor :language
       
       ##
       # The term mappings, a list of terms and their associated URIs.
@@ -160,8 +160,8 @@ module RDF::RDFa
       # Host Languages may define an initial list.
       # If a Host Language provides an initial list, it should do so via an RDFa Context document.
       #
-      # @attr [Hash{Symbol => RDF::URI}]
-      attr :term_mappings, true
+      # @attr_accessor [Hash{Symbol => RDF::URI}]
+      attr_accessor :term_mappings
       
       ##
       # The default vocabulary
@@ -170,15 +170,15 @@ module RDF::RDFa
       # This specification does not define an initial setting for the default vocabulary.
       # Host Languages may define an initial setting.
       #
-      # @attr [RDF::URI]
-      attr :default_vocabulary, true
+      # @attr_accessor [RDF::URI]
+      attr_accessor :default_vocabulary
 
       ##
       # lists
       #
       # A hash associating lists with properties.
-      # @attr [Hash{RDF::URI => Array<RDF::Resource>}]
-      attr :list_mapping, true
+      # @attr_accessor [Hash{RDF::URI => Array<RDF::Resource>}]
+      attr_accessor :list_mapping
 
       # @param [RDF::URI] base
       # @param [Hash] host_defaults
@@ -568,7 +568,7 @@ module RDF::RDFa
         end
     end
 
-    # Extract the XMLNS mappings from an element
+    # Extract the prefix mappings from an element
     def extract_mappings(element, uri_mappings, namespaces)
       # look for xmlns
       # (note, this may be dependent on @host_language)
@@ -600,6 +600,9 @@ module RDF::RDFa
         # Downcase prefix for RDFa 1.1
         pfx_lc = (@version == :"rdfa1.0" || prefix.nil?) ? prefix : prefix.downcase
         if prefix
+          if uri_mappings.fetch(pfx_lc.to_sym, href) != href
+            add_warning(element, "Redefining prefix #{pfx_lc}: from <#{uri_mappings[pfx_lc]}> to <#{href}>", RDF::RDFA.PrefixRedefinition)
+          end
           uri_mappings[pfx_lc.to_sym] = href
           namespaces[pfx_lc] ||= href
           prefix(pfx_lc, href)
@@ -619,7 +622,7 @@ module RDF::RDFa
         #puts "uri_mappings prefix #{prefix} <#{uri}>"
         next unless prefix.match(/:$/)
         prefix.chop!
-        
+
         unless prefix.match(NC_REGEXP)
           add_error(element, "extract_mappings: Prefix #{prefix.inspect} does not match NCName production")
           next
@@ -628,7 +631,11 @@ module RDF::RDFa
         # A Conforming RDFa Processor must ignore any definition of a mapping for the '_' prefix.
         next if prefix == "_"
 
-        uri_mappings[prefix.to_s.empty? ? nil : prefix.to_s.to_sym] = uri
+        pfx_index = prefix.to_s.empty? ? nil : prefix.to_s.to_sym
+        if uri_mappings.fetch(pfx_index, uri) != uri
+          add_warning(element, "Redefining prefix #{prefix}: from <#{uri_mappings[pfx_index]}> to <#{uri}>", RDF::RDFA.PrefixRedefinition)
+        end
+        uri_mappings[pfx_index] = uri
         prefix(prefix, uri)
         add_info(element, "extract_mappings: prefix #{prefix} => <#{uri}>")
       end unless @version == :"rdfa1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-rdfa
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf