rdf-rdfa 0.3.8 → 0.3.9

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

@@ -29,30 +29,17 @@ module RDF::RDFa
       # to a previous subject. If _element_ is :li, the tag will be written
       # with <li> instead of <div>.
       #
-      # Note that @rel and @resource can be used together, or @about and @typeof, but
-      # not both.
-      #
       # Locals: subject, typeof, predicates, rel, element, inlist
       # Yield: predicates.each
       :subject => %q(
         - if element == :li
-          %li{:rel => rel, :resource => resource, :inlist => inlist}
+          %li{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
             - if typeof
-              %span{:rel => 'rdf:type', :resource => typeof}.type!= typeof
-            - predicates.each do |predicate|
-              != yield(predicate)
-        - elsif rel && typeof
-          %div{:rel => rel}
-            %div{:about => resource, :typeof => typeof}
               %span.type!= typeof
-              - predicates.each do |predicate|
-                != yield(predicate)
-        - elsif rel
-          %div{:rel => rel, :resource => resource}
             - predicates.each do |predicate|
               != yield(predicate)
         - else
-          %div{:about => about, :typeof => typeof}
+          %div{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
             - if typeof
               %span.type!= typeof
             - predicates.each do |predicate|
@@ -76,9 +63,9 @@ module RDF::RDFa
             - elsif get_curie(object) == 'rdf:nil'
               %span{:rel => get_curie(predicate), :inlist => ''}
             - elsif object.node?
-              %span{:resource => get_curie(object), :rel => get_curie(predicate), :inlist => inlist}= get_curie(object)
+              %span{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
             - elsif object.uri?
-              %a{:href => object.to_s, :rel => get_curie(predicate), :inlist => inlist}= object.to_s
+              %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
             - elsif object.datatype == RDF.XMLLiteral
               %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
             - else
@@ -97,10 +84,10 @@ module RDF::RDFa
               - if res = yield(object)
                 != res
               - elsif object.node?
-                %li{:rel => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+                %li{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
               - elsif object.uri?
                 %li
-                  %a{:rel => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+                  %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
               - elsif object.datatype == RDF.XMLLiteral
                 %li{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_curie(object.datatype), :inlist => inlist}<!= get_value(object)
               - else
@@ -134,28 +121,9 @@ module RDF::RDFa
       # Locals: about, typeof, predicates, :inlist
       # Yield: predicates.each
       :subject => %q(
-        - if element == :li
-          %li{:rel => rel, :resource => resource, :inlist => inlist}
-            - if typeof
-              %span{:rel => 'rdf:type', :resource => typeof}.type!= typeof
-            - predicates.each do |predicate|
-              != yield(predicate)
-          %li{:about => resource, :typeof => typeof}
-            - predicates.each do |predicate|
-              != yield(predicate)
-        - elsif rel && typeof
-          %div{:rel => rel, :inlist => inlist}
-            %div{:about => resource, :typeof => typeof}
-              - predicates.each do |predicate|
-                != yield(predicate)
-        - elsif rel
-          %div{:rel => rel, :resource => resource, :inlist => inlist}
-            - predicates.each do |predicate|
-              != yield(predicate)
-        - else
-          %div{:about => about, :typeof => typeof}
-            - predicates.each do |predicate|
-              != yield(predicate)
+        %div{:rel => rel, :resource => (about || resource), :typeof => typeof}
+          - predicates.each do |predicate|
+            != yield(predicate)
       ),
 
       # Output for single-valued properties.
@@ -165,15 +133,18 @@ module RDF::RDFa
       # If nil is returned, render as a leaf
       # Otherwise, render result
       :property_value => %q(
-        %div.property
-          - if get_curie(object) == 'rdf:nil'
-            %span{:rel => get_curie(predicate), :inlist => ''}
-          - elsif object.resource?
-            %span{:resource => get_curie(object), :rel => get_curie(predicate), :inlist => inlist}
-          - elsif object.datatype == RDF.XMLLiteral
-            %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
-          - else
-            %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(object.to_s)
+      - if res = yield(object)
+        != res
+      - elsif get_curie(object) == 'rdf:nil'
+        %span{:rel => get_curie(predicate), :inlist => ''}
+      - elsif object.node?
+        %span{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+      - elsif object.uri?
+        %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+      - elsif object.datatype == RDF.XMLLiteral
+        %span{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
+      - else
+        %span{:property => get_curie(predicate), :content => get_content(object), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}= escape_entities(get_value(object))
       )
     }
 
@@ -218,26 +189,14 @@ module RDF::RDFa
       # Yield: predicates.each
       :subject => %q(
         - if element == :li
-          %li{:rel => rel, :resource => resource, :inlist => inlist}
+          %li{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
             - if typeof
-              %span{:rel => 'rdf:type', :resource => typeof}.type!= typeof
-            %table.properties
-              - predicates.each do |predicate|
-                != yield(predicate)
-        - elsif rel && typeof
-          %td{:rel => rel, :inlist => inlist}
-            %div{:about => resource, :typeof => typeof}
               %span.type!= typeof
-              %table.properties
-                - predicates.each do |predicate|
-                  != yield(predicate)
-        - elsif rel
-          %td{:rel => rel, :resource => resource, :inlist => inlist}
             %table.properties
               - predicates.each do |predicate|
                 != yield(predicate)
         - else
-          %div{:about => about, :typeof => typeof}
+          %td{:rel => rel, :resource => (about || resource), :typeof => typeof, :inlist => inlist}
             - if typeof
               %span.type!= typeof
             %table.properties
@@ -262,10 +221,10 @@ module RDF::RDFa
             - elsif get_curie(object) == 'rdf:nil'
               %td{:rel => get_curie(predicate), :inlist => ''}= "Empty"
             - elsif object.node?
-              %td{:resource => get_curie(object), :rel => get_curie(predicate), :inlist => inlist}= get_curie(object)
+              %td{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
             - elsif object.uri?
               %td
-                %a{:href => object.to_s, :rel => get_curie(predicate), :inlist => inlist}= object.to_s
+                %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
             - elsif object.datatype == RDF.XMLLiteral
               %td{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_dt_curie(object), :inlist => inlist}<!= get_value(object)
             - else
@@ -285,10 +244,10 @@ module RDF::RDFa
                 - if res = yield(object)
                   != res
                 - elsif object.node?
-                  %li{:rel => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
+                  %li{:property => get_curie(predicate), :resource => get_curie(object), :inlist => inlist}= get_curie(object)
                 - elsif object.uri?
                   %li
-                    %a{:rel => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
+                    %a{:property => get_curie(predicate), :href => object.to_s, :inlist => inlist}= object.to_s
                 - elsif object.datatype == RDF.XMLLiteral
                   %li{:property => get_curie(predicate), :lang => get_lang(object), :datatype => get_curie(object.datatype), :inlist => inlist}<!= get_value(object)
                 - else

metadata

@@ -1,200 +1,286 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rdf-rdfa
-version: !ruby/object:Gem::Version
-  version: 0.3.8
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 9
+  version: 0.3.9
 platform: ruby
-authors:
+authors: 
 - Gregg
 - Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdf
-  requirement: &2161384300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 3
+        - 3
         version: 0.3.3
   type: :runtime
-  prerelease: false
-  version_requirements: *2161384300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &2161383420 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: *2161383420
-- !ruby/object:Gem::Dependency
-  name: facets
-  requirement: &2161370720 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.9.1
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2161370720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rdf-xsd
-  requirement: &2161369720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
   type: :runtime
-  prerelease: false
-  version_requirements: *2161369720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: htmlentities
-  requirement: &2161368560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 4
+        - 3
+        - 0
         version: 4.3.0
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: backports
   prerelease: false
-  version_requirements: *2161368560
-- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2161367940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
   type: :development
-  prerelease: false
-  version_requirements: *2161367940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: equivalent-xml
-  requirement: &2161367160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 2
+        - 8
         version: 0.2.8
   type: :development
-  prerelease: false
-  version_requirements: *2161367160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: open-uri-cached
-  requirement: &2161366120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
         version: 0.0.4
   type: :development
-  prerelease: false
-  version_requirements: *2161366120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: spira
-  requirement: &2161365500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 0
+        - 12
         version: 0.0.12
   type: :development
-  prerelease: false
-  version_requirements: *2161365500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2161364820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
-  prerelease: false
-  version_requirements: *2161364820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: rdf-spec
-  requirement: &2161363480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
   type: :development
-  prerelease: false
-  version_requirements: *2161363480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: rdf-turtle
-  requirement: &2161361320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
   type: :development
-  prerelease: false
-  version_requirements: *2161361320
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: rdf-rdfxml
-  requirement: &2161359740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
         version: 0.3.4
   type: :development
-  prerelease: false
-  version_requirements: *2161359740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: rdf-isomorphic
-  requirement: &2161358080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 3
+        - 4
         version: 0.3.4
   type: :development
-  prerelease: false
-  version_requirements: *2161358080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: sparql
-  requirement: &2161357100 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
         version: 0.0.2
   type: :development
-  prerelease: false
-  version_requirements: *2161357100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &2161355420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
   type: :development
-  prerelease: false
-  version_requirements: *2161355420
-description: RDF::RDFa is an RDFa reader/writer for Ruby using the RDF.rb library
-  suite.
+  version_requirements: *id016
+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: []
-files:
+
+files: 
 - AUTHORS
 - README
 - UNLICENSE
@@ -212,6 +298,7 @@ files:
 - lib/rdf/rdfa/expansion.rb
 - lib/rdf/rdfa/format.rb
 - lib/rdf/rdfa/patches/string_hacks.rb
+- lib/rdf/rdfa/profile/html.rb
 - lib/rdf/rdfa/profile/xhtml.rb
 - lib/rdf/rdfa/profile/xml.rb
 - lib/rdf/rdfa/profile.rb
@@ -224,29 +311,40 @@ files:
 - 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: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 53
+      segments: 
+      - 1
+      - 8
+      - 1
       version: 1.8.1
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: rdf-rdfa
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RDFa reader/writer for RDF.rb.
 test_files: []
+
 has_rdoc: false