rdf-rdfa 0.3.4.2 → 0.3.5.1

data/VERSION

@@ -1 +1 @@
-0.3.4.2
+0.3.5.1

data/lib/rdf/rdfa/reader.rb

@@ -266,8 +266,8 @@ module RDF::RDFa
       # Snif version based on input
       case input
       when Nokogiri::XML::Document, Nokogiri::HTML::Document
-        doc_type_string = input.doc_type.to_s
-        version_attr = input.root && @doc.root.attribute("version").to_s
+        doc_type_string = input.doctype.to_s
+        version_attr = input.root && input.root.attribute("version").to_s
         root_element = input.root.name.downcase
         root_namespace = input.root.namespace.to_s
         root_attrs = input.root.attributes
@@ -624,7 +624,7 @@ module RDF::RDFa
 
       # Pull out the attributes needed for the skip test.
       property = attrs['property'].to_s.strip if attrs['property']
-      typeof = attrs['typeof'].to_s.strip if attrs['typeof']
+      typeof = attrs['typeof'].to_s.strip if attrs.has_key?('typeof')
       datatype = attrs['datatype'].to_s if attrs['datatype']
       content = attrs['content'].to_s if attrs['content']
       rel = attrs['rel'].to_s.strip if attrs['rel']
@@ -763,13 +763,13 @@ module RDF::RDFa
         # otherwise,
         #   if parent object is present, new subject is set to the value of parent object.
         # Additionally, if @property is not present then the skip element flag is set to 'true';
-        new_subject ||= if element == @doc.root && base
-          uri(base)
-        elsif [:xhtml1, :xhtml5, :html4, :html5].include?(@host_language) && element.name =~ /^(head|body)$/
+        new_subject ||= if [:xhtml1, :xhtml5, :html4, :html5].include?(@host_language) && element.name =~ /^(head|body)$/
           # From XHTML+RDFa 1.1:
           # if no URI is provided, then first check to see if the element is the head or body element.
           # If it is, then act as if there is an empty @about present, and process it according to the rule for @about.
           uri(base)
+        elsif element == @doc.root && base
+          uri(base)
         elsif typeof
           RDF::Node.new
         else

data/lib/rdf/rdfa/writer.rb

@@ -426,7 +426,7 @@ module RDF::RDFa
     #   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, property, rel, options = {})
+    def render_property(predicate, objects, property, rel, options = {}, &block)
       # If there are multiple objects, and no :properti_values is defined, call recursively with
       # each object
       
@@ -434,7 +434,7 @@ module RDF::RDFa
       template ||= objects.length > 1 ? haml_template[:property_values] : haml_template[:property_value]
       if objects.length > 1 && template.nil?
         objects.map do |object|
-          render_property(predicate, [object], property, rel, options)
+          render_property(predicate, [object], property, rel, options, &block)
         end.join(" ")
       else
         raise RDF::WriterError, "Missing property template" if template.nil?
@@ -503,7 +503,7 @@ module RDF::RDFa
       # Add distinguished classes
       top_classes.
       select {|s| !seen.include?(s)}.
-        each do |class_uri|
+      each do |class_uri|
         graph.query(:predicate => RDF.type, :object => class_uri).map {|st| st.subject}.sort.uniq.each do |subject|
           #add_debug "order_subjects: #{subject.inspect}"
           subjects << subject
@@ -517,6 +517,8 @@ module RDF::RDFa
         map {|r| [r.is_a?(RDF::Node) ? 1 : 0, ref_count(r), r]}.
         sort
       
+      add_debug "order_subjects: #{recursable.inspect}"
+
       subjects += recursable.map{|r| r.last}
     end
     
@@ -615,13 +617,10 @@ module RDF::RDFa
         get_curie(subject)
       end
 
-      # See if there's a template for any of the types associated with this subject
-      tmpl = (properties[RDF.type.to_s] || []).
-        map do |type|
-          haml_template[type] || (@options[:haml] && @options[:haml][type])
-        end.
-        compact.first
-      
+      # 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 = [properties.delete(RDF.type.to_s)].flatten.compact.map {|r| get_curie(r)}.join(" ")
       typeof = nil if typeof.empty?
       
@@ -629,7 +628,7 @@ module RDF::RDFa
       typeof ||= "" unless curie
       prop_list -= [RDF.type.to_s]
 
-      add_debug "subject: found template in #{haml_template.keys.inspect}? #{(!tmpl.nil?).inspect}"
+      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
@@ -721,6 +720,8 @@ module RDF::RDFa
       else
         literal.to_s
       end
+    rescue
+      literal.to_s  # When all else fails ...
     end
 
     # Haml rendering helper. Return an appropriate label for a resource.
@@ -808,7 +809,14 @@ module RDF::RDFa
     
     # Set the template to use within block
     def with_template(templ)
-      old_template, @haml_template = @haml_template, templ
+      if templ
+        new_template = @options[:haml].
+          reject {|k,v| ![:subject, :property_value, :property_values, :rel].include?(k)}.
+          merge(templ || {})
+        old_template, @haml_template = @haml_template, new_template
+      else
+        old_template = @haml_template
+      end
 
       res = yield
       # Restore template
@@ -825,10 +833,10 @@ module RDF::RDFa
     # @return [String]
     # @raise [RDF::WriterError]
     def hamlify(template, locals = {})
+      add_debug "hamlify template: #{template}"
       template = haml_template[template] if template.is_a?(Symbol)
 
       template = template.align_left
-      add_debug "hamlify template: #{template}"
       add_debug "hamlify locals: #{locals.inspect}"
 
       Haml::Engine.new(template, @options[:haml_options] || HAML_OPTIONS).render(self, locals) do |*args|
@@ -841,6 +849,14 @@ module RDF::RDFa
         "and locals #{locals.inspect}"
     end
 
+    ##
+    # Find a template appropriate for the subject. 
+    # Override this method to provide templates based on attributes of a given subject
+    #
+    # @param [RDF::URI] subject
+    # @return [Hash] # return matched matched template
+    def find_template(subject); end
+
     # Mark a subject as done.
     def subject_done(subject)
       @serialized[subject] = true

data/lib/rdf/rdfa/writer/haml_templates.rb

@@ -3,6 +3,7 @@ module RDF::RDFa
   class Writer
     # The default set of HAML templates used for RDFa code generation
    BASE_HAML = {
+     :identifier => "base", 
       # Document
       # Locals: language, title, profile, prefix, base, subjects
       # Yield: subjects.each
@@ -109,6 +110,7 @@ module RDF::RDFa
     # This version does not perform recursive object generation and does not attempt
     # to create human readable output.
     MIN_HAML = {
+      :identifier => "min", 
       # Document
       # Locals: language, title, profile, prefix, base, subjects
       # Yield: subjects.each
@@ -167,6 +169,7 @@ module RDF::RDFa
     }
 
     DISTILLER_HAML = {
+      :identifier => "distiller", 
       # Document
       # Locals: language, title, profile, prefix, base, subjects
       # Yield: subjects.each

metadata

@@ -1,351 +1,214 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-rdfa
 version: !ruby/object:Gem::Version 
+  hash: 65
   prerelease: 
-  version: 0.3.4.2
+  segments: 
+  - 0
+  - 3
+  - 5
+  - 1
+  version: 0.3.5.1
 platform: ruby
 authors: 
-- Gregg Kellogg
+- Gregg
+- Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 -07:00
-default_executable: 
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: rdf
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.4
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
+        version: 0.3.3
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rdf
+  name: haml
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: nokogiri
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
+        version: 1.4.4
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: facets
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        hash: 41
+        segments: 
+        - 2
+        - 9
+        - 1
+        version: 2.9.1
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: facets
+  name: spira
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.9.1
-  type: :runtime
-  prerelease: false
+        hash: 7
+        segments: 
+        - 0
+        - 0
+        - 12
+        version: 0.0.12
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: open-uri-cached
+  name: rspec
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.3
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rdf-spec
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
+        version: 0.3.2
   type: :development
-  prerelease: false
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rdf-isomorphic
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.4
-  type: :development
-  prerelease: false
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rdf-n3
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.1
-  type: :development
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sxp
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: sparql-algebra
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: sparql-grammar
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: spira
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.12
-  type: :development
-  prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: yard
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.4
-  type: :development
   prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: rdf
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: haml
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  requirement: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.4.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: facets
-  requirement: &id019 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
-  name: spira
-  requirement: &id020 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.0.12
-  type: :development
-  prerelease: false
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id021 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *id021
-- !ruby/object:Gem::Dependency 
-  name: rdf-spec
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
         version: 0.3.3
   type: :development
-  prerelease: false
-  version_requirements: *id022
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rdf-isomorphic
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
         version: 0.3.4
   type: :development
-  prerelease: false
-  version_requirements: *id023
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
   type: :development
-  prerelease: false
-  version_requirements: *id024
-description: "    RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library suite.\n"
-email: gregg@kellogg-assoc.com
+  version_requirements: *id010
+description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library suite.
+email: public-rdf-ruby@w3.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- AUTHORS
-- CONTRIBUTORS
-- History.md
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .yardopts
 - AUTHORS
-- CONTRIBUTORS
-- Gemfile
-- History.md
 - README
-- README.md
-- Rakefile
 - UNLICENSE
 - VERSION
-- etc/basic.html
-- etc/foaf.html
-- etc/profile.html
-- etc/xhv.html
-- example-files/bb-test.rb
-- example-files/best-buy.html
-- example-files/data-view.xhtml
-- example-files/erdf_profile.html
-- example-files/gk-foaf.html
-- example-files/payswarm.html
-- example-files/payswarm.n3
-- example.rb
-- lib/rdf/.gitignore
-- lib/rdf/rdfa.rb
 - lib/rdf/rdfa/format.rb
 - lib/rdf/rdfa/patches/graph_properties.rb
 - lib/rdf/rdfa/patches/literal_hacks.rb
 - lib/rdf/rdfa/patches/nokogiri_hacks.rb
 - lib/rdf/rdfa/patches/string_hacks.rb
-- lib/rdf/rdfa/profile.rb
 - lib/rdf/rdfa/profile/xhtml.rb
 - lib/rdf/rdfa/profile/xml.rb
+- lib/rdf/rdfa/profile.rb
 - lib/rdf/rdfa/reader.rb
 - lib/rdf/rdfa/version.rb
 - lib/rdf/rdfa/vocab.rb
-- lib/rdf/rdfa/writer.rb
 - lib/rdf/rdfa/writer/haml_templates.rb
-- pkg/.gitignore
-- rdf-rdfa.gemspec
-- script/console
-- script/intern_vocabulary
-- script/parse
-- script/tc
-- script/yard-to-rubyforge
-- spec/.gitignore
-- spec/literal_spec.rb
-- spec/matchers.rb
-- spec/profile_spec.rb
-- spec/reader_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/test_helper.rb
-- spec/writer_spec.rb
-has_rdoc: true
+- lib/rdf/rdfa/writer.rb
+- lib/rdf/rdfa.rb
 homepage: http://github.com/gkellogg/rdf-rdfa
-licenses: []
-
+licenses: 
+- Public Domain
 post_install_message: 
 rdoc_options: []
 
@@ -356,17 +219,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 53
+      segments: 
+      - 1
+      - 8
+      - 1
+      version: 1.8.1
 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.6.2
+rubyforge_project: rdf-rdfa
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: RDFa reader/writer for RDF.rb.